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

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r32255:7e35d31b

default

Download file

             test-encode.t
        
                    63 lines
            
             | 1.0 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 ..

	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 ..