upstream/mercurial-mirror Files · tests/test-encode.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

Yuya Nishihara - - Load All Authors

File last commit:

r37479:538353b8 default


                r38817:bb54db4a

@96 default

Download file

             test-encode.t
        
                    72 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-encode.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Test encode/decode filters

        $ hg init

        $ cat > .hg/hgrc <<EOF

        > [encode]

        > not.gz = tr [:lower:] [:upper:]

        > *.gz = gzip -d

        > [decode]

        > not.gz = tr [:upper:] [:lower:]

        > *.gz = gzip

        > EOF

        $ echo "this is a test" | gzip > a.gz

        $ echo "this is a test" > not.gz

        $ hg add *

        $ hg ci -m "test"

      no changes

        $ hg status

        $ touch *

      no changes

        $ hg status

      check contents in repo are encoded

        $ hg debugdata a.gz 0

        this is a test

        $ hg debugdata not.gz 0

        THIS IS A TEST

      check committed content was decoded

        $ gunzip < a.gz

        this is a test

        $ cat not.gz

        this is a test

        $ rm *

        $ hg co -C

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

      check decoding of our new working dir copy

        $ gunzip < a.gz

        this is a test

        $ cat not.gz

        this is a test

      check hg cat operation

        $ hg cat a.gz

        this is a test

        $ hg cat --decode a.gz | gunzip

        this is a test

        $ mkdir subdir

        $ cd subdir

        $ hg -R .. cat ../a.gz

        this is a test

        $ hg -R .. cat --decode ../a.gz | gunzip

        this is a test

        $ cd ..

      check tempfile filter

        $ hg cat a.gz --decode --config 'decode.*.gz=tempfile:gzip -c INFILE > OUTFILE' | gunzip

        this is a test

        $ hg cat a.gz --decode --config 'decode.*.gz=tempfile:sh -c "exit 1"'

        abort: command '*' failed: exited with status 1 (glob)

        [255]

        $ cd ..

	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

				Test encode/decode filters

				$ hg init
				$ cat > .hg/hgrc <<EOF
				> [encode]
				> not.gz = tr [:lower:] [:upper:]
				> *.gz = gzip -d
				> [decode]
				> not.gz = tr [:upper:] [:lower:]
				> *.gz = gzip
				> EOF
				$ echo "this is a test" \| gzip > a.gz
				$ echo "this is a test" > not.gz
				$ hg add *
				$ hg ci -m "test"

				no changes

				$ hg status
				$ touch *

				no changes

				$ hg status

				check contents in repo are encoded

				$ hg debugdata a.gz 0
				this is a test
				$ hg debugdata not.gz 0
				THIS IS A TEST

				check committed content was decoded

				$ gunzip < a.gz
				this is a test
				$ cat not.gz
				this is a test
				$ rm *
				$ hg co -C
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved

				check decoding of our new working dir copy

				$ gunzip < a.gz
				this is a test
				$ cat not.gz
				this is a test

				check hg cat operation

				$ hg cat a.gz
				this is a test
				$ hg cat --decode a.gz \| gunzip
				this is a test
				$ mkdir subdir
				$ cd subdir
				$ hg -R .. cat ../a.gz
				this is a test
				$ hg -R .. cat --decode ../a.gz \| gunzip
				this is a test
				$ cd ..

				check tempfile filter

				$ hg cat a.gz --decode --config 'decode.*.gz=tempfile:gzip -c INFILE > OUTFILE' \| gunzip
				this is a test
				$ hg cat a.gz --decode --config 'decode.*.gz=tempfile:sh -c "exit 1"'
				abort: command '*' failed: exited with status 1 (glob)
				[255]

				$ cd ..