Mercurial > hg
comparison mercurial/copies.py @ 42594:d013099c551b
copies: filter invalid copies only at end of pathcopies() (issue6163)
copies._filter() filters out copies whose source file does not exist
in the start commit or whose target file does not exist in the end
commit. We do that after chaining copies with dirstate copies or
backward renames from another branch. We also do at the end of the
changeset-centric copy tracing. The filtering means that we will
remove copies to/from files that did not exist in some intermediate
commit. That is inconsistent with what we do if a file has been
deleted and then re-added (we allow updating across that).
Copying the two first examples from issue6163:
@ 4 'rename x to y'
|
o 3 'add x again'
|
o 2 'remove x'
|
| o 1 'modify x'
|/
o 0 'add x'
@ 4 'rename x to y'
|
o 3 'add x again'
|
| o 2 'modify x'
| |
| o 1 'add x'
|/
o 0 'base'
When doing `hg rebase -r 1 -d 4` in the first case, it succeeds, but
`hg rebase -r 2 -d 4` in the second case does not. That's because we
chain and filter via commit 0, which does not have file 'x' in the
second case. IMO, that's clearly inconsistent. So this patch removes
the filtering step so it only happens at the end. If a file was
temporarily removed, whether via a merge base or not, it will now
still be considered the same file. That fixes issue6163 for the
changeset-centric case.
Differential Revision: https://phab.mercurial-scm.org/D6603
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 25 Jun 2019 14:25:03 -0700 |
parents | 11ceb1b8fd74 |
children | 819712deac69 |
comparison
equal
deleted
inserted
replaced
42593:11ceb1b8fd74 | 42594:d013099c551b |
---|---|
283 if dst not in copies: | 283 if dst not in copies: |
284 # If it was copied on the p1 side, leave it as copied from | 284 # If it was copied on the p1 side, leave it as copied from |
285 # that side, even if it was also copied on the p2 side. | 285 # that side, even if it was also copied on the p2 side. |
286 copies[dst] = copies2[dst] | 286 copies[dst] = copies2[dst] |
287 if r == b.rev(): | 287 if r == b.rev(): |
288 _filter(a, b, copies) | |
289 return copies | 288 return copies |
290 for i, c in enumerate(children[r]): | 289 for i, c in enumerate(children[r]): |
291 childctx = repo[c] | 290 childctx = repo[c] |
292 if r == childctx.p1().rev(): | 291 if r == childctx.p1().rev(): |
293 parent = 1 | 292 parent = 1 |
319 # check for working copy | 318 # check for working copy |
320 if b.rev() is None: | 319 if b.rev() is None: |
321 cm = _committedforwardcopies(a, b.p1(), match) | 320 cm = _committedforwardcopies(a, b.p1(), match) |
322 # combine copies from dirstate if necessary | 321 # combine copies from dirstate if necessary |
323 copies = _chain(cm, _dirstatecopies(b._repo, match)) | 322 copies = _chain(cm, _dirstatecopies(b._repo, match)) |
324 _filter(a, b, copies) | |
325 else: | 323 else: |
326 copies = _committedforwardcopies(a, b, match) | 324 copies = _committedforwardcopies(a, b, match) |
327 return copies | 325 return copies |
328 | 326 |
329 def _backwardrenames(a, b, match): | 327 def _backwardrenames(a, b, match): |
371 else: | 369 else: |
372 if debug: | 370 if debug: |
373 repo.ui.debug('debug.copies: search mode: combined\n') | 371 repo.ui.debug('debug.copies: search mode: combined\n') |
374 copies = _chain(_backwardrenames(x, a, match=match), | 372 copies = _chain(_backwardrenames(x, a, match=match), |
375 _forwardcopies(a, y, match=match)) | 373 _forwardcopies(a, y, match=match)) |
376 _filter(x, y, copies) | 374 _filter(x, y, copies) |
377 return copies | 375 return copies |
378 | 376 |
379 def mergecopies(repo, c1, c2, base): | 377 def mergecopies(repo, c1, c2, base): |
380 """ | 378 """ |
381 Finds moves and copies between context c1 and c2 that are relevant for | 379 Finds moves and copies between context c1 and c2 that are relevant for |