Mercurial > hg
changeset 22966:ff93aa006e6a
manifest: transpose pair of pairs from diff()
It makes more sense for the file nodeids and returned from diff() to
be ((n1,fl1),(n2,fl2)) than ((n1,n2),(fl1,fl2)), so change it to the
former.
| author | Martin von Zweigbergk <martinvonz@gmail.com> |
|---|---|
| date | Tue, 14 Oct 2014 23:18:07 -0700 |
| parents | b697fa74b475 |
| children | a42d67c16fb9 |
| files | mercurial/manifest.py mercurial/merge.py |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/manifest.py Tue Oct 14 22:48:44 2014 -0700 +++ b/mercurial/manifest.py Tue Oct 14 23:18:07 2014 -0700 @@ -42,7 +42,7 @@ def diff(self, m2): '''Finds changes between the current manifest and m2. The result is returned as a dict with filename as key and values of the form - ((n1,n2),(fl1,fl2)), where n1/n2 is the nodeid in the current/other + ((n1,fl1),(n2,fl2)), where n1/n2 is the nodeid in the current/other manifest and fl1/fl2 is the flag in the current/other manifest. Where the file does not exist, the nodeid will be None and the flags will be the empty string.''' @@ -55,12 +55,12 @@ if n2 is None: fl2 = '' if n1 != n2 or fl1 != fl2: - diff[fn] = ((n1, n2), (fl1, fl2)) + diff[fn] = ((n1, fl1), (n2, fl2)) for fn, n2 in m2.iteritems(): if fn not in self: fl2 = m2._flags.get(fn, '') - diff[fn] = ((None, n2), ('', fl2)) + diff[fn] = ((None, ''), (n2, fl2)) return diff
--- a/mercurial/merge.py Tue Oct 14 22:48:44 2014 -0700 +++ b/mercurial/merge.py Tue Oct 14 23:18:07 2014 -0700 @@ -424,7 +424,7 @@ # Compare manifests diff = m1.diff(m2) - for f, ((n1, n2), (fl1, fl2)) in diff.iteritems(): + for f, ((n1, fl1), (n2, fl2)) in diff.iteritems(): if partial and not partial(f): continue if n1 and n2: