upstream/mercurial-mirror Files · tests/test-merge-internal-tools-pattern.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.

Erik Huelsmann - - Load All Authors

File last commit:

r26071:ff12a6c6 default


                r29560:303e9300

default

Download file

             test-merge-internal-tools-pattern.t
        
                    141 lines
            
             | 2.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge-internal-tools-pattern.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Erik Huelsmann
    
filemerge: add 'union' merge to internal merge tool...

              r26071
            
      Make sure that the internal merge tools (internal:fail, internal:local,

      internal:union and internal:other) are used when matched by a

      merge-pattern in hgrc

        Adrian Buehlmann
    
tests: unify test-merge-internal-tools-pattern

              r12257
            
      Make sure HGMERGE doesn't interfere with the test:

        $ unset HGMERGE

        $ hg init

      Initial file contents:

        $ echo "line 1" > f

        $ echo "line 2" >> f

        $ echo "line 3" >> f

        $ hg ci -Am "revision 0"

        adding f

        $ cat f

        line 1

        line 2

        line 3

      Branch 1: editing line 1:

        $ sed 's/line 1/first line/' f > f.new

        $ mv f.new f

        $ hg ci -Am "edited first line"

      Branch 2: editing line 3:

        $ hg update 0

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

        $ sed 's/line 3/third line/' f > f.new

        $ mv f.new f

        $ hg ci -Am "edited third line"

        created new head

      Merge using internal:fail tool:

        $ echo "[merge-patterns]" > .hg/hgrc

        $ echo "* = internal:fail" >> .hg/hgrc

        $ hg merge

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

        Brodie Rao
    
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'...

              r12314
            
        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Adrian Buehlmann
    
tests: unify test-merge-internal-tools-pattern

              r12257
            
        $ cat f

        line 1

        line 2

        third line

        $ hg stat

        M f

      Merge using internal:local tool:

        $ hg update -C 2

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

        $ sed 's/internal:fail/internal:local/' .hg/hgrc > .hg/hgrc.new

        $ mv .hg/hgrc.new .hg/hgrc

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ cat f

        line 1

        line 2

        third line

        $ hg stat

        M f

      Merge using internal:other tool:

        $ hg update -C 2

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

        $ sed 's/internal:local/internal:other/' .hg/hgrc > .hg/hgrc.new

        $ mv .hg/hgrc.new .hg/hgrc

        $ hg merge

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

        (branch merge, don't forget to commit)

        $ cat f

        first line

        line 2

        line 3

        $ hg stat

        M f

      Merge using default tool:

        $ hg update -C 2

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

        $ rm .hg/hgrc

        $ hg merge

        merging f

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

        (branch merge, don't forget to commit)

        $ cat f

        first line

        line 2

        third line

        $ hg stat

        M f

        Erik Huelsmann
    
filemerge: add 'union' merge to internal merge tool...

              r26071
            
      Merge using internal:union tool:

        $ hg update -C 2

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

        $ echo "line 4a" >>f

        $ hg ci -Am "Adding fourth line (commit 4)"

        $ hg update 2

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

        $ echo "line 4b" >>f

        $ hg ci -Am "Adding fourth line v2 (commit 5)"

        created new head

        $ echo "[merge-patterns]" > .hg/hgrc

        $ echo "* = internal:union" >> .hg/hgrc

        $ hg merge 3

        merging f

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

        (branch merge, don't forget to commit)

        $ cat f

        line 1

        line 2

        third line

        line 4b

        line 4a

	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

Erik Huelsmann filemerge: add 'union' merge to internal merge tool...	r26071	Make sure that the internal merge tools (internal:fail, internal:local,
		internal:union and internal:other) are used when matched by a
		merge-pattern in hgrc
Adrian Buehlmann tests: unify test-merge-internal-tools-pattern	r12257
		Make sure HGMERGE doesn't interfere with the test:

		$ unset HGMERGE

		$ hg init

		Initial file contents:

		$ echo "line 1" > f
		$ echo "line 2" >> f
		$ echo "line 3" >> f
		$ hg ci -Am "revision 0"
		adding f

		$ cat f
		line 1
		line 2
		line 3

		Branch 1: editing line 1:

		$ sed 's/line 1/first line/' f > f.new
		$ mv f.new f
		$ hg ci -Am "edited first line"

		Branch 2: editing line 3:

		$ hg update 0
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ sed 's/line 3/third line/' f > f.new
		$ mv f.new f
		$ hg ci -Am "edited third line"
		created new head

		Merge using internal:fail tool:

		$ echo "[merge-patterns]" > .hg/hgrc
		$ echo "* = internal:fail" >> .hg/hgrc

		$ hg merge
		0 files updated, 0 files merged, 0 files removed, 1 files unresolved
Brodie Rao merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'...	r12314	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Adrian Buehlmann tests: unify test-merge-internal-tools-pattern	r12257
		$ cat f
		line 1
		line 2
		third line

		$ hg stat
		M f

		Merge using internal:local tool:

		$ hg update -C 2
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ sed 's/internal:fail/internal:local/' .hg/hgrc > .hg/hgrc.new
		$ mv .hg/hgrc.new .hg/hgrc

		$ hg merge
		0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

		$ cat f
		line 1
		line 2
		third line

		$ hg stat
		M f

		Merge using internal:other tool:

		$ hg update -C 2
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ sed 's/internal:local/internal:other/' .hg/hgrc > .hg/hgrc.new
		$ mv .hg/hgrc.new .hg/hgrc

		$ hg merge
		0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

		$ cat f
		first line
		line 2
		line 3

		$ hg stat
		M f

		Merge using default tool:

		$ hg update -C 2
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ rm .hg/hgrc

		$ hg merge
		merging f
		0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

		$ cat f
		first line
		line 2
		third line

		$ hg stat
		M f

Erik Huelsmann filemerge: add 'union' merge to internal merge tool...	r26071	Merge using internal:union tool:

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

		$ echo "line 4a" >>f
		$ hg ci -Am "Adding fourth line (commit 4)"
		$ hg update 2
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ echo "line 4b" >>f
		$ hg ci -Am "Adding fourth line v2 (commit 5)"
		created new head

		$ echo "[merge-patterns]" > .hg/hgrc
		$ echo "* = internal:union" >> .hg/hgrc

		$ hg merge 3
		merging f
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

		$ cat f
		line 1
		line 2
		third line
		line 4b
		line 4a