Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/localrepo.py @ 2902:cd7bbb19b96e
merge with mpm.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Tue, 15 Aug 2006 09:37:58 -0700 |
| parents | 05257fd28591 |
| children | 5bb65c3945a3 |
comparison
equal
deleted
inserted
replaced
| 2901:05f357b70cb0 | 2902:cd7bbb19b96e |
|---|---|
| 666 If node2 is None, compare node1 with working directory. | 666 If node2 is None, compare node1 with working directory. |
| 667 """ | 667 """ |
| 668 | 668 |
| 669 def fcmp(fn, mf): | 669 def fcmp(fn, mf): |
| 670 t1 = self.wread(fn) | 670 t1 = self.wread(fn) |
| 671 t2 = self.file(fn).read(mf.get(fn, nullid)) | 671 return self.file(fn).cmp(mf.get(fn, nullid), t1) |
| 672 return cmp(t1, t2) | |
| 673 | 672 |
| 674 def mfmatches(node): | 673 def mfmatches(node): |
| 675 change = self.changelog.read(node) | 674 change = self.changelog.read(node) |
| 676 mf = dict(self.manifest.read(change[0])) | 675 mf = dict(self.manifest.read(change[0])) |
| 677 for fn in mf.keys(): | 676 for fn in mf.keys(): |