Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 6535:93e140dbcd44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
localrepo: forbid nullid copyrev
author Patrick Mezard <pmezard@gmail.com>
date Mon, 14 Apr 2008 22:31:33 +0200
parents 34c51857ba4f
children 2af1b9de62b3 deda205a00e1
comparison
equal deleted inserted replaced
6534:9b35a9f34675 6535:93e140dbcd44
707 # \ / merging rev3 and rev4 should use bar@rev2 707 # \ / merging rev3 and rev4 should use bar@rev2
708 # \- 2 --- 4 as the merge base 708 # \- 2 --- 4 as the merge base
709 # 709 #
710 meta["copy"] = cp 710 meta["copy"] = cp
711 if not manifest2: # not a branch merge 711 if not manifest2: # not a branch merge
712 meta["copyrev"] = hex(manifest1.get(cp, nullid)) 712 meta["copyrev"] = hex(manifest1[cp])
713 fp2 = nullid 713 fp2 = nullid
714 elif fp2 != nullid: # copied on remote side 714 elif fp2 != nullid: # copied on remote side
715 meta["copyrev"] = hex(manifest1.get(cp, nullid)) 715 meta["copyrev"] = hex(manifest1[cp])
716 elif fp1 != nullid: # copied on local side, reversed 716 elif fp1 != nullid: # copied on local side, reversed
717 meta["copyrev"] = hex(manifest2.get(cp)) 717 meta["copyrev"] = hex(manifest2[cp])
718 fp2 = fp1 718 fp2 = fp1
719 elif cp in manifest2: # directory rename on local side 719 elif cp in manifest2: # directory rename on local side
720 meta["copyrev"] = hex(manifest2[cp]) 720 meta["copyrev"] = hex(manifest2[cp])
721 else: # directory rename on remote side 721 else: # directory rename on remote side
722 meta["copyrev"] = hex(manifest1.get(cp, nullid)) 722 meta["copyrev"] = hex(manifest1[cp])
723 self.ui.debug(_(" %s: copy %s:%s\n") % 723 self.ui.debug(_(" %s: copy %s:%s\n") %
724 (fn, cp, meta["copyrev"])) 724 (fn, cp, meta["copyrev"]))
725 fp1 = nullid 725 fp1 = nullid
726 elif fp2 != nullid: 726 elif fp2 != nullid:
727 # is one parent an ancestor of the other? 727 # is one parent an ancestor of the other?