Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/localrepo.py @ 41783:2e2076c8c25f
commit: migrate to new method for getting copy info
Differential Revision: https://phab.mercurial-scm.org/D6014
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 27 Dec 2017 22:31:24 -0800 |
| parents | ec7bba81ebf4 |
| children | f6eff9e4de80 |
comparison
equal
deleted
inserted
replaced
| 41782:151cc149b17f | 41783:2e2076c8c25f |
|---|---|
| 2291 changelist.append(fname) | 2291 changelist.append(fname) |
| 2292 return node | 2292 return node |
| 2293 | 2293 |
| 2294 flog = self.file(fname) | 2294 flog = self.file(fname) |
| 2295 meta = {} | 2295 meta = {} |
| 2296 copy = fctx.renamed() | 2296 cfname = fctx.copysource() |
| 2297 if copy and copy[0] != fname: | 2297 if cfname and cfname != fname: |
| 2298 # Mark the new revision of this file as a copy of another | 2298 # Mark the new revision of this file as a copy of another |
| 2299 # file. This copy data will effectively act as a parent | 2299 # file. This copy data will effectively act as a parent |
| 2300 # of this new revision. If this is a merge, the first | 2300 # of this new revision. If this is a merge, the first |
| 2301 # parent will be the nullid (meaning "look up the copy data") | 2301 # parent will be the nullid (meaning "look up the copy data") |
| 2302 # and the second one will be the other parent. For example: | 2302 # and the second one will be the other parent. For example: |
| 2312 # 0 --- 1 --- 3 rev4 reverts the content change from rev2 | 2312 # 0 --- 1 --- 3 rev4 reverts the content change from rev2 |
| 2313 # \ / merging rev3 and rev4 should use bar@rev2 | 2313 # \ / merging rev3 and rev4 should use bar@rev2 |
| 2314 # \- 2 --- 4 as the merge base | 2314 # \- 2 --- 4 as the merge base |
| 2315 # | 2315 # |
| 2316 | 2316 |
| 2317 cfname = copy[0] | |
| 2318 crev = manifest1.get(cfname) | 2317 crev = manifest1.get(cfname) |
| 2319 newfparent = fparent2 | 2318 newfparent = fparent2 |
| 2320 | 2319 |
| 2321 if manifest2: # branch merge | 2320 if manifest2: # branch merge |
| 2322 if fparent2 == nullid or crev is None: # copied on remote side | 2321 if fparent2 == nullid or crev is None: # copied on remote side |