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

store: introduce _matchtrackedpath() and use it to filter store files...

store: introduce _matchtrackedpath() and use it to filter store files This patch introduces a function to filter store files on the basis of the path which they are tracking. The function assumes that the entries can be of two types, 'meta/*' and 'data/*' which means it will just work on revlog based storage and not with another storage ways. For the 'data/*' entries, we remove the 'data/' part and '.i/.d' part from the beginning and the end then pass that to matcher. For the 'meta/*' entries, we remove the 'meta/' and '/00manifest.(i/d)' part from beginning and end then call matcher.visitdir() with it to make sure all the parent directories are also downloaded. Since the storage filtering for narrow stream clones is implemented with this patch, we remove the un-implemented error message, add some more tests and add the treemanifest case to tests too. The tests demonstrate that it works correctly. After this patch, we have now narrow stream clones working. Narrow stream clones are a very important feature for large repositories who have good internet connection because they use streamclones for cloning and if they do normal narrow clone, that takes more time then a full streamclone. Also narrow-stream clone will drastically speed up clone timings. Differential Revision: https://phab.mercurial-scm.org/D5139

Matt Harbison - - Load All Authors

File last commit:

r39982:2b4c8fa0 default


                r40529:9aeb9e2d

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