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

Adrian Buehlmann - - Load All Authors

File last commit:

r12279:28e2e380 default


                r14076:924c8215

default

Download file

             test-merge-types.t
        
                    70 lines
            
             | 1.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-types.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo a > a

        $ hg ci -Amadd

        adding a

        $ chmod +x a

        $ hg ci -mexecutable

        $ hg up 0

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

        $ rm a

        $ ln -s symlink a

        $ hg ci -msymlink

        created new head

        $ hg merge --debug

          searching for copies back to rev 1

        resolving manifests

         overwrite None partial False

         ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c

         conflicting flags for a

        (n)one, e(x)ec or sym(l)ink? n

         a: update permissions -> e

        updating: a 1/1 files (100.00%)

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

        (branch merge, don't forget to commit)

      Symlink is local parent, executable is other:

        $ if [ -h a ]; then

        >     echo a is a symlink

        >     $TESTDIR/readlink.py a

        > elif [ -x a ]; then

        >     echo a is executable

        > else

        >     echo "a has no flags (default for conflicts)"

        > fi

        a has no flags (default for conflicts)

        $ hg update -C 1

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ hg merge --debug

          searching for copies back to rev 1

        resolving manifests

         overwrite None partial False

         ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f

         conflicting flags for a

        (n)one, e(x)ec or sym(l)ink? n

         a: remote is newer -> g

        updating: a 1/1 files (100.00%)

        getting a

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        (branch merge, don't forget to commit)

      Symlink is other parent, executable is local:

        $ if [ -h a ]; then

        >    echo a is a symlink

        >    $TESTDIR/readlink.py a

        > elif [ -x a ]; then

        >     echo a is executable

        > else

        >     echo "a has no flags (default for conflicts)"

        > fi

        a has no flags (default for conflicts)

	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

				$ hg init

				$ echo a > a
				$ hg ci -Amadd
				adding a

				$ chmod +x a
				$ hg ci -mexecutable

				$ hg up 0
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm a
				$ ln -s symlink a
				$ hg ci -msymlink
				created new head

				$ hg merge --debug
				searching for copies back to rev 1
				resolving manifests
				overwrite None partial False
				ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
				conflicting flags for a
				(n)one, e(x)ec or sym(l)ink? n
				a: update permissions -> e
				updating: a 1/1 files (100.00%)
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)


				Symlink is local parent, executable is other:

				$ if [ -h a ]; then
				> echo a is a symlink
				> $TESTDIR/readlink.py a
				> elif [ -x a ]; then
				> echo a is executable
				> else
				> echo "a has no flags (default for conflicts)"
				> fi
				a has no flags (default for conflicts)

				$ hg update -C 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ hg merge --debug
				searching for copies back to rev 1
				resolving manifests
				overwrite None partial False
				ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f
				conflicting flags for a
				(n)one, e(x)ec or sym(l)ink? n
				a: remote is newer -> g
				updating: a 1/1 files (100.00%)
				getting a
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)


				Symlink is other parent, executable is local:

				$ if [ -h a ]; then
				> echo a is a symlink
				> $TESTDIR/readlink.py a
				> elif [ -x a ]; then
				> echo a is executable
				> else
				> echo "a has no flags (default for conflicts)"
				> fi
				a has no flags (default for conflicts)