Mercurial > public > mercurial-scm > hg

comparison mercurial/patch.py @ 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 0db6810e84e8
children 0188c2d90356
comparison
equal deleted inserted replaced
23994:8a2156780839 23995:d8330fb8c44d
1786 copyto = dict([(v, k) for k, v in copy.items()]) 1786 copyto = dict([(v, k) for k, v in copy.items()])
1787 1787
1788 if opts.git: 1788 if opts.git:
1789 revs = None 1789 revs = None
1790 1790
1791 modifiedset, addedset, removedset = set(modified), set(added), set(removed) 1791 addedset, removedset = set(added), set(removed)
1792 # Fix up modified and added, since merged-in additions appear as 1792 # Fix up added, since merged-in additions appear as
1793 # modifications during merges 1793 # modifications during merges
1794 for f in modifiedset.copy(): 1794 for f in modified:
1795 if f not in ctx1: 1795 if f not in ctx1:
1796 addedset.add(f) 1796 addedset.add(f)
1797 modifiedset.remove(f)
1798 for f in sorted(modified + added + removed): 1797 for f in sorted(modified + added + removed):
1799 to = None 1798 to = None
1800 tn = None 1799 tn = None
1801 binarydiff = False 1800 binarydiff = False
1802 header = [] 1801 header = []