upstream/mercurial-mirror Files · tests/test-merge-closedheads.t

httprepo: long arguments support (issue2126)...

httprepo: long arguments support (issue2126) Send the command arguments in the HTTP headers. The command is still part of the URL. If the server does not have the 'httpheader' capability, the client will send the command arguments in the URL as it did previously. Web servers typically allow more data to be placed within the headers than in the URL, so this approach will: - Avoid HTTP errors due to using a URL that is too large. - Allow Mercurial to implement a more efficient wire protocol. An alternate approach is to send the arguments as part of the request body. This approach has been rejected because it requires the use of POST requests, so it would break any existing configuration that relies on the request type for authentication or caching. Extensibility: - The header size is provided by the server, which makes it possible to introduce an hgrc setting for it. - The client ignores the capability value after the first comma, which allows more information to be included in the future.

Matt Mackall - - Load All Authors

File last commit:

r12316:4134686b default


                r14093:ce99d887

default

Download file

             test-merge-closedheads.t
        
                    85 lines
            
             | 2.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-closedheads.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hgcommit() {

        >    hg commit -u user "$@"

        > }

        $ hg init clhead

        $ cd clhead

        $ touch foo && hg add && hgcommit -m 'foo'

        adding foo

        $ touch bar && hg add && hgcommit -m 'bar'

        adding bar

        $ touch baz && hg add && hgcommit -m 'baz'

        adding baz

        $ echo "flub" > foo

        $ hgcommit -m "flub"

        $ echo "nub" > foo

        $ hgcommit -m "nub"

        $ hg up -C 2

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

        $ echo "c1" > c1

        $ hg add c1

        $ hgcommit -m "c1"

        created new head

        $ echo "c2" > c1

        $ hgcommit -m "c2"

        $ hg up -C 2

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

        $ echo "d1" > d1

        $ hg add d1

        $ hgcommit -m "d1"

        created new head

        $ echo "d2" > d1

        $ hgcommit -m "d2"

        $ hg tag -l good

      fail with three heads

        $ hg up -C good

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

        $ hg merge

        abort: branch 'default' has 3 heads - please merge with an explicit rev

        (run 'hg heads .' to see heads)

        [255]

      close one of the heads

        $ hg up -C 6

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

        $ hgcommit -m 'close this head' --close-branch

      succeed with two open heads

        $ hg up -C good

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

        $ hg up -C good

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

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ hgcommit -m 'merged heads'

      hg update -C 8

        $ hg update -C 8

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

      hg branch some-branch

        $ hg branch some-branch

        marked working directory as branch some-branch

      hg commit

        $ hgcommit -m 'started some-branch'

      hg commit --close-branch

        $ hgcommit --close-branch -m 'closed some-branch'

      hg update default

        $ hg update default

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

      hg merge some-branch

        $ hg merge some-branch

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

        (branch merge, don't forget to commit)

      hg commit (no reopening of some-branch)

        $ hgcommit -m 'merge with closed branch'

	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

				$ hgcommit() {
				> hg commit -u user "$@"
				> }

				$ hg init clhead
				$ cd clhead

				$ touch foo && hg add && hgcommit -m 'foo'
				adding foo
				$ touch bar && hg add && hgcommit -m 'bar'
				adding bar
				$ touch baz && hg add && hgcommit -m 'baz'
				adding baz

				$ echo "flub" > foo
				$ hgcommit -m "flub"
				$ echo "nub" > foo
				$ hgcommit -m "nub"

				$ hg up -C 2
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ echo "c1" > c1
				$ hg add c1
				$ hgcommit -m "c1"
				created new head
				$ echo "c2" > c1
				$ hgcommit -m "c2"

				$ hg up -C 2
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved

				$ echo "d1" > d1
				$ hg add d1
				$ hgcommit -m "d1"
				created new head
				$ echo "d2" > d1
				$ hgcommit -m "d2"
				$ hg tag -l good

				fail with three heads
				$ hg up -C good
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg merge
				abort: branch 'default' has 3 heads - please merge with an explicit rev
				(run 'hg heads .' to see heads)
				[255]

				close one of the heads
				$ hg up -C 6
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hgcommit -m 'close this head' --close-branch

				succeed with two open heads
				$ hg up -C good
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg up -C good
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg merge
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hgcommit -m 'merged heads'

				hg update -C 8
				$ hg update -C 8
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				hg branch some-branch
				$ hg branch some-branch
				marked working directory as branch some-branch
				hg commit
				$ hgcommit -m 'started some-branch'
				hg commit --close-branch
				$ hgcommit --close-branch -m 'closed some-branch'

				hg update default
				$ hg update default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				hg merge some-branch
				$ hg merge some-branch
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				hg commit (no reopening of some-branch)
				$ hgcommit -m 'merge with closed branch'