Mercurial > hg
annotate tests/test-hgwebdir-paths.py @ 41163:0101a35deae2
phabricator: warn if unable to amend, instead of aborting after posting
There was a divergence in behavior here between obsolete and strip based
amending. I first noticed the abort when testing outside of the test harness,
but then had trouble recreating it here after reverting the code changes. It
turns out, strip based amend was successfully amending the public commit after
it was posted! It looks like the protection is in the `commit --amend` command,
not in the underlying code that it calls.
I considered doing a preflight check and aborting. But the locks are only
acquired at the end, if amending, and this is too large a section of code to be
wrapped in a maybe-it's-held-or-not context manager for my tastes.
Additionally, some people do post-push reviews, and amending is the default
behavior, so they shouldn't see a misleading error message.
The lack of a 'Differential Revision' entry in the commit message breaks a
{phabreview} test, so it had to be partially conditionalized.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 05 Jan 2019 15:20:33 -0500 |
parents | 81455f482478 |
children | 2372284d9457 |
rev | line source |
---|---|
28932
4eac86331acb
tests: make test-hgwebdir-paths use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
15381
diff
changeset
|
1 from __future__ import absolute_import |
4eac86331acb
tests: make test-hgwebdir-paths use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
15381
diff
changeset
|
2 |
8529
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
3 import os |
28932
4eac86331acb
tests: make test-hgwebdir-paths use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
15381
diff
changeset
|
4 from mercurial import ( |
4eac86331acb
tests: make test-hgwebdir-paths use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
15381
diff
changeset
|
5 hg, |
4eac86331acb
tests: make test-hgwebdir-paths use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
15381
diff
changeset
|
6 ui as uimod, |
4eac86331acb
tests: make test-hgwebdir-paths use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
15381
diff
changeset
|
7 ) |
4eac86331acb
tests: make test-hgwebdir-paths use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
15381
diff
changeset
|
8 from mercurial.hgweb import ( |
4eac86331acb
tests: make test-hgwebdir-paths use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
15381
diff
changeset
|
9 hgwebdir_mod, |
4eac86331acb
tests: make test-hgwebdir-paths use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
15381
diff
changeset
|
10 ) |
4eac86331acb
tests: make test-hgwebdir-paths use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
15381
diff
changeset
|
11 hgwebdir = hgwebdir_mod.hgwebdir |
8529
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
12 |
37879
81455f482478
tests: port test-hgwebdir-paths.py to Python 3
Augie Fackler <augie@google.com>
parents:
30559
diff
changeset
|
13 os.mkdir(b'webdir') |
81455f482478
tests: port test-hgwebdir-paths.py to Python 3
Augie Fackler <augie@google.com>
parents:
30559
diff
changeset
|
14 os.chdir(b'webdir') |
8529
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
15 |
37879
81455f482478
tests: port test-hgwebdir-paths.py to Python 3
Augie Fackler <augie@google.com>
parents:
30559
diff
changeset
|
16 webdir = os.path.realpath(b'.') |
8529
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
17 |
30559
d83ca854fa21
ui: factor out ui.load() to create a ui without loading configs (API)
Yuya Nishihara <yuya@tcha.org>
parents:
28932
diff
changeset
|
18 u = uimod.ui.load() |
37879
81455f482478
tests: port test-hgwebdir-paths.py to Python 3
Augie Fackler <augie@google.com>
parents:
30559
diff
changeset
|
19 hg.repository(u, b'a', create=1) |
81455f482478
tests: port test-hgwebdir-paths.py to Python 3
Augie Fackler <augie@google.com>
parents:
30559
diff
changeset
|
20 hg.repository(u, b'b', create=1) |
81455f482478
tests: port test-hgwebdir-paths.py to Python 3
Augie Fackler <augie@google.com>
parents:
30559
diff
changeset
|
21 os.chdir(b'b') |
81455f482478
tests: port test-hgwebdir-paths.py to Python 3
Augie Fackler <augie@google.com>
parents:
30559
diff
changeset
|
22 hg.repository(u, b'd', create=1) |
81455f482478
tests: port test-hgwebdir-paths.py to Python 3
Augie Fackler <augie@google.com>
parents:
30559
diff
changeset
|
23 os.chdir(b'..') |
81455f482478
tests: port test-hgwebdir-paths.py to Python 3
Augie Fackler <augie@google.com>
parents:
30559
diff
changeset
|
24 hg.repository(u, b'c', create=1) |
81455f482478
tests: port test-hgwebdir-paths.py to Python 3
Augie Fackler <augie@google.com>
parents:
30559
diff
changeset
|
25 os.chdir(b'..') |
8529
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
26 |
37879
81455f482478
tests: port test-hgwebdir-paths.py to Python 3
Augie Fackler <augie@google.com>
parents:
30559
diff
changeset
|
27 paths = {b't/a/': b'%s/a' % webdir, |
81455f482478
tests: port test-hgwebdir-paths.py to Python 3
Augie Fackler <augie@google.com>
parents:
30559
diff
changeset
|
28 b'b': b'%s/b' % webdir, |
81455f482478
tests: port test-hgwebdir-paths.py to Python 3
Augie Fackler <augie@google.com>
parents:
30559
diff
changeset
|
29 b'coll': b'%s/*' % webdir, |
81455f482478
tests: port test-hgwebdir-paths.py to Python 3
Augie Fackler <augie@google.com>
parents:
30559
diff
changeset
|
30 b'rcoll': b'%s/**' % webdir} |
8529
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
31 |
37879
81455f482478
tests: port test-hgwebdir-paths.py to Python 3
Augie Fackler <augie@google.com>
parents:
30559
diff
changeset
|
32 config = os.path.join(webdir, b'hgwebdir.conf') |
81455f482478
tests: port test-hgwebdir-paths.py to Python 3
Augie Fackler <augie@google.com>
parents:
30559
diff
changeset
|
33 configfile = open(config, 'wb') |
81455f482478
tests: port test-hgwebdir-paths.py to Python 3
Augie Fackler <augie@google.com>
parents:
30559
diff
changeset
|
34 configfile.write(b'[paths]\n') |
8529
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
35 for k, v in paths.items(): |
37879
81455f482478
tests: port test-hgwebdir-paths.py to Python 3
Augie Fackler <augie@google.com>
parents:
30559
diff
changeset
|
36 configfile.write(b'%s = %s\n' % (k, v)) |
8529
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
37 configfile.close() |
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
38 |
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
39 confwd = hgwebdir(config) |
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
40 dictwd = hgwebdir(paths) |
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
41 |
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
42 assert len(confwd.repos) == len(dictwd.repos), 'different numbers' |
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
43 assert len(confwd.repos) == 9, 'expected 9 repos, found %d' % len(confwd.repos) |
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
44 |
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
45 found = dict(confwd.repos) |
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
46 for key, path in dictwd.repos: |
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
47 assert key in found, 'repository %s was not found' % key |
a767998f0a78
hgweb: make hgwebdir handle dict/list paths the same as config paths
Jeremy Whitlock <jcscoobyrs@gmail.com>
parents:
diff
changeset
|
48 assert found[key] == path, 'different paths for repo %s' % key |