upstream/mercurial-mirror Files · tests/test-revset-dirstate-parents.t

subrepos: abort commit by default if a subrepo is dirty (BC)...

subrepos: abort commit by default if a subrepo is dirty (BC) This changeset flips the default value of ui.commitsubrepos setting from True to False and adds a --subrepos flag to commit. The commit, status, and diff commands behave like this with regard to recusion and the ui.commitsubrepos setting: | recurses | recurses | by default | with --subrepos --------+---------------+---------------- commit: | commitsubrepo | True status: | False | True diff: | False | True By changing the default from True to False, the table becomes consistent in the two columns: * without --subrepos on the command line, commit will abort if a subrepo is dirty and status/diff wont show changes inside subrepos. * with --subrepos, all three commands will recurse. A --subrepos flag on the command line overrides the config settin.g

Patrick Mezard - - Load All Authors

File last commit:

r12936:bdb766e6 default


                r15321:e174353e

stable

Download file

             test-revset-dirstate-parents.t
        
                    52 lines
            
             | 793 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revset-dirstate-parents.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ HGENCODING=utf-8

        $ export HGENCODING

        $ try() {

        >   hg debugrevspec --debug $@

        > }

        $ log() {

        >   hg log --template '{rev}\n' -r "$1"

        > }

        $ hg init repo

        $ cd repo

        $ try 'p1()'

        ('func', ('symbol', 'p1'), None)

        $ try 'p2()'

        ('func', ('symbol', 'p2'), None)

        $ try 'parents()'

        ('func', ('symbol', 'parents'), None)

      null revision

        $ log 'p1()'

        $ log 'p2()'

        $ log 'parents()'

      working dir with a single parent

        $ echo a > a

        $ hg ci -Aqm0

        $ log 'p1()'

        0

        $ log 'tag() and p1()'

        $ log 'p2()'

        $ log 'parents()'

        0

        $ log 'tag() and parents()'

      merge in progress

        $ echo b > b

        $ hg ci -Aqm1

        $ hg up -q 0

        $ echo c > c

        $ hg ci -Aqm2

        $ hg merge -q

        $ log 'p1()'

        2

        $ log 'p2()'

        1

        $ log 'tag() and p2()'

        $ log 'parents()'

        1

        2

	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

				$ HGENCODING=utf-8
				$ export HGENCODING

				$ try() {
				> hg debugrevspec --debug $@
				> }

				$ log() {
				> hg log --template '{rev}\n' -r "$1"
				> }

				$ hg init repo
				$ cd repo

				$ try 'p1()'
				('func', ('symbol', 'p1'), None)
				$ try 'p2()'
				('func', ('symbol', 'p2'), None)
				$ try 'parents()'
				('func', ('symbol', 'parents'), None)

				null revision
				$ log 'p1()'
				$ log 'p2()'
				$ log 'parents()'

				working dir with a single parent
				$ echo a > a
				$ hg ci -Aqm0
				$ log 'p1()'
				0
				$ log 'tag() and p1()'
				$ log 'p2()'
				$ log 'parents()'
				0
				$ log 'tag() and parents()'

				merge in progress
				$ echo b > b
				$ hg ci -Aqm1
				$ hg up -q 0
				$ echo c > c
				$ hg ci -Aqm2
				$ hg merge -q
				$ log 'p1()'
				2
				$ log 'p2()'
				1
				$ log 'tag() and p2()'
				$ log 'parents()'
				1
				2