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

  $ HGENCODING=utf-8

     2

  $ export HGENCODING

     3

     4

  $ try() {

     5

  >   hg debugrevspec --debug $@

     6

  > }

     7

     8

  $ log() {

     9

  >   hg log --template '{rev}\n' -r "$1"

    10

  > }

    11

    12

  $ hg init repo

    13

  $ cd repo

    14

    15

  $ try 'p1()'

    16

  ('func', ('symbol', 'p1'), None)

    17

  $ try 'p2()'

    18

  ('func', ('symbol', 'p2'), None)

    19

  $ try 'parents()'

    20

  ('func', ('symbol', 'parents'), None)

    21

    22

null revision

    23

  $ log 'p1()'

    24

  $ log 'p2()'

    25

  $ log 'parents()'

    26

    27

working dir with a single parent

    28

  $ echo a > a

    29

  $ hg ci -Aqm0

    30

  $ log 'p1()'

    31

  0

    32

  $ log 'tag() and p1()'

    33

  $ log 'p2()'

    34

  $ log 'parents()'

    35

  0

    36

  $ log 'tag() and parents()'

    37

    38

merge in progress

    39

  $ echo b > b

    40

  $ hg ci -Aqm1

    41

  $ hg up -q 0

    42

  $ echo c > c

    43

  $ hg ci -Aqm2

    44

  $ hg merge -q

    45

  $ log 'p1()'

    46

  2

    47

  $ log 'p2()'

    48

  1

    49

  $ log 'tag() and p2()'

    50

  $ log 'parents()'

    51

  1

    52

  2