upstream/mercurial-mirror Files · tests/test-gendoc.t

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Augie Fackler - - Load All Authors

File last commit:

r32940:75be1499 default


                r38817:bb54db4a

@96 default

Download file

             test-gendoc.t
        
                    32 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-gendoc.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require docutils

      #require gettext

      Test document extraction

        $ HGENCODING=UTF-8

        $ export HGENCODING

        $ { echo C; ls "$TESTDIR/../i18n"/*.po | sort; } | while read PO; do

        >     LOCALE=`basename "$PO" .po`

        >     echo "% extracting documentation from $LOCALE"

        >     LANGUAGE=$LOCALE $PYTHON "$TESTDIR/../doc/gendoc.py" >> gendoc-$LOCALE.txt 2> /dev/null || exit

        > 

        >     if [ $LOCALE != C ]; then

        >         if [ ! -f $TESTDIR/test-gendoc-$LOCALE.t ]; then

        >             echo missing test-gendoc-$LOCALE.t

        >         fi

        >         cmp -s gendoc-C.txt gendoc-$LOCALE.txt && echo "** NOTHING TRANSLATED ($LOCALE) **"

        >     fi

        > done; true

        % extracting documentation from C

        % extracting documentation from da

        % extracting documentation from de

        % extracting documentation from el

        % extracting documentation from fr

        % extracting documentation from it

        % extracting documentation from ja

        % extracting documentation from pt_BR

        % extracting documentation from ro

        % extracting documentation from ru

        % extracting documentation from sv

        % extracting documentation from zh_CN

        % extracting documentation from zh_TW

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				#require docutils
				#require gettext

				Test document extraction

				$ HGENCODING=UTF-8
				$ export HGENCODING
				$ { echo C; ls "$TESTDIR/../i18n"/*.po \| sort; } \| while read PO; do
				> LOCALE=`basename "$PO" .po`
				> echo "% extracting documentation from $LOCALE"
				> LANGUAGE=$LOCALE $PYTHON "$TESTDIR/../doc/gendoc.py" >> gendoc-$LOCALE.txt 2> /dev/null \|\| exit
				>
				> if [ $LOCALE != C ]; then
				> if [ ! -f $TESTDIR/test-gendoc-$LOCALE.t ]; then
				> echo missing test-gendoc-$LOCALE.t
				> fi
				> cmp -s gendoc-C.txt gendoc-$LOCALE.txt && echo " NOTHING TRANSLATED ($LOCALE) "
				> fi
				> done; true
				% extracting documentation from C
				% extracting documentation from da
				% extracting documentation from de
				% extracting documentation from el
				% extracting documentation from fr
				% extracting documentation from it
				% extracting documentation from ja
				% extracting documentation from pt_BR
				% extracting documentation from ro
				% extracting documentation from ru
				% extracting documentation from sv
				% extracting documentation from zh_CN
				% extracting documentation from zh_TW