upstream/mercurial-mirror Files · tests/test-merge-symlinks.t

logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter...

logcmdutil: rewrite jsonchangeset printer to be backed by jsonformatter This is a bit slower than the original implementation, but I don't think that would actually matter. It's still faster than full templating. $ hg log -Tjson -r0:5000 --time > /dev/null (orig) time: real 1.550 secs (user 1.500+0.000 sys 0.040+0.000) (new) time: real 1.810 secs (user 1.740+0.000 sys 0.070+0.000) cf. $ hg log -Tdefault -r0:5000 --time > /dev/null time: real 4.980 secs (user 4.850+0.000 sys 0.130+0.000) $ hg log -r0:5000 --time > /dev/null time: real 2.340 secs (user 2.220+0.000 sys 0.100+0.000) $ hg log -r0:5000 -q --time > /dev/null time: real 0.750 secs (user 0.670+0.000 sys 0.070+0.000) The test output changes because keys are sorted alphabetically.

Gregory Szorc - - Load All Authors

File last commit:

r37354:5d10f41d default


                r37790:814151cd

default

Download file

             test-merge-symlinks.t
        
                    65 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-symlinks.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ cat > echo.py <<EOF

        > #!$PYTHON

        > from __future__ import absolute_import, print_function

        > import os

        > import sys

        > try:

        >     import msvcrt

        >     msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)

        >     msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)

        > except ImportError:

        >     pass

        > 

        > for k in ('HG_FILE', 'HG_MY_ISLINK', 'HG_OTHER_ISLINK', 'HG_BASE_ISLINK'):

        >     print(k, os.environ[k])

        > EOF

      Create 2 heads containing the same file, once as

      a file, once as a link. Bundle was generated with:

      # hg init t

      # cd t

      # echo a > a

      # hg ci -qAm t0 -d '0 0'

      # echo l > l

      # hg ci -qAm t1 -d '1 0'

      # hg up -C 0

      # ln -s a l

      # hg ci -qAm t2 -d '2 0'

      # echo l2 > l2

      # hg ci -qAm t3 -d '3 0'

        $ hg init t

        $ cd t

        $ hg -q unbundle "$TESTDIR/bundles/test-merge-symlinks.hg"

        $ hg up -C 3

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

      Merge them and display *_ISLINK vars

      merge heads

        $ hg merge --tool="$PYTHON ../echo.py"

        merging l

        HG_FILE l

        HG_MY_ISLINK 1

        HG_OTHER_ISLINK 0

        HG_BASE_ISLINK 0

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

        (branch merge, don't forget to commit)

      Test working directory symlink bit calculation wrt copies,

      especially on non-supporting systems.

      merge working directory

        $ hg up -C 2

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

        $ hg copy l l2

        $ HGMERGE="$PYTHON ../echo.py" hg up 3

        merging l2

        HG_FILE l2

        HG_MY_ISLINK 1

        HG_OTHER_ISLINK 0

        HG_BASE_ISLINK 0

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

        $ 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

				$ cat > echo.py <<EOF
				> #!$PYTHON
				> from __future__ import absolute_import, print_function
				> import os
				> import sys
				> try:
				> import msvcrt
				> msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
				> msvcrt.setmode(sys.stderr.fileno(), os.O_BINARY)
				> except ImportError:
				> pass
				>
				> for k in ('HG_FILE', 'HG_MY_ISLINK', 'HG_OTHER_ISLINK', 'HG_BASE_ISLINK'):
				> print(k, os.environ[k])
				> EOF

				Create 2 heads containing the same file, once as
				a file, once as a link. Bundle was generated with:

				# hg init t
				# cd t
				# echo a > a
				# hg ci -qAm t0 -d '0 0'
				# echo l > l
				# hg ci -qAm t1 -d '1 0'
				# hg up -C 0
				# ln -s a l
				# hg ci -qAm t2 -d '2 0'
				# echo l2 > l2
				# hg ci -qAm t3 -d '3 0'

				$ hg init t
				$ cd t
				$ hg -q unbundle "$TESTDIR/bundles/test-merge-symlinks.hg"
				$ hg up -C 3
				3 files updated, 0 files merged, 0 files removed, 0 files unresolved

				Merge them and display *_ISLINK vars
				merge heads

				$ hg merge --tool="$PYTHON ../echo.py"
				merging l
				HG_FILE l
				HG_MY_ISLINK 1
				HG_OTHER_ISLINK 0
				HG_BASE_ISLINK 0
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				Test working directory symlink bit calculation wrt copies,
				especially on non-supporting systems.
				merge working directory

				$ hg up -C 2
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg copy l l2
				$ HGMERGE="$PYTHON ../echo.py" hg up 3
				merging l2
				HG_FILE l2
				HG_MY_ISLINK 1
				HG_OTHER_ISLINK 0
				HG_BASE_ISLINK 0
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved

				$ cd ..