annotate tests/test-hgweb-auth.py.out @ 44909:d452acc8cce8 stable

flags: account for flag change when tracking rename relevant to merge

There are some logic filtering rename to the one relevant to the merge. That
logic was oblivious of flag change, leading to exec flag being dropped when
merged with a renamed.

There are two others bugs affecting this scenario. This patch fix the was where
there is not modification involved except for the flag change. Fixes for the
other bug are coming in later changesets.

Differential Revision: https://phab.mercurial-scm.org/D8531

*** Test in-uri schemes

CFG: {b'x.prefix': b'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
URI: https://[e-mail]/bar
     abort
URI: https://[e-mail]/bar
     abort
CFG: {b'x.prefix': b'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')
URI: https://[e-mail]/bar
     ('x', 'x')
URI: https://[e-mail]/bar
     abort
CFG: {b'x.prefix': b'http://example.org', b'x.schemes': b'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
URI: https://[e-mail]/bar
     abort
URI: https://[e-mail]/bar
     abort
CFG: {b'x.prefix': b'https://example.org', b'x.schemes': b'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')
URI: https://[e-mail]/bar
     ('x', 'x')
URI: https://[e-mail]/bar
     abort

*** Test separately configured schemes

CFG: {b'x.prefix': b'example.org', b'x.schemes': b'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
URI: https://[e-mail]/bar
     abort
URI: https://[e-mail]/bar
     abort
CFG: {b'x.prefix': b'example.org', b'x.schemes': b'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')
URI: https://[e-mail]/bar
     ('x', 'x')
URI: https://[e-mail]/bar
     abort
CFG: {b'x.prefix': b'example.org', b'x.schemes': b'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')
URI: https://[e-mail]/bar
     ('x', 'x')
URI: https://[e-mail]/bar
     abort

*** Test prefix matching

CFG: {b'x.prefix': b'http://example.org/foo', b'y.prefix': b'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
URI: https://[e-mail]/bar
     abort
URI: https://[e-mail]/bar
     abort
CFG: {b'x.prefix': b'http://example.org/foo', b'y.prefix': b'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
URI: https://[e-mail]/bar
     abort
URI: https://[e-mail]/bar
     abort
CFG: {b'x.prefix': b'*', b'y.prefix': b'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')
URI: https://[e-mail]/bar
     ('x', 'x')
URI: https://[e-mail]/bar
     ('y', 'y')

*** Test user matching

CFG: {b'x.password': b'xpassword', b'x.prefix': b'http://example.org/foo', b'x.username': None}
URI: http://[e-mail]/foo
     ('y', 'xpassword')
CFG: {b'x.password': b'xpassword', b'x.prefix': b'http://example.org/foo', b'x.username': None, b'y.password': b'ypassword', b'y.prefix': b'http://example.org/foo', b'y.username': b'y'}
URI: http://[e-mail]/foo
     ('y', 'ypassword')
CFG: {b'x.password': b'xpassword', b'x.prefix': b'http://example.org/foo/bar', b'x.username': None, b'y.password': b'ypassword', b'y.prefix': b'http://example.org/foo', b'y.username': b'y'}
URI: http://[e-mail]/foo/bar
     ('y', 'xpassword')

*** Test user matching with name in prefix

CFG: {b'x.password': b'xpassword', b'x.prefix': b'https://example.org/foo', b'x.username': None, b'y.password': b'ypassword', b'y.prefix': b'http://[e-mail]/foo', b'y.username': b'y'}
URI: http://[e-mail]/foo
     ('y', 'ypassword')
CFG: {b'y.password': b'ypassword', b'y.prefix': b'http://[e-mail]/foo', b'y.username': b'y'}
URI: http://[e-mail]/foo
     abort
CFG: {b'y.password': b'ypassword', b'y.prefix': b'http://[e-mail]/foo'}
URI: http://[e-mail]/foo
     abort
CFG: {b'y.password': b'ypassword', b'y.prefix': b'http://[e-mail]/foo', b'y.username': b'z'}
URI: http://[e-mail]/foo
     abort
CFG: {b'y.password': b'ypassword', b'y.prefix': b'http://[e-mail]/foo'}
URI: http://[e-mail]/foo
     ('y', 'ypassword')
CFG: {b'y.password': b'ypassword', b'y.prefix': b'http://[e-mail]/foo'}
URI: http://example.org/foo
     abort

*** Test urllib2 and util.url

URIs: http://[e-mail]:8080/foo http://example.com:8080/foo
('user', '')