Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 5229:dee573ba79f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
correctly record file-level history when the local side renames a directory
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 27 Aug 2007 14:21:04 -0300
parents 8050f13772f6
children 0d28d4e5fe1f ef65d6ec114e
comparison
equal deleted inserted replaced
5228:8050f13772f6 5229:dee573ba79f1
610 elif fp2 != nullid: # copied on remote side 610 elif fp2 != nullid: # copied on remote side
611 meta["copyrev"] = hex(manifest1.get(cp, nullid)) 611 meta["copyrev"] = hex(manifest1.get(cp, nullid))
612 elif fp1 != nullid: # copied on local side, reversed 612 elif fp1 != nullid: # copied on local side, reversed
613 meta["copyrev"] = hex(manifest2.get(cp)) 613 meta["copyrev"] = hex(manifest2.get(cp))
614 fp2 = fp1 614 fp2 = fp1
615 else: # directory rename 615 elif cp in manifest2: # directory rename on local side
616 meta["copyrev"] = hex(manifest2[cp])
617 else: # directory rename on remote side
616 meta["copyrev"] = hex(manifest1.get(cp, nullid)) 618 meta["copyrev"] = hex(manifest1.get(cp, nullid))
617 self.ui.debug(_(" %s: copy %s:%s\n") % 619 self.ui.debug(_(" %s: copy %s:%s\n") %
618 (fn, cp, meta["copyrev"])) 620 (fn, cp, meta["copyrev"]))
619 fp1 = nullid 621 fp1 = nullid
620 elif fp2 != nullid: 622 elif fp2 != nullid: