Mercurial > hg
comparison mercurial/patch.py @ 23664:377124ba6b10
trydiff: use 'not in addedset' for symmetry with 'not in removedset'
With the previous change in place, we can safely use 'addedset'.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 23 Dec 2014 16:25:00 -0800 |
parents | a9853fc172d2 |
children | a90499a6ad8d |
comparison
equal
deleted
inserted
replaced
23663:a9853fc172d2 | 23664:377124ba6b10 |
---|---|
1805 for f in sorted(modified + added + removed): | 1805 for f in sorted(modified + added + removed): |
1806 to = None | 1806 to = None |
1807 tn = None | 1807 tn = None |
1808 dodiff = True | 1808 dodiff = True |
1809 header = [] | 1809 header = [] |
1810 if f in man1: | 1810 if f not in addedset: |
1811 to = getfilectx(f, ctx1).data() | 1811 to = getfilectx(f, ctx1).data() |
1812 if f not in removedset: | 1812 if f not in removedset: |
1813 tn = getfilectx(f, ctx2).data() | 1813 tn = getfilectx(f, ctx2).data() |
1814 a, b = f, f | 1814 a, b = f, f |
1815 if opts.git or losedatafn: | 1815 if opts.git or losedatafn: |