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.

     1

  $ hg init

     2

  $ echo "nothing" > a

     3

  $ hg add a

     4

  $ hg commit -m ancestor

     5

  $ echo "something" > a

     6

  $ hg commit -m branch1

     7

  $ hg co 0

     8

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

     9

  $ echo "something else" > a

    10

  $ hg commit -m branch2

    11

  created new head

    12

    13

  $ hg merge 1

    14

  merging a

    15

  warning: conflicts during merge.

    16

  merging a failed!

    17

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

    18

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

    19

  [1]

    20

    21

  $ hg id

    22

  32e80765d7fe+75234512624c+ tip

    23

    24

  $ cat a

    25

  <<<<<<< local

    26

  something else

    27

  =======

    28

  something

    29

  >>>>>>> other

    30

    31

  $ hg status

    32

  M a

    33

  ? a.orig