upstream/mercurial-mirror Files · tests/test-rename-rev.t

rename: add support for --at-rev, which marks as copy and removes the source...

rename: add support for --at-rev, which marks as copy and removes the source I had previously only added support for `--at-rev` to `hg cp`, but not to `hg mv`. This patch adds that support. Just like for `hg cp`, it marks the destination as copied from the source, and doesn't care if the source file still exists (because it only supports the `-A` mode, aka "don't touch files" mode). It works whether or not the source file still exists. This matches the behavior of `hg mv -A` in the working copy. Differential Revision: https://phab.mercurial-scm.org/D8840

Martin von Zweigbergk - - Load All Authors

File last commit:

r45928:5178dd22 default


                r45928:5178dd22

default

Download file

             test-rename-rev.t
        
                    107 lines
            
             | 2.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-rename-rev.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin von Zweigbergk
    
copy: add experimental support for marking committed copies...

              r44847
            
        $ hg init

        $ mkdir d1 d1/d11 d2

        $ echo d1/a > d1/a

        $ echo d1/ba > d1/ba

        $ echo d1/a1 > d1/d11/a1

        $ echo d1/b > d1/b

        $ echo d2/b > d2/b

        $ hg add d1/a d1/b d1/ba d1/d11/a1 d2/b

        $ hg commit -m "intial"

      Test single file

        Martin von Zweigbergk
    
tests: show poor error message for  `hg cp -A --at-rev . non-existent dst`...

              r45315
            
      # One recorded copy, one copy to record after commit

        Martin von Zweigbergk
    
copy: add experimental support for marking committed copies...

              r44847
            
        $ hg cp d1/b d1/c

        $ cp d1/b d1/d

        $ hg add d1/d

        $ hg ci -m 'copy d1/b to d1/c and d1/d'

        $ hg st -C --change .

        A d1/c

          d1/b

        A d1/d

      # Errors out without --after for now

        $ hg cp --at-rev . d1/b d1/d

        abort: --at-rev requires --after

        [255]

        Martin von Zweigbergk
    
tests: show poor error message for  `hg cp -A --at-rev . non-existent dst`...

              r45315
            
      # Errors out with non-existent source

        $ hg cp -A --at-rev . d1/non-existent d1/d

        d1/non-existent: no such file in rev 55d1fd85ef0a

        Martin von Zweigbergk
    
copy: give better error message when no source paths found with --at-rev...

              r45316
            
        abort: no files to copy

        Martin von Zweigbergk
    
tests: show poor error message for  `hg cp -A --at-rev . non-existent dst`...

              r45315
            
        [255]

        Martin von Zweigbergk
    
copy: add experimental support for marking committed copies...

              r44847
            
      # Errors out with non-existent destination

        $ hg cp -A --at-rev . d1/b d1/non-existent

        abort: d1/non-existent: copy destination does not exist in 8a9d70fa20c9

        [255]

      # Successful invocation

        $ hg cp -A --at-rev . d1/b d1/d

        saved backup bundle to $TESTTMP/.hg/strip-backup/8a9d70fa20c9-973ae357-copy.hg

      # New copy is recorded, and previously recorded copy is also still there

        $ hg st -C --change .

        A d1/c

          d1/b

        A d1/d

          d1/b

        Martin von Zweigbergk
    
rename: add support for --at-rev, which marks as copy and removes the source...

              r45928
            
      Test moved file (not copied) using 'hg cp' command

        Martin von Zweigbergk
    
tests: show that `hg cp -A --at-rev .` doesn't work for renames...

              r45313
            
        $ hg co 0

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

        $ mv d1/b d1/d

        $ hg rm -A d1/b

        $ hg add d1/d

        $ hg ci -m 'move d1/b to d1/d'

        created new head

        $ hg cp -A --at-rev . d1/b d1/d

        Martin von Zweigbergk
    
copy: to find copy source, walk parent of revision we're marking copies in...

              r45314
            
        saved backup bundle to $TESTTMP/.hg/strip-backup/519850c3ea27-153c8fbb-copy.hg

        Martin von Zweigbergk
    
tests: show that `hg cp -A --at-rev .` doesn't work for renames...

              r45313
            
        $ hg st -C --change .

        A d1/d

        Martin von Zweigbergk
    
copy: to find copy source, walk parent of revision we're marking copies in...

              r45314
            
          d1/b

        Martin von Zweigbergk
    
tests: show that `hg cp -A --at-rev .` doesn't work for renames...

              r45313
            
        R d1/b

        Martin von Zweigbergk
    
rename: add support for --at-rev, which marks as copy and removes the source...

              r45928
            
      Test moved file (not copied) using 'hg mv' command

        $ hg co 0

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

        $ mv d1/b d1/d

        $ hg rm -A d1/b

        $ hg add d1/d

        $ hg ci -m 'move d1/b to d1/d'

        created new head

        $ hg mv -A --at-rev . d1/b d1/d

        saved backup bundle to $TESTTMP/.hg/strip-backup/519850c3ea27-153c8fbb-copy.hg

        $ hg st -C --change .

        A d1/d

          d1/b

        R d1/b

      Test moved file (not copied) for which source still exists

        $ hg co 0

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

        $ cp d1/b d1/d

        $ hg add d1/d

        $ hg ci -m 'copy d1/b to d1/d'

        created new head

        $ hg mv -A --at-rev . d1/b d1/d

        saved backup bundle to $TESTTMP/.hg/strip-backup/c8d0f6bcf7ca-1c9bb53e-copy.hg

        $ hg st -C --change .

        A d1/d

          d1/b

        Martin von Zweigbergk
    
copy: add experimental support for marking committed copies...

              r44847
            
      Test using directory as destination

        $ hg co 0

        Martin von Zweigbergk
    
rename: add support for --at-rev, which marks as copy and removes the source...

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

        Martin von Zweigbergk
    
copy: add experimental support for marking committed copies...

              r44847
            
        $ cp -R d1 d3

        $ hg add d3

        adding d3/a

        adding d3/b

        adding d3/ba

        adding d3/d11/a1

        $ hg ci -m 'copy d1/ to d3/'

        created new head

        $ hg cp -A --at-rev . d1 d3

        abort: d3: --at-rev does not support a directory as destination

        [255]

	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 von Zweigbergk copy: add experimental support for marking committed copies...	r44847	$ hg init
		$ mkdir d1 d1/d11 d2
		$ echo d1/a > d1/a
		$ echo d1/ba > d1/ba
		$ echo d1/a1 > d1/d11/a1
		$ echo d1/b > d1/b
		$ echo d2/b > d2/b
		$ hg add d1/a d1/b d1/ba d1/d11/a1 d2/b
		$ hg commit -m "intial"


		Test single file

Martin von Zweigbergk tests: show poor error message for `hg cp -A --at-rev . non-existent dst`...	r45315	# One recorded copy, one copy to record after commit
Martin von Zweigbergk copy: add experimental support for marking committed copies...	r44847	$ hg cp d1/b d1/c
		$ cp d1/b d1/d
		$ hg add d1/d
		$ hg ci -m 'copy d1/b to d1/c and d1/d'
		$ hg st -C --change .
		A d1/c
		d1/b
		A d1/d
		# Errors out without --after for now
		$ hg cp --at-rev . d1/b d1/d
		abort: --at-rev requires --after
		[255]
Martin von Zweigbergk tests: show poor error message for `hg cp -A --at-rev . non-existent dst`...	r45315	# Errors out with non-existent source
		$ hg cp -A --at-rev . d1/non-existent d1/d
		d1/non-existent: no such file in rev 55d1fd85ef0a
Martin von Zweigbergk copy: give better error message when no source paths found with --at-rev...	r45316	abort: no files to copy
Martin von Zweigbergk tests: show poor error message for `hg cp -A --at-rev . non-existent dst`...	r45315	[255]
Martin von Zweigbergk copy: add experimental support for marking committed copies...	r44847	# Errors out with non-existent destination
		$ hg cp -A --at-rev . d1/b d1/non-existent
		abort: d1/non-existent: copy destination does not exist in 8a9d70fa20c9
		[255]
		# Successful invocation
		$ hg cp -A --at-rev . d1/b d1/d
		saved backup bundle to $TESTTMP/.hg/strip-backup/8a9d70fa20c9-973ae357-copy.hg
		# New copy is recorded, and previously recorded copy is also still there
		$ hg st -C --change .
		A d1/c
		d1/b
		A d1/d
		d1/b

Martin von Zweigbergk rename: add support for --at-rev, which marks as copy and removes the source...	r45928	Test moved file (not copied) using 'hg cp' command
Martin von Zweigbergk tests: show that `hg cp -A --at-rev .` doesn't work for renames...	r45313
		$ hg co 0
		0 files updated, 0 files merged, 2 files removed, 0 files unresolved
		$ mv d1/b d1/d
		$ hg rm -A d1/b
		$ hg add d1/d
		$ hg ci -m 'move d1/b to d1/d'
		created new head
		$ hg cp -A --at-rev . d1/b d1/d
Martin von Zweigbergk copy: to find copy source, walk parent of revision we're marking copies in...	r45314	saved backup bundle to $TESTTMP/.hg/strip-backup/519850c3ea27-153c8fbb-copy.hg
Martin von Zweigbergk tests: show that `hg cp -A --at-rev .` doesn't work for renames...	r45313	$ hg st -C --change .
		A d1/d
Martin von Zweigbergk copy: to find copy source, walk parent of revision we're marking copies in...	r45314	d1/b
Martin von Zweigbergk tests: show that `hg cp -A --at-rev .` doesn't work for renames...	r45313	R d1/b

Martin von Zweigbergk rename: add support for --at-rev, which marks as copy and removes the source...	r45928	Test moved file (not copied) using 'hg mv' command

		$ hg co 0
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ mv d1/b d1/d
		$ hg rm -A d1/b
		$ hg add d1/d
		$ hg ci -m 'move d1/b to d1/d'
		created new head
		$ hg mv -A --at-rev . d1/b d1/d
		saved backup bundle to $TESTTMP/.hg/strip-backup/519850c3ea27-153c8fbb-copy.hg
		$ hg st -C --change .
		A d1/d
		d1/b
		R d1/b

		Test moved file (not copied) for which source still exists

		$ hg co 0
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ cp d1/b d1/d
		$ hg add d1/d
		$ hg ci -m 'copy d1/b to d1/d'
		created new head
		$ hg mv -A --at-rev . d1/b d1/d
		saved backup bundle to $TESTTMP/.hg/strip-backup/c8d0f6bcf7ca-1c9bb53e-copy.hg
		$ hg st -C --change .
		A d1/d
		d1/b

Martin von Zweigbergk copy: add experimental support for marking committed copies...	r44847	Test using directory as destination

		$ hg co 0
Martin von Zweigbergk rename: add support for --at-rev, which marks as copy and removes the source...	r45928	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Martin von Zweigbergk copy: add experimental support for marking committed copies...	r44847	$ cp -R d1 d3
		$ hg add d3
		adding d3/a
		adding d3/b
		adding d3/ba
		adding d3/d11/a1
		$ hg ci -m 'copy d1/ to d3/'
		created new head
		$ hg cp -A --at-rev . d1 d3
		abort: d3: --at-rev does not support a directory as destination
		[255]