##// END OF EJS Templates
largefiles: restore standins according to restored dirstate...
largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

File last commit:

r15024:0f1311e8 stable
r22285:85bded43 default
Show More
test-hgweb-auth.py.out
196 lines | 4.7 KiB | text/plain | TextLexer
/ tests / test-hgweb-auth.py.out
Sune Foldager
allow http authentication information to be specified in the configuration
r8333
*** Test in-uri schemes
CFG: {x.prefix: http://example.org}
URI: http://example.org/foo
('x', 'x')
URI: http://example.org/foo/bar
('x', 'x')
URI: http://example.org/bar
('x', 'x')
URI: https://example.org/foo
abort
URI: https://example.org/foo/bar
abort
URI: https://example.org/bar
abort
Patrick Mezard
hgweb: do not ignore [auth] if url has a username (issue2822)...
r15005 URI: https://x@example.org/bar
abort
URI: https://y@example.org/bar
abort
Sune Foldager
allow http authentication information to be specified in the configuration
r8333 CFG: {x.prefix: https://example.org}
URI: http://example.org/foo
abort
URI: http://example.org/foo/bar
abort
URI: http://example.org/bar
abort
URI: https://example.org/foo
('x', 'x')
URI: https://example.org/foo/bar
('x', 'x')
URI: https://example.org/bar
('x', 'x')
Patrick Mezard
hgweb: do not ignore [auth] if url has a username (issue2822)...
r15005 URI: https://x@example.org/bar
('x', 'x')
URI: https://y@example.org/bar
abort
Sune Foldager
allow http authentication information to be specified in the configuration
r8333 CFG: {x.prefix: http://example.org, x.schemes: https}
URI: http://example.org/foo
('x', 'x')
URI: http://example.org/foo/bar
('x', 'x')
URI: http://example.org/bar
('x', 'x')
URI: https://example.org/foo
abort
URI: https://example.org/foo/bar
abort
URI: https://example.org/bar
abort
Patrick Mezard
hgweb: do not ignore [auth] if url has a username (issue2822)...
r15005 URI: https://x@example.org/bar
abort
URI: https://y@example.org/bar
abort
Sune Foldager
allow http authentication information to be specified in the configuration
r8333 CFG: {x.prefix: https://example.org, x.schemes: http}
URI: http://example.org/foo
abort
URI: http://example.org/foo/bar
abort
URI: http://example.org/bar
abort
URI: https://example.org/foo
('x', 'x')
URI: https://example.org/foo/bar
('x', 'x')
URI: https://example.org/bar
('x', 'x')
Patrick Mezard
hgweb: do not ignore [auth] if url has a username (issue2822)...
r15005 URI: https://x@example.org/bar
('x', 'x')
URI: https://y@example.org/bar
abort
Sune Foldager
allow http authentication information to be specified in the configuration
r8333
*** Test separately configured schemes
CFG: {x.prefix: example.org, x.schemes: http}
URI: http://example.org/foo
('x', 'x')
URI: http://example.org/foo/bar
('x', 'x')
URI: http://example.org/bar
('x', 'x')
URI: https://example.org/foo
abort
URI: https://example.org/foo/bar
abort
URI: https://example.org/bar
abort
Patrick Mezard
hgweb: do not ignore [auth] if url has a username (issue2822)...
r15005 URI: https://x@example.org/bar
abort
URI: https://y@example.org/bar
abort
Sune Foldager
allow http authentication information to be specified in the configuration
r8333 CFG: {x.prefix: example.org, x.schemes: https}
URI: http://example.org/foo
abort
URI: http://example.org/foo/bar
abort
URI: http://example.org/bar
abort
URI: https://example.org/foo
('x', 'x')
URI: https://example.org/foo/bar
('x', 'x')
URI: https://example.org/bar
('x', 'x')
Patrick Mezard
hgweb: do not ignore [auth] if url has a username (issue2822)...
r15005 URI: https://x@example.org/bar
('x', 'x')
URI: https://y@example.org/bar
abort
Sune Foldager
allow http authentication information to be specified in the configuration
r8333 CFG: {x.prefix: example.org, x.schemes: http https}
URI: http://example.org/foo
('x', 'x')
URI: http://example.org/foo/bar
('x', 'x')
URI: http://example.org/bar
('x', 'x')
URI: https://example.org/foo
('x', 'x')
URI: https://example.org/foo/bar
('x', 'x')
URI: https://example.org/bar
('x', 'x')
Patrick Mezard
hgweb: do not ignore [auth] if url has a username (issue2822)...
r15005 URI: https://x@example.org/bar
('x', 'x')
URI: https://y@example.org/bar
abort
Sune Foldager
allow http authentication information to be specified in the configuration
r8333
*** Test prefix matching
CFG: {x.prefix: http://example.org/foo, y.prefix: http://example.org/bar}
URI: http://example.org/foo
('x', 'x')
URI: http://example.org/foo/bar
('x', 'x')
URI: http://example.org/bar
('y', 'y')
URI: https://example.org/foo
abort
URI: https://example.org/foo/bar
abort
URI: https://example.org/bar
abort
Patrick Mezard
hgweb: do not ignore [auth] if url has a username (issue2822)...
r15005 URI: https://x@example.org/bar
abort
URI: https://y@example.org/bar
abort
Sune Foldager
allow http authentication information to be specified in the configuration
r8333 CFG: {x.prefix: http://example.org/foo, y.prefix: http://example.org/foo/bar}
URI: http://example.org/foo
('x', 'x')
URI: http://example.org/foo/bar
('y', 'y')
URI: http://example.org/bar
abort
URI: https://example.org/foo
abort
URI: https://example.org/foo/bar
abort
URI: https://example.org/bar
abort
Patrick Mezard
hgweb: do not ignore [auth] if url has a username (issue2822)...
r15005 URI: https://x@example.org/bar
abort
URI: https://y@example.org/bar
abort
Sune Foldager
allow http authentication information to be specified in the configuration
r8333 CFG: {x.prefix: *, y.prefix: https://example.org/bar}
URI: http://example.org/foo
abort
URI: http://example.org/foo/bar
abort
URI: http://example.org/bar
abort
URI: https://example.org/foo
('x', 'x')
URI: https://example.org/foo/bar
('x', 'x')
URI: https://example.org/bar
('y', 'y')
Patrick Mezard
hgweb: do not ignore [auth] if url has a username (issue2822)...
r15005 URI: https://x@example.org/bar
('x', 'x')
URI: https://y@example.org/bar
('y', 'y')
*** Test user matching
CFG: {x.password: xpassword, x.prefix: http://example.org/foo, x.username: None}
URI: http://y@example.org/foo
('y', 'xpassword')
CFG: {x.password: xpassword, x.prefix: http://example.org/foo, x.username: None, y.password: ypassword, y.prefix: http://example.org/foo, y.username: y}
URI: http://y@example.org/foo
('y', 'ypassword')
CFG: {x.password: xpassword, x.prefix: http://example.org/foo/bar, x.username: None, y.password: ypassword, y.prefix: http://example.org/foo, y.username: y}
URI: http://y@example.org/foo/bar
('y', 'xpassword')
Patrick Mezard
http: strip credentials from urllib2 manager URIs (issue2885)...
r15024
*** Test urllib2 and util.url
URIs: http://user@example.com:8080/foo http://example.com:8080/foo
('user', '')