D6665: continue: added support for graft

taapas1128 updated this revision to Diff 16792. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6665?vs=16173=16792 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6665/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6665 AFFECTED

D6659: graft: split graft code into seperate functions

taapas1128 updated this revision to Diff 16791. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6659?vs=16155=16791 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6659/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6659 AFFECTED

D6659: graft: split graft code into seperate functions

taapas1128 added a comment. taapas1128 marked an inline comment as done. @durin42 done. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6659/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6659 To: taapas1128, #hg-reviewers, durin42 Cc: pulkit,

D6735: update: added support for --abort flag(issue4404)

taapas1128 added a comment. taapas1128 marked an inline comment as done. @durin42 I don't think the subrepos are properly initialized in the tests. I would be updating them soon. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6735/new/ REVISION

D6735: update: added support for --abort flag(issue4404)

taapas1128 added inline comments. taapas1128 marked an inline comment as done. INLINE COMMENTS > mharbison72 wrote in test-merge-tools.t:2092 > When you add more tests, please include some with 1 dirty subrepo, and then > another where the first subrepo is already merged/resolved, and the

D6735: update: added support for --abort flag(issue4404)

taapas1128 updated this revision to Diff 16294. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6735?vs=16262=16294 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6735/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6735 AFFECTED

D6735: update: added support for --abort flag(issue4404)

taapas1128 marked an inline comment as done. taapas1128 updated this revision to Diff 16262. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6735?vs=16261=16262 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6735/new/ REVISION DETAIL

D6735: update: added support for --abort flag(issue4404)

taapas1128 added inline comments. taapas1128 marked an inline comment as done. INLINE COMMENTS > pulkit wrote in test-merge-tools.t:2092 > I suggest taking `update --abort` tests in a new file as we will need to > extensively test that. I have created a separate file will add more tests.

D6735: update: added support for --abort flag(issue4404)

taapas1128 updated this revision to Diff 16261. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6735?vs=16251=16261 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6735/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6735 AFFECTED

D6735: update: added support for --abort flag(issue4404)

taapas1128 updated this revision to Diff 16251. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6735?vs=16250=16251 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6735/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6735 AFFECTED

D6735: update: added support for --abort flag(issue4404)

taapas1128 updated this revision to Diff 16250. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6735?vs=16249=16250 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6735/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6735 AFFECTED

D6735: update: added support for --abort flag(issue4404)

taapas1128 created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch adds functionality to abort a conflicted update. A new function `hg.abortupdate()` is added for the purpose which has a helper function

D6678: continue: added support for histedit

taapas1128 added a comment. @pulkit This one is ready too. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6678/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6678 To: taapas1128, durin42, #hg-reviewers Cc: pulkit, mercurial-devel

D6695: transplant: added support for --stop flag

Closed by commit rHG4d10aada6c3b: transplant: added support for --stop flag (authored by taapas1128). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6695?vs=16215=16223 CHANGES

D6695: transplant: added support for --stop flag

taapas1128 updated this revision to Diff 16215. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6695?vs=16214=16215 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6695/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6695 AFFECTED

D6695: transplant: added support for --stop flag

taapas1128 edited the summary of this revision. taapas1128 retitled this revision from "transplant: added support for --abort flag" to "transplant: added support for --stop flag". taapas1128 marked an inline comment as done. taapas1128 updated this revision to Diff 16214. REPOSITORY rHG

D6665: continue: added support for graft

taapas1128 updated this revision to Diff 16173. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6665?vs=16156=16173 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6665/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6665 AFFECTED

D6689: continue: added support for transplant

Closed by commit rHG0a4303c77637: continue: added support for transplant (authored by taapas1128). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6689?vs=16161=16169 CHANGES SINCE

D6695: transplant: added support for --abort flag

taapas1128 updated this revision to Diff 16162. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6695?vs=16159=16162 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6695/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6695 AFFECTED

D6689: continue: added support for transplant

taapas1128 marked an inline comment as done. taapas1128 updated this revision to Diff 16161. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6689?vs=16158=16161 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6689/new/ REVISION DETAIL

D6659: graft: split graft code into seperate functions

taapas1128 added inline comments. INLINE COMMENTS > pulkit wrote in cmdutil.py:3495 > the function name is not correct with respect to what it does, maybe > something like `getopts` or something. Also, we no longer update the `opts`, > so we can drop that as argument and also need to update

D6665: continue: added support for graft

taapas1128 updated this revision to Diff 16156. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6665?vs=16121=16156 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6665/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6665 AFFECTED

D6659: graft: split graft code into seperate functions

taapas1128 marked an inline comment as done. taapas1128 updated this revision to Diff 16155. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6659?vs=16120=16155 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6659/new/ REVISION DETAIL

D6696: abort: added support for transplant

taapas1128 marked an inline comment as done. taapas1128 updated this revision to Diff 16160. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6696?vs=16070=16160 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6696/new/ REVISION DETAIL

D6695: transplant: added support for --abort flag

taapas1128 marked 4 inline comments as done. taapas1128 updated this revision to Diff 16159. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6695?vs=16069=16159 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6695/new/ REVISION DETAIL

D6678: continue: added support for histedit

taapas1128 marked an inline comment as done. taapas1128 updated this revision to Diff 16157. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6678?vs=16019=16157 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6678/new/ REVISION DETAIL

D6689: continue: added support for transplant

taapas1128 updated this revision to Diff 16158. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6689?vs=16043=16158 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6689/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6689 AFFECTED

D6659: graft: split graft code into seperate functions

taapas1128 added a comment. @martinvonz @durin42 Have a look I ve updated the patch. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6659/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6659 To: taapas1128, #hg-reviewers, durin42 Cc: durin42,

D6665: continue: added support for graft

taapas1128 updated this revision to Diff 16121. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6665?vs=15988=16121 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6665/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6665 AFFECTED

D6659: graft: split graft code into seperate functions

taapas1128 updated this revision to Diff 16120. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6659?vs=15987=16120 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6659/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6659 AFFECTED

D6696: abort: added support for transplant

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This adds support of `transplant--abort` to `hg abort`. A seperate `aborttransplant` function is created for that. Results are shown in tests.

D6695: transplant: added support for --abort flag

taapas1128 updated this revision to Diff 16069. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6695?vs=16068=16069 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6695/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6695 AFFECTED

D6695: transplant: added support for --abort flag

taapas1128 updated this revision to Diff 16068. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6695?vs=16067=16068 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6695/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6695 AFFECTED

D6695: transplant: added support for --abort flag

taapas1128 created this revision. Herald added subscribers: mercurial-devel, mjpieters. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This adds fuctionality for `--abort` flag to `transplant`. A new method `abort` is added to `transplanter` class containing logic to abort

D6689: continue: added support for transplant

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This creates a seperate function `continuetransplant()` containing logic for resuming transplant from interrupted state. `continuetransplant()` is then

D6678: continue: added support for histedit

taapas1128 updated this revision to Diff 16019. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6678?vs=16018=16019 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6678/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6678 AFFECTED

D6678: continue: added support for histedit

taapas1128 created this revision. Herald added a reviewer: durin42. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch adds the support for histedit in `hg continue` plan. As seperate `hgcontinuehistedit()` function is created to

D6665: continue: added support for graft

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch creates `cmdutil.continuegraft()` function which contains the logic to resume graft when called directly. This function is then registered as

D6659: graft: split graft code into seperate functions

taapas1128 edited the summary of this revision. taapas1128 retitled this revision from "graft: split graft code to avoid duplication" to "graft: split graft code into seperate functions". taapas1128 updated this revision to Diff 15987. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6660: commands: removed part of description from abort and continue

Closed by commit rHG55d8329ba509: commands: removed part of description from abort and continue (authored by taapas1128). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6655: continue: added support for graft

taapas1128 added a comment. @martinvonz No problem, I will update patch D6659 . REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6655/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6655 To: taapas1128,

D6655: continue: added support for graft

taapas1128 added inline comments. INLINE COMMENTS > mharbison72 wrote in test-graft.t:1 > This has the same problem D6579 had > where there are 4 separate test cases, instead of 2 with sub cases. @mharbison72 I have generated a patch for that in D6659

D6659: graft: split graft code to avoid duplication

taapas1128 updated this revision to Diff 15978. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6659?vs=15973=15978 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6659/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6659 AFFECTED

D6655: continue: added support for graft

taapas1128 added inline comments. INLINE COMMENTS > martinvonz wrote in test-graft.t:1 > I tried to fix that but the test fails if I do that. I will have a look. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6655/new/ REVISION DETAIL

D6655: continue: added support for graft

taapas1128 added a comment. @yuja have a look at D6659 and suggest changes there. Extracting the core `for` loop as a helper function sounds like a nice idea. I will update the patch for the same. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D6655: continue: added support for graft

taapas1128 added inline comments. INLINE COMMENTS > martinvonz wrote in cmdutil.py:3482-3498 > It looks like pretty much this entire function is copies `commands.graft()` > and then all this code is left dead here (since `cont = True` above). I'd > prefer to de-queue this commit and let you

D6659: graft: split graft code to avoid duplication

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY To avoid duplication of code due to `cmdutil.continuegraft()`; `graft()` is split into `cmdutil.finishgraft()` which deals with the execution of graft once

D6660: commands: removed part of description from abort and continue

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY The description for registration of new `continuefunc` or `abortfunc` is removed as it is not required from user perspective. REPOSITORY rHG Mercurial

D6655: continue: added support for graft

taapas1128 added a comment. @martinvonz I will send a patch doing that. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6655/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6655 To: taapas1128, #hg-reviewers Cc: martinvonz, durin42,

D6655: continue: added support for graft

Closed by commit rHG0fff3cc9098c: continue: added support for graft (authored by taapas1128). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES SINCE

D6655: continue: added support for graft

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This adds support of graft to hg continue plan. The patch creates a seperate function `cmdutil.continuegraft` so that continue logic for graft can be

D6645: continue: added logic for hg continue

Closed by commit rHGb53633d3f809: continue: added logic for hg continue (authored by taapas1128). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES SINCE

D6652: continue: added support for unshelve

Closed by commit rHG3072efd46d1c: continue: added support for unshelve (authored by taapas1128). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES SINCE

D6646: continue: added support for rebase

Closed by commit rHGdb963eda96ef: continue: added support for rebase (authored by taapas1128). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES SINCE

D6652: continue: added support for unshelve

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch adds the support for `ushelve` in `hg continue` plan. `hgcontinueunshelve()` has been created for independent calls. In case an interrupted

D6646: continue: added support for rebase

taapas1128 updated this revision to Diff 15938. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6646?vs=15914=15938 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6646/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6646 AFFECTED

D6645: continue: added logic for hg continue

taapas1128 updated this revision to Diff 15915. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6645?vs=15913=15915 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6645/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6645 AFFECTED

D6646: continue: added support for rebase

taapas1128 created this revision. Herald added a reviewer: durin42. Herald added a reviewer: martinvonz. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This adds support of rebase to hg continue plan. An independent continue logic for

D6645: continue: added logic for hg continue

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is part of GSoC19 project `Implement abort and continue commands`. This patch is part of the continue plan. This adds the basic logic for hg

D6638: abort: removed labels argument from abortmerge()

Closed by commit rHG8d03ee731751: abort: removed labels argument from abortmerge() (authored by taapas1128). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6638?vs=15889=15911

D6638: abort: removed labels argument from abortmerge()

taapas1128 added a comment. Updated that is it fine now ? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6638/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6638 To: taapas1128, #hg-reviewers Cc: pulkit, mercurial-devel

D6638: abort: removed labels argument from abortmerge()

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15889. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6638?vs=15886=15889 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6638/new/ REVISION DETAIL

D6638: abort: removed labels argument from abortmerge()

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY Labels are used to label the code that belongs to `working copy` and `merge rev` in case of a conflicted state. However when merge is aborted there is no

D6588: abort: added support for merge

Closed by commit rHG3bc400ccbf99: abort: added support for merge (authored by taapas1128). This revision was automatically updated to reflect the committed changes. CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6588?vs=15880=15883#toc REPOSITORY rHG Mercurial CHANGES SINCE LAST

D6579: abort: added support for unshelve

Closed by commit rHG3fb0493812c0: abort: added support for unshelve (authored by taapas1128). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15866=15882 CHANGES SINCE LAST

D6636: unshelve: changed Corruptedstate error msg from ui.warn to error.Abort

Closed by commit rHG8ddfdcce4bd6: unshelve: changed Corruptedstate error msg from ui.warn to error.Abort (authored by taapas1128). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6588: abort: added support for merge

taapas1128 updated this revision to Diff 15880. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6588?vs=15879=15880 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6588/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6588 AFFECTED

D6588: abort: added support for merge

taapas1128 updated this revision to Diff 15879. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6588?vs=15867=15879 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6588/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6588 AFFECTED

D6548: mq: fix for merge detection methods

Closed by commit rHG51e52a495214: mq: fix for merge detection methods (authored by taapas1128). This revision was automatically updated to reflect the committed changes. This revision was not accepted when it landed; it landed in state "Needs Review". REPOSITORY rHG Mercurial CHANGES SINCE

D6636: unshelve: changed Corruptedstate error msg from ui.warn to error.Abort

taapas1128 added a comment. Fixed the message. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6636/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6636 To: taapas1128, #hg-reviewers, pulkit Cc: mercurial-devel

D6588: abort: added support for merge

taapas1128 updated this revision to Diff 15867. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6588?vs=15864=15867 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6588/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6588 AFFECTED

D6579: abort: added support for unshelve

taapas1128 updated this revision to Diff 15866. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15863=15866 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6579 AFFECTED

D6636: unshelve: changed Corruptedstate error msg from ui.warn to error.Abort

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15865. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6636?vs=15856=15865 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6636/new/ REVISION DETAIL

D6588: abort: added support for merge

taapas1128 updated this revision to Diff 15864. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6588?vs=15858=15864 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6588/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6588 AFFECTED

D6579: abort: added support for unshelve

taapas1128 updated this revision to Diff 15863. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15861=15863 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6579 AFFECTED

D6637: unshelve: changed Corruptedstate error msg from ui.warn to error.Abort

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This changes the message type of Corruptedstate error in case of `hg unshelve --abort` to error.Abort from warning message. This is done so as to avoid the

D6579: abort: added support for unshelve

taapas1128 updated this revision to Diff 15861. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15860=15861 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6579 AFFECTED

D6579: abort: added support for unshelve

taapas1128 added a comment. updated that. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6579 To: taapas1128, #hg-reviewers Cc: mharbison72, pulkit, mercurial-devel

D6579: abort: added support for unshelve

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15860. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15859=15860 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL

D6579: abort: added support for unshelve

taapas1128 updated this revision to Diff 15859. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15857=15859 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6579 AFFECTED

D6588: abort: added support for merge

taapas1128 updated this revision to Diff 15858. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6588?vs=15835=15858 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6588/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6588 AFFECTED

D6579: abort: added support for unshelve

taapas1128 marked 5 inline comments as done. taapas1128 updated this revision to Diff 15857. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15833=15857 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL

D6636: unshelve: changed Corruptedstate error msg from ui.warn to error.Abort

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This changes the message type of Corruptedstate error in case of `hg unshelve --abort` to error.Abort from warning message. This is fone so as to avoid the

D6566: abort: added logic for of hg abort

Closed by commit rHGbb135a784b70: abort: added logic for of hg abort (authored by taapas1128). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6566?vs=15836=15845 CHANGES SINCE LAST

D6567: abort: added support for graft

Closed by commit rHG5171937ad0f9: abort: added support for graft (authored by taapas1128). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6567?vs=15831=15846 CHANGES SINCE LAST

D6582: abort: added support for histedit

Closed by commit rHGdb5560c07a28: abort: added support for histedit (authored by taapas1128). This revision was automatically updated to reflect the committed changes. CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6582?vs=15834=15848#toc REPOSITORY rHG Mercurial CHANGES SINCE

D6568: abort: added support for rebase

Closed by commit rHGb9bc47211cf5: abort: added support for rebase (authored by taapas1128). This revision was automatically updated to reflect the committed changes. CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6568?vs=15832=15847#toc REPOSITORY rHG Mercurial CHANGES SINCE LAST

D6567: abort: added support for graft

taapas1128 added a comment. amended. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6567/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6567 To: taapas1128, #hg-reviewers, pulkit Cc: pulkit, mercurial-devel

D6566: abort: added logic for of hg abort

taapas1128 marked 3 inline comments as done. taapas1128 updated this revision to Diff 15836. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6566?vs=15802=15836 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6566/new/ REVISION DETAIL

D6588: abort: added support for merge

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15835. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6588?vs=15808=15835 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6588/new/ REVISION DETAIL

D6579: abort: added support for unshelve

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15833. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15806=15833 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL

D6582: abort: added support for histedit

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15834. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6582?vs=15807=15834 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6582/new/ REVISION DETAIL

D6567: abort: added support for graft

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15831. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6567?vs=15804=15831 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6567/new/ REVISION DETAIL

D6568: abort: added support for rebase

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15832. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6568?vs=15805=15832 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6568/new/ REVISION DETAIL

D6607: merge: disallow merge abort in case of an unfinished operation(issue6160)

Closed by commit rHGb8d54f4625cb: merge: disallow merge abort in case of an unfinished operation (issue6160) (authored by taapas1128). This revision was automatically updated to reflect the committed changes. CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6607?vs=15814=15829#toc

D6606: statecheck: updated docstrings related to afterresolvedstates

Closed by commit rHGceb31d96d3ae: statecheck: updated docstrings related to afterresolvedstates (authored by taapas1128). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D6608: graft: moved abortgraft and readgraft to cmdutil

Closed by commit rHGf9da9d5f3f5a: graft: moved abortgraft and readgraft to cmdutil (authored by taapas1128). This revision was automatically updated to reflect the committed changes. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6608?vs=15803=15817

D6607: merge: disallow merge abort in case of an unfinished operation(issue6160)

taapas1128 added a comment. taapas1128 marked an inline comment as done. added the entry in relnotes. INLINE COMMENTS > pulkit wrote in commands.py:4020 > state can be `None` here. My bad I really shouldn't have missed that. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION

D6607: merge: disallow merge abort in case of an unfinished operation(issue6160)

taapas1128 updated this revision to Diff 15814. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6607?vs=15801=15814 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6607/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6607 AFFECTED

D6579: abort: added support for unshelve

taapas1128 added a comment. @mharbison72 Thanks for the suggestions. I have amended the patch accordingly. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6579 To: taapas1128, #hg-reviewers

  1   2   3   4   5   >