Mercurial > hg-stable

comparison mercurial/localrepo.py @ 6549:2af1b9de62b3

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