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

test that a commit clears the merge state.

     2

     3

  $ hg init repo

     4

  $ cd repo

     5

     6

  $ echo foo > file

     7

  $ hg commit -Am 'add file'

     8

  adding file

     9

    10

  $ echo bar >> file

    11

  $ hg commit -Am 'append bar'

    12

    13

    14

create a second head

    15

    16

  $ hg up -C 0

    17

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

    18

  $ echo baz >> file

    19

  $ hg commit -Am 'append baz'

    20

  created new head

    21

    22

failing merge

    23

    24

  $ hg merge --tool=internal:fail

    25

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

    26

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

    27

  [1]

    28

    29

  $ echo resolved > file

    30

  $ hg resolve -m file

    31

  $ hg commit -m 'resolved'

    32

    33

resolve -l, should be empty

    34

    35

  $ hg resolve -l

    36

    37

test crashed merge with empty mergestate

    38

    39

  $ mkdir .hg/merge

    40

  $ touch .hg/merge/state

    41

    42

resolve -l, should be empty

    43

    44

  $ hg resolve -l