upstream/mercurial-mirror Files · tests/test-add.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.

Martin von Zweigbergk - - Load All Authors

File last commit:

r23258:10697f29 default


                r24158:d414c28d

stable

Download file

             test-add.t
        
                    172 lines
            
             | 2.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-add.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg add -n

        adding a

        $ hg st

        ? a

        $ hg add

        adding a

        $ hg st

        A a

        $ hg forget a

        $ hg add

        adding a

        $ hg st

        A a

        $ echo b > b

        $ hg add -n b

        $ hg st

        A a

        ? b

        $ hg add b

        $ hg st

        A a

        A b

      should fail

        $ hg add b

        b already tracked!

        $ hg st

        A a

        A b

      #if no-windows

        $ echo foo > con.xml

        $ hg --config ui.portablefilenames=jump add con.xml

        abort: ui.portablefilenames value is invalid ('jump')

        [255]

        $ hg --config ui.portablefilenames=abort add con.xml

        abort: filename contains 'con', which is reserved on Windows: 'con.xml'

        [255]

        $ hg st

        A a

        A b

        ? con.xml

        $ hg add con.xml

        warning: filename contains 'con', which is reserved on Windows: 'con.xml'

        $ hg st

        A a

        A b

        A con.xml

        $ hg forget con.xml

        $ rm con.xml

      #endif

      #if eol-in-paths

        $ echo bla > 'hello:world'

        $ hg --config ui.portablefilenames=abort add

        adding hello:world

        abort: filename contains ':', which is reserved on Windows: 'hello:world'

        [255]

        $ hg st

        A a

        A b

        ? hello:world

        $ hg --config ui.portablefilenames=ignore add

        adding hello:world

        $ hg st

        A a

        A b

        A hello:world

      #endif

        $ hg ci -m 0 --traceback

      should fail

        $ hg add a

        a already tracked!

        $ echo aa > a

        $ hg ci -m 1

        $ hg up 0

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

        $ echo aaa > a

        $ hg ci -m 2

        created new head

        $ hg merge

        merging a

        warning: conflicts during merge.

        merging a incomplete! (edit conflicts, then use 'hg resolve --mark')

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

        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        [1]

        $ hg st

        M a

        ? a.orig

      should fail

        $ hg add a

        a already tracked!

        $ hg st

        M a

        ? a.orig

        $ hg resolve -m a

        (no more unresolved files)

        $ hg ci -m merge

      Issue683: peculiarity with hg revert of an removed then added file

        $ hg forget a

        $ hg add a

        $ hg st

        ? a.orig

        $ hg rm a

        $ hg st

        R a

        ? a.orig

        $ echo a > a

        $ hg add a

        $ hg st

        M a

        ? a.orig

      Forgotten file can be added back (as either clean or modified)

        $ hg forget b

        $ hg add b

        $ hg st -A b

        C b

        $ hg forget b

        $ echo modified > b

        $ hg add b

        $ hg st -A b

        M b

        $ hg revert -qC b

        $ hg add c && echo "unexpected addition of missing file"

        c: * (glob)

        [1]

        $ echo c > c

        $ hg add d c && echo "unexpected addition of missing file"

        d: * (glob)

        [1]

        $ hg st

        M a

        A c

        ? a.orig

        $ hg up -C

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

      forget and get should have the right order: added but missing dir should be

      forgotten before file with same name is added

        $ echo file d > d

        $ hg add d

        $ hg ci -md

        $ hg rm d

        $ mkdir d

        $ echo a > d/a

        $ hg add d/a

        $ rm -r d

        $ hg up -C

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

        $ cat d

        file d

        $ 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 a
				$ cd a
				$ echo a > a
				$ hg add -n
				adding a
				$ hg st
				? a
				$ hg add
				adding a
				$ hg st
				A a
				$ hg forget a
				$ hg add
				adding a
				$ hg st
				A a

				$ echo b > b
				$ hg add -n b
				$ hg st
				A a
				? b
				$ hg add b
				$ hg st
				A a
				A b

				should fail

				$ hg add b
				b already tracked!
				$ hg st
				A a
				A b

				#if no-windows
				$ echo foo > con.xml
				$ hg --config ui.portablefilenames=jump add con.xml
				abort: ui.portablefilenames value is invalid ('jump')
				[255]
				$ hg --config ui.portablefilenames=abort add con.xml
				abort: filename contains 'con', which is reserved on Windows: 'con.xml'
				[255]
				$ hg st
				A a
				A b
				? con.xml
				$ hg add con.xml
				warning: filename contains 'con', which is reserved on Windows: 'con.xml'
				$ hg st
				A a
				A b
				A con.xml
				$ hg forget con.xml
				$ rm con.xml
				#endif

				#if eol-in-paths
				$ echo bla > 'hello:world'
				$ hg --config ui.portablefilenames=abort add
				adding hello:world
				abort: filename contains ':', which is reserved on Windows: 'hello:world'
				[255]
				$ hg st
				A a
				A b
				? hello:world
				$ hg --config ui.portablefilenames=ignore add
				adding hello:world
				$ hg st
				A a
				A b
				A hello:world
				#endif

				$ hg ci -m 0 --traceback

				should fail

				$ hg add a
				a already tracked!

				$ echo aa > a
				$ hg ci -m 1
				$ hg up 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo aaa > a
				$ hg ci -m 2
				created new head

				$ hg merge
				merging a
				warning: conflicts during merge.
				merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
				0 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
				[1]
				$ hg st
				M a
				? a.orig

				should fail

				$ hg add a
				a already tracked!
				$ hg st
				M a
				? a.orig
				$ hg resolve -m a
				(no more unresolved files)
				$ hg ci -m merge

				Issue683: peculiarity with hg revert of an removed then added file

				$ hg forget a
				$ hg add a
				$ hg st
				? a.orig
				$ hg rm a
				$ hg st
				R a
				? a.orig
				$ echo a > a
				$ hg add a
				$ hg st
				M a
				? a.orig

				Forgotten file can be added back (as either clean or modified)

				$ hg forget b
				$ hg add b
				$ hg st -A b
				C b
				$ hg forget b
				$ echo modified > b
				$ hg add b
				$ hg st -A b
				M b
				$ hg revert -qC b

				$ hg add c && echo "unexpected addition of missing file"
				c: * (glob)
				[1]
				$ echo c > c
				$ hg add d c && echo "unexpected addition of missing file"
				d: * (glob)
				[1]
				$ hg st
				M a
				A c
				? a.orig
				$ hg up -C
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				forget and get should have the right order: added but missing dir should be
				forgotten before file with same name is added

				$ echo file d > d
				$ hg add d
				$ hg ci -md
				$ hg rm d
				$ mkdir d
				$ echo a > d/a
				$ hg add d/a
				$ rm -r d
				$ hg up -C
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cat d
				file d

				$ cd ..