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

localrepo: use the path relative to "self.vfs" instead of "path" argument...

localrepo: use the path relative to "self.vfs" instead of "path" argument As a part of migration to vfs, this patch uses "self.root", which can be recognized as the path relative to "self.vfs", instead of "path" argument. This fix allows to make invocations of "util.makedirs()" and "os.path.exists()" while ensuring repository directory in "localrepository.__init__()" ones indirectly via vfs. But this fix also raises issue 2528: "hg clone" with empty destination. "path" argument is empty in many cases, so this issue can't be fixed in the view of "localrepository.__init__()". Before this patch, it is fixed by empty-ness check ("not name") of exception handler in "util.makedirs()". try: os.mkdir(name) except OSError, err: if err.errno == errno.EEXIST: return if err.errno != errno.ENOENT or not name: raise This requires "localrepository.__init__()" to invoke "util.makedirs()" with "path" instead of "self.root", because empty "path" is treated as "current directory" and "self.root" becomes valid path. But "hg clone" with empty destination can be detected also in "hg.clone()" before "localrepository.__init__()" invocation, so this patch re-fixes issue2528 by checking it in "hg.clone()".

Mads Kiilerich - - Load All Authors

File last commit:

r17110:722fd97f default


                r17159:36a30168

default

Download file

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

        $ "$TESTDIR/hghave" symlink execbit || exit 80

        $ 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: False, 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: False, 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)

      Update to link without local change should get us a symlink (issue3316):

        $ hg up -C 0

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

        $ hg up

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

        $ hg st

      Update to link with local change should cause a merge prompt (issue3200):

        $ hg up -C 0

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

        $ echo data > a

        $ HGMERGE= hg up -y --debug

          searching for copies back to rev 2

        resolving manifests

         overwrite: False, partial: False

         ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f

         a: versions differ -> m

        preserving a for resolve of a

        updating: a 1/1 files (100.00%)

        (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re)

        picked tool 'internal:prompt' for a (binary False symlink True)

         no tool found to merge a

        keep (l)ocal or take (o)ther? l

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

        $ hg diff --git

        diff --git a/a b/a

        old mode 120000

        new mode 100644

        --- a/a

        +++ b/a

        @@ -1,1 +1,1 @@

        -symlink

        \ No newline at end of file

        +data

	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

				$ "$TESTDIR/hghave" symlink execbit \|\| exit 80

				$ 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: False, 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: False, 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)

				Update to link without local change should get us a symlink (issue3316):

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

				Update to link with local change should cause a merge prompt (issue3200):

				$ hg up -C 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo data > a
				$ HGMERGE= hg up -y --debug
				searching for copies back to rev 2
				resolving manifests
				overwrite: False, partial: False
				ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f
				a: versions differ -> m
				preserving a for resolve of a
				updating: a 1/1 files (100.00%)
				(couldn't find merge tool hgmerge\|tool hgmerge can't handle symlinks) (re)
				picked tool 'internal:prompt' for a (binary False symlink True)
				no tool found to merge a
				keep (l)ocal or take (o)ther? l
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				$ hg diff --git
				diff --git a/a b/a
				old mode 120000
				new mode 100644
				--- a/a
				+++ b/a
				@@ -1,1 +1,1 @@
				-symlink
				\ No newline at end of file
				+data