facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2025-01-08 14:46:47 +03:00
Code Issues Projects Releases Wiki Activity

merge: prevent simplemerge from mutating label list

Browse Source 
simplemerge was using list.pop() to remove items from the labels list. This
mutated the list and made it unusable by other calls (for instance, it might be
used in both the premerge and actual merge stages).
This commit is contained in:
Durham Goode 2014-05-08 16:33:06 -07:00
parent 6750e4199f
commit 18d054f5ce
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mercurial/simplemerge.py
View File

@ -416,11 +416,11 @@ def simplemerge(ui, local, base, other, **opts):
name_a = local
name_b = other
labels = opts.get('label', [])
if labels:
name_a = labels.pop(0)
if labels:
name_b = labels.pop(0)
if labels:
if len(labels) > 0:
name_a = labels[0]
if len(labels) > 1:
name_b = labels[1]
if len(labels) > 2:
raise util.Abort(_("can only specify two labels."))
try: