D6588: abort: added support for merge

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

D6579: abort: added support for unshelve

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

D6582: abort: added support for histedit

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

D6567: abort: added support for graft

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

D6608: graft: moved abortgraft and readgraft to cmdutil

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15803. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6608?vs=15778&id=15803 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6608/new/ REVISION DETAIL h

D6566: abort: added logic for of hg abort

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15802. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6566?vs=15777&id=15802 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6566/new/ REVISION DETAIL h

D6568: abort: added support for rebase

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

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

taapas1128 edited the summary of this revision. taapas1128 updated this revision to Diff 15801. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6607?vs=15793&id=15801 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6607/new/ REVISION DETAIL h

D6582: abort: added support for histedit

taapas1128 added a comment. Okay I will do that. So should I remove `--no-backup` flag altogether from this series of patches because none of the commands support `--no-backup` then. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6582/new/ REVISION DE

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

taapas1128 added a comment. okay I will create that in `cmdutil.py`. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6607/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6607 To: taapas1128, #hg-reviewers Cc: pulkit, mercurial-devel

D6582: abort: added support for histedit

taapas1128 added a comment. @pulkit Yeah I know that but look at D3965 . histedit once did support `--no-backup` flag. It was dropped off for a different reason. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6582

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

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

D6588: abort: added support for merge

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

D6579: abort: added support for unshelve

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

D6582: abort: added support for histedit

taapas1128 updated this revision to Diff 15782. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6582?vs=15769&id=15782 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6582/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6582 AFFECTED FI

D6567: abort: added support for graft

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

D6608: graft: moved abortgraft and readgraft to cmdutil

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6608 AFFECTED FILES mercurial/cmdutil.py mercurial/commands.py CHANGE DETAILS diff --git a/mercu

D6566: abort: added logic for of hg abort

taapas1128 updated this revision to Diff 15777. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6566?vs=15775&id=15777 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6566/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6566 AFFECTED FI

D6568: abort: added support for rebase

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

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

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This patch disallows `hg merge --abort` in case an operation of higher precedence i.e unshelve, rebase, histedit are in unfinished states. This is done so

D6566: abort: added logic for of hg abort

taapas1128 updated this revision to Diff 15775. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6566?vs=15750&id=15775 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6566/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6566 AFFECTED FI

D6588: abort: added support for merge

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

D6579: abort: added support for unshelve

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

D6582: abort: added support for histedit

taapas1128 updated this revision to Diff 15769. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6582?vs=15754&id=15769 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6582/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6582 AFFECTED FI

D6567: abort: added support for graft

taapas1128 updated this revision to Diff 15766. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6567?vs=15751&id=15766 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6567/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6567 AFFECTED FI

D6568: abort: added support for rebase

taapas1128 updated this revision to Diff 15767. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6568?vs=15752&id=15767 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6568/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6568 AFFECTED FI

D6606: statecheck: updated docstrings related to afterresolvedstates

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6606 AFFECTED FILES mercurial/cmdutil.py CHANGE DETAILS diff --git a/mercurial/cmdutil.py b/mercur

D6588: abort: added support for merge

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

D6588: abort: added support for merge

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

D6579: abort: added support for unshelve

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

D6588: abort: added support for merge

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

D6579: abort: added support for unshelve

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

D6566: abort: added logic for of hg abort

taapas1128 edited the summary of this revision. taapas1128 retitled this revision from "abort: first prototype of hg abort" to "abort: added logic for of hg abort". taapas1128 updated this revision to Diff 15750. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.o

D6568: abort: added support for rebase

taapas1128 added a comment. @pulkit I have updated the descriptions. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6568/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6568 To: taapas1128, martinvonz, #hg-reviewers Cc: pulkit, mercurial-devel

D6582: abort: added support for histedit

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

D6568: abort: added support for rebase

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

D6567: abort: added support for graft

taapas1128 edited the summary of this revision. taapas1128 retitled this revision from "abort: added functionality for graft" to "abort: added support for graft". taapas1128 updated this revision to Diff 15751. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org

D6588: abort: added support for merge

taapas1128 updated this revision to Diff 15749. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6588?vs=15706&id=15755 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6588/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6588 AFFECTED FI

D6566: abort: added logic for of hg abort

taapas1128 updated this revision to Diff 15731. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6566?vs=15646&id=15750 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6566/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6566 AFFECTED FI

D6579: abort: added support for unshelve

taapas1128 updated this revision to Diff 15734. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6579?vs=15666&id=15756 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6579/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6579 AFFECTED FI

D6579: abort: added support for unshelve

taapas1128 added a comment. I have rebased it. 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: pulkit, mercurial-devel __

D6567: abort: added support for graft

taapas1128 added inline comments. INLINE COMMENTS > pulkit wrote in commands.py:2738 > Directly calling `_abortgraft` is not safe. `graft --abort` takes wlock first > and then calls it. We skipped taking the lock in case of `hg abort`. @pulkit the wlock is activated later in `graft --abort` dur

D6582: abort: added support for histedit

taapas1128 updated this revision to Diff 15735. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6582?vs=15686&id=15754 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6582/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6582 AFFECTED FI

D6567: abort: added support for graft

taapas1128 updated this revision to Diff 15732. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6567?vs=15647&id=15751 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6567/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6567 AFFECTED FI

D6568: abort: added support for rebase

taapas1128 updated this revision to Diff 15733. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6568?vs=15648&id=15752 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6568/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6568 AFFECTED FI

D6588: abort: added support for merge

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This adds support of `hg merge --abort` to `hg abort`. Results are shown as tests. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org

D6547: shelve: removed redundant merge detection method

Closed by commit rHGe9f2252e218e: shelve: removed redundant merge detection method (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 CHA

D6557: relnotes: added description about statemod._statecheck

taapas1128 added inline comments. INLINE COMMENTS > martinvonz wrote in next:65-66 > I'll drop the last sentence in flight since D6583 > has landed. thanks! REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6557/new/

D6557: relnotes: added description about statemod._statecheck

Closed by commit rHGdf5f674050b7: relnotes: added description about statemod._statecheck (authored by taapas1128). This revision was automatically updated to reflect the committed changes. CHANGED PRIOR TO COMMIT https://phab.mercurial-scm.org/D6557?vs=15690&id=15691#toc REPOSITORY rHG Mercu

D6557: relnotes: added description about statemod._statecheck

taapas1128 updated this revision to Diff 15690. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6557?vs=15620&id=15690 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6557/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6557 AFFECTED FI

D6583: statecheck: shifted defaults to addunfinished()

Closed by commit rHGfaec09d89435: statecheck: shifted defaults to addunfinished() (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 CHAN

D6551: statecheck: added support for cmdutil.afterresolvedstates

taapas1128 added inline comments. INLINE COMMENTS > taapas1128 wrote in state.py:135 > sure. resolved in D6583 REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6551/new/ REVISION DETAIL https://phab.mercurial-scm.o

D6583: statecheck: shifted defaults to addunfinished()

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This shifts the definitions and defaults of `_statecheck()` class to `addunfinished()` registration method. REPOSITORY rHG Mercurial REVISION DETAIL https

D6551: statecheck: added support for cmdutil.afterresolvedstates

taapas1128 added inline comments. INLINE COMMENTS > martinvonz wrote in state.py:135 > Oh, it still won't be consistent... Can you send a follow-up to reorder these > assignments to be consistent? sure. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D655

D6547: shelve: removed redundant merge detection method

taapas1128 updated this revision to Diff 15687. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6547?vs=15642&id=15687 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6547/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6547 AFFECTED FI

D6557: relnotes: added description about statemod._statecheck

taapas1128 added inline comments. INLINE COMMENTS > martinvonz wrote in next:63-69 > The "private" (underscore-prefixed) members should not be mentioned here. > Extension developers should not be accessing them, so they don't need to know > about them. What they need to know is that if they had

D6582: abort: 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 abort` plan. `_aborthistedit()` has been modified for independent calls.

D6551: statecheck: added support for cmdutil.afterresolvedstates

Closed by commit rHG0231032729c4: statecheck: added support for cmdutil.afterresolvedstates (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 Mercu

D6484: states: moved cmdutil.unfinishedstates to state.py

Closed by commit rHG5f2f6912c9e6: states: moved cmdutil.unfinishedstates to state.py (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/D6484?vs=15638&id=15681

D6503: statecheck: added support for STATES

Closed by commit rHG12243f15d53e: statecheck: added support for STATES (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/D6503?vs=15641&id=15684 CHANGES SINCE

D6501: state: created new class statecheck to handle unfinishedstates

Closed by commit rHGdc3fdd1b5af4: state: created new class statecheck to handle unfinishedstates (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/D6501?vs=1563

D6502: state: moved cmdutil.STATES and utilities to state.py

Closed by commit rHG5bddd2244814: state: moved cmdutil.STATES and utilities to state.py (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/D6502?vs=15640&id=1568

D6579: abort: added support for unshelve

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

D6579: abort: 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 shelve in `hg abort` plan. `unshelveabort()` has been modified for independent calls. Results are shown as tests. REPOSITO

D6566: abort: first prototype of hg abort

taapas1128 updated this revision to Diff 15646. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6566?vs=15635&id=15646 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6566/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6566 AFFECTED FI

D6567: abort: added functionality for graft

taapas1128 updated this revision to Diff 15647. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6567?vs=15636&id=15647 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6567/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6567 AFFECTED FI

D6568: abort: added support for rebase

taapas1128 updated this revision to Diff 15648. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6568?vs=15637&id=15648 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6568/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6568 AFFECTED FI

D6566: abort: first prototype of hg abort

taapas1128 added a comment. @martinvonz I wanted this as a seperate stack for now so that the previous stack can be committed first. Do you want me to update its parents and add it to the previous stack? REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D

D6558: cmdutil: updated description for bailifchanged()

taapas1128 added a comment. taapas1128 abandoned this revision. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6558/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6558 To: taapas1128, #hg-reviewers Cc: mercurial-devel __

D6551: statecheck: added support for cmdutil.afterresolvedstates

taapas1128 updated this revision to Diff 15645. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6551?vs=15644&id=15645 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6551/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6551 AFFECTED FI

D6551: statecheck: added support for cmdutil.afterresolvedstates

taapas1128 edited the summary of this revision. taapas1128 retitled this revision from "state: moved cmdutil.afterresolvedstates to statemod" to "statecheck: added support for cmdutil.afterresolvedstates". taapas1128 updated this revision to Diff 15644. REPOSITORY rHG Mercurial CHANGES SINCE

D6548: mq: fix for merge detection methods

taapas1128 updated this revision to Diff 15643. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6548?vs=15600&id=15643 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6548/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6548 AFFECTED FI

D6547: shelve: removed redundant merge detection method

taapas1128 updated this revision to Diff 15642. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6547?vs=15598&id=15642 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6547/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6547 AFFECTED FI

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15641. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15614&id=15641 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED FI

D6484: states: moved cmdutil.unfinishedstates to state.py

taapas1128 updated this revision to Diff 15638. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6484?vs=15586&id=15638 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6484/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6484 AFFECTED FI

D6501: state: created new class statecheck to handle unfinishedstates

taapas1128 updated this revision to Diff 15639. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6501?vs=15613&id=15639 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6501/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6501 AFFECTED FI

D6502: state: moved cmdutil.STATES and utilities to state.py

taapas1128 updated this revision to Diff 15640. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6502?vs=15583&id=15640 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6502/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6502 AFFECTED FI

D6567: abort: added functionality for graft

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This modifies existing `_abortgraft()` and removes its dependency of `graftstate`. This is done because the operations listed in the previous commits have spe

D6566: abort: first prototype of hg abort

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This adds the first prototype for `hg abort`. It includes the logic of `hg abort` and adds a way to register abort funtions for various unfinished operations.

D6568: abort: added support for rebase

taapas1128 created this revision. Herald added a reviewer: martinvonz. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This creates a new `_abortrebase()` whose arguments are independent of `rebaseruntime` object. Results of tests are sh

D6552: statecheck: added support for cmdutil.afterresolvedstates

taapas1128 updated this revision to Diff 15629. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6552?vs=15615&id=15629 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6552/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6552 AFFECTED FI

D6558: cmdutil: updated description for bailifchanged()

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REVISION SUMMARY This is added to establish a connection between `statemod.checkunfinished()` and `bailifchanged()`. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.

D6501: state: created new class statecheck to handle unfinishedstates

taapas1128 added a comment. @martinvonz relnotes/next have been updated in D6557 . REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6501/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6501 To: taapas1128, d

D6557: relnotes: added description about statemod._statecheck

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6557 AFFECTED FILES relnotes/next CHANGE DETAILS diff --git a/relnotes/next b/relnotes/next --- a/

D6552: statecheck: added support for cmdutil.afterresolvedstates

taapas1128 updated this revision to Diff 15615. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6552?vs=15612&id=15615 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6552/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6552 AFFECTED FI

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15614. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15610&id=15614 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED FI

D6501: state: created new class statecheck to handle unfinishedstates

taapas1128 updated this revision to Diff 15613. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6501?vs=15570&id=15613 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6501/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6501 AFFECTED FI

D6503: statecheck: added support for STATES

taapas1128 added inline comments. taapas1128 marked an inline comment as done. INLINE COMMENTS > martinvonz wrote in rebase.py:1954-1955 > It seems like this should also be unified with the new tracking of unfinished > operations. Will you have time to look into that after the current series? Y

D6551: state: moved cmdutil.afterresolvedstates to statemod

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 commit moves `cmdutil.afterresolvedstates` and adjoining function to `state.py`. The

D6552: statecheck: added support for cmdutil.afterresolvedstates

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 removes `afterresolvedstates` from `state.py` and adds support for it in `_statechec

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15610. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15597&id=15610 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED FI

D6548: mq: fix for merge detection methods

taapas1128 updated this revision to Diff 15600. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6548?vs=15599&id=15600 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6548/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6548 AFFECTED FI

D6548: mq: fix for merge detection methods

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6548 AFFECTED FILES hgext/mq.py tests/test-mq-qnew.t CHANGE DETAILS diff --git a/tests/test-mq-q

D6547: shelve: removed redundant merge detection method

taapas1128 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6547 AFFECTED FILES hgext/shelve.py CHANGE DETAILS diff --git a/hgext/shelve.py b/hgext/shelve.py

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15597. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15589&id=15597 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED FI

D6503: statecheck: added support for STATES

taapas1128 added a comment. taapas1128 marked 2 inline comments as done. okay I will send seperate patches for them right away . The amends in this are done. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercu

D6503: statecheck: added support for STATES

taapas1128 added inline comments. INLINE COMMENTS > martinvonz wrote in test-shelve.t:1156 > Don't forget to add patch that cleans up `shelve.py` to not handle the merge > case explicitly (unless it's still needed there for some reason). The same > applies to mq. as a seperate patch after this

D6503: statecheck: added support for STATES

taapas1128 added inline comments. INLINE COMMENTS > state.py:167 > +""" > +if self._opname == 'merge': > +return len(repo[None].parents()) > 1 removed bisect from here . @martinvonz have a look. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mer

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15589. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15588&id=15589 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED FI

D6503: statecheck: added support for STATES

taapas1128 updated this revision to Diff 15588. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6503?vs=15587&id=15588 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6503/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6503 AFFECTED FI

<    1   2   3   4   5   >