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

subrepo: avoids empty commit when .hgsubstate is dirty (issue2403)...

subrepo: avoids empty commit when .hgsubstate is dirty (issue2403) This patch avoids empty commit when .hgsubstate is dirty. Empty commit was caused by .hgsubstate being updated back to the state of the working copy parent when committing, if a user had changed it manually and not made any changes in subrepositories. The subrepository state from the working copies parent is compared with the state calculated as a result of trying to commit the subrepositories. If the two states are the same, then return None otherwise the commit is just done. The line: "committing subrepository x" will be written if there is nothing committed, but .hgsubstate is dirty for x subrepository.

Mads Kiilerich - - Load All Authors

File last commit:

r12640:6cc4b14f default


                r13155:f02d7a56

default

Download file

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

        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

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