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

Pierre-Yves David - - Load All Authors

File last commit:

r21693:9c35f3a8 default


                r24158:d414c28d

stable

Download file

             test-merge-revert2.t
        
                    94 lines
            
             | 1.9 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-revert2.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg init

        $ echo "added file1" > file1

        $ echo "another line of text" >> file1

        $ echo "added file2" > file2

        $ hg add file1 file2

        $ hg commit -m "added file1 and file2"

        $ echo "changed file1" >> file1

        $ hg commit -m "changed file1"

        $ hg -q log

        1:dfab7f3c2efb

        0:c3fa057dd86f

        $ hg id

        dfab7f3c2efb tip

        $ hg update -C 0

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

        $ hg id

        c3fa057dd86f

        $ echo "changed file1" >> file1

        $ hg id

        c3fa057dd86f+

        $ hg revert --no-backup --all

        reverting file1

        $ hg diff

        $ hg status

        $ hg id

        c3fa057dd86f

        $ hg update

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

        $ hg diff

        $ hg status

        $ hg id

        dfab7f3c2efb tip

        $ hg update -C 0

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

        $ echo "changed file1 different" >> file1

        $ hg update

        merging file1

        warning: conflicts during merge.

        Matt Mackall
    
merge: give a special message for internal:merge failure (issue3105)

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

        Adrian Buehlmann
    
combine tests

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

        use 'hg resolve' to retry unresolved file merges

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg diff --nodates

        diff -r dfab7f3c2efb file1

        --- a/file1

        +++ b/file1

        @@ -1,3 +1,7 @@

         added file1

         another line of text

        Pierre-Yves David
    
merge: drop the quotes around commit description...

              r21693
            
        +<<<<<<< working copy: c3fa057dd86f  - test: added file1 and file2

        Adrian Buehlmann
    
combine tests

              r12279
            
        +changed file1 different

        +=======

         changed file1

        Pierre-Yves David
    
merge: drop the quotes around commit description...

              r21693
            
        +>>>>>>> destination:  dfab7f3c2efb - test: changed file1

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg status

        M file1

        ? file1.orig

        $ hg id

        dfab7f3c2efb+ tip

        $ hg revert --no-backup --all

        reverting file1

        $ hg diff

        $ hg status

        ? file1.orig

        $ hg id

        dfab7f3c2efb tip

        $ hg revert -r tip --no-backup --all

        $ hg diff

        $ hg status

        ? file1.orig

        $ hg id

        dfab7f3c2efb tip

        $ hg update -C

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

        $ hg diff

        $ hg status

        ? file1.orig

        $ hg id

        dfab7f3c2efb tip

	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

Adrian Buehlmann combine tests	r12279	$ hg init

		$ echo "added file1" > file1
		$ echo "another line of text" >> file1
		$ echo "added file2" > file2
		$ hg add file1 file2
		$ hg commit -m "added file1 and file2"

		$ echo "changed file1" >> file1
		$ hg commit -m "changed file1"

		$ hg -q log
		1:dfab7f3c2efb
		0:c3fa057dd86f
		$ hg id
		dfab7f3c2efb tip

		$ hg update -C 0
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg id
		c3fa057dd86f

		$ echo "changed file1" >> file1
		$ hg id
		c3fa057dd86f+

		$ hg revert --no-backup --all
		reverting file1
		$ hg diff
		$ hg status
		$ hg id
		c3fa057dd86f

		$ hg update
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg diff
		$ hg status
		$ hg id
		dfab7f3c2efb tip

		$ hg update -C 0
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ echo "changed file1 different" >> file1

		$ hg update
		merging file1
		warning: conflicts during merge.
Matt Mackall merge: give a special message for internal:merge failure (issue3105)	r15501	merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
Adrian Buehlmann combine tests	r12279	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
		use 'hg resolve' to retry unresolved file merges
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Adrian Buehlmann combine tests	r12279
		$ hg diff --nodates
		diff -r dfab7f3c2efb file1
		--- a/file1
		+++ b/file1
		@@ -1,3 +1,7 @@
		added file1
		another line of text
Pierre-Yves David merge: drop the quotes around commit description...	r21693	+<<<<<<< working copy: c3fa057dd86f - test: added file1 and file2
Adrian Buehlmann combine tests	r12279	+changed file1 different
		+=======
		changed file1
Pierre-Yves David merge: drop the quotes around commit description...	r21693	+>>>>>>> destination: dfab7f3c2efb - test: changed file1
Adrian Buehlmann combine tests	r12279
		$ hg status
		M file1
		? file1.orig
		$ hg id
		dfab7f3c2efb+ tip

		$ hg revert --no-backup --all
		reverting file1
		$ hg diff
		$ hg status
		? file1.orig
		$ hg id
		dfab7f3c2efb tip

		$ hg revert -r tip --no-backup --all
		$ hg diff
		$ hg status
		? file1.orig
		$ hg id
		dfab7f3c2efb tip

		$ hg update -C
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg diff
		$ hg status
		? file1.orig
		$ hg id
		dfab7f3c2efb tip