Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/hg.py @ 575:7f5ce4bbdd7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More whitespace cleanups -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 More whitespace cleanups manifest hash: 6721a7b11295e0127386b080fd7a7b516ebced74 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxwm/ywK+sNU5EO8RAnl+AKCg/7ZCW7zIoG0nefksZzgLzgNmFACgnAFz ZkW0LyZcU/hkFgXoGwo7ktk= =AW+0 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 02 Jul 2005 13:40:15 -0800
parents b2c9b36bd639
children da11baf5de7b
comparison
equal deleted inserted replaced
574:af7e21f3b2d9 575:7f5ce4bbdd7b
645 meta = {} 645 meta = {}
646 cp = self.dirstate.copied(f) 646 cp = self.dirstate.copied(f)
647 if cp: 647 if cp:
648 meta["copy"] = cp 648 meta["copy"] = cp
649 meta["copyrev"] = hex(m1.get(cp, m2.get(cp, nullid))) 649 meta["copyrev"] = hex(m1.get(cp, m2.get(cp, nullid)))
650 self.ui.debug(" %s: copy %s:%s\n" % (f, cp, meta["copyrev"])) 650 self.ui.debug(" %s: copy %s:%s\n" % (f, cp, meta["copyrev"]))
651 651
652 r = self.file(f) 652 r = self.file(f)
653 fp1 = m1.get(f, nullid) 653 fp1 = m1.get(f, nullid)
654 fp2 = m2.get(f, nullid) 654 fp2 = m2.get(f, nullid)
655 new[f] = r.add(t, meta, tr, linkrev, fp1, fp2) 655 new[f] = r.add(t, meta, tr, linkrev, fp1, fp2)
811 f = 1 811 f = 1
812 812
813 while n != bottom: 813 while n != bottom:
814 p = self.changelog.parents(n)[0] 814 p = self.changelog.parents(n)[0]
815 if i == f: 815 if i == f:
816 l.append(n) 816 l.append(n)
817 f = f * 2 817 f = f * 2
818 n = p 818 n = p
819 i += 1 819 i += 1
820 820
821 r.append(l) 821 r.append(l)