Mercurial > hg-stable

changeset 23995:d8330fb8c44d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
trydiff: remove unused variable 'modifiedset' We started updating 'modifiedset' in a9853fc172d2 (trydiff: simplify checking for additions, 2014-12-23) but in the same commit, we removed the last use of the variable. Clean it up.
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 29 Jan 2015 21:12:35 -0800
parents 8a2156780839
children 0188c2d90356
files mercurial/patch.py
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/patch.py	Mon Feb 02 23:07:04 2015 +0900
+++ b/mercurial/patch.py	Thu Jan 29 21:12:35 2015 -0800
@@ -1788,13 +1788,12 @@
     if opts.git:
         revs = None
 
-    modifiedset, addedset, removedset = set(modified), set(added), set(removed)
-    # Fix up modified and added, since merged-in additions appear as
+    addedset, removedset = set(added), set(removed)
+    # Fix up  added, since merged-in additions appear as
     # modifications during merges
-    for f in modifiedset.copy():
+    for f in modified:
         if f not in ctx1:
             addedset.add(f)
-            modifiedset.remove(f)
     for f in sorted(modified + added + removed):
         to = None
         tn = None