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

Herald added a subscriber: mercurial-patches. ryancoop987 added a comment. This is the latest online this play euchre free card game i am exited to all time see it REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6607/new/ REVISIO

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&id=15829#toc RE

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 https://ph

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&id=15814 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6607/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6607 AFFECTED FI

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

pulkit added a comment. Also, can you add an entry about this to relnotes/next? INLINE COMMENTS > commands.py:4020 > +state = cmdutil.getunfinishedstate(repo) > +if state._opname != 'merge': > +raise error.Abort(_('cannot abort merge with %s in progress') % state

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

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

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

pulkit added inline comments. INLINE COMMENTS > commands.py:4019 > if abort: > +for state in statemod._unfinishedstates: > +if state.isunfinished(repo) and state._opname != 'merge': We are performing the same loop in https://phab.mercurial-scm.org/D6566. How about havin

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

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

pulkit added inline comments. INLINE COMMENTS > commands.py:4017 > +unfinishedstate = None > +for state in statemod._unfinishedstates: > +if state.isunfinished(repo): We should first check `if abort` before performing this loop instead of checking later. > commands.py:4019 > +

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