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

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper Code paths below expect "hg.updaterepo" (or "hg.update" using it) to execute linear merging: - "update" in commands - "postincoming" in commands, used for: - "hg pull --update" - "hg unbundle --update" - "hgsubrepo.get" in subrepo For linear merging with largefiles, standins should be updated according to (possibly dirty) largefiles before "merge.update" invocation to detect conflicts correctly. Before this patch, only the "update" command can execute linear merging correctly, because largefiles extension takes care of only it. This patch moves "updatestandin" invocation from "overrideupdate" ("hg update" wrapper) to "_hgupdaterepo" ("hg.updaterepo" wrapper) to execute linear merging in "hg.updaterepo" correctly. This is also a preparation to centralize the logic of updating largefiles in the working directory into the function wrapping "merge.update" in the subsequent patch.

Matt Mackall - - Load All Authors

File last commit:

r22047:8fb6844a default


                r22287:f3ac9677

default

Download file

             test-permissions.t
        
                    72 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-permissions.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: change some #ifs to #requires

              r22047
            
      #require unix-permissions no-root

        Mads Kiilerich
    
tests: use 'hghave unix-permissions' for tests that really use chmod...

              r15443
            
        Adrian Buehlmann
    
combine tests

              r12279
            
        $ hg init t

        $ cd t

        $ echo foo > a

        $ hg add a

        $ hg commit -m "1"

        $ hg verify

        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        $ chmod -r .hg/store/data/a.i

        Matt Mackall
    
tests: cleanup exit code handling in unified tests

              r12365
            
        $ hg verify

        Adrian Buehlmann
    
combine tests

              r12279
            
        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        Mads Kiilerich
    
tests: remove redundant globs...

              r12640
            
        abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i

        Matt Mackall
    
tests: cleanup exit code handling in unified tests

              r12365
            
        [255]

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ chmod +r .hg/store/data/a.i

        Matt Mackall
    
tests: cleanup exit code handling in unified tests

              r12365
            
        $ hg verify

        Adrian Buehlmann
    
combine tests

              r12279
            
        checking changesets

        checking manifests

        crosschecking files in changesets and manifests

        checking files

        1 files, 1 changesets, 1 total revisions

        $ chmod -w .hg/store/data/a.i

        $ echo barber > a

        Matt Mackall
    
tests: cleanup exit code handling in unified tests

              r12365
            
        $ hg commit -m "2"

        Adrian Buehlmann
    
combine tests

              r12279
            
        trouble committing a!

        Mads Kiilerich
    
tests: remove redundant globs...

              r12640
            
        abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i

        Matt Mackall
    
tests: cleanup exit code handling in unified tests

              r12365
            
        [255]

        Adrian Buehlmann
    
combine tests

              r12279
            
        $ chmod -w .

        $ hg diff --nodates

        diff -r 2a18120dc1c9 a

        --- a/a

        +++ b/a

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

        -foo

        +barber

        $ chmod +w .

        $ chmod +w .hg/store/data/a.i

        $ mkdir dir

        $ touch dir/a

        $ hg status

        M a

        ? dir/a

        $ chmod -rx dir

        $ hg status

        dir: Permission denied

        M a

      Reenable perm to allow deletion:

        $ chmod +rx dir

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Matt Mackall tests: change some #ifs to #requires	r22047	#require unix-permissions no-root
Mads Kiilerich tests: use 'hghave unix-permissions' for tests that really use chmod...	r15443
Adrian Buehlmann combine tests	r12279	$ hg init t
		$ cd t

		$ echo foo > a
		$ hg add a

		$ hg commit -m "1"

		$ hg verify
		checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		1 files, 1 changesets, 1 total revisions

		$ chmod -r .hg/store/data/a.i

Matt Mackall tests: cleanup exit code handling in unified tests	r12365	$ hg verify
Adrian Buehlmann combine tests	r12279	checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
Mads Kiilerich tests: remove redundant globs...	r12640	abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i
Matt Mackall tests: cleanup exit code handling in unified tests	r12365	[255]
Adrian Buehlmann combine tests	r12279
		$ chmod +r .hg/store/data/a.i

Matt Mackall tests: cleanup exit code handling in unified tests	r12365	$ hg verify
Adrian Buehlmann combine tests	r12279	checking changesets
		checking manifests
		crosschecking files in changesets and manifests
		checking files
		1 files, 1 changesets, 1 total revisions

		$ chmod -w .hg/store/data/a.i

		$ echo barber > a
Matt Mackall tests: cleanup exit code handling in unified tests	r12365	$ hg commit -m "2"
Adrian Buehlmann combine tests	r12279	trouble committing a!
Mads Kiilerich tests: remove redundant globs...	r12640	abort: Permission denied: $TESTTMP/t/.hg/store/data/a.i
Matt Mackall tests: cleanup exit code handling in unified tests	r12365	[255]
Adrian Buehlmann combine tests	r12279
		$ chmod -w .

		$ hg diff --nodates
		diff -r 2a18120dc1c9 a
		--- a/a
		+++ b/a
		@@ -1,1 +1,1 @@
		-foo
		+barber

		$ chmod +w .

		$ chmod +w .hg/store/data/a.i
		$ mkdir dir
		$ touch dir/a
		$ hg status
		M a
		? dir/a
		$ chmod -rx dir
		$ hg status
		dir: Permission denied
		M a

		Reenable perm to allow deletion:

		$ chmod +rx dir

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..