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

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

     2

     3

Initialize repository

     4

     5

  $ hg init foo

     6

  $ touch foo/a && hg -R foo commit -A -m "added a"

     7

  adding a

     8

     9

  $ hg clone foo foo1

    10

  updating to branch default

    11

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

    12

    13

  $ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1"

    14

  $ echo "hi" > foo/a && hg -R foo commit -m "edited a foo"

    15

  $ hg -R foo1 pull -u

    16

  pulling from $TESTTMP/foo

    17

  searching for changes

    18

  adding changesets

    19

  adding manifests

    20

  adding file changes

    21

  added 1 changesets with 1 changes to 1 files (+1 heads)

    22

  not updating: crosses branches (merge branches or update --check to force update)

    23

    24

  $ hg -R foo1 book branchy

    25

  $ hg -R foo1 book

    26

   * branchy                   1:e3e522925eff

    27

    28

Pull. Bookmark should not jump to new head.

    29

    30

  $ echo "there" >> foo/a && hg -R foo commit -m "edited a again"

    31

  $ hg -R foo1 pull

    32

  pulling from $TESTTMP/foo

    33

  searching for changes

    34

  adding changesets

    35

  adding manifests

    36

  adding file changes

    37

  added 1 changesets with 1 changes to 1 files

    38

  (run 'hg update' to get a working copy)

    39

    40

  $ hg -R foo1 book

    41

   * branchy                   1:e3e522925eff