Mercurial > hg
annotate tests/test-ui-color.py @ 29196:bf7b8157c483 stable
strip: invalidate phase cache after stripping changeset (issue5235)
When we remove a changeset from the changelog, the phase cache must be
invalidated, otherwise it could refer to changesets that are no longer in the
repo.
To reproduce the failure, I created an extension querying the phase cache after
the strip transaction is over.
To do that, I stripped two commits with a bookmark on one of them to force
another transaction (we open a transaction for moving bookmarks)
after the strip transaction.
Without the fix in this patch, the test leads to a stacktrace showing the issue:
repair.strip(ui, repo, revs, backup)
File "/Users/lcharignon/facebook-hg-rpms/hg-crew/mercurial/repair.py", line 205, in strip
tr.close()
File "/Users/lcharignon/facebook-hg-rpms/hg-crew/mercurial/transaction.py", line 44, in _active
return func(self, *args, **kwds)
File "/Users/lcharignon/facebook-hg-rpms/hg-crew/mercurial/transaction.py", line 490, in close
self._postclosecallback[cat](self)
File "$TESTTMP/crashstrip2.py", line 4, in test
[repo.changelog.node(r) for r in repo.revs("not public()")]
File "/Users/lcharignon/facebook-hg-rpms/hg-crew/mercurial/changelog.py", line 337, in node
return super(changelog, self).node(rev)
File "/Users/lcharignon/facebook-hg-rpms/hg-crew/mercurial/revlog.py", line 377, in node
return self.index[rev][7]
IndexError: revlog index out of range
The situation was encountered in inhibit (evolve's repo) where we would crash
following the volatile set invalidation submitted by Augie in
e6f490e328635312ee214a12bc7fd3c7d46bf9ce. Before his patch the issue was masked
as we were not accessing the phasecache after stripping a revision.
This bug uncovered another but in histedit (see explanation in issue5235).
I changed the histedit test accordingly to avoid fixing two things at once.
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Thu, 12 May 2016 06:13:59 -0700 |
parents | 40afa22bee9b |
children | d83ca854fa21 |
rev | line source |
---|---|
28915
40afa22bee9b
tests: make test-ui-color use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28682
diff
changeset
|
1 from __future__ import absolute_import, print_function |
40afa22bee9b
tests: make test-ui-color use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28682
diff
changeset
|
2 |
19322
ff1586a3adc5
cleanup: remove unused imports
Simon Heimberg <simohe@besonet.ch>
parents:
17956
diff
changeset
|
3 import os |
28915
40afa22bee9b
tests: make test-ui-color use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28682
diff
changeset
|
4 from hgext import ( |
40afa22bee9b
tests: make test-ui-color use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28682
diff
changeset
|
5 color, |
40afa22bee9b
tests: make test-ui-color use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28682
diff
changeset
|
6 ) |
40afa22bee9b
tests: make test-ui-color use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28682
diff
changeset
|
7 from mercurial import ( |
40afa22bee9b
tests: make test-ui-color use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28682
diff
changeset
|
8 dispatch, |
40afa22bee9b
tests: make test-ui-color use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28682
diff
changeset
|
9 ui as uimod, |
40afa22bee9b
tests: make test-ui-color use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28682
diff
changeset
|
10 ) |
11732
386e56ecfb78
color: call correct superclass method in write_err
Brodie Rao <brodie@bitheap.org>
parents:
diff
changeset
|
11 |
386e56ecfb78
color: call correct superclass method in write_err
Brodie Rao <brodie@bitheap.org>
parents:
diff
changeset
|
12 # ensure errors aren't buffered |
386e56ecfb78
color: call correct superclass method in write_err
Brodie Rao <brodie@bitheap.org>
parents:
diff
changeset
|
13 testui = color.colorui() |
386e56ecfb78
color: call correct superclass method in write_err
Brodie Rao <brodie@bitheap.org>
parents:
diff
changeset
|
14 testui.pushbuffer() |
17956
a08775ec89f2
i18n: wrap false positives for translation detection
Matt Mackall <mpm@selenic.com>
parents:
14614
diff
changeset
|
15 testui.write(('buffered\n')) |
a08775ec89f2
i18n: wrap false positives for translation detection
Matt Mackall <mpm@selenic.com>
parents:
14614
diff
changeset
|
16 testui.warn(('warning\n')) |
11732
386e56ecfb78
color: call correct superclass method in write_err
Brodie Rao <brodie@bitheap.org>
parents:
diff
changeset
|
17 testui.write_err('error\n') |
28682
2e5be704bc96
py3: make test-ui-color use print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
19322
diff
changeset
|
18 print(repr(testui.popbuffer())) |
14516
842a9179132c
color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com>
parents:
12865
diff
changeset
|
19 |
842a9179132c
color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com>
parents:
12865
diff
changeset
|
20 # test dispatch.dispatch with the same ui object |
842a9179132c
color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com>
parents:
12865
diff
changeset
|
21 hgrc = open(os.environ["HGRCPATH"], 'w') |
842a9179132c
color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com>
parents:
12865
diff
changeset
|
22 hgrc.write('[extensions]\n') |
842a9179132c
color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com>
parents:
12865
diff
changeset
|
23 hgrc.write('color=\n') |
842a9179132c
color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com>
parents:
12865
diff
changeset
|
24 hgrc.close() |
842a9179132c
color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com>
parents:
12865
diff
changeset
|
25 |
28915
40afa22bee9b
tests: make test-ui-color use absolute_import
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28682
diff
changeset
|
26 ui_ = uimod.ui() |
14516
842a9179132c
color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com>
parents:
12865
diff
changeset
|
27 ui_.setconfig('ui', 'formatted', 'True') |
842a9179132c
color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com>
parents:
12865
diff
changeset
|
28 |
14614
afccc64eea73
ui: use I/O descriptors internally
Idan Kamara <idankk86@gmail.com>
parents:
14516
diff
changeset
|
29 # we're not interested in the output, so write that to devnull |
afccc64eea73
ui: use I/O descriptors internally
Idan Kamara <idankk86@gmail.com>
parents:
14516
diff
changeset
|
30 ui_.fout = open(os.devnull, 'w') |
afccc64eea73
ui: use I/O descriptors internally
Idan Kamara <idankk86@gmail.com>
parents:
14516
diff
changeset
|
31 |
14516
842a9179132c
color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com>
parents:
12865
diff
changeset
|
32 # call some arbitrary command just so we go through |
842a9179132c
color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com>
parents:
12865
diff
changeset
|
33 # color's wrapped _runcommand twice. |
842a9179132c
color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com>
parents:
12865
diff
changeset
|
34 def runcmd(): |
842a9179132c
color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com>
parents:
12865
diff
changeset
|
35 dispatch.dispatch(dispatch.request(['version', '-q'], ui_)) |
842a9179132c
color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com>
parents:
12865
diff
changeset
|
36 |
842a9179132c
color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com>
parents:
12865
diff
changeset
|
37 runcmd() |
28682
2e5be704bc96
py3: make test-ui-color use print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
19322
diff
changeset
|
38 print("colored? " + str(issubclass(ui_.__class__, color.colorui))) |
14516
842a9179132c
color: check if ui is already a subclass of colorui before wrapping it
Idan Kamara <idankk86@gmail.com>
parents:
12865
diff
changeset
|
39 runcmd() |
28682
2e5be704bc96
py3: make test-ui-color use print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
19322
diff
changeset
|
40 print("colored? " + str(issubclass(ui_.__class__, color.colorui))) |