##// END OF EJS Templates
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper Code paths below expect "hg.updaterepo" (or "hg.update" using it) to execute linear merging: - "update" in commands - "postincoming" in commands, used for: - "hg pull --update" - "hg unbundle --update" - "hgsubrepo.get" in subrepo For linear merging with largefiles, standins should be updated according to (possibly dirty) largefiles before "merge.update" invocation to detect conflicts correctly. Before this patch, only the "update" command can execute linear merging correctly, because largefiles extension takes care of only it. This patch moves "updatestandin" invocation from "overrideupdate" ("hg update" wrapper) to "_hgupdaterepo" ("hg.updaterepo" wrapper) to execute linear merging in "hg.updaterepo" correctly. This is also a preparation to centralize the logic of updating largefiles in the working directory into the function wrapping "merge.update" in the subsequent patch.

File last commit:

r22046:7a9cbb31 default
r22287:f3ac9677 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