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

largefiles: restore standins from non branch-tip parent at rollback correctly...

largefiles: restore standins from non branch-tip parent at rollback correctly Before this patch, "hg rollback" can't restore standins correclty, if: - old parent of the working directory is rollback-ed, and - new parent of the working directory is not branch-tip "overriderollback" uses "merge.update" as a kind of "revert" utility to restore only standins with "node=None", and this makes "merge.update" choose "branch-tip" revision as the updating target unexpectedly. Then, "merge.update" restores standins from the branch-tip revision regardless of the parent of the working directory after rollback and this may cause unexpected behavior. This patch invokes "merge.update" with "node='.'" to restore standins from the parent revision of the working directory. In fact, this "merge.update" invocation will be replaced in the subsequent patch to fix another problem, but this change is usefull to inform reason why such complicated case should be tested.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r22284:72b37865

default

Download file

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

        $ 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

        [255]

        $ hg addremove -s -1

        abort: similarity must be between 0 and 100

        [255]

        $ hg addremove -s 1e6

        abort: similarity must be between 0 and 100

        [255]

        $ cd ..

      Issue1527: repeated addremove causes util.Abort

        $ 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

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

        $ 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

        removing d/b (glob)

      copies here

        $ hg addremove -s80

        adding c

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

        $ 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

				$ 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
				[255]
				$ hg addremove -s -1
				abort: similarity must be between 0 and 100
				[255]
				$ hg addremove -s 1e6
				abort: similarity must be between 0 and 100
				[255]

				$ cd ..

				Issue1527: repeated addremove causes util.Abort

				$ 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
				recording removal of d/a as rename to d/b (100% similar) (glob)
				$ 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
				removing d/b (glob)

				copies here

				$ hg addremove -s80
				adding c
				recording removal of d/a as rename to c (100% similar) (glob)

				$ cd ..