Mercurial > hg
annotate tests/test-bugzilla.t @ 39473:b6db2e80a9ce
ancestors: actually iterate over ancestors in topological order (issue5979)
This code previously used a dequeue logic, the first ancestors seen were the
first ancestors to be emitted. In branching/merging situations, it can result
in ancestors being yielded before their descendants, breaking the object
contract.
We got affected by this issue while working on the copy tracing code. At about
the same time, Axel Hecht <axel@mozilla.com> reported the issue and provided
the test case used in this changeset. Thanks Axel.
Running `hg perfancestors` does not show a significant difference between the
old and the new version.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Thu, 06 Sep 2018 17:00:28 -0400 |
parents | fc3cca406b2e |
children | 7370f302be71 |
rev | line source |
---|---|
28950
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
1 mock bugzilla driver for testing template output: |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
2 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
3 $ cat <<EOF > bzmock.py |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
4 > from __future__ import absolute_import |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
5 > from mercurial import extensions |
33432
fbfecd1dbfb5
configitems: register the 'bugzilla.mocklog' config
Boris Feld <boris.feld@octobus.net>
parents:
29102
diff
changeset
|
6 > from mercurial import registrar |
28950
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
7 > |
33432
fbfecd1dbfb5
configitems: register the 'bugzilla.mocklog' config
Boris Feld <boris.feld@octobus.net>
parents:
29102
diff
changeset
|
8 > configtable = {} |
fbfecd1dbfb5
configitems: register the 'bugzilla.mocklog' config
Boris Feld <boris.feld@octobus.net>
parents:
29102
diff
changeset
|
9 > configitem = registrar.configitem(configtable) |
fbfecd1dbfb5
configitems: register the 'bugzilla.mocklog' config
Boris Feld <boris.feld@octobus.net>
parents:
29102
diff
changeset
|
10 > |
38070
fc3cca406b2e
py3: add b'' prefixes in tests/test-bugzilla.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
11 > configitem(b'bugzilla', b'mocklog', |
33432
fbfecd1dbfb5
configitems: register the 'bugzilla.mocklog' config
Boris Feld <boris.feld@octobus.net>
parents:
29102
diff
changeset
|
12 > default=None, |
fbfecd1dbfb5
configitems: register the 'bugzilla.mocklog' config
Boris Feld <boris.feld@octobus.net>
parents:
29102
diff
changeset
|
13 > ) |
28950
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
14 > def extsetup(ui): |
38070
fc3cca406b2e
py3: add b'' prefixes in tests/test-bugzilla.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
15 > bugzilla = extensions.find(b'bugzilla') |
28950
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
16 > class bzmock(bugzilla.bzaccess): |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
17 > def __init__(self, ui): |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
18 > super(bzmock, self).__init__(ui) |
38070
fc3cca406b2e
py3: add b'' prefixes in tests/test-bugzilla.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
19 > self._logfile = ui.config(b'bugzilla', b'mocklog') |
28950
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
20 > def updatebug(self, bugid, newstate, text, committer): |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
21 > with open(self._logfile, 'a') as f: |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
22 > f.write('update bugid=%r, newstate=%r, committer=%r\n' |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
23 > % (bugid, newstate, committer)) |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
24 > f.write('----\n' + text + '\n----\n') |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
25 > def notify(self, bugs, committer): |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
26 > with open(self._logfile, 'a') as f: |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
27 > f.write('notify bugs=%r, committer=%r\n' |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
28 > % (bugs, committer)) |
38070
fc3cca406b2e
py3: add b'' prefixes in tests/test-bugzilla.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
29 > bugzilla.bugzilla._versions[b'mock'] = bzmock |
28950
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
30 > EOF |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
31 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
32 set up mock repository: |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
33 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
34 $ hg init mockremote |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
35 $ cat <<EOF > mockremote/.hg/hgrc |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
36 > [extensions] |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
37 > bugzilla = |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
38 > bzmock = $TESTTMP/bzmock.py |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
39 > |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
40 > [bugzilla] |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
41 > version = mock |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
42 > mocklog = $TESTTMP/bzmock.log |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
43 > |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
44 > [hooks] |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
45 > incoming.bugzilla = python:hgext.bugzilla.hook |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
46 > |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
47 > [web] |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
48 > baseurl=http://example.org/hg |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
49 > |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
50 > %include $TESTTMP/bzstyle.hgrc |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
51 > EOF |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
52 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
53 $ hg clone -q mockremote mocklocal |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
54 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
55 push with default template: |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
56 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
57 $ echo '[bugzilla]' > bzstyle.hgrc |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
58 $ echo foo > mocklocal/foo |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
59 $ hg ci -R mocklocal -Aqm 'Fixes bug 123' |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
60 $ hg -R mocklocal push -q |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
61 $ cat bzmock.log && rm bzmock.log |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
62 update bugid=123, newstate={}, committer='test' |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
63 ---- |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
33432
diff
changeset
|
64 changeset 7875a8342c6f in repo $TESTTMP/mockremote refers to bug 123. |
28950
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
65 details: |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
66 Fixes bug 123 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
67 ---- |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
68 notify bugs={123: {}}, committer='test' |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
69 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
70 push with style: |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
71 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
72 $ cat <<EOF > bzstyle.map |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
73 > changeset = "{node|short} refers to bug {bug}." |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
74 > EOF |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
75 $ echo "style = $TESTTMP/bzstyle.map" >> bzstyle.hgrc |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
76 $ echo foo >> mocklocal/foo |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
77 $ hg ci -R mocklocal -qm 'Fixes bug 456' |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
78 $ hg -R mocklocal push -q |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
79 $ cat bzmock.log && rm bzmock.log |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
80 update bugid=456, newstate={}, committer='test' |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
81 ---- |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
82 2808b172464b refers to bug 456. |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
83 ---- |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
84 notify bugs={456: {}}, committer='test' |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
85 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
86 push with template (overrides style): |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
87 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
88 $ cat <<EOF >> bzstyle.hgrc |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
89 > template = Changeset {node|short} in {root|basename}. |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
90 > {hgweb}/rev/{node|short}\n |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
91 > {desc} |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
92 > EOF |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
93 $ echo foo >> mocklocal/foo |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
94 $ hg ci -R mocklocal -qm 'Fixes bug 789' |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
95 $ hg -R mocklocal push -q |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
96 $ cat bzmock.log && rm bzmock.log |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
97 update bugid=789, newstate={}, committer='test' |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
98 ---- |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
99 Changeset a770f3e409f2 in mockremote. |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
100 http://example.org/hg/rev/a770f3e409f2 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
101 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
102 Fixes bug 789 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
103 ---- |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
104 notify bugs={789: {}}, committer='test' |