upstream/mercurial-mirror Files · tests/test-convert-splicemap.t

url: move URL parsing functions into util to improve startup time...

url: move URL parsing functions into util to improve startup time The introduction of the new URL parsing code has created a startup time regression. This is mainly due to the use of url.hasscheme() in the ui class. It ends up importing many libraries that the url module requires. This fix helps marginally, but if we can get rid of the urllib import in the URL parser all together, startup time will go back to normal. perfstartup time before the URL refactoring (8796fb6af67e): ! wall 0.050692 comb 0.000000 user 0.000000 sys 0.000000 (best of 100) current startup time (139fb11210bb): ! wall 0.070685 comb 0.000000 user 0.000000 sys 0.000000 (best of 100) after this change: ! wall 0.064667 comb 0.000000 user 0.000000 sys 0.000000 (best of 100)

Matt Mackall - - Load All Authors

File last commit:

r12531:a1cbcc1a default


                r14076:924c8215

default

Download file

             test-convert-splicemap.t
        
                    79 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-convert-splicemap.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "convert=" >> $HGRCPATH

        $ echo 'graphlog =' >> $HGRCPATH

        $ glog()

        > {

        >     hg glog --template '{rev} "{desc|firstline}" files: {files}\n' "$@"

        > }

        $ hg init repo1

        $ cd repo1

        $ echo a > a

        $ hg ci -Am adda

        adding a

        $ echo b > b

        $ echo a >> a

        $ hg ci -Am addb

        adding b

        $ PARENTID1=`hg id --debug -i`

        $ echo c > c

        $ hg ci -Am addc

        adding c

        $ PARENTID2=`hg id --debug -i`

        $ cd ..

        $ hg init repo2

        $ cd repo2

        $ echo b > a

        $ echo d > d

        $ hg ci -Am addaandd

        adding a

        adding d

        $ CHILDID1=`hg id --debug -i`

        $ echo d >> d

        $ hg ci -Am changed

        $ CHILDID2=`hg id --debug -i`

        $ echo e > e

        $ hg ci -Am adde

        adding e

        $ cd ..

      test invalid splicemap

        $ cat > splicemap <<EOF

        > $CHILDID2

        > EOF

        $ hg convert --splicemap splicemap repo2 repo1

        abort: syntax error in splicemap(1): key/value pair expected

        [255]

      splice repo2 on repo1

        $ cat > splicemap <<EOF

        > $CHILDID1 $PARENTID1

        > $CHILDID2 $PARENTID2,$CHILDID1

        > EOF

        $ hg clone repo1 target1

        updating to branch default

        3 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg convert --splicemap splicemap repo2 target1

        scanning source...

        sorting...

        converting...

        2 addaandd

        spliced in ['6d4c2037ddc2cb2627ac3a244ecce35283268f8e'] as parents of 527cdedf31fbd5ea708aa14eeecf53d4676f38db

        1 changed

        spliced in ['e55c719b85b60e5102fac26110ba626e7cb6b7dc', '527cdedf31fbd5ea708aa14eeecf53d4676f38db'] as parents of e4ea00df91897da3079a10fab658c1eddba6617b

        0 adde

        $ glog -R target1

        o  5 "adde" files: e

        |

        o    4 "changed" files: d

        |\

        | o  3 "addaandd" files: a d

        | |

        @ |  2 "addc" files: c

        |/

        o  1 "addb" files: a b

        |

        o  0 "adda" files: a

	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


				$ echo "[extensions]" >> $HGRCPATH
				$ echo "convert=" >> $HGRCPATH
				$ echo 'graphlog =' >> $HGRCPATH
				$ glog()
				> {
				> hg glog --template '{rev} "{desc\|firstline}" files: {files}\n' "$@"
				> }
				$ hg init repo1
				$ cd repo1
				$ echo a > a
				$ hg ci -Am adda
				adding a
				$ echo b > b
				$ echo a >> a
				$ hg ci -Am addb
				adding b
				$ PARENTID1=`hg id --debug -i`
				$ echo c > c
				$ hg ci -Am addc
				adding c
				$ PARENTID2=`hg id --debug -i`
				$ cd ..
				$ hg init repo2
				$ cd repo2
				$ echo b > a
				$ echo d > d
				$ hg ci -Am addaandd
				adding a
				adding d
				$ CHILDID1=`hg id --debug -i`
				$ echo d >> d
				$ hg ci -Am changed
				$ CHILDID2=`hg id --debug -i`
				$ echo e > e
				$ hg ci -Am adde
				adding e
				$ cd ..

				test invalid splicemap

				$ cat > splicemap <<EOF
				> $CHILDID2
				> EOF
				$ hg convert --splicemap splicemap repo2 repo1
				abort: syntax error in splicemap(1): key/value pair expected
				[255]

				splice repo2 on repo1

				$ cat > splicemap <<EOF
				> $CHILDID1 $PARENTID1
				> $CHILDID2 $PARENTID2,$CHILDID1
				> EOF
				$ hg clone repo1 target1
				updating to branch default
				3 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg convert --splicemap splicemap repo2 target1
				scanning source...
				sorting...
				converting...
				2 addaandd
				spliced in ['6d4c2037ddc2cb2627ac3a244ecce35283268f8e'] as parents of 527cdedf31fbd5ea708aa14eeecf53d4676f38db
				1 changed
				spliced in ['e55c719b85b60e5102fac26110ba626e7cb6b7dc', '527cdedf31fbd5ea708aa14eeecf53d4676f38db'] as parents of e4ea00df91897da3079a10fab658c1eddba6617b
				0 adde
				$ glog -R target1
				o 5 "adde" files: e
				\|
				o 4 "changed" files: d
				\|\
				\| o 3 "addaandd" files: a d
				\| \|
				@ \| 2 "addc" files: c
				\|/
				o 1 "addb" files: a b
				\|
				o 0 "adda" files: a