Mercurial > hg
view tests/test-verify.t @ 30152:d65e246100ed
help: backout f3c4edfd35e1 (mark boolean flags with [no-] in help) for now
The ability to negate any boolean flags itself is great, but I think we are not
ready to expose the help side of it yet.
First, while there exist a handful of such flags whose default value can be
changed (eg: git diff, patchwork confirmation), there is only a few of them. The
users who benefit the most from this change are alias users and large
installation that can deploy extension to change behavior (eg: facebook
tweakdefault). So the majority of user who will be affected by a large change
to command help that is not yet relevant to them. (I expect this to become
relevant when ui.progressive start to exists).
Below is an example of the impact of the new help on 'hg help diff':
-r --rev REV [+] revision
-c --change REV change made by revision
-a --[no-]text treat all files as text
-g --[no-]git use git extended diff format
--[no-]nodates omit dates from diff headers
--[no-]noprefix omit a/ and b/ prefixes from filenames
-p --[no-]show-function show which function each change is in
--[no-]reverse produce a diff that undoes the changes
-w --[no-]ignore-all-space ignore white space when comparing lines
-b --[no-]ignore-space-change ignore changes in the amount of white space
-B --[no-]ignore-blank-lines ignore changes whose lines are all blank
-U --unified NUM number of lines of context to show
--[no-]stat output diffstat-style summary of changes
--root DIR produce diffs relative to subdirectory
-I --include PATTERN [+] include names matching the given patterns
-X --exclude PATTERN [+] exclude names matching the given patterns
-S --[no-]subrepos recurse into subrepositories
Another issue with the current state of help, the default value for the
flag is not conveyed to the user. For example in the 'backout' help, there is
no real distinction between "--[no-]backup" (default to True) and "--[no-]keep"
(default) to False:
--[no-]backup no backups
--[no-]keep do not modify working directory during strip
In addition, I've discussed with Augie Fackler and the last batch of the work on
this have burned him out quite some. Therefore he is not intending to perform
any more work on this topic. Quoting him, he would rather see the help part
backed out than spending more time on it.
I do not think we are ready to expose this to users in 4.0 (freeze in a week),
especially because we cannot expect quick improvement on these aspect as this
topic no longer have an owner. We should be able to reintroduce that change in
the future when someone get back on it and the main issues are solves:
* Introduction of ui.progressive makes it relevant for a majority of user,
* Current default value are efficiently conveyed to the user.
(In addition, the excerpt from diff help show that we still have some issue with
some negative option like '--nodates' so further improvement are probably
welcome there.)
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Sun, 09 Oct 2016 03:11:18 +0200 |
parents | 408446e4b10c |
children | c059286a0f9c |
line wrap: on
line source
prepare repo $ hg init a $ cd a $ echo "some text" > FOO.txt $ echo "another text" > bar.txt $ echo "more text" > QUICK.txt $ hg add adding FOO.txt adding QUICK.txt adding bar.txt $ hg ci -mtest1 verify $ hg verify checking changesets checking manifests crosschecking files in changesets and manifests checking files 3 files, 1 changesets, 3 total revisions verify with journal $ touch .hg/store/journal $ hg verify abandoned transaction found - run hg recover checking changesets checking manifests crosschecking files in changesets and manifests checking files 3 files, 1 changesets, 3 total revisions $ rm .hg/store/journal introduce some bugs in repo $ cd .hg/store/data $ mv _f_o_o.txt.i X_f_o_o.txt.i $ mv bar.txt.i xbar.txt.i $ rm _q_u_i_c_k.txt.i $ hg verify checking changesets checking manifests crosschecking files in changesets and manifests checking files warning: revlog 'data/FOO.txt.i' not in fncache! 0: empty or missing FOO.txt FOO.txt@0: manifest refers to unknown revision f62022d3d590 warning: revlog 'data/QUICK.txt.i' not in fncache! 0: empty or missing QUICK.txt QUICK.txt@0: manifest refers to unknown revision 88b857db8eba warning: revlog 'data/bar.txt.i' not in fncache! 0: empty or missing bar.txt bar.txt@0: manifest refers to unknown revision 256559129457 3 files, 1 changesets, 0 total revisions 3 warnings encountered! hint: run "hg debugrebuildfncache" to recover from corrupt fncache 6 integrity errors encountered! (first damaged changeset appears to be 0) [1] $ cd ../../.. $ cd .. Set up a repo for testing missing revlog entries $ hg init missing-entries $ cd missing-entries $ echo 0 > file $ hg ci -Aqm0 $ cp -r .hg/store .hg/store-partial $ echo 1 > file $ hg ci -Aqm1 $ cp -r .hg/store .hg/store-full Entire changelog missing $ rm .hg/store/00changelog.* $ hg verify -q 0: empty or missing changelog manifest@0: d0b6632564d4 not in changesets manifest@1: 941fc4534185 not in changesets 3 integrity errors encountered! (first damaged changeset appears to be 0) [1] $ cp -r .hg/store-full/. .hg/store Entire manifest log missing $ rm .hg/store/00manifest.* $ hg verify -q 0: empty or missing manifest 1 integrity errors encountered! (first damaged changeset appears to be 0) [1] $ cp -r .hg/store-full/. .hg/store Entire filelog missing $ rm .hg/store/data/file.* $ hg verify -q warning: revlog 'data/file.i' not in fncache! 0: empty or missing file file@0: manifest refers to unknown revision 362fef284ce2 file@1: manifest refers to unknown revision c10f2164107d 1 warnings encountered! hint: run "hg debugrebuildfncache" to recover from corrupt fncache 3 integrity errors encountered! (first damaged changeset appears to be 0) [1] $ cp -r .hg/store-full/. .hg/store Entire changelog and manifest log missing $ rm .hg/store/00changelog.* $ rm .hg/store/00manifest.* $ hg verify -q warning: orphan revlog 'data/file.i' 1 warnings encountered! $ cp -r .hg/store-full/. .hg/store Entire changelog and filelog missing $ rm .hg/store/00changelog.* $ rm .hg/store/data/file.* $ hg verify -q 0: empty or missing changelog manifest@0: d0b6632564d4 not in changesets manifest@1: 941fc4534185 not in changesets warning: revlog 'data/file.i' not in fncache! ?: empty or missing file file@0: manifest refers to unknown revision 362fef284ce2 file@1: manifest refers to unknown revision c10f2164107d 1 warnings encountered! hint: run "hg debugrebuildfncache" to recover from corrupt fncache 6 integrity errors encountered! (first damaged changeset appears to be 0) [1] $ cp -r .hg/store-full/. .hg/store Entire manifest log and filelog missing $ rm .hg/store/00manifest.* $ rm .hg/store/data/file.* $ hg verify -q 0: empty or missing manifest warning: revlog 'data/file.i' not in fncache! 0: empty or missing file 1 warnings encountered! hint: run "hg debugrebuildfncache" to recover from corrupt fncache 2 integrity errors encountered! (first damaged changeset appears to be 0) [1] $ cp -r .hg/store-full/. .hg/store Changelog missing entry $ cp -f .hg/store-partial/00changelog.* .hg/store $ hg verify -q manifest@?: rev 1 points to nonexistent changeset 1 manifest@?: 941fc4534185 not in changesets file@?: rev 1 points to nonexistent changeset 1 (expected 0) 1 warnings encountered! 3 integrity errors encountered! [1] $ cp -r .hg/store-full/. .hg/store Manifest log missing entry $ cp -f .hg/store-partial/00manifest.* .hg/store $ hg verify -q manifest@1: changeset refers to unknown revision 941fc4534185 file@1: c10f2164107d not in manifests 2 integrity errors encountered! (first damaged changeset appears to be 1) [1] $ cp -r .hg/store-full/. .hg/store Filelog missing entry $ cp -f .hg/store-partial/data/file.* .hg/store/data $ hg verify -q file@1: manifest refers to unknown revision c10f2164107d 1 integrity errors encountered! (first damaged changeset appears to be 1) [1] $ cp -r .hg/store-full/. .hg/store Changelog and manifest log missing entry $ cp -f .hg/store-partial/00changelog.* .hg/store $ cp -f .hg/store-partial/00manifest.* .hg/store $ hg verify -q file@?: rev 1 points to nonexistent changeset 1 (expected 0) file@?: c10f2164107d not in manifests 1 warnings encountered! 2 integrity errors encountered! [1] $ cp -r .hg/store-full/. .hg/store Changelog and filelog missing entry $ cp -f .hg/store-partial/00changelog.* .hg/store $ cp -f .hg/store-partial/data/file.* .hg/store/data $ hg verify -q manifest@?: rev 1 points to nonexistent changeset 1 manifest@?: 941fc4534185 not in changesets file@?: manifest refers to unknown revision c10f2164107d 3 integrity errors encountered! [1] $ cp -r .hg/store-full/. .hg/store Manifest and filelog missing entry $ cp -f .hg/store-partial/00manifest.* .hg/store $ cp -f .hg/store-partial/data/file.* .hg/store/data $ hg verify -q manifest@1: changeset refers to unknown revision 941fc4534185 1 integrity errors encountered! (first damaged changeset appears to be 1) [1] $ cp -r .hg/store-full/. .hg/store Corrupt changelog base node to cause failure to read revision $ printf abcd | dd conv=notrunc of=.hg/store/00changelog.i bs=1 seek=16 \ > 2> /dev/null $ hg verify -q 0: unpacking changeset 08b1860757c2: * (glob) manifest@?: rev 0 points to unexpected changeset 0 manifest@?: d0b6632564d4 not in changesets file@?: rev 0 points to unexpected changeset 0 (expected 1) 1 warnings encountered! 4 integrity errors encountered! (first damaged changeset appears to be 0) [1] $ cp -r .hg/store-full/. .hg/store Corrupt manifest log base node to cause failure to read revision $ printf abcd | dd conv=notrunc of=.hg/store/00manifest.i bs=1 seek=16 \ > 2> /dev/null $ hg verify -q manifest@0: reading delta d0b6632564d4: * (glob) file@0: 362fef284ce2 not in manifests 2 integrity errors encountered! (first damaged changeset appears to be 0) [1] $ cp -r .hg/store-full/. .hg/store Corrupt filelog base node to cause failure to read revision $ printf abcd | dd conv=notrunc of=.hg/store/data/file.i bs=1 seek=16 \ > 2> /dev/null $ hg verify -q file@0: unpacking 362fef284ce2: * (glob) 1 integrity errors encountered! (first damaged changeset appears to be 0) [1] $ cp -r .hg/store-full/. .hg/store $ cd .. test changelog without a manifest $ hg init b $ cd b $ hg branch foo marked working directory as branch foo (branches are permanent and global, did you want a bookmark?) $ hg ci -m branchfoo $ hg verify checking changesets checking manifests crosschecking files in changesets and manifests checking files 0 files, 1 changesets, 0 total revisions test revlog corruption $ touch a $ hg add a $ hg ci -m a $ echo 'corrupted' > b $ dd if=.hg/store/data/a.i of=start bs=1 count=20 2>/dev/null $ cat start b > .hg/store/data/a.i $ hg verify checking changesets checking manifests crosschecking files in changesets and manifests checking files a@1: broken revlog! (index data/a.i is corrupted) warning: orphan revlog 'data/a.i' 1 files, 2 changesets, 0 total revisions 1 warnings encountered! 1 integrity errors encountered! (first damaged changeset appears to be 1) [1] $ cd .. test revlog format 0 $ revlog-formatv0.py $ cd formatv0 $ hg verify repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions $ cd ..