upstream/mercurial-mirror Files · tests/test-update-renames.t

sslutil: synchronize hostname matching logic with CPython...

sslutil: synchronize hostname matching logic with CPython sslutil contains its own hostname matching logic. CPython has code for the same intent. However, it is only available to Python 2.7.9+ (or distributions that have backported 2.7.9's ssl module improvements). This patch effectively imports CPython's hostname matching code from its ssl.py into sslutil.py. The hostname matching code itself is pretty similar. However, the DNS name matching code is much more robust and spec conformant. As the test changes show, this changes some behavior around wildcard handling and IDNA matching. The new behavior allows wildcards in the middle of words (e.g. 'f*.com' matches 'foo.com') This is spec compliant according to RFC 6125 Section 6.5.3 item 3. There is one test where the matcher is more strict. Before, '*.a.com' matched '.a.com'. Now it doesn't match. Strictly speaking this is a security vulnerability.

Siddharth Agarwal - - Load All Authors

File last commit:

r26614:ef1eb6df default


                r29452:26a5d605

3.8.4 stable

Download file

             test-update-renames.t
        
                    26 lines
            
             | 486 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-update-renames.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: fix a bunch of pointless #s in unified tests

              r12328
            
      Test update logic when there are renames

        Adrian Buehlmann
    
tests: unify test-update-renames

              r12299
            
        Matt Mackall
    
tests: fix a bunch of pointless #s in unified tests

              r12328
            
      Update with local changes across a file rename

        Adrian Buehlmann
    
tests: unify test-update-renames

              r12299
            
        $ hg init

        $ echo a > a

        $ hg add a

        $ hg ci -m a

        $ hg mv a b

        $ hg ci -m rename

        $ echo b > b

        $ hg ci -m change

        $ hg up -q 0

        $ echo c > a

        $ hg up

        merging a and b to b

        Siddharth Agarwal
    
simplemerge: move conflict warning message to filemerge...

              r26614
            
        warning: conflicts while merging b! (edit, then use 'hg resolve --mark')

        Adrian Buehlmann
    
tests: unify test-update-renames

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

        use 'hg resolve' to retry unresolved file merges

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

	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

Matt Mackall tests: fix a bunch of pointless #s in unified tests	r12328	Test update logic when there are renames
Adrian Buehlmann tests: unify test-update-renames	r12299
Matt Mackall tests: fix a bunch of pointless #s in unified tests	r12328	Update with local changes across a file rename
Adrian Buehlmann tests: unify test-update-renames	r12299
		$ hg init

		$ echo a > a
		$ hg add a
		$ hg ci -m a

		$ hg mv a b
		$ hg ci -m rename

		$ echo b > b
		$ hg ci -m change

		$ hg up -q 0

		$ echo c > a

		$ hg up
		merging a and b to b
Siddharth Agarwal simplemerge: move conflict warning message to filemerge...	r26614	warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
Adrian Buehlmann tests: unify test-update-renames	r12299	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
		use 'hg resolve' to retry unresolved file merges
Matt Mackall tests: add exit codes to unified tests	r12316	[1]