upstream/mercurial-mirror Files · tests/test-mq-caches.t

phase: when phase cannot be reduced, hint at --force and return 1 (BC)...

phase: when phase cannot be reduced, hint at --force and return 1 (BC) Before, trying to change the phase of a "public" node to "draft" would result in: $ hg phase --draft . no phases changed [0] With this patch: $ hg phase --draft . cannot move 1 changesets to a more permissive phase, use --force no phases changed [1] On partial failures, the exit status is now 1 instead of 0 and the number of changed nodes is displayed while it was only with --verbose. It seems useful to tell the user that despite the apparent failure, something changed. $ hg phase --draft '5 or 7' cannot move 1 changesets to a more permissive phase, use --force phase changed for 1 changesets [1]

Mads Kiilerich - - Load All Authors

File last commit:

r15886:a5917346 default


                r16097:8dc573a9

default

Download file

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

        $ branches=.hg/cache/branchheads

        $ 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 -d '0 0' p1

        $ show_branch_cache

        tip: 0

        d986d5caac23a7d44a46efc0ddaf5eb9665844cf 0

        d986d5caac23a7d44a46efc0ddaf5eb9665844cf default

        $ echo > pfile

        $ hg add pfile

        $ hg qrefresh -m 'patch 1'

        $ show_branch_cache

        tip: 0

        a7977e38ed2c2942fa6c278030badfef3d180979 0

        a7977e38ed2c2942fa6c278030badfef3d180979 default

      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

        982611f6955f9c48d3365decea203217c945ef0d 2

        982611f6955f9c48d3365decea203217c945ef0d bar

        dc25e3827021582e979f600811852e36cbe57341 foo

        $ hg qnew -d '0 0' p2

        $ echo foo > .hg/branch

        $ echo foo2 >> foo

        $ hg qrefresh -m 'patch 2'

        $ show_branch_cache 1

        tip: 3

        982611f6955f9c48d3365decea203217c945ef0d 2

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

        3fe2e3b237359b5c55cec6ed172ac41d3850fade 1

        3fe2e3b237359b5c55cec6ed172ac41d3850fade 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/cache/branchheads
				$ 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 -d '0 0' p1
				$ show_branch_cache
				tip: 0
				d986d5caac23a7d44a46efc0ddaf5eb9665844cf 0
				d986d5caac23a7d44a46efc0ddaf5eb9665844cf default

				$ echo > pfile
				$ hg add pfile
				$ hg qrefresh -m 'patch 1'
				$ show_branch_cache
				tip: 0
				a7977e38ed2c2942fa6c278030badfef3d180979 0
				a7977e38ed2c2942fa6c278030badfef3d180979 default

				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
				982611f6955f9c48d3365decea203217c945ef0d 2
				982611f6955f9c48d3365decea203217c945ef0d bar
				dc25e3827021582e979f600811852e36cbe57341 foo

				$ hg qnew -d '0 0' p2
				$ echo foo > .hg/branch
				$ echo foo2 >> foo
				$ hg qrefresh -m 'patch 2'
				$ show_branch_cache 1
				tip: 3
				982611f6955f9c48d3365decea203217c945ef0d 2
				982611f6955f9c48d3365decea203217c945ef0d 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
				3fe2e3b237359b5c55cec6ed172ac41d3850fade 1
				3fe2e3b237359b5c55cec6ed172ac41d3850fade foo