upstream/mercurial-mirror Files · tests/test-addremove-similar.t

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r22285:85bded43

default

Download file

             test-addremove-similar.t
        
                    102 lines
            
             | 2.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-addremove-similar.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
tests: unify test-addremove-similar

              r11851
            
        $ hg init rep; cd rep

        $ touch empty-file

        $ python -c 'for x in range(10000): print x' > large-file

        $ hg addremove

        adding empty-file

        adding large-file

        $ hg commit -m A

        $ rm large-file empty-file

        $ python -c 'for x in range(10,10000): print x' > another-file

        $ hg addremove -s50

        adding another-file

        removing empty-file

        removing large-file

        recording removal of large-file as rename to another-file (99% similar)

        $ hg commit -m B

      comparing two empty files caused ZeroDivisionError in the past

        $ hg update -C 0

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

        $ rm empty-file

        $ touch another-empty-file

        $ hg addremove -s50

        adding another-empty-file

        removing empty-file

        $ cd ..

        $ hg init rep2; cd rep2

        $ python -c 'for x in range(10000): print x' > large-file

        $ python -c 'for x in range(50): print x' > tiny-file

        $ hg addremove

        adding large-file

        adding tiny-file

        $ hg commit -m A

        $ python -c 'for x in range(70): print x' > small-file

        $ rm tiny-file

        $ rm large-file

        $ hg addremove -s50

        removing large-file

        adding small-file

        removing tiny-file

        recording removal of tiny-file as rename to small-file (82% similar)

        $ hg commit -m B

      should all fail

        $ hg addremove -s foo

        abort: similarity must be a number

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Martin Geisler
    
tests: unify test-addremove-similar

              r11851
            
        $ hg addremove -s -1

        abort: similarity must be between 0 and 100

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Martin Geisler
    
tests: unify test-addremove-similar

              r11851
            
        $ hg addremove -s 1e6

        abort: similarity must be between 0 and 100

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Martin Geisler
    
tests: unify test-addremove-similar

              r11851
            
        $ cd ..

        Martin Geisler
    
tests: added a short description to issue numbers...

              r12399
            
      Issue1527: repeated addremove causes util.Abort

        Martin Geisler
    
tests: unify test-addremove-similar

              r11851
            
        $ hg init rep3; cd rep3

        $ mkdir d

        $ echo a > d/a

        $ hg add d/a

        $ hg commit -m 1

        $ mv d/a d/b

        $ hg addremove -s80

        removing d/a

        adding d/b

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        recording removal of d/a as rename to d/b (100% similar) (glob)

        Martin Geisler
    
tests: unify test-addremove-similar

              r11851
            
        $ hg debugstate

        r   0          0 1970-01-01 00:00:00 d/a

        a   0         -1 unset               d/b

        copy: d/a -> d/b

        $ mv d/b c

      no copies found here (since the target isn't in d

        $ hg addremove -s80 d

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        removing d/b (glob)

        Martin Geisler
    
tests: unify test-addremove-similar

              r11851
            
      copies here

        $ hg addremove -s80

        adding c

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        recording removal of d/a as rename to c (100% similar) (glob)

        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: unify test-addremove-similar	r11851	$ hg init rep; cd rep

		$ touch empty-file
		$ python -c 'for x in range(10000): print x' > large-file

		$ hg addremove
		adding empty-file
		adding large-file

		$ hg commit -m A

		$ rm large-file empty-file
		$ python -c 'for x in range(10,10000): print x' > another-file

		$ hg addremove -s50
		adding another-file
		removing empty-file
		removing large-file
		recording removal of large-file as rename to another-file (99% similar)

		$ hg commit -m B

		comparing two empty files caused ZeroDivisionError in the past

		$ hg update -C 0
		2 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ rm empty-file
		$ touch another-empty-file
		$ hg addremove -s50
		adding another-empty-file
		removing empty-file

		$ cd ..

		$ hg init rep2; cd rep2

		$ python -c 'for x in range(10000): print x' > large-file
		$ python -c 'for x in range(50): print x' > tiny-file

		$ hg addremove
		adding large-file
		adding tiny-file

		$ hg commit -m A

		$ python -c 'for x in range(70): print x' > small-file
		$ rm tiny-file
		$ rm large-file

		$ hg addremove -s50
		removing large-file
		adding small-file
		removing tiny-file
		recording removal of tiny-file as rename to small-file (82% similar)

		$ hg commit -m B

		should all fail

		$ hg addremove -s foo
		abort: similarity must be a number
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Martin Geisler tests: unify test-addremove-similar	r11851	$ hg addremove -s -1
		abort: similarity must be between 0 and 100
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Martin Geisler tests: unify test-addremove-similar	r11851	$ hg addremove -s 1e6
		abort: similarity must be between 0 and 100
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Martin Geisler tests: unify test-addremove-similar	r11851
		$ cd ..

Martin Geisler tests: added a short description to issue numbers...	r12399	Issue1527: repeated addremove causes util.Abort
Martin Geisler tests: unify test-addremove-similar	r11851
		$ hg init rep3; cd rep3
		$ mkdir d
		$ echo a > d/a
		$ hg add d/a
		$ hg commit -m 1

		$ mv d/a d/b
		$ hg addremove -s80
		removing d/a
		adding d/b
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	recording removal of d/a as rename to d/b (100% similar) (glob)
Martin Geisler tests: unify test-addremove-similar	r11851	$ hg debugstate
		r 0 0 1970-01-01 00:00:00 d/a
		a 0 -1 unset d/b
		copy: d/a -> d/b
		$ mv d/b c

		no copies found here (since the target isn't in d

		$ hg addremove -s80 d
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	removing d/b (glob)
Martin Geisler tests: unify test-addremove-similar	r11851
		copies here

		$ hg addremove -s80
		adding c
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	recording removal of d/a as rename to c (100% similar) (glob)
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..