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

hgweb: do not ignore [auth] if url has a username (issue2822)...

hgweb: do not ignore [auth] if url has a username (issue2822) The [auth] section was ignored when handling URLs like: http://user@example.com/foo Instead, we look in [auth] for an entry matching the URL and supplied user name. Entries without username can match URL with a username. Prefix length ties are resolved in favor of entries matching the username. With: foo.prefix = http://example.org foo.username = user foo.password = password bar.prefix = http://example.org/bar and the input URL: http://user@example.org/bar the 'bar' entry will be selected because of prefix length, therefore prompting for a password. This behaviour ensure that entries selection is consistent when looking for credentials or for certificates, and that certificates can be picked even if their entries do no define usernames while the URL does. Additionally, entries without a username matched against a username are returned as if they did have requested username set to avoid prompting again for a username if the password is not set. v2: reparse the URL in readauthforuri() to handle HTTP and HTTPS similarly. v3: allow unset usernames to match URL usernames to pick certificates. Resolve prefix length ties in favor of entries with usernames.

Matt Mackall - - Load All Authors

File last commit:

r12328:b63f6422 default


                r15005:4a43e23b

1.9.1 stable

Download file

             test-issue672.t
        
                    101 lines
            
             | 2.7 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue672.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      http://mercurial.selenic.com/bts/issue672

      # 0-2-4

      #  \ \ \

      #   1-3-5

      #

      # rename in #1, content change in #4.

        $ hg init

        $ touch 1

        $ touch 2

        $ hg commit -Am init  # 0

        adding 1

        adding 2

        $ hg rename 1 1a

        $ hg commit -m rename # 1

        $ hg co -C 0

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

        $ echo unrelated >> 2

        $ hg ci -m unrelated1 # 2

        created new head

        $ hg merge --debug 1

          searching for copies back to rev 1

          unmatched files in other:

           1a

          all copies found (* = to merge, ! = divergent):

           1a -> 1 

          checking for directory renames

        resolving manifests

         overwrite None partial False

         ancestor 81f4b099af3d local c64f439569a9+ remote c12dcd37c90a

         1: other deleted -> r

         1a: remote created -> g

        updating: 1 1/2 files (50.00%)

        removing 1

        updating: 1a 2/2 files (100.00%)

        getting 1a

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

        (branch merge, don't forget to commit)

        $ hg ci -m merge1 # 3

        $ hg co -C 2

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

        $ echo hello >> 1

        $ hg ci -m unrelated2 # 4

        created new head

        $ hg co -C 3

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

        $ hg merge -y --debug 4

          searching for copies back to rev 1

          unmatched files in local:

           1a

          all copies found (* = to merge, ! = divergent):

           1a -> 1 *

          checking for directory renames

        resolving manifests

         overwrite None partial False

         ancestor c64f439569a9 local e327dca35ac8+ remote 746e9549ea96

         1a: local copied/moved to 1 -> m

        preserving 1a for resolve of 1a

        updating: 1a 1/1 files (100.00%)

        picked tool 'internal:merge' for 1a (binary False symlink False)

        merging 1a and 1 to 1a

        my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d

         premerge successful

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

        (branch merge, don't forget to commit)

        $ hg co -C 4

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

        $ hg merge -y --debug 3

          searching for copies back to rev 1

          unmatched files in other:

           1a

          all copies found (* = to merge, ! = divergent):

           1a -> 1 *

          checking for directory renames

        resolving manifests

         overwrite None partial False

         ancestor c64f439569a9 local 746e9549ea96+ remote e327dca35ac8

         1: remote moved to 1a -> m

        preserving 1 for resolve of 1a

        removing 1

        updating: 1 1/1 files (100.00%)

        picked tool 'internal:merge' for 1a (binary False symlink False)

        merging 1 and 1a to 1a

        my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d

         premerge successful

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

        (branch merge, don't forget to commit)

	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

				http://mercurial.selenic.com/bts/issue672

				# 0-2-4
				# \ \ \
				# 1-3-5
				#
				# rename in #1, content change in #4.

				$ hg init

				$ touch 1
				$ touch 2
				$ hg commit -Am init # 0
				adding 1
				adding 2

				$ hg rename 1 1a
				$ hg commit -m rename # 1

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

				$ echo unrelated >> 2
				$ hg ci -m unrelated1 # 2
				created new head

				$ hg merge --debug 1
				searching for copies back to rev 1
				unmatched files in other:
				1a
				all copies found (* = to merge, ! = divergent):
				1a -> 1
				checking for directory renames
				resolving manifests
				overwrite None partial False
				ancestor 81f4b099af3d local c64f439569a9+ remote c12dcd37c90a
				1: other deleted -> r
				1a: remote created -> g
				updating: 1 1/2 files (50.00%)
				removing 1
				updating: 1a 2/2 files (100.00%)
				getting 1a
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ hg ci -m merge1 # 3

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

				$ echo hello >> 1
				$ hg ci -m unrelated2 # 4
				created new head

				$ hg co -C 3
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved

				$ hg merge -y --debug 4
				searching for copies back to rev 1
				unmatched files in local:
				1a
				all copies found (* = to merge, ! = divergent):
				1a -> 1 *
				checking for directory renames
				resolving manifests
				overwrite None partial False
				ancestor c64f439569a9 local e327dca35ac8+ remote 746e9549ea96
				1a: local copied/moved to 1 -> m
				preserving 1a for resolve of 1a
				updating: 1a 1/1 files (100.00%)
				picked tool 'internal:merge' for 1a (binary False symlink False)
				merging 1a and 1 to 1a
				my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
				premerge successful
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				$ hg co -C 4
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved

				$ hg merge -y --debug 3
				searching for copies back to rev 1
				unmatched files in other:
				1a
				all copies found (* = to merge, ! = divergent):
				1a -> 1 *
				checking for directory renames
				resolving manifests
				overwrite None partial False
				ancestor c64f439569a9 local 746e9549ea96+ remote e327dca35ac8
				1: remote moved to 1a -> m
				preserving 1 for resolve of 1a
				removing 1
				updating: 1 1/1 files (100.00%)
				picked tool 'internal:merge' for 1a (binary False symlink False)
				merging 1 and 1a to 1a
				my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d
				premerge successful
				0 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)