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 1

     2

     3

  $ echo '[ui]' >> 1/.hg/hgrc

     4

  $ echo 'timeout = 10' >> 1/.hg/hgrc

     5

     6

  $ echo foo > 1/foo

     7

  $ hg --cwd 1 ci -A -m foo

     8

  adding foo

     9

    10

  $ hg clone 1 2

    11

  updating to branch default

    12

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

    13

    14

  $ hg clone 2 3

    15

  updating to branch default

    16

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

    17

    18

  $ echo '[hooks]' >> 2/.hg/hgrc

    19

  $ echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc

    20

    21

  $ echo bar >> 3/foo

    22

  $ hg --cwd 3 ci -m bar

    23

    24

  $ hg --cwd 3 push ../2

    25

  pushing to ../2

    26

  searching for changes

    27

  adding changesets

    28

  adding manifests

    29

  adding file changes

    30

  added 1 changesets with 1 changes to 1 files

    31