| pulkit |
| hg-reviewers |
Filelog based copy tracing only trace copy for file that have been added. This
is a trade off between skipping some rare copy case in exchange for avoiding
atrocious-to-the-point-of-unusable performance.
The changeset centric copy tracing does not need this trade off and naturally
trace all copy, include the one involving non-new files.
In order to ease the comparison from both algorithm, we add a small devel option
to trace copy for all files in the target revisions.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/configitems.py (6 lines) | |||
| M | mercurial/copies.py (16 lines) | |||
| M | tests/test-copies.t (4 lines) | |||
| M | tests/test-copy.t (11 lines) |
| b'check-locks', | b'check-locks', | ||||
| default=False, | default=False, | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'devel', | b'devel', | ||||
| b'check-relroot', | b'check-relroot', | ||||
| default=False, | default=False, | ||||
| ) | ) | ||||
| # Track copy information for all file, not just "added" one (very slow) | |||||
| coreconfigitem( | |||||
| b'devel', | |||||
| b'copy-tracing.trace-all-files', | |||||
| default=False, | |||||
| ) | |||||
| coreconfigitem( | coreconfigitem( | ||||
| b'devel', | b'devel', | ||||
| b'default-date', | b'default-date', | ||||
| default=None, | default=None, | ||||
| ) | ) | ||||
| coreconfigitem( | coreconfigitem( | ||||
| b'devel', | b'devel', | ||||
| b'deprec-warn', | b'deprec-warn', | ||||
| # case of computing what copies are in a commit versus its parent (like | # case of computing what copies are in a commit versus its parent (like | ||||
| # during a rebase or histedit). Note, we exclude merge commits from this | # during a rebase or histedit). Note, we exclude merge commits from this | ||||
| # optimization, since the ctx.files() for a merge commit is not correct for | # optimization, since the ctx.files() for a merge commit is not correct for | ||||
| # this comparison. | # this comparison. | ||||
| forwardmissingmatch = match | forwardmissingmatch = match | ||||
| if b.p1() == a and b.p2().node() == nullid: | if b.p1() == a and b.p2().node() == nullid: | ||||
| filesmatcher = matchmod.exact(b.files()) | filesmatcher = matchmod.exact(b.files()) | ||||
| forwardmissingmatch = matchmod.intersectmatchers(match, filesmatcher) | forwardmissingmatch = matchmod.intersectmatchers(match, filesmatcher) | ||||
| if repo.ui.configbool(b'devel', b'copy-tracing.trace-all-files'): | |||||
| missing = list(b.walk(match)) | |||||
| # _computeforwardmissing(a, b, match=forwardmissingmatch) | |||||
| if debug: | |||||
| dbg(b'debug.copies: searching all files: %d\n' % len(missing)) | |||||
| else: | |||||
| missing = _computeforwardmissing(a, b, match=forwardmissingmatch) | missing = _computeforwardmissing(a, b, match=forwardmissingmatch) | ||||
| if debug: | |||||
| dbg( | |||||
| b'debug.copies: missing files to search: %d\n' | |||||
| % len(missing) | |||||
| ) | |||||
| ancestrycontext = a._repo.changelog.ancestors([b.rev()], inclusive=True) | ancestrycontext = a._repo.changelog.ancestors([b.rev()], inclusive=True) | ||||
| if debug: | |||||
| dbg(b'debug.copies: missing files to search: %d\n' % len(missing)) | |||||
| for f in sorted(missing): | for f in sorted(missing): | ||||
| if debug: | if debug: | ||||
| dbg(b'debug.copies: tracing file: %s\n' % f) | dbg(b'debug.copies: tracing file: %s\n' % f) | ||||
| fctx = b[f] | fctx = b[f] | ||||
| fctx._ancestrycontext = ancestrycontext | fctx._ancestrycontext = ancestrycontext | ||||
| if debug: | if debug: | ||||
| start = util.timer() | start = util.timer() | ||||
| @ 1 copy x onto y | @ 1 copy x onto y | ||||
| | y | | y | ||||
| o 0 add x and y | o 0 add x and y | ||||
| x y | x y | ||||
| $ hg debugp1copies -r 1 | $ hg debugp1copies -r 1 | ||||
| x -> y | x -> y | ||||
| $ hg debugpathcopies 0 1 | $ hg debugpathcopies 0 1 | ||||
| x -> y (no-filelog !) | x -> y (no-filelog !) | ||||
| $ hg debugpathcopies 0 1 --config devel.copy-tracing.trace-all-files=yes | |||||
| x -> y | |||||
| Copy a file onto another file with same content. If metadata is stored in changeset, this does not | Copy a file onto another file with same content. If metadata is stored in changeset, this does not | ||||
| produce a new filelog entry. The changeset's "files" entry should still list the file. | produce a new filelog entry. The changeset's "files" entry should still list the file. | ||||
| $ newrepo | $ newrepo | ||||
| $ echo x > x | $ echo x > x | ||||
| $ echo x > x2 | $ echo x > x2 | ||||
| $ hg ci -Aqm 'add x and x2 with same content' | $ hg ci -Aqm 'add x and x2 with same content' | ||||
| $ hg cp -f x x2 | $ hg cp -f x x2 | ||||
| $ hg ci -m 'copy x onto x2' | $ hg ci -m 'copy x onto x2' | ||||
| $ hg l | $ hg l | ||||
| @ 1 copy x onto x2 | @ 1 copy x onto x2 | ||||
| | x2 | | x2 | ||||
| o 0 add x and x2 with same content | o 0 add x and x2 with same content | ||||
| x x2 | x x2 | ||||
| $ hg debugp1copies -r 1 | $ hg debugp1copies -r 1 | ||||
| x -> x2 | x -> x2 | ||||
| $ hg debugpathcopies 0 1 | $ hg debugpathcopies 0 1 | ||||
| x -> x2 (no-filelog !) | x -> x2 (no-filelog !) | ||||
| $ hg debugpathcopies 0 1 --config devel.copy-tracing.trace-all-files=yes | |||||
| x -> x2 | |||||
| Rename file in a loop: x->y->z->x | Rename file in a loop: x->y->z->x | ||||
| $ newrepo | $ newrepo | ||||
| $ echo x > x | $ echo x > x | ||||
| $ hg ci -Aqm 'add x' | $ hg ci -Aqm 'add x' | ||||
| $ hg mv x y | $ hg mv x y | ||||
| $ hg debugp1copies | $ hg debugp1copies | ||||
| x -> y | x -> y | ||||
| 0 0 2ed2a3912a0b 000000000000 000000000000 | 0 0 2ed2a3912a0b 000000000000 000000000000 | ||||
| 1 2 dd12c926cf16 2ed2a3912a0b 000000000000 | 1 2 dd12c926cf16 2ed2a3912a0b 000000000000 | ||||
| $ hg debugrename bar | $ hg debugrename bar | ||||
| bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17 | bar renamed from foo:dd12c926cf165e3eb4cf87b084955cb617221c17 | ||||
| should show no copies | should show no copies | ||||
| $ hg st -C | $ hg st -C | ||||
| note: since filelog based copy tracing only trace copy for new file, the copy information here is not displayed. | |||||
| $ hg status --copies --change . | |||||
| M bar | |||||
| They are a devel option to walk all file and fine this information anyway. | |||||
| $ hg status --copies --change . --config devel.copy-tracing.trace-all-files=yes | |||||
| M bar | |||||
| foo | |||||
| copy --after on an added file | copy --after on an added file | ||||
| $ cp bar baz | $ cp bar baz | ||||
| $ hg add baz | $ hg add baz | ||||
| $ hg cp -A bar baz | $ hg cp -A bar baz | ||||
| $ hg st -C | $ hg st -C | ||||
| A baz | A baz | ||||
| bar | bar | ||||