D2238: narrowmerge: iterate over a copy of dict items so we can mutate the dict

[durin42 (Augie Fackler)]

This revision was automatically updated to reflect the committed changes.
Closed by commit rHG53fe5a1a92bd: narrowmerge: iterate over a copy of dict 
items so we can mutate the dict (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2238?vs=5660=5674

REVISION DETAIL
  https://phab.mercurial-scm.org/D2238

AFFECTED FILES
  hgext/narrow/narrowmerge.py

CHANGE DETAILS

diff --git a/hgext/narrow/narrowmerge.py b/hgext/narrow/narrowmerge.py
--- a/hgext/narrow/narrowmerge.py
+++ b/hgext/narrow/narrowmerge.py
@@ -28,7 +28,9 @@
 nooptypes = set(['k']) # TODO: handle with nonconflicttypes
 nonconflicttypes = set('a am c cm f g r e'.split())
 narrowmatch = repo.narrowmatch()
-for f, action in actions.items():
+# We mutate the items in the dict during iteration, so iterate
+# over a copy.
+for f, action in list(actions.items()):
 if narrowmatch(f):
 pass
 elif not branchmerge:



To: durin42, #hg-reviewers, indygreg
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D2238: narrowmerge: iterate over a copy of dict items so we can mutate the dict

[durin42 (Augie Fackler)]

durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2238

AFFECTED FILES
  hgext/narrow/narrowmerge.py

CHANGE DETAILS

diff --git a/hgext/narrow/narrowmerge.py b/hgext/narrow/narrowmerge.py
--- a/hgext/narrow/narrowmerge.py
+++ b/hgext/narrow/narrowmerge.py
@@ -28,7 +28,9 @@
 nooptypes = set(['k']) # TODO: handle with nonconflicttypes
 nonconflicttypes = set('a am c cm f g r e'.split())
 narrowmatch = repo.narrowmatch()
-for f, action in actions.items():
+# We mutate the items in the dict during iteration, so iterate
+# over a copy.
+for f, action in list(actions.items()):
 if narrowmatch(f):
 pass
 elif not branchmerge:



To: durin42, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel