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

r23080:c586cb50 stable


                r24158:d414c28d

stable

Download file

             test-diff-reverse.t
        
                    65 lines
            
             | 885 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-diff-reverse.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
tests: unify test-diff-reverse

              r12139
            
        $ hg init

        $ cat > a <<EOF

        > a

        > b

        > c

        > EOF

        $ hg ci -Am adda

        adding a

        $ cat > a <<EOF

        > d

        > e

        > f

        > EOF

        $ hg ci -m moda

        $ hg diff --reverse -r0 -r1

        diff -r 2855cdcfcbb7 -r 8e1805a3cf6e a

        --- a/a	Thu Jan 01 00:00:00 1970 +0000

        +++ b/a	Thu Jan 01 00:00:00 1970 +0000

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

        -d

        -e

        -f

        +a

        +b

        +c

        $ cat >> a <<EOF

        > g

        > h

        > EOF

        $ hg diff --reverse --nodates

        diff -r 2855cdcfcbb7 a

        --- a/a

        +++ b/a

        @@ -1,5 +1,3 @@

         d

         e

         f

        -g

        -h

        Martin von Zweigbergk
    
context.status: remove incorrect swapping of added/removed in workingctx...

              r23080
            
      should show removed file 'a' as being added

        $ hg revert a

        $ hg rm a

        $ hg diff --reverse --nodates a

        diff -r 2855cdcfcbb7 a

        --- /dev/null

        +++ b/a

        @@ -0,0 +1,3 @@

        +d

        +e

        +f

      should show added file 'b' as being removed

        $ echo b >> b

        $ hg add b

        $ hg diff --reverse --nodates b

        diff -r 2855cdcfcbb7 b

        --- a/b

        +++ /dev/null

        @@ -1,1 +0,0 @@

        -b

	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 tests: unify test-diff-reverse	r12139	$ hg init

		$ cat > a <<EOF
		> a
		> b
		> c
		> EOF
		$ hg ci -Am adda
		adding a

		$ cat > a <<EOF
		> d
		> e
		> f
		> EOF
		$ hg ci -m moda

		$ hg diff --reverse -r0 -r1
		diff -r 2855cdcfcbb7 -r 8e1805a3cf6e a
		--- a/a Thu Jan 01 00:00:00 1970 +0000
		+++ b/a Thu Jan 01 00:00:00 1970 +0000
		@@ -1,3 +1,3 @@
		-d
		-e
		-f
		+a
		+b
		+c

		$ cat >> a <<EOF
		> g
		> h
		> EOF
		$ hg diff --reverse --nodates
		diff -r 2855cdcfcbb7 a
		--- a/a
		+++ b/a
		@@ -1,5 +1,3 @@
		d
		e
		f
		-g
		-h

Martin von Zweigbergk context.status: remove incorrect swapping of added/removed in workingctx...	r23080	should show removed file 'a' as being added
		$ hg revert a
		$ hg rm a
		$ hg diff --reverse --nodates a
		diff -r 2855cdcfcbb7 a
		--- /dev/null
		+++ b/a
		@@ -0,0 +1,3 @@
		+d
		+e
		+f

		should show added file 'b' as being removed
		$ echo b >> b
		$ hg add b
		$ hg diff --reverse --nodates b
		diff -r 2855cdcfcbb7 b
		--- a/b
		+++ /dev/null
		@@ -1,1 +0,0 @@
		-b