Mercurial > public > mercurial-scm > hg
comparison mercurial/copies.py @ 6275:fda369b5779c
diff: use copy smarts from copies.py
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 15 Mar 2008 10:02:31 -0500 |
parents | f3f383efbeae |
children | cfebb175704f |
comparison
equal
deleted
inserted
replaced
6274:f3f383efbeae | 6275:fda369b5779c |
---|---|
55 def copies(repo, c1, c2, ca): | 55 def copies(repo, c1, c2, ca): |
56 """ | 56 """ |
57 Find moves and copies between context c1 and c2 | 57 Find moves and copies between context c1 and c2 |
58 """ | 58 """ |
59 # avoid silly behavior for update from empty dir | 59 # avoid silly behavior for update from empty dir |
60 if not c1 or not c2 or not ca: | 60 if not c1 or not c2: |
61 return {}, {} | 61 return {}, {} |
62 | 62 |
63 rev1, rev2 = c1.rev(), c2.rev() | 63 rev1, rev2 = c1.rev(), c2.rev() |
64 if rev1 is None: # c1 is a workingctx | 64 if rev1 is None: # c1 is a workingctx |
65 rev1 = c1.parents()[0].rev() | 65 rev1 = c1.parents()[0].rev() |