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

Matt Mackall - - Load All Authors

File last commit:

r12316:4134686b default


                r13155:f02d7a56

default

Download file

             test-pull-r.t
        
                    72 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-pull-r.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

        $ echo foo > foo

        $ hg ci -qAm 'add foo'

        $ echo >> foo

        $ hg ci -m 'change foo'

        $ hg up -qC 0

        $ echo bar > bar

        $ hg ci -qAm 'add bar'

        $ hg log

        changeset:   2:effea6de0384

        tag:         tip

        parent:      0:bbd179dfa0a7

        user:        test

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

        summary:     add bar

        changeset:   1:ed1b79f46b9a

        user:        test

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

        summary:     change foo

        changeset:   0:bbd179dfa0a7

        user:        test

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

        summary:     add foo

        $ cd ..

        $ hg init copy

        $ cd copy

      Pull a missing revision:

        $ hg pull -qr missing ../repo

        abort: unknown revision 'missing'!

        [255]

      Pull multiple revisions with update:

        $ hg pull -qu -r 0 -r 1 ../repo

        $ hg -q parents

        0:bbd179dfa0a7

        $ hg rollback

        rolling back to revision -1 (undo pull)

        $ hg pull -qr 0 ../repo

        $ hg log

        changeset:   0:bbd179dfa0a7

        tag:         tip

        user:        test

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

        summary:     add foo

        $ hg pull -qr 1 ../repo

        $ hg log

        changeset:   1:ed1b79f46b9a

        tag:         tip

        user:        test

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

        summary:     change foo

        changeset:   0:bbd179dfa0a7

        user:        test

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

        summary:     add foo

      This used to abort: received changelog group is empty:

        $ hg pull -qr 1 ../repo

	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

				$ hg init repo
				$ cd repo
				$ echo foo > foo
				$ hg ci -qAm 'add foo'
				$ echo >> foo
				$ hg ci -m 'change foo'
				$ hg up -qC 0
				$ echo bar > bar
				$ hg ci -qAm 'add bar'

				$ hg log
				changeset: 2:effea6de0384
				tag: tip
				parent: 0:bbd179dfa0a7
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add bar

				changeset: 1:ed1b79f46b9a
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: change foo

				changeset: 0:bbd179dfa0a7
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add foo

				$ cd ..
				$ hg init copy
				$ cd copy

				Pull a missing revision:

				$ hg pull -qr missing ../repo
				abort: unknown revision 'missing'!
				[255]

				Pull multiple revisions with update:

				$ hg pull -qu -r 0 -r 1 ../repo
				$ hg -q parents
				0:bbd179dfa0a7
				$ hg rollback
				rolling back to revision -1 (undo pull)

				$ hg pull -qr 0 ../repo
				$ hg log
				changeset: 0:bbd179dfa0a7
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add foo

				$ hg pull -qr 1 ../repo
				$ hg log
				changeset: 1:ed1b79f46b9a
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: change foo

				changeset: 0:bbd179dfa0a7
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add foo


				This used to abort: received changelog group is empty:

				$ hg pull -qr 1 ../repo