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 CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6638/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6638 AFFECTED FILES mercurial/hg.py CHANGE DETAILS diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -957,7 +957,7 @@ """Branch merge with node, resolving changes. Return true if any unresolved conflicts.""" if abort: -return abortmerge(repo.ui, repo, labels=labels) +return abortmerge(repo.ui, repo) stats = mergemod.update(repo, node, branchmerge=True, force=force, mergeforce=mergeforce, labels=labels) @@ -969,7 +969,7 @@ repo.ui.status(_("(branch merge, don't forget to commit)\n")) return stats.unresolvedcount > 0 -def abortmerge(ui, repo, labels=None): +def abortmerge(ui, repo): ms = mergemod.mergestate.read(repo) if ms.active(): # there were conflicts @@ -980,8 +980,7 @@ repo.ui.status(_("aborting the merge, updating back to" " %s\n") % node[:12]) -stats = mergemod.update(repo, node, branchmerge=False, force=True, -labels=labels) +stats = mergemod.update(repo, node, branchmerge=False, force=True) _showstats(repo, stats) return stats.unresolvedcount > 0 To: taapas1128, #hg-reviewers, pulkit Cc: pulkit, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
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 ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/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 https://phab.mercurial-scm.org/D6638 AFFECTED FILES mercurial/hg.py CHANGE DETAILS diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -957,7 +957,7 @@ """Branch merge with node, resolving changes. Return true if any unresolved conflicts.""" if abort: -return abortmerge(repo.ui, repo, labels=labels) +return abortmerge(repo.ui, repo) stats = mergemod.update(repo, node, branchmerge=True, force=force, mergeforce=mergeforce, labels=labels) @@ -969,7 +969,7 @@ repo.ui.status(_("(branch merge, don't forget to commit)\n")) return stats.unresolvedcount > 0 -def abortmerge(ui, repo, labels=None): +def abortmerge(ui, repo): ms = mergemod.mergestate.read(repo) if ms.active(): # there were conflicts @@ -980,8 +980,7 @@ repo.ui.status(_("aborting the merge, updating back to" " %s\n") % node[:12]) -stats = mergemod.update(repo, node, branchmerge=False, force=True, -labels=labels) +stats = mergemod.update(repo, node, branchmerge=False, force=True) _showstats(repo, stats) return stats.unresolvedcount > 0 To: taapas1128, #hg-reviewers Cc: pulkit, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D6638: abort: removed labels argument from abortmerge()
pulkit added a comment. > However when merge is aborted there is no unresolved merge in progress and hence This needs to be reworded. > no labels are required. 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 ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
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 unresolved merge in progress and hence no labels are required. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6638 AFFECTED FILES mercurial/hg.py CHANGE DETAILS diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -957,7 +957,7 @@ """Branch merge with node, resolving changes. Return true if any unresolved conflicts.""" if abort: -return abortmerge(repo.ui, repo, labels=labels) +return abortmerge(repo.ui, repo) stats = mergemod.update(repo, node, branchmerge=True, force=force, mergeforce=mergeforce, labels=labels) @@ -969,7 +969,7 @@ repo.ui.status(_("(branch merge, don't forget to commit)\n")) return stats.unresolvedcount > 0 -def abortmerge(ui, repo, labels=None): +def abortmerge(ui, repo): ms = mergemod.mergestate.read(repo) if ms.active(): # there were conflicts @@ -980,8 +980,7 @@ repo.ui.status(_("aborting the merge, updating back to" " %s\n") % node[:12]) -stats = mergemod.update(repo, node, branchmerge=False, force=True, -labels=labels) +stats = mergemod.update(repo, node, branchmerge=False, force=True) _showstats(repo, stats) return stats.unresolvedcount > 0 To: taapas1128, #hg-reviewers Cc: mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel