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

largefiles: access to specific fields only if largefiles enabled (issue4547)...

largefiles: access to specific fields only if largefiles enabled (issue4547) Even if largefiles extension is enabled in a repository, "repo" object, which isn't "largefiles.reposetup()"-ed, is passed to overridden functions in the cases below unexpectedly, because extensions are enabled for each repositories strictly. (1) clone without -U: (2) pull with -U: (3) pull with --rebase: combination of "enabled@src", "disabled@dst" and "not-required@src" cause this situation. largefiles requirement @src @dst @src result -------- -------- --------------- -------------------- enabled disabled not-required aborted unexpectedly required requirement error (intentional) -------- -------- --------------- -------------------- enabled enabled * success -------- -------- --------------- -------------------- disabled enabled * success (only for "pull") -------- -------- --------------- -------------------- disabled disabled not-required success required requirement error (intentional) -------- -------- --------------- -------------------- (4) update/revert with a subrepo disabling largefiles In these cases, overridden functions cause accessing to largefiles specific fields of not "largefiles.reposetup()"-ed "repo" object, and execution is aborted. - (1), (2), (4) cause accessing to "_lfstatuswriters" in "getstatuswriter()" invoked via "updatelfiles()" - (3) causes accessing to "_lfcommithooks" in "overriderebase()" For safe accessing to these fields, this patch examines whether passed "repo" object is "largefiles.reposetup()"-ed or not before accessing to them. This patch chooses examining existence of newly introduced "_largefilesenabled" instead of "_lfcommithooks" and "_lfstatuswriters" directly, because the former is better name for the generic "largefiles is enabled in this repo" mark than the latter. In the future, all other overridden functions should avoid largefiles specific processing for efficiency, and "_largefilesenabled" is better also for such purpose. BTW, "lfstatus" can't be used for such purpose, because some code paths set it forcibly regardless of existence of it in specified "repo" object.

Mads Kiilerich - - Load All Authors

File last commit:

r23749:a387b039 default


                r24158:d414c28d

stable

Download file

             test-addremove.t
        
                    103 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-addremove.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Martin Geisler
    
tests: unify test-addremove

              r11850
            
        $ hg init rep

        $ cd rep

        $ mkdir dir

        $ touch foo dir/bar

        $ hg -v addremove

        adding dir/bar

        adding foo

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

              r12156
            
        $ hg -v commit -m "add 1"

        Mads Kiilerich
    
localrepo: show headline notes in commitctx before showing filenames...

              r23749
            
        committing files:

        Martin Geisler
    
tests: unify test-addremove

              r11850
            
        dir/bar

        foo

        Mads Kiilerich
    
localrepo: show headline notes in commitctx before showing filenames...

              r23749
            
        committing manifest

        committing changelog

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

              r12156
            
        committed changeset 0:6f7f953567a2

        Martin Geisler
    
tests: unify test-addremove

              r11850
            
        $ cd dir/

        Adrian Buehlmann
    
test-addremove: remove bits about con.xml...

              r16874
            
        $ touch ../foo_2 bar_2

        Martin Geisler
    
tests: unify test-addremove

              r11850
            
        $ hg -v addremove

        adding dir/bar_2

        adding foo_2

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

              r12156
            
        $ hg -v commit -m "add 2"

        Mads Kiilerich
    
localrepo: show headline notes in commitctx before showing filenames...

              r23749
            
        committing files:

        Martin Geisler
    
tests: unify test-addremove

              r11850
            
        dir/bar_2

        foo_2

        Mads Kiilerich
    
localrepo: show headline notes in commitctx before showing filenames...

              r23749
            
        committing manifest

        committing changelog

        Adrian Buehlmann
    
test-addremove: remove bits about con.xml...

              r16874
            
        committed changeset 1:e65414bf35c5

        Martin von Zweigbergk
    
addremove: add back forgotten files (BC)...

              r23259
            
        $ cd ..

        $ hg forget foo

        $ hg -v addremove

        adding foo

        Matt Harbison
    
addremove: warn when addremove fails to operate on a named path...

              r23534
            
        $ hg forget foo

      #if windows

        $ hg -v addremove nonexistant

        nonexistant: The system cannot find the file specified

        [1]

      #else

        $ hg -v addremove nonexistant

        nonexistant: No such file or directory

        [1]

      #endif

        Martin von Zweigbergk
    
addremove: add back forgotten files (BC)...

              r23259
            
        $ cd ..

        Martin Geisler
    
tests: unify test-addremove

              r11850
            
        Martin von Zweigbergk
    
addremove: print relative paths when called with -I/-X (BC)...

              r23427
            
        $ hg init subdir

        $ cd subdir

        $ mkdir dir

        $ cd dir

        $ touch a.py

        $ hg addremove 'glob:*.py'

        adding a.py

        $ hg forget a.py

        $ hg addremove -I 'glob:*.py'

        adding a.py

        $ hg forget a.py

        $ hg addremove

        adding dir/a.py

        $ cd ..

        Martin Geisler
    
tests: unify test-addremove

              r11850
            
        $ hg init sim

        $ cd sim

        $ echo a > a

        $ echo a >> a

        $ echo a >> a

        $ echo c > c

        $ hg commit -Ama

        adding a

        adding c

        $ mv a b

        $ rm c

        $ echo d > d

        $ hg addremove -n -s 50 # issue 1696

        removing a

        adding b

        removing c

        adding d

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

        $ hg addremove -s 50

        removing a

        adding b

        removing c

        adding d

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

        $ hg commit -mb

        Martin von Zweigbergk
    
addremove: add back forgotten files (BC)...

              r23259
            
        $ cp b c

        $ hg forget b

        $ hg addremove -s 50

        adding b

        adding c

        Matt Harbison
    
commit: abort if --addremove is specified, but fails...

              r23535
            
        $ rm c

      #if windows

        $ hg ci -A -m "c" nonexistant

        nonexistant: The system cannot find the file specified

        abort: failed to mark all new/missing files as added/removed

        [255]

      #else

        $ hg ci -A -m "c" nonexistant

        nonexistant: No such file or directory

        abort: failed to mark all new/missing files as added/removed

        [255]

      #endif

        $ hg st

        ! c

        Mads Kiilerich
    
tests: cleanup of tests that got lost in their own nested directories...

              r16912
            
        $ 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	r11850	$ hg init rep
		$ cd rep
		$ mkdir dir
		$ touch foo dir/bar
		$ hg -v addremove
		adding dir/bar
		adding foo
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg -v commit -m "add 1"
Mads Kiilerich localrepo: show headline notes in commitctx before showing filenames...	r23749	committing files:
Martin Geisler tests: unify test-addremove	r11850	dir/bar
		foo
Mads Kiilerich localrepo: show headline notes in commitctx before showing filenames...	r23749	committing manifest
		committing changelog
Martin Geisler tests: remove unneeded -d flags...	r12156	committed changeset 0:6f7f953567a2
Martin Geisler tests: unify test-addremove	r11850	$ cd dir/
Adrian Buehlmann test-addremove: remove bits about con.xml...	r16874	$ touch ../foo_2 bar_2
Martin Geisler tests: unify test-addremove	r11850	$ hg -v addremove
		adding dir/bar_2
		adding foo_2
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg -v commit -m "add 2"
Mads Kiilerich localrepo: show headline notes in commitctx before showing filenames...	r23749	committing files:
Martin Geisler tests: unify test-addremove	r11850	dir/bar_2
		foo_2
Mads Kiilerich localrepo: show headline notes in commitctx before showing filenames...	r23749	committing manifest
		committing changelog
Adrian Buehlmann test-addremove: remove bits about con.xml...	r16874	committed changeset 1:e65414bf35c5
Martin von Zweigbergk addremove: add back forgotten files (BC)...	r23259	$ cd ..
		$ hg forget foo
		$ hg -v addremove
		adding foo
Matt Harbison addremove: warn when addremove fails to operate on a named path...	r23534	$ hg forget foo
		#if windows
		$ hg -v addremove nonexistant
		nonexistant: The system cannot find the file specified
		[1]
		#else
		$ hg -v addremove nonexistant
		nonexistant: No such file or directory
		[1]
		#endif
Martin von Zweigbergk addremove: add back forgotten files (BC)...	r23259	$ cd ..
Martin Geisler tests: unify test-addremove	r11850
Martin von Zweigbergk addremove: print relative paths when called with -I/-X (BC)...	r23427	$ hg init subdir
		$ cd subdir
		$ mkdir dir
		$ cd dir
		$ touch a.py
		$ hg addremove 'glob:*.py'
		adding a.py
		$ hg forget a.py
		$ hg addremove -I 'glob:*.py'
		adding a.py
		$ hg forget a.py
		$ hg addremove
		adding dir/a.py
		$ cd ..

Martin Geisler tests: unify test-addremove	r11850	$ hg init sim
		$ cd sim
		$ echo a > a
		$ echo a >> a
		$ echo a >> a
		$ echo c > c
		$ hg commit -Ama
		adding a
		adding c
		$ mv a b
		$ rm c
		$ echo d > d
		$ hg addremove -n -s 50 # issue 1696
		removing a
		adding b
		removing c
		adding d
		recording removal of a as rename to b (100% similar)
		$ hg addremove -s 50
		removing a
		adding b
		removing c
		adding d
		recording removal of a as rename to b (100% similar)
		$ hg commit -mb
Martin von Zweigbergk addremove: add back forgotten files (BC)...	r23259	$ cp b c
		$ hg forget b
		$ hg addremove -s 50
		adding b
		adding c
Matt Harbison commit: abort if --addremove is specified, but fails...	r23535
		$ rm c
		#if windows
		$ hg ci -A -m "c" nonexistant
		nonexistant: The system cannot find the file specified
		abort: failed to mark all new/missing files as added/removed
		[255]
		#else
		$ hg ci -A -m "c" nonexistant
		nonexistant: No such file or directory
		abort: failed to mark all new/missing files as added/removed
		[255]
		#endif
		$ hg st
		! c
Mads Kiilerich tests: cleanup of tests that got lost in their own nested directories...	r16912	$ cd ..