Mercurial > hg
comparison mercurial/copies.py @ 15774:0bd17a4bed88
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 | 1ffeeb91c55d |
| children | 91eb4512edd0 |
comparison
equal
deleted
inserted
replaced
| 15773:371cff9610cd | 15774:0bd17a4bed88 |
|---|---|
| 82 | 82 |
| 83 if not hascommonancestor: | 83 if not hascommonancestor: |
| 84 return None | 84 return None |
| 85 return limit | 85 return limit |
| 86 | 86 |
| 87 def copies(repo, c1, c2, ca, checkdirs=False): | 87 def pathcopies(c1, c2): |
| 88 return mergecopies(c1._repo, c1, c2, c1._repo["null"], False)[0] | |
| 89 | |
| 90 def mergecopies(repo, c1, c2, ca, checkdirs=True): | |
| 88 """ | 91 """ |
| 89 Find moves and copies between context c1 and c2 | 92 Find moves and copies between context c1 and c2 |
| 90 """ | 93 """ |
| 91 # avoid silly behavior for update from empty dir | 94 # avoid silly behavior for update from empty dir |
| 92 if not c1 or not c2 or c1 == c2: | 95 if not c1 or not c2 or c1 == c2: |