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

Martin Geisler - - Load All Authors

File last commit:

r12156:4c94b6d0 default


                r13155:f02d7a56

default

Download file

             test-mq-caches.t
        
                    124 lines
            
             | 2.5 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-caches.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ branches=.hg/branchheads.cache

        $ echo '[extensions]' >> $HGRCPATH

        $ echo 'mq =' >> $HGRCPATH

        $ show_branch_cache()

        > {

        >     # force cache (re)generation

        >     hg log -r does-not-exist 2> /dev/null

        >     hg log -r tip --template 'tip: {rev}\n'

        >     if [ -f $branches ]; then

        >       sort $branches

        >     else

        >       echo No branch cache

        >     fi

        >     if [ "$1" = 1 ]; then

        >       for b in foo bar; do

        >         hg log -r $b --template "branch $b: "'{rev}\n'

        >       done

        >     fi

        > }

        $ hg init a

        $ cd a

        $ hg qinit -c

      mq patch on an empty repo

        $ hg qnew p1

        $ show_branch_cache

        tip: 0

        No branch cache

        $ echo > pfile

        $ hg add pfile

        $ hg qrefresh -m 'patch 1'

        $ show_branch_cache

        tip: 0

        No branch cache

      some regular revisions

        $ hg qpop

        popping p1

        patch queue now empty

        $ echo foo > foo

        $ hg add foo

        $ echo foo > .hg/branch

        $ hg ci -m 'branch foo'

        $ echo bar > bar

        $ hg add bar

        $ echo bar > .hg/branch

        $ hg ci -m 'branch bar'

        $ show_branch_cache

        tip: 1

        c229711f16da3d7591f89b1b8d963b79bda22714 1

        c229711f16da3d7591f89b1b8d963b79bda22714 bar

        dc25e3827021582e979f600811852e36cbe57341 foo

      add some mq patches

        $ hg qpush

        applying p1

        now at: p1

        $ show_branch_cache

        tip: 2

        c229711f16da3d7591f89b1b8d963b79bda22714 1

        c229711f16da3d7591f89b1b8d963b79bda22714 bar

        dc25e3827021582e979f600811852e36cbe57341 foo

        $ hg qnew p2

        $ echo foo > .hg/branch

        $ echo foo2 >> foo

        $ hg qrefresh -m 'patch 2'

        $ show_branch_cache 1

        tip: 3

        c229711f16da3d7591f89b1b8d963b79bda22714 1

        c229711f16da3d7591f89b1b8d963b79bda22714 bar

        dc25e3827021582e979f600811852e36cbe57341 foo

        branch foo: 3

        branch bar: 2

      removing the cache

        $ rm $branches

        $ show_branch_cache 1

        tip: 3

        c229711f16da3d7591f89b1b8d963b79bda22714 1

        c229711f16da3d7591f89b1b8d963b79bda22714 bar

        dc25e3827021582e979f600811852e36cbe57341 foo

        branch foo: 3

        branch bar: 2

      importing rev 1 (the cache now ends in one of the patches)

        $ hg qimport -r 1 -n p0

        $ show_branch_cache 1

        tip: 3

        c229711f16da3d7591f89b1b8d963b79bda22714 1

        c229711f16da3d7591f89b1b8d963b79bda22714 bar

        dc25e3827021582e979f600811852e36cbe57341 foo

        branch foo: 3

        branch bar: 2

        $ hg log -r qbase --template 'qbase: {rev}\n'

        qbase: 1

      detect an invalid cache

        $ hg qpop -a

        popping p2

        popping p1

        popping p0

        patch queue now empty

        $ hg qpush -a

        applying p0

        applying p1

        applying p2

        now at: p2

        $ show_branch_cache

        tip: 3

        dc25e3827021582e979f600811852e36cbe57341 0

        dc25e3827021582e979f600811852e36cbe57341 foo

	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

				$ branches=.hg/branchheads.cache
				$ echo '[extensions]' >> $HGRCPATH
				$ echo 'mq =' >> $HGRCPATH

				$ show_branch_cache()
				> {
				> # force cache (re)generation
				> hg log -r does-not-exist 2> /dev/null
				> hg log -r tip --template 'tip: {rev}\n'
				> if [ -f $branches ]; then
				> sort $branches
				> else
				> echo No branch cache
				> fi
				> if [ "$1" = 1 ]; then
				> for b in foo bar; do
				> hg log -r $b --template "branch $b: "'{rev}\n'
				> done
				> fi
				> }

				$ hg init a
				$ cd a
				$ hg qinit -c


				mq patch on an empty repo

				$ hg qnew p1
				$ show_branch_cache
				tip: 0
				No branch cache

				$ echo > pfile
				$ hg add pfile
				$ hg qrefresh -m 'patch 1'
				$ show_branch_cache
				tip: 0
				No branch cache

				some regular revisions

				$ hg qpop
				popping p1
				patch queue now empty
				$ echo foo > foo
				$ hg add foo
				$ echo foo > .hg/branch
				$ hg ci -m 'branch foo'

				$ echo bar > bar
				$ hg add bar
				$ echo bar > .hg/branch
				$ hg ci -m 'branch bar'
				$ show_branch_cache
				tip: 1
				c229711f16da3d7591f89b1b8d963b79bda22714 1
				c229711f16da3d7591f89b1b8d963b79bda22714 bar
				dc25e3827021582e979f600811852e36cbe57341 foo

				add some mq patches

				$ hg qpush
				applying p1
				now at: p1
				$ show_branch_cache
				tip: 2
				c229711f16da3d7591f89b1b8d963b79bda22714 1
				c229711f16da3d7591f89b1b8d963b79bda22714 bar
				dc25e3827021582e979f600811852e36cbe57341 foo

				$ hg qnew p2
				$ echo foo > .hg/branch
				$ echo foo2 >> foo
				$ hg qrefresh -m 'patch 2'
				$ show_branch_cache 1
				tip: 3
				c229711f16da3d7591f89b1b8d963b79bda22714 1
				c229711f16da3d7591f89b1b8d963b79bda22714 bar
				dc25e3827021582e979f600811852e36cbe57341 foo
				branch foo: 3
				branch bar: 2

				removing the cache

				$ rm $branches
				$ show_branch_cache 1
				tip: 3
				c229711f16da3d7591f89b1b8d963b79bda22714 1
				c229711f16da3d7591f89b1b8d963b79bda22714 bar
				dc25e3827021582e979f600811852e36cbe57341 foo
				branch foo: 3
				branch bar: 2

				importing rev 1 (the cache now ends in one of the patches)

				$ hg qimport -r 1 -n p0
				$ show_branch_cache 1
				tip: 3
				c229711f16da3d7591f89b1b8d963b79bda22714 1
				c229711f16da3d7591f89b1b8d963b79bda22714 bar
				dc25e3827021582e979f600811852e36cbe57341 foo
				branch foo: 3
				branch bar: 2
				$ hg log -r qbase --template 'qbase: {rev}\n'
				qbase: 1

				detect an invalid cache

				$ hg qpop -a
				popping p2
				popping p1
				popping p0
				patch queue now empty
				$ hg qpush -a
				applying p0
				applying p1
				applying p2
				now at: p2
				$ show_branch_cache
				tip: 3
				dc25e3827021582e979f600811852e36cbe57341 0
				dc25e3827021582e979f600811852e36cbe57341 foo