##// 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:

r22046:7a9cbb31 default
r23524:a1a7c94d default
Show More
test-gendoc.t
62 lines | 1.7 KiB | text/troff | Tads3Lexer
Matt Mackall
tests: replace exit 80 with #require
r22046 #require docutils
Matt Mackall
tests: unify test-gendoc
r12427 Test document extraction
$ HGENCODING=UTF-8
$ export HGENCODING
Simon Heimberg
tests: use ls instead of find, all files are in the same directory...
r20390 $ { echo C; ls "$TESTDIR/../i18n"/*.po | sort; } | while read PO; do
Thomas Arendsen Hein
tests: make tests work if directory contains special characters...
r16350 > LOCALE=`basename "$PO" .po`
Matt Mackall
tests: unify test-gendoc
r12427 > echo
> echo "% extracting documentation from $LOCALE"
> echo ".. -*- coding: utf-8 -*-" > gendoc-$LOCALE.txt
> echo "" >> gendoc-$LOCALE.txt
Simon Heimberg
tests: really test translations for rst syntax errors (issue4003)...
r19922 > LANGUAGE=$LOCALE python "$TESTDIR/../doc/gendoc.py" >> gendoc-$LOCALE.txt 2> /dev/null || exit
Matt Mackall
tests: unify test-gendoc
r12427 >
Simon Heimberg
tests: test-gendoc.t checks if anything was translated...
r19923 > if [ $LOCALE != C ]; then
> cmp -s gendoc-C.txt gendoc-$LOCALE.txt && echo '** NOTHING TRANSLATED **'
> fi
>
Matt Mackall
tests: unify test-gendoc
r12427 > # We call runrst without adding "--halt warning" to make it report
> # all errors instead of stopping on the first one.
> echo "checking for parse errors"
Thomas Arendsen Hein
tests: make tests work if directory contains special characters...
r16350 > python "$TESTDIR/../doc/runrst" html gendoc-$LOCALE.txt /dev/null
Matt Mackall
tests: unify test-gendoc
r12427 > done
% extracting documentation from C
checking for parse errors
% extracting documentation from da
checking for parse errors
% extracting documentation from de
checking for parse errors
% extracting documentation from el
checking for parse errors
% extracting documentation from fr
checking for parse errors
% extracting documentation from it
checking for parse errors
% extracting documentation from ja
checking for parse errors
% extracting documentation from pt_BR
checking for parse errors
% extracting documentation from ro
checking for parse errors
Martin Geisler
test-gendoc: update for new Russian translation
r14475 % extracting documentation from ru
checking for parse errors
Matt Mackall
tests: unify test-gendoc
r12427 % extracting documentation from sv
checking for parse errors
% extracting documentation from zh_CN
checking for parse errors
% extracting documentation from zh_TW
checking for parse errors