D521: simplemerge: refactor _picklabels to be more compact
phillco (Phil Cohen)
phabricator at mercurial-scm.org
Fri Aug 25 20:50:08 UTC 2017
phillco created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Use @martinvonz's suggestion from https://phab.mercurial-scm.org/D376.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D521
AFFECTED FILES
mercurial/simplemerge.py
CHANGE DETAILS
diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -406,18 +406,12 @@
return text
def _picklabels(defaults, overrides):
- name_a, name_b, name_base = defaults
-
- if len(overrides) > 0:
- name_a = overrides[0]
- if len(overrides) > 1:
- name_b = overrides[1]
- if len(overrides) > 2:
- name_base = overrides[2]
if len(overrides) > 3:
raise error.Abort(_("can only specify three labels."))
-
- return [name_a, name_b, name_base]
+ result = defaults[:]
+ for i, override in enumerate(overrides):
+ result[i] = override
+ return result
def simplemerge(ui, localctx, basectx, otherctx, repo=None, **opts):
"""Performs the simplemerge algorithm.
To: phillco, #hg-reviewers
Cc: martinvonz, mercurial-devel
More information about the Mercurial-devel
mailing list