Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/merge.py @ 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 | 3177d710630d 902554884335 |
comparison
equal
deleted
inserted
replaced
| 22965:b697fa74b475 | 22966:ff93aa006e6a |
|---|---|
| 422 | 422 |
| 423 aborts = [] | 423 aborts = [] |
| 424 # Compare manifests | 424 # Compare manifests |
| 425 diff = m1.diff(m2) | 425 diff = m1.diff(m2) |
| 426 | 426 |
| 427 for f, ((n1, n2), (fl1, fl2)) in diff.iteritems(): | 427 for f, ((n1, fl1), (n2, fl2)) in diff.iteritems(): |
| 428 if partial and not partial(f): | 428 if partial and not partial(f): |
| 429 continue | 429 continue |
| 430 if n1 and n2: | 430 if n1 and n2: |
| 431 fa = f | 431 fa = f |
| 432 a = ma.get(f, nullid) | 432 a = ma.get(f, nullid) |