upstream/mercurial-mirror Files · tests/test-bheads.t

sslutil: require TLS 1.1+ when supported...

sslutil: require TLS 1.1+ when supported Currently, Mercurial will use TLS 1.0 or newer when connecting to remote servers, selecting the highest TLS version supported by both peers. On older Pythons, only TLS 1.0 is available. On newer Pythons, TLS 1.1 and 1.2 should be available. Security professionals recommend avoiding TLS 1.0 if possible. PCI DSS 3.1 "strongly encourages" the use of TLS 1.2. Known attacks like BEAST and POODLE exist against TLS 1.0 (although mitigations are available and properly configured servers aren't vulnerable). I asked Eric Rescorla - Mozilla's resident crypto expert - whether Mercurial should drop support for TLS 1.0. His response was "if you can get away with it." Essentially, a number of servers on the Internet don't support TLS 1.1+. This is why web browsers continue to support TLS 1.0 despite desires from security experts. This patch changes Mercurial's default behavior on modern Python versions to require TLS 1.1+, thus avoiding known security issues with TLS 1.0 and making Mercurial more secure by default. Rather than drop TLS 1.0 support wholesale, we still allow TLS 1.0 to be used if configured. This is a compromise solution - ideally we'd disallow TLS 1.0. However, since we're not sure how many Mercurial servers don't support TLS 1.1+ and we're not sure how much user inconvenience this change will bring, I think it is prudent to ship an escape hatch that still allows usage of TLS 1.0. In the default case our users get better security. In the worst case, they are no worse off than before this patch. This patch has no effect when running on Python versions that don't support TLS 1.1+. As the added test shows, connecting to a server that doesn't support TLS 1.1+ will display a warning message with a link to our wiki, where we can guide people to configure their client to allow less secure connections.

Matt Mackall - - Load All Authors

File last commit:

r25295:701df761 default


                r29560:303e9300

default

Download file

             test-bheads.t
        
                    370 lines
            
             | 8.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-bheads.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
tests: unify test-bheads

              r12072
            
        $ heads()

        > {

        >    hg heads --template '{rev}: {desc|firstline|strip} ({branches})\n' "$@"

        > }

        $ hg init a

        $ cd a

        $ echo 'root' >root

        $ hg add root

        $ hg commit -m "Adding root node"

        $ heads

        0: Adding root node ()

      -------

        $ heads .

        0: Adding root node ()

      =======

        $ echo 'a' >a

        $ hg add a

        $ hg branch a

        marked working directory as branch a

        Matt Mackall
    
branch: warn on branching

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

        Adrian Buehlmann
    
tests: unify test-bheads

              r12072
            
        $ hg commit -m "Adding a branch"

        $ heads

        1: Adding a branch (a)

        0: Adding root node ()

      -------

        $ heads .

        1: Adding a branch (a)

      =======

        $ hg update -C 0

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

        $ echo 'b' >b

        $ hg add b

        $ hg branch b

        marked working directory as branch b

        $ hg commit -m "Adding b branch"

        $ heads

        2: Adding b branch (b)

        1: Adding a branch (a)

        0: Adding root node ()

      -------

        $ heads .

        2: Adding b branch (b)

      =======

        $ echo 'bh1' >bh1

        $ hg add bh1

        $ hg commit -m "Adding b branch head 1"

        $ heads

        3: Adding b branch head 1 (b)

        1: Adding a branch (a)

        0: Adding root node ()

      -------

        $ heads .

        3: Adding b branch head 1 (b)

      =======

        $ hg update -C 2

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

        $ echo 'bh2' >bh2

        $ hg add bh2

        $ hg commit -m "Adding b branch head 2"

        created new head

        $ heads

        4: Adding b branch head 2 (b)

        3: Adding b branch head 1 (b)

        1: Adding a branch (a)

        0: Adding root node ()

        $ heads .

        4: Adding b branch head 2 (b)

        3: Adding b branch head 1 (b)

      =======

        $ hg update -C 2

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

        $ echo 'bh3' >bh3

        $ hg add bh3

        $ hg commit -m "Adding b branch head 3"

        created new head

        $ heads

        5: Adding b branch head 3 (b)

        4: Adding b branch head 2 (b)

        3: Adding b branch head 1 (b)

        1: Adding a branch (a)

        0: Adding root node ()

      -------

        $ heads .

        5: Adding b branch head 3 (b)

        4: Adding b branch head 2 (b)

        3: Adding b branch head 1 (b)

      =======

        $ hg merge 4

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

        (branch merge, don't forget to commit)

        $ hg commit -m "Merging b branch head 2 and b branch head 3"

        $ heads

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

        1: Adding a branch (a)

        0: Adding root node ()

      -------

        $ heads .

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

      =======

        $ echo 'c' >c

        $ hg add c

        $ hg branch c

        marked working directory as branch c

        $ hg commit -m "Adding c branch"

        $ heads

        7: Adding c branch (c)

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

        1: Adding a branch (a)

        0: Adding root node ()

      -------

        $ heads .

        7: Adding c branch (c)

      =======

        $ heads -r 3 .

        no open branch heads found on branches c (started at 3)

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Adrian Buehlmann
    
tests: unify test-bheads

              r12072
            
        $ heads -r 2 .

        7: Adding c branch (c)

      -------

        $ hg update -C 4

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

      -------

        $ heads -r 3 .

        3: Adding b branch head 1 (b)

      -------

        $ heads -r 2 .

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

      -------

        $ heads -r 7 .

        no open branch heads found on branches b (started at 7)

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Adrian Buehlmann
    
tests: unify test-bheads

              r12072
            
      =======

        $ for i in 0 1 2 3 4 5 6 7; do

        >     hg update -C "$i"

        >     heads

        >     echo '-------'

        >     heads .

        >     echo '-------'

        > done

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

        7: Adding c branch (c)

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

        1: Adding a branch (a)

        0: Adding root node ()

        -------

        0: Adding root node ()

        -------

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

        7: Adding c branch (c)

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

        1: Adding a branch (a)

        0: Adding root node ()

        -------

        1: Adding a branch (a)

        -------

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

        7: Adding c branch (c)

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

        1: Adding a branch (a)

        0: Adding root node ()

        -------

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

        -------

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

        7: Adding c branch (c)

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

        1: Adding a branch (a)

        0: Adding root node ()

        -------

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

        -------

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

        7: Adding c branch (c)

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

        1: Adding a branch (a)

        0: Adding root node ()

        -------

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

        -------

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

        7: Adding c branch (c)

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

        1: Adding a branch (a)

        0: Adding root node ()

        -------

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

        -------

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

        7: Adding c branch (c)

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

        1: Adding a branch (a)

        0: Adding root node ()

        -------

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

        -------

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

        7: Adding c branch (c)

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

        1: Adding a branch (a)

        0: Adding root node ()

        -------

        7: Adding c branch (c)

        -------

      =======

        $ for i in a b c z; do

        >     heads "$i"

        >     echo '-------'

        > done

        1: Adding a branch (a)

        -------

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

        -------

        7: Adding c branch (c)

        -------

        abort: unknown revision 'z'!

        -------

      =======

        $ heads 0 1 2 3 4 5 6 7

        7: Adding c branch (c)

        6: Merging b branch head 2 and b branch head 3 (b)

        3: Adding b branch head 1 (b)

        1: Adding a branch (a)

        0: Adding root node ()

      Topological heads:

        $ heads -t

        7: Adding c branch (c)

        3: Adding b branch head 1 (b)

        1: Adding a branch (a)

        $ cd ..

      ______________

      "created new head" message tests

        $ hg init newheadmsg

        $ cd newheadmsg

      Init: no msg

        $ echo 1 > a

        $ hg ci -Am "a0: Initial root"

        adding a

        $ echo 2 >> a

        $ hg ci -m "a1 (HN)"

        $ hg branch b

        marked working directory as branch b

        Matt Mackall
    
branch: warn on branching

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

        Adrian Buehlmann
    
tests: unify test-bheads

              r12072
            
        $ echo 1 > b

        $ hg ci -Am "b2: Initial root for branch b"

        adding b

        $ echo 2 >> b

        $ hg ci -m "b3 (HN)"

      Case NN: msg

        $ hg up -q null

        $ hg branch -f b

        marked working directory as branch b

        $ echo 1 > bb

        $ hg ci -Am "b4 (NN): new topo root for branch b"

        adding bb

        created new head

      Case HN: no msg

        $ echo 2 >> bb

        $ hg ci -m "b5 (HN)"

      Case BN: msg

        $ hg branch -f default

        marked working directory as branch default

        $ echo 1 > aa

        $ hg ci -Am "a6 (BN): new branch root"

        adding aa

        created new head

      Case CN: msg

        $ hg up -q 4

        $ echo 3 >> bbb

        $ hg ci -Am "b7 (CN): regular new head"

        adding bbb

        created new head

      Case BB: msg

        $ hg up -q 4

        $ hg merge -q 3

        $ hg branch -f default

        marked working directory as branch default

        $ hg ci -m "a8 (BB): weird new branch root"

        created new head

      Case CB: msg

        $ hg up -q 4

        $ hg merge -q 1

        $ hg ci -m "b9 (CB): new head from branch merge"

        created new head

      Case HB: no msg

        $ hg up -q 7

        $ hg merge -q 6

        $ hg ci -m "b10 (HB): continuing head from branch merge"

      Case CC: msg

        $ hg up -q 4

        $ hg merge -q 2

        $ hg ci -m "b11 (CC): new head from merge"

        created new head

      Case CH: no msg

        $ hg up -q 2

        $ hg merge -q 10

        $ hg ci -m "b12 (CH): continuing head from merge"

      Case HH: no msg

        $ hg merge -q 3

        $ hg ci -m "b12 (HH): merging two heads"

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Adrian Buehlmann tests: unify test-bheads	r12072	$ heads()
		> {
		> hg heads --template '{rev}: {desc\|firstline\|strip} ({branches})\n' "$@"
		> }

		$ hg init a
		$ cd a
		$ echo 'root' >root
		$ hg add root
		$ hg commit -m "Adding root node"
		$ heads
		0: Adding root node ()
		-------
		$ heads .
		0: Adding root node ()

		=======

		$ echo 'a' >a
		$ hg add a
		$ hg branch a
		marked working directory as branch a
Matt Mackall branch: warn on branching	r15615	(branches are permanent and global, did you want a bookmark?)
Adrian Buehlmann tests: unify test-bheads	r12072	$ hg commit -m "Adding a branch"
		$ heads
		1: Adding a branch (a)
		0: Adding root node ()
		-------
		$ heads .
		1: Adding a branch (a)

		=======

		$ hg update -C 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ echo 'b' >b
		$ hg add b
		$ hg branch b
		marked working directory as branch b
		$ hg commit -m "Adding b branch"
		$ heads
		2: Adding b branch (b)
		1: Adding a branch (a)
		0: Adding root node ()
		-------
		$ heads .
		2: Adding b branch (b)

		=======

		$ echo 'bh1' >bh1
		$ hg add bh1
		$ hg commit -m "Adding b branch head 1"
		$ heads
		3: Adding b branch head 1 (b)
		1: Adding a branch (a)
		0: Adding root node ()
		-------
		$ heads .
		3: Adding b branch head 1 (b)

		=======

		$ hg update -C 2
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ echo 'bh2' >bh2
		$ hg add bh2
		$ hg commit -m "Adding b branch head 2"
		created new head
		$ heads
		4: Adding b branch head 2 (b)
		3: Adding b branch head 1 (b)
		1: Adding a branch (a)
		0: Adding root node ()
		$ heads .
		4: Adding b branch head 2 (b)
		3: Adding b branch head 1 (b)

		=======

		$ hg update -C 2
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ echo 'bh3' >bh3
		$ hg add bh3
		$ hg commit -m "Adding b branch head 3"
		created new head
		$ heads
		5: Adding b branch head 3 (b)
		4: Adding b branch head 2 (b)
		3: Adding b branch head 1 (b)
		1: Adding a branch (a)
		0: Adding root node ()
		-------
		$ heads .
		5: Adding b branch head 3 (b)
		4: Adding b branch head 2 (b)
		3: Adding b branch head 1 (b)

		=======

		$ hg merge 4
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		$ hg commit -m "Merging b branch head 2 and b branch head 3"
		$ heads
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)
		1: Adding a branch (a)
		0: Adding root node ()
		-------
		$ heads .
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)

		=======

		$ echo 'c' >c
		$ hg add c
		$ hg branch c
		marked working directory as branch c
		$ hg commit -m "Adding c branch"
		$ heads
		7: Adding c branch (c)
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)
		1: Adding a branch (a)
		0: Adding root node ()
		-------
		$ heads .
		7: Adding c branch (c)

		=======

		$ heads -r 3 .
		no open branch heads found on branches c (started at 3)
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Adrian Buehlmann tests: unify test-bheads	r12072	$ heads -r 2 .
		7: Adding c branch (c)
		-------
		$ hg update -C 4
		0 files updated, 0 files merged, 2 files removed, 0 files unresolved
		-------
		$ heads -r 3 .
		3: Adding b branch head 1 (b)
		-------
		$ heads -r 2 .
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)
		-------
		$ heads -r 7 .
		no open branch heads found on branches b (started at 7)
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Adrian Buehlmann tests: unify test-bheads	r12072
		=======

		$ for i in 0 1 2 3 4 5 6 7; do
		> hg update -C "$i"
		> heads
		> echo '-------'
		> heads .
		> echo '-------'
		> done
		0 files updated, 0 files merged, 2 files removed, 0 files unresolved
		7: Adding c branch (c)
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)
		1: Adding a branch (a)
		0: Adding root node ()
		-------
		0: Adding root node ()
		-------
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		7: Adding c branch (c)
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)
		1: Adding a branch (a)
		0: Adding root node ()
		-------
		1: Adding a branch (a)
		-------
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		7: Adding c branch (c)
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)
		1: Adding a branch (a)
		0: Adding root node ()
		-------
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)
		-------
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		7: Adding c branch (c)
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)
		1: Adding a branch (a)
		0: Adding root node ()
		-------
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)
		-------
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		7: Adding c branch (c)
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)
		1: Adding a branch (a)
		0: Adding root node ()
		-------
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)
		-------
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		7: Adding c branch (c)
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)
		1: Adding a branch (a)
		0: Adding root node ()
		-------
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)
		-------
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		7: Adding c branch (c)
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)
		1: Adding a branch (a)
		0: Adding root node ()
		-------
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)
		-------
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		7: Adding c branch (c)
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)
		1: Adding a branch (a)
		0: Adding root node ()
		-------
		7: Adding c branch (c)
		-------

		=======

		$ for i in a b c z; do
		> heads "$i"
		> echo '-------'
		> done
		1: Adding a branch (a)
		-------
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)
		-------
		7: Adding c branch (c)
		-------
		abort: unknown revision 'z'!
		-------

		=======

		$ heads 0 1 2 3 4 5 6 7
		7: Adding c branch (c)
		6: Merging b branch head 2 and b branch head 3 (b)
		3: Adding b branch head 1 (b)
		1: Adding a branch (a)
		0: Adding root node ()

		Topological heads:

		$ heads -t
		7: Adding c branch (c)
		3: Adding b branch head 1 (b)
		1: Adding a branch (a)

		$ cd ..
		______________

		"created new head" message tests

		$ hg init newheadmsg
		$ cd newheadmsg

		Init: no msg

		$ echo 1 > a
		$ hg ci -Am "a0: Initial root"
		adding a
		$ echo 2 >> a
		$ hg ci -m "a1 (HN)"

		$ hg branch b
		marked working directory as branch b
Matt Mackall branch: warn on branching	r15615	(branches are permanent and global, did you want a bookmark?)
Adrian Buehlmann tests: unify test-bheads	r12072	$ echo 1 > b
		$ hg ci -Am "b2: Initial root for branch b"
		adding b
		$ echo 2 >> b
		$ hg ci -m "b3 (HN)"

		Case NN: msg

		$ hg up -q null
		$ hg branch -f b
		marked working directory as branch b
		$ echo 1 > bb
		$ hg ci -Am "b4 (NN): new topo root for branch b"
		adding bb
		created new head

		Case HN: no msg

		$ echo 2 >> bb
		$ hg ci -m "b5 (HN)"

		Case BN: msg

		$ hg branch -f default
		marked working directory as branch default
		$ echo 1 > aa
		$ hg ci -Am "a6 (BN): new branch root"
		adding aa
		created new head

		Case CN: msg

		$ hg up -q 4
		$ echo 3 >> bbb
		$ hg ci -Am "b7 (CN): regular new head"
		adding bbb
		created new head

		Case BB: msg

		$ hg up -q 4
		$ hg merge -q 3
		$ hg branch -f default
		marked working directory as branch default
		$ hg ci -m "a8 (BB): weird new branch root"
		created new head

		Case CB: msg

		$ hg up -q 4
		$ hg merge -q 1
		$ hg ci -m "b9 (CB): new head from branch merge"
		created new head

		Case HB: no msg

		$ hg up -q 7
		$ hg merge -q 6
		$ hg ci -m "b10 (HB): continuing head from branch merge"

		Case CC: msg

		$ hg up -q 4
		$ hg merge -q 2
		$ hg ci -m "b11 (CC): new head from merge"
		created new head

		Case CH: no msg

		$ hg up -q 2
		$ hg merge -q 10
		$ hg ci -m "b12 (CH): continuing head from merge"

		Case HH: no msg

		$ hg merge -q 3
		$ hg ci -m "b12 (HH): merging two heads"

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..