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

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.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r22287:f3ac9677

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