##// END OF EJS Templates
remotefilelog: include file contents in bundles produced during strip...
remotefilelog: include file contents in bundles produced during strip `hg strip` and other things that use repair.strip (such as the narrow extension's `hg tracked --removeinclude`) will "save" some commits that have a higher revision number than the oldest commit we're stripping, but aren't actually descended from any of the commits that we're stripping. It saves them in a bundle, and then reapplies them to the repo. Remotefilelog doesn't generally participate in strip, it doesn't contribute files to either the backup bundle or the "saved" bundle, and doesn't adjust linknodes when commits are stripped. This can break things like push, which rely on the linknodes. This change makes it so that remotefilelog includes files in these bundles during strip operations. During reapplication, the files are reapplied from the bundle, and the linknode is properly updated. Differential Revision: https://phab.mercurial-scm.org/D10320

File last commit:

r47606:47a95277 default
r47606:47a95277 default
Show More
test-remotefilelog-strip.t
68 lines | 2.0 KiB | text/troff | Tads3Lexer
/ tests / test-remotefilelog-strip.t
Kyle Lippincott
tests: add test-remotefilelog-strip.t to demonstrate an issue with linknodes...
r47605 #require no-windows
$ . "$TESTDIR/remotefilelog-library.sh"
$ hg init master
$ cd master
$ cat >> .hg/hgrc <<EOF
> [remotefilelog]
> server=True
> EOF
$ echo x > x
$ hg commit -qAm x
$ cd ..
$ hgcloneshallow ssh://user@dummy/master shallow -q
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
$ cd shallow
$ cat >> $TESTTMP/get_file_linknode.py <<EOF
> from mercurial import node, registrar, scmutil
> cmdtable = {}
> command = registrar.command(cmdtable)
> @command(b'debug-file-linknode', [(b'r', b'rev', b'.', b'rev')], b'hg debug-file-linknode FILE')
> def debug_file_linknode(ui, repo, file, **opts):
> rflctx = scmutil.revsingle(repo.unfiltered(), opts['rev']).filectx(file)
> ui.status(b'%s\n' % node.hex(rflctx.ancestormap()[rflctx._filenode][2]))
> EOF
$ cat >> .hg/hgrc <<EOF
> [ui]
> interactive=1
> [extensions]
> strip=
> get_file_linknode=$TESTTMP/get_file_linknode.py
> [experimental]
> evolution=createmarkers,allowunstable
> EOF
$ echo a > a
$ hg commit -qAm msg1
$ hg commit --amend 're:^$' -m msg2
$ hg commit --amend 're:^$' -m msg3
$ hg --hidden log -G -T '{rev} {node|short}'
@ 3 df91f74b871e
|
| x 2 70494d7ec5ef
|/
| x 1 1e423846dde0
|/
o 0 b292c1e3311f
$ hg debug-file-linknode -r 70494d a
df91f74b871e064c89afa1fe9e2f66afa2c125df
$ hg --hidden strip -r 1 3
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/df91f74b871e-c94d67be-backup.hg
$ hg --hidden log -G -T '{rev} {node|short}'
o 1 70494d7ec5ef
|
@ 0 b292c1e3311f
Kyle Lippincott
remotefilelog: include file contents in bundles produced during strip...
r47606 Demonstrate that the linknode points to a commit that is actually in the repo
after the strip operation. Otherwise remotefilelog has to search every commit in
the repository looking for a valid linkrev every time it's queried, such as
during push.
Kyle Lippincott
tests: add test-remotefilelog-strip.t to demonstrate an issue with linknodes...
r47605 $ hg debug-file-linknode -r 70494d a
Kyle Lippincott
remotefilelog: include file contents in bundles produced during strip...
r47606 70494d7ec5ef6cd3cd6939a9fd2812f9956bf553