##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

localrepo: make journal.dirstate contain in-memory changes before transaction...
localrepo: make journal.dirstate contain in-memory changes before transaction Before this patch, in-memory dirstate changes aren't written out at opening transaction, even though 'journal.dirstate' is created directly from '.hg/dirstate'. Therefore, subsequent 'hg rollback' uses incomplete 'undo.dirstate' to restore dirstate, if dirstate is changed and isn't written out before opening transaction. In cases below, the condition "dirstate is changed and isn't written out before opening transaction" isn't satisfied and this problem doesn't appear: - "wlock scope" and "transaction scope" are almost equivalent e.g. 'commit --amend', 'import' and so on - dirstate changes are written out before opening transaction e.g. 'rebase' (via 'dirstateguard') and 'commit -A' (by separated wlock scopes) On the other hand, 'backout' may satisfy the condition above. To make 'journal.dirstate' contain in-memory changes before opening transaction, this patch explicitly invokes 'dirstate.write()' in 'localrepository.transaction()'. 'dirstate.write()' is placed before not "writing journal files out" but "invoking pretxnopen hooks" for visibility of dirstate changes to external hook processes. BTW, in the test script, 'touch -t 200001010000' and 'hg status' are invoked to make file 'c' surely clean in dirstate, because "clean but unsure" files indirectly cause 'dirstate.write()' at 'repo.status()' in 'repo.commit()' (see fe03f522dda9 for detail) and prevents from certainly reproducing the issue.
Patrick Mezard - - Load All Authors

File last commit:

r15024:0f1311e8 stable
r25878:800e090e stable
Show More
test-hgweb-auth.py.out
196 lines | 4.7 KiB | text/plain | TextLexer
/ tests / test-hgweb-auth.py.out
History | Source | Raw |Copy content |Copy permalink
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', '')