Mercurial Mercurial > mercurial / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-subrepo-missing.t
author Patrick Mezard <pmezard@gmail.com>
Mon, 01 Aug 2011 23:58:50 +0200
branchstable
changeset 15005 4a43e23b8c55
parent 14870 f73c7b70df68
child 16073 b254f827b7a6
permissions -rw-r--r--
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13017
d0e21c5fde41 subrepo: handle missing subrepo spec file as removed
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     1
 
  $ hg init repo
d0e21c5fde41 subrepo: handle missing subrepo spec file as removed
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     2
 
  $ cd repo
d0e21c5fde41 subrepo: handle missing subrepo spec file as removed
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     3
 
  $ hg init subrepo
d0e21c5fde41 subrepo: handle missing subrepo spec file as removed
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     4
 
  $ echo a > subrepo/a
d0e21c5fde41 subrepo: handle missing subrepo spec file as removed
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     5
 
  $ hg -R subrepo ci -Am adda
d0e21c5fde41 subrepo: handle missing subrepo spec file as removed
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     6
 
  adding a
d0e21c5fde41 subrepo: handle missing subrepo spec file as removed
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     7
 
  $ echo 'subrepo = subrepo' > .hgsub
d0e21c5fde41 subrepo: handle missing subrepo spec file as removed
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     8
 
  $ hg ci -Am addsubrepo
d0e21c5fde41 subrepo: handle missing subrepo spec file as removed
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     9
 
  adding .hgsub
d0e21c5fde41 subrepo: handle missing subrepo spec file as removed
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    10
 
  committing subrepository subrepo
d0e21c5fde41 subrepo: handle missing subrepo spec file as removed
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    11
 
  $ echo b > subrepo/b
d0e21c5fde41 subrepo: handle missing subrepo spec file as removed
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    12
 
  $ hg -R subrepo ci -Am addb
d0e21c5fde41 subrepo: handle missing subrepo spec file as removed
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    13
 
  adding b
d0e21c5fde41 subrepo: handle missing subrepo spec file as removed
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    14
 
  $ hg ci -m updatedsub
d0e21c5fde41 subrepo: handle missing subrepo spec file as removed
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    15
 
  committing subrepository subrepo
d0e21c5fde41 subrepo: handle missing subrepo spec file as removed
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    16
 












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    17


delete .hgsub and revert it












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    18














d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    19


  $ rm .hgsub












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    20


  $ hg revert .hgsub












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    21


  warning: subrepo spec file .hgsub not found







14870






f73c7b70df68
subrepo: use working copy of .hgsub to filter status (issue2901)



Matt Mackall <mpm@selenic.com>


parents: 
13017

diff
changeset




    22


  warning: subrepo spec file .hgsub not found







13017






d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    23














d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    24


delete .hgsubstate and revert it












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    25














d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    26


  $ rm .hgsubstate












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    27


  $ hg revert .hgsubstate












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    28














d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    29


delete .hgsub and update












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    30














d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    31


  $ rm .hgsub












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    32


  $ hg up 0












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    33


  warning: subrepo spec file .hgsub not found







14870






f73c7b70df68
subrepo: use working copy of .hgsub to filter status (issue2901)



Matt Mackall <mpm@selenic.com>


parents: 
13017

diff
changeset




    34


  warning: subrepo spec file .hgsub not found







13017






d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    35


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












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    36


  $ hg st







14870






f73c7b70df68
subrepo: use working copy of .hgsub to filter status (issue2901)



Matt Mackall <mpm@selenic.com>


parents: 
13017

diff
changeset




    37


  warning: subrepo spec file .hgsub not found







13017






d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    38


  ! .hgsub












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    39


  $ ls subrepo












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    40


  a












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    41














d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    42


delete .hgsubstate and update












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    43














d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    44


  $ hg up -C












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    45


  warning: subrepo spec file .hgsub not found







14870






f73c7b70df68
subrepo: use working copy of .hgsub to filter status (issue2901)



Matt Mackall <mpm@selenic.com>


parents: 
13017

diff
changeset




    46


  warning: subrepo spec file .hgsub not found







13017






d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    47


  2 files updated, 0 files merged, 0 files removed, 0 files unresolved












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    48


  $ rm .hgsubstate












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    49


  $ hg up 0  












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    50


  remote changed .hgsubstate which local deleted












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    51


  use (c)hanged version or leave (d)eleted? c












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    52


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












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    53


  $ hg st












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    54


  $ ls subrepo












d0e21c5fde41
subrepo: handle missing subrepo spec file as removed



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    55


  a














mercurial