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

Matt Harbison - - Load All Authors

File last commit:

r28318:564a354f default


                r29452:26a5d605

3.8.4 stable

Download file

             test-double-merge.t
        
                    66 lines
            
             | 1.8 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-double-merge.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

        $ echo line 1 > foo

        $ hg ci -qAm 'add foo'

      copy foo to bar and change both files

        $ hg cp foo bar

        $ echo line 2-1 >> foo

        $ echo line 2-2 >> bar

        $ hg ci -m 'cp foo bar; change both'

      in another branch, change foo in a way that doesn't conflict with

      the other changes

        $ hg up -qC 0

        $ echo line 0 > foo

        $ hg cat foo >> foo

        $ hg ci -m 'change foo'

        created new head

      we get conflicts that shouldn't be there

        $ hg merge -P

        changeset:   1:484bf6903104

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     cp foo bar; change both

        $ hg merge --debug

          searching for copies back to rev 1

          unmatched files in other:

           bar

          all copies found (* = to merge, ! = divergent, % = renamed and deleted):

           src: 'foo' -> dst: 'bar' *

          checking for directory renames

        resolving manifests

         branchmerge: True, force: False, partial: False

         ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104

         preserving foo for resolve of bar

         preserving foo for resolve of foo

        starting 4 threads for background file closing (?)

         bar: remote copied from foo -> m (premerge)

        picked tool ':merge' for bar (binary False symlink False changedelete False)

        merging foo and bar to bar

        my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc

         premerge successful

         foo: versions differ -> m (premerge)

        picked tool ':merge' for foo (binary False symlink False changedelete False)

        merging foo

        my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc

         premerge successful

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

        (branch merge, don't forget to commit)

      contents of foo

        $ cat foo

        line 0

        line 1

        line 2-1

      contents of bar

        $ cat bar

        line 0

        line 1

        line 2-2

        $ 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

				$ hg init repo
				$ cd repo

				$ echo line 1 > foo
				$ hg ci -qAm 'add foo'

				copy foo to bar and change both files
				$ hg cp foo bar
				$ echo line 2-1 >> foo
				$ echo line 2-2 >> bar
				$ hg ci -m 'cp foo bar; change both'

				in another branch, change foo in a way that doesn't conflict with
				the other changes
				$ hg up -qC 0
				$ echo line 0 > foo
				$ hg cat foo >> foo
				$ hg ci -m 'change foo'
				created new head

				we get conflicts that shouldn't be there
				$ hg merge -P
				changeset: 1:484bf6903104
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: cp foo bar; change both

				$ hg merge --debug
				searching for copies back to rev 1
				unmatched files in other:
				bar
				all copies found (* = to merge, ! = divergent, % = renamed and deleted):
				src: 'foo' -> dst: 'bar' *
				checking for directory renames
				resolving manifests
				branchmerge: True, force: False, partial: False
				ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104
				preserving foo for resolve of bar
				preserving foo for resolve of foo
				starting 4 threads for background file closing (?)
				bar: remote copied from foo -> m (premerge)
				picked tool ':merge' for bar (binary False symlink False changedelete False)
				merging foo and bar to bar
				my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc
				premerge successful
				foo: versions differ -> m (premerge)
				picked tool ':merge' for foo (binary False symlink False changedelete False)
				merging foo
				my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc
				premerge successful
				0 files updated, 2 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				contents of foo
				$ cat foo
				line 0
				line 1
				line 2-1

				contents of bar
				$ cat bar
				line 0
				line 1
				line 2-2

				$ cd ..