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

filemerge: add internal merge tool to dump files forcibly...

filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

Matt Mackall - - Load All Authors

File last commit:

r22047:8fb6844a default


                r32255:7e35d31b

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 ..