##// END OF EJS Templates
merge: don't report progress for dr/rd actions...
merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

File last commit:

r22047:8fb6844a default
r23524:a1a7c94d default
Show More
test-check-code-hg.t
15 lines | 661 B | text/troff | Tads3Lexer
/ tests / test-check-code-hg.t
Matt Mackall
tests: change some #ifs to #requires
r22047 #require test-repo
Matt Mackall
test-check-code-hg: use test-repo check
r21223
Mads Kiilerich
tests: convert test-check-code-hg.py to .t
r15557 $ check_code="$TESTDIR"/../contrib/check-code.py
$ cd "$TESTDIR"/..
Mads Kiilerich
tests: run check-code with warnings and maintain a whitelist...
r15558
Simon Heimberg
tests: check-code all python files in one run
r19384 New errors are not allowed. Warnings are strongly discouraged.
Simon Heimberg
check-code: always report when a file is skipped by "no-check-code"...
r20239 (The writing "no-che?k-code" is for not skipping this file when checking.)
Simon Heimberg
tests: check-code all python files in one run
r19384
Matt Mackall
test-check-code-hg: use locate instead of manifest
r21225 $ hg locate | sed 's-\\-/-g' |
Simon Heimberg
tests: test-check-code-hg.t works for all files to check...
r19495 > xargs "$check_code" --warnings --per-file=0 || false
Simon Heimberg
check-code: always report when a file is skipped by "no-check-code"...
r20239 Skipping hgext/zeroconf/Zeroconf.py it has no-che?k-code (glob)
Skipping i18n/polib.py it has no-che?k-code (glob)
Skipping mercurial/httpclient/__init__.py it has no-che?k-code (glob)
Skipping mercurial/httpclient/_readers.py it has no-che?k-code (glob)
Skipping mercurial/httpclient/socketutil.py it has no-che?k-code (glob)