upstream/mercurial-mirror Files · tests/test-changelog-exec.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

Sune Foldager - - Load All Authors

File last commit:

r14182:ec5886db default


                r15321:e174353e

stable

Download file

             test-changelog-exec.t
        
                    53 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-changelog-exec.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      b51a8138292a introduced a regression where we would mention in the

      changelog executable files added by the second parent of a merge. Test

      that that doesn't happen anymore

        $ "$TESTDIR/hghave" execbit || exit 80

        $ hg init repo

        $ cd repo

        $ echo foo > foo

        $ hg ci -qAm 'add foo'

        $ echo bar > bar

        $ chmod +x bar

        $ hg ci -qAm 'add bar'

      manifest of p2:

        $ hg manifest

        bar

        foo

        $ hg up -qC 0

        $ echo >> foo

        $ hg ci -m 'change foo'

        created new head

      manifest of p1:

        $ hg manifest

        foo

        $ hg merge

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        (branch merge, don't forget to commit)

        $ hg ci -m 'merge'

      this should not mention bar:

        $ hg tip -v

        changeset:   3:ef2fc9b4a51b

        tag:         tip

        parent:      2:ed1b79f46b9a

        parent:      1:d394a8db219b

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        description:

        merge

        $ hg debugindex bar

           rev    offset  length   base linkrev nodeid       p1           p2

             0         0       5      0       1 b004912a8510 000000000000 000000000000

	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

				b51a8138292a introduced a regression where we would mention in the
				changelog executable files added by the second parent of a merge. Test
				that that doesn't happen anymore

				$ "$TESTDIR/hghave" execbit \|\| exit 80

				$ hg init repo
				$ cd repo
				$ echo foo > foo
				$ hg ci -qAm 'add foo'

				$ echo bar > bar
				$ chmod +x bar
				$ hg ci -qAm 'add bar'

				manifest of p2:

				$ hg manifest
				bar
				foo

				$ hg up -qC 0
				$ echo >> foo
				$ hg ci -m 'change foo'
				created new head

				manifest of p1:

				$ hg manifest
				foo

				$ hg merge
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg ci -m 'merge'

				this should not mention bar:

				$ hg tip -v
				changeset: 3:ef2fc9b4a51b
				tag: tip
				parent: 2:ed1b79f46b9a
				parent: 1:d394a8db219b
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				description:
				merge



				$ hg debugindex bar
				rev offset length base linkrev nodeid p1 p2
				0 0 5 0 1 b004912a8510 000000000000 000000000000