upstream/mercurial-mirror Files · tests/test-copy-move-merge.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:

r16913:f2719b38 default


                r17159:36a30168

default

Download file

             test-copy-move-merge.t
        
                    64 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-copy-move-merge.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
tests: remove redundant mkdir...

              r13956
            
        $ hg init t

        Pradeepkumar Gayam
    
tests: unify test-copy-move-merge

              r11972
            
        $ cd t

        $ echo 1 > a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg ci -qAm "first"

        Pradeepkumar Gayam
    
tests: unify test-copy-move-merge

              r11972
            
        $ hg cp a b

        $ hg mv a c

        $ echo 2 >> b

        $ echo 2 >> c

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg ci -qAm "second"

        Pradeepkumar Gayam
    
tests: unify test-copy-move-merge

              r11972
            
        $ hg co -C 0

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

        $ echo 0 > a

        $ echo 1 >> a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg ci -qAm "other"

        Pradeepkumar Gayam
    
tests: unify test-copy-move-merge

              r11972
            
        $ hg merge --debug

          searching for copies back to rev 1

          unmatched files in other:

           b

           c

        Thomas Arendsen Hein
    
merge: show renamed on one and deleted on the other side in debug output

              r16795
            
          all copies found (* = to merge, ! = divergent, % = renamed and deleted):

        Pradeepkumar Gayam
    
tests: unify test-copy-move-merge

              r11972
            
           c -> a *

           b -> a *

          checking for directory renames

        resolving manifests

        Martin Geisler
    
merge: make debug output easier to read...

              r15625
            
         overwrite: False, partial: False

         ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6

        Pradeepkumar Gayam
    
tests: unify test-copy-move-merge

              r11972
            
         a: remote moved to c -> m

         a: remote moved to b -> m

        preserving a for resolve of b

        preserving a for resolve of c

        removing a

        updating: a 1/2 files (50.00%)

        picked tool 'internal:merge' for b (binary False symlink False)

        merging a and b to b

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc

        Pradeepkumar Gayam
    
tests: unify test-copy-move-merge

              r11972
            
         premerge successful

        updating: a 2/2 files (100.00%)

        picked tool 'internal:merge' for c (binary False symlink False)

        merging a and c to c

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc

        Pradeepkumar Gayam
    
tests: unify test-copy-move-merge

              r11972
            
         premerge successful

        0 files updated, 2 files merged, 0 files removed, 0 files unresolved

        (branch merge, don't forget to commit)

      file b

        $ cat b

        0

        1

        2

      file c

        $ cat c

        0

        1

        2

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Martin Geisler tests: remove redundant mkdir...	r13956	$ hg init t
Pradeepkumar Gayam tests: unify test-copy-move-merge	r11972	$ cd t

		$ echo 1 > a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg ci -qAm "first"
Pradeepkumar Gayam tests: unify test-copy-move-merge	r11972
		$ hg cp a b
		$ hg mv a c
		$ echo 2 >> b
		$ echo 2 >> c

Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg ci -qAm "second"
Pradeepkumar Gayam tests: unify test-copy-move-merge	r11972
		$ hg co -C 0
		1 files updated, 0 files merged, 2 files removed, 0 files unresolved

		$ echo 0 > a
		$ echo 1 >> a

Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg ci -qAm "other"
Pradeepkumar Gayam tests: unify test-copy-move-merge	r11972
		$ hg merge --debug
		searching for copies back to rev 1
		unmatched files in other:
		b
		c
Thomas Arendsen Hein merge: show renamed on one and deleted on the other side in debug output	r16795	all copies found (* = to merge, ! = divergent, % = renamed and deleted):
Pradeepkumar Gayam tests: unify test-copy-move-merge	r11972	c -> a *
		b -> a *
		checking for directory renames
		resolving manifests
Martin Geisler merge: make debug output easier to read...	r15625	overwrite: False, partial: False
		ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
Pradeepkumar Gayam tests: unify test-copy-move-merge	r11972	a: remote moved to c -> m
		a: remote moved to b -> m
		preserving a for resolve of b
		preserving a for resolve of c
		removing a
		updating: a 1/2 files (50.00%)
		picked tool 'internal:merge' for b (binary False symlink False)
		merging a and b to b
Martin Geisler tests: remove unneeded -d flags...	r12156	my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
Pradeepkumar Gayam tests: unify test-copy-move-merge	r11972	premerge successful
		updating: a 2/2 files (100.00%)
		picked tool 'internal:merge' for c (binary False symlink False)
		merging a and c to c
Martin Geisler tests: remove unneeded -d flags...	r12156	my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc
Pradeepkumar Gayam tests: unify test-copy-move-merge	r11972	premerge successful
		0 files updated, 2 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

		file b
		$ cat b
		0
		1
		2

		file c
		$ cat c
		0
		1
		2
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..