Mercurial > hg
view tests/test-fix-metadata.t @ 44805:02bf61bb4a70
copy: to find copy source, walk parent of revision we're marking copies in
As shown in the previous patch, `hg cp --after --at-rev . src dst`
fails if `src` is not in `.`. It seems obvious that you should always
walk the *parent* of the revision you're marking copies in, but that's
not how it was done for the working copy, and I didn't think to change
it when marking copies in a non-working-copy commit.
This patch fixes that by walking the parent commit instead, but only
if we're marking copies for a non-working-copy commit. We need to
leave the working-copy code unchanged because it depends on the weird
behavior of `workingctx.walk()`. With these changes, there's very
little overlap between the working-copy version and the
non-working-copy version of `walkpats()`, but I've refrained from
cleaning that up on the stable branch.
Differential Revision: https://phab.mercurial-scm.org/D8494
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 06 May 2020 10:33:56 -0700 |
parents | 2d70b1118af2 |
children |
line wrap: on
line source
A python hook for "hg fix" that prints out the number of files and revisions that were affected, along with which fixer tools were applied. Also checks how many times it sees a specific key generated by one of the fixer tools defined below. $ cat >> $TESTTMP/postfixhook.py <<EOF > import collections > def file(ui, repo, rev=None, path=b'', metadata=None, **kwargs): > ui.status(b'fixed %s in revision %d using %s\n' % > (path, rev, b', '.join(metadata.keys()))) > def summarize(ui, repo, replacements=None, wdirwritten=False, > metadata=None, **kwargs): > counts = collections.defaultdict(int) > keys = 0 > for fixername, metadatalist in metadata.items(): > for metadata in metadatalist: > if metadata is None: > continue > counts[fixername] += 1 > if 'key' in metadata: > keys += 1 > ui.status(b'saw "key" %d times\n' % (keys,)) > for name, count in sorted(counts.items()): > ui.status(b'fixed %d files with %s\n' % (count, name)) > if replacements: > ui.status(b'fixed %d revisions\n' % (len(replacements),)) > if wdirwritten: > ui.status(b'fixed the working copy\n') > EOF Some mock output for fixer tools that demonstrate what could go wrong with expecting the metadata output format. $ printf 'new content\n' > $TESTTMP/missing $ printf 'not valid json\0new content\n' > $TESTTMP/invalid $ printf '{"key": "value"}\0new content\n' > $TESTTMP/valid Configure some fixer tools based on the output defined above, and enable the hooks defined above. Disable parallelism to make output of the parallel file processing phase stable. $ cat >> $HGRCPATH <<EOF > [extensions] > fix = > [fix] > metadatafalse:command=cat $TESTTMP/missing > metadatafalse:pattern=metadatafalse > metadatafalse:metadata=false > missing:command=cat $TESTTMP/missing > missing:pattern=missing > missing:metadata=true > invalid:command=cat $TESTTMP/invalid > invalid:pattern=invalid > invalid:metadata=true > valid:command=cat $TESTTMP/valid > valid:pattern=valid > valid:metadata=true > [hooks] > postfixfile = python:$TESTTMP/postfixhook.py:file > postfix = python:$TESTTMP/postfixhook.py:summarize > [worker] > enabled=false > EOF See what happens when we execute each of the fixer tools. Some print warnings, some write back to the file. $ hg init repo $ cd repo $ printf "old content\n" > metadatafalse $ printf "old content\n" > invalid $ printf "old content\n" > missing $ printf "old content\n" > valid $ hg add -q $ hg fix -w ignored invalid output from fixer tool: invalid fixed metadatafalse in revision 2147483647 using metadatafalse ignored invalid output from fixer tool: missing fixed valid in revision 2147483647 using valid saw "key" 1 times fixed 1 files with valid fixed the working copy $ cat metadatafalse new content $ cat missing old content $ cat invalid old content $ cat valid new content $ cd ..