upstream/mercurial-mirror Files · tests/test-merge-internal-tools-pattern.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()".

Matt Mackall - - Load All Authors

File last commit:

r12328:b63f6422 default


                r17159:36a30168

default

Download file

             test-merge-internal-tools-pattern.t
        
                    112 lines
            
             | 2.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-internal-tools-pattern.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Make sure that the internal merge tools (internal:fail, internal:local, and

      internal:other) are used when matched by a merge-pattern in hgrc

      Make sure HGMERGE doesn't interfere with the test:

        $ unset HGMERGE

        $ hg init

      Initial file contents:

        $ echo "line 1" > f

        $ echo "line 2" >> f

        $ echo "line 3" >> f

        $ hg ci -Am "revision 0"

        adding f

        $ cat f

        line 1

        line 2

        line 3

      Branch 1: editing line 1:

        $ sed 's/line 1/first line/' f > f.new

        $ mv f.new f

        $ hg ci -Am "edited first line"

      Branch 2: editing line 3:

        $ hg update 0

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

        $ sed 's/line 3/third line/' f > f.new

        $ mv f.new f

        $ hg ci -Am "edited third line"

        created new head

      Merge using internal:fail tool:

        $ echo "[merge-patterns]" > .hg/hgrc

        $ echo "* = internal:fail" >> .hg/hgrc

        $ hg merge

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

        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        [1]

        $ cat f

        line 1

        line 2

        third line

        $ hg stat

        M f

      Merge using internal:local tool:

        $ hg update -C 2

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

        $ sed 's/internal:fail/internal:local/' .hg/hgrc > .hg/hgrc.new

        $ mv .hg/hgrc.new .hg/hgrc

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ cat f

        line 1

        line 2

        third line

        $ hg stat

        M f

      Merge using internal:other tool:

        $ hg update -C 2

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

        $ sed 's/internal:local/internal:other/' .hg/hgrc > .hg/hgrc.new

        $ mv .hg/hgrc.new .hg/hgrc

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ cat f

        first line

        line 2

        line 3

        $ hg stat

        M f

      Merge using default tool:

        $ hg update -C 2

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

        $ rm .hg/hgrc

        $ hg merge

        merging f

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

        (branch merge, don't forget to commit)

        $ cat f

        first line

        line 2

        third line

        $ hg stat

        M f

	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

				Make sure that the internal merge tools (internal:fail, internal:local, and
				internal:other) are used when matched by a merge-pattern in hgrc

				Make sure HGMERGE doesn't interfere with the test:

				$ unset HGMERGE

				$ hg init

				Initial file contents:

				$ echo "line 1" > f
				$ echo "line 2" >> f
				$ echo "line 3" >> f
				$ hg ci -Am "revision 0"
				adding f

				$ cat f
				line 1
				line 2
				line 3

				Branch 1: editing line 1:

				$ sed 's/line 1/first line/' f > f.new
				$ mv f.new f
				$ hg ci -Am "edited first line"

				Branch 2: editing line 3:

				$ hg update 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ sed 's/line 3/third line/' f > f.new
				$ mv f.new f
				$ hg ci -Am "edited third line"
				created new head

				Merge using internal:fail tool:

				$ echo "[merge-patterns]" > .hg/hgrc
				$ echo "* = internal:fail" >> .hg/hgrc

				$ hg merge
				0 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
				[1]

				$ cat f
				line 1
				line 2
				third line

				$ hg stat
				M f

				Merge using internal:local tool:

				$ hg update -C 2
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ sed 's/internal:fail/internal:local/' .hg/hgrc > .hg/hgrc.new
				$ mv .hg/hgrc.new .hg/hgrc

				$ hg merge
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ cat f
				line 1
				line 2
				third line

				$ hg stat
				M f

				Merge using internal:other tool:

				$ hg update -C 2
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ sed 's/internal:local/internal:other/' .hg/hgrc > .hg/hgrc.new
				$ mv .hg/hgrc.new .hg/hgrc

				$ hg merge
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ cat f
				first line
				line 2
				line 3

				$ hg stat
				M f

				Merge using default tool:

				$ hg update -C 2
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm .hg/hgrc

				$ hg merge
				merging f
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ cat f
				first line
				line 2
				third line

				$ hg stat
				M f