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

debug: add a method to check the state of, and built an SSL cert chain...

debug: add a method to check the state of, and built an SSL cert chain This is only useful on Windows, and avoids the need to use Internet Explorer to build the certificate chain. I can see this being extended in the future to print information about the certificate(s) to help debug issues on any platform. Maybe even perform some of the python checks listed on the secure connections wiki page. But for now, all I need is 1) a command that can be invoked in a setup script to ensure the certificate is installed, and 2) a command that the user can run if/when a certificate changes in the future. It would have been nice to leverage the sslutil library to pick up host specific settings, but attempting to use sslutil.wrapsocket() failed the 'not sslsocket.cipher()' check in it and aborted. The output is a little more chatty than some commands, but I've seen the update take 10+ seconds, and this is only a debug command.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r33493:9a9f9521

default

Download file

             test-merge-closedheads.t
        
                    87 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

        (branches are permanent and global, did you want a bookmark?)

      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'

        $ cd ..

	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
				(branches are permanent and global, did you want a bookmark?)
				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'

				$ cd ..