Mercurial > hg
comparison mercurial/hg.py @ 566:b2c9b36bd639
repo.changes: fix duplicate changes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
repo.changes: fix duplicate changes
We need to discard the changed and added lists from dirstate.changes
before adding to them when comparing manifests. Otherwise something
that changed from rev->parent->working dir will appear twice.
Bug spotted by Goffredo Baroncelli <kreijack@libero.it>
manifest hash: 64c335e2fe6df6d1ce29d0903f16821c7566768f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxcT3ywK+sNU5EO8RAivLAJ4gqbWfMnt+BdyGac/ZGduy2KbNegCgncPV
D4ay6Qw9sIodEPjRebvk3GE=
=AZd2
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Fri, 01 Jul 2005 14:34:31 -0800 |
parents | cdddf4652aec |
children | 7f5ce4bbdd7b |
comparison
equal
deleted
inserted
replaced
565:9a80418646dd | 566:b2c9b36bd639 |
---|---|
684 self.dirstate.setparents(n) | 684 self.dirstate.setparents(n) |
685 self.dirstate.update(new, "n") | 685 self.dirstate.update(new, "n") |
686 self.dirstate.forget(remove) | 686 self.dirstate.forget(remove) |
687 | 687 |
688 def changes(self, node1, node2, files=None): | 688 def changes(self, node1, node2, files=None): |
689 # changed, added, deleted, unknown | 689 mf2, u = None, [] |
690 c, a, d, u, mf2 = [], [], [], [], None | |
691 | 690 |
692 def fcmp(fn, mf): | 691 def fcmp(fn, mf): |
693 t1 = self.wfile(fn).read() | 692 t1 = self.wfile(fn).read() |
694 t2 = self.file(fn).revision(mf[fn]) | 693 t2 = self.file(fn).revision(mf[fn]) |
695 return cmp(t1, t2) | 694 return cmp(t1, t2) |
724 for f in d: | 723 for f in d: |
725 if f in mf2: del mf2[f] | 724 if f in mf2: del mf2[f] |
726 else: | 725 else: |
727 change = self.changelog.read(node2) | 726 change = self.changelog.read(node2) |
728 mf2 = self.manifest.read(change[0]) | 727 mf2 = self.manifest.read(change[0]) |
728 | |
729 # flush lists from dirstate before comparing manifests | |
730 c, a = [], [] | |
729 | 731 |
730 change = self.changelog.read(node1) | 732 change = self.changelog.read(node1) |
731 mf1 = self.manifest.read(change[0]).copy() | 733 mf1 = self.manifest.read(change[0]).copy() |
732 | 734 |
733 for fn in mf2: | 735 for fn in mf2: |