This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6638

abort: removed labels argument from abortmerge()
ClosedPublic

Authored by taapas1128 on Jul 10 2019, 5:41 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG209f2b8a50dc: abort: removed labels argument from abortmerge()
rHG8d03ee731751: abort: removed labels argument from abortmerge()
Summary

Labels are used to label the code that belongs to working copy and merge rev
in case of a conflicted state.
No such labelling is required while aborting merge as conflicted parts
are reverted to normal.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

taapas1128 created this revision.Jul 10 2019, 5:41 PM
pulkit added a subscriber: pulkit.Jul 11 2019, 9:21 AM

However when merge is aborted there is no unresolved merge in progress and hence

This needs to be reworded.

no labels are required.

taapas1128 edited the summary of this revision. (Show Details)Jul 11 2019, 9:28 AM
taapas1128 updated this revision to Diff 15889.
taapas1128 added a comment.Jul 11 2019, 9:30 AM

Updated that is it fine now ?

pulkit accepted this revision.Jul 15 2019, 9:50 AM
This revision is now accepted and ready to land.Jul 15 2019, 9:50 AM
taapas1128 added a commit: rHG8d03ee731751: abort: removed labels argument from abortmerge().Jul 15 2019, 10:14 AM
Closed by commit rHG8d03ee731751: abort: removed labels argument from abortmerge() (authored by taapas1128). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hg.py (7 lines)

Diff 15911

mercurial/hg.py

return ret return ret
def merge(repo, node, force=None, remind=True, mergeforce=False, labels=None, def merge(repo, node, force=None, remind=True, mergeforce=False, labels=None,
abort=False): abort=False):
"""Branch merge with node, resolving changes. Return true if any """Branch merge with node, resolving changes. Return true if any
unresolved conflicts.""" unresolved conflicts."""
if abort: if abort:
return abortmerge(repo.ui, repo, labels=labels) return abortmerge(repo.ui, repo)
stats = mergemod.update(repo, node, branchmerge=True, force=force, stats = mergemod.update(repo, node, branchmerge=True, force=force,
mergeforce=mergeforce, labels=labels) mergeforce=mergeforce, labels=labels)
_showstats(repo, stats) _showstats(repo, stats)
if stats.unresolvedcount: if stats.unresolvedcount:
repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
"or 'hg merge --abort' to abandon\n")) "or 'hg merge --abort' to abandon\n"))
elif remind: elif remind:
repo.ui.status(_("(branch merge, don't forget to commit)\n")) repo.ui.status(_("(branch merge, don't forget to commit)\n"))
return stats.unresolvedcount > 0 return stats.unresolvedcount > 0
def abortmerge(ui, repo, labels=None): def abortmerge(ui, repo):
ms = mergemod.mergestate.read(repo) ms = mergemod.mergestate.read(repo)
if ms.active(): if ms.active():
# there were conflicts # there were conflicts
node = ms.localctx.hex() node = ms.localctx.hex()
else: else:
# there were no conficts, mergestate was not stored # there were no conficts, mergestate was not stored
node = repo['.'].hex() node = repo['.'].hex()
repo.ui.status(_("aborting the merge, updating back to" repo.ui.status(_("aborting the merge, updating back to"
" %s\n") % node[:12]) " %s\n") % node[:12])
stats = mergemod.update(repo, node, branchmerge=False, force=True, stats = mergemod.update(repo, node, branchmerge=False, force=True)
labels=labels)
_showstats(repo, stats) _showstats(repo, stats)
return stats.unresolvedcount > 0 return stats.unresolvedcount > 0
def _incoming(displaychlist, subreporecurse, ui, repo, source, def _incoming(displaychlist, subreporecurse, ui, repo, source,
opts, buffered=False): opts, buffered=False):
""" """
Helper for incoming / gincoming. Helper for incoming / gincoming.
displaychlist gets called with displaychlist gets called with