Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmdutil.py @ 15774:0bd17a4bed88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: split the copies api for "normal" and merge cases (API)
author Matt Mackall <mpm@selenic.com>
date Wed, 04 Jan 2012 15:48:02 -0600
parents 1facaad963a8
children 12309c09d19a
comparison
equal deleted inserted replaced
15773:371cff9610cd 15774:0bd17a4bed88
1199 return bad 1199 return bad
1200 1200
1201 def duplicatecopies(repo, rev, p1, p2): 1201 def duplicatecopies(repo, rev, p1, p2):
1202 "Reproduce copies found in the source revision in the dirstate for grafts" 1202 "Reproduce copies found in the source revision in the dirstate for grafts"
1203 # Here we simulate the copies and renames in the source changeset 1203 # Here we simulate the copies and renames in the source changeset
1204 cop, diver = copies.copies(repo, repo[rev], repo[p1], repo[p2], True) 1204 cop, diver = copies.mergecopies(repo, repo[rev], repo[p1], repo[p2])
1205 m1 = repo[rev].manifest() 1205 m1 = repo[rev].manifest()
1206 m2 = repo[p1].manifest() 1206 m2 = repo[p1].manifest()
1207 for k, v in cop.iteritems(): 1207 for k, v in cop.iteritems():
1208 if k in m1: 1208 if k in m1:
1209 if v in m1 or v in m2: 1209 if v in m1 or v in m2: