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

discovery: add extinct changesets to outgoing.excluded...

discovery: add extinct changesets to outgoing.excluded Before this change, push would incorrectly fast-path the bundle generation when extinct changesets are involved, because they are not added to outgoing.excluded. The reason to do so are related to outgoing.excluded being assumed to contain only secret changesets by scmutil.nochangesfound(), when displaying warnings like: changes found (ignored 9 secret changesets) Still, outgoing.excluded seems like a good API to report the extinct changesets instead of dedicated code and nothing in the docstring indicates it to be bound to secret changesets. This patch adds extinct changesets to outgoing.excluded and fixes scmutil.nochangesfound() to filter the excluded node list. Original version and test by Pierre-Yves.David@ens-lyon.org

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r17248:6ffb35b2

stable

Download file

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

        $ cat > echo.py <<EOF

        > #!/usr/bin/env python

        > import os, 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 pull "$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
				> #!/usr/bin/env python
				> import os, 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 pull "$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 ..