Mercurial > hg
annotate tests/test-bugzilla.t @ 44984:bfef35bb4ecb
absorb: preserve branch-closing changesets even if empty
This makes the behavior consistent with 'hg commit', which allows to create
otherwise empty changesets if they close the branch. A lost branch closure can
inadvertently re-open a branch, so it should be preserved.
author | Manuel Jacob <me@manueljacob.de> |
---|---|
date | Mon, 01 Jun 2020 11:07:33 +0200 |
parents | 7370f302be71 |
children | 42d2b31cee0b |
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 |
41343
7370f302be71
py3: port test-bugzilla.t to Python 3
Augie Fackler <augie@google.com>
parents:
38070
diff
changeset
|
6 > from mercurial import pycompat |
33432
fbfecd1dbfb5
configitems: register the 'bugzilla.mocklog' config
Boris Feld <boris.feld@octobus.net>
parents:
29102
diff
changeset
|
7 > from mercurial import registrar |
41343
7370f302be71
py3: port test-bugzilla.t to Python 3
Augie Fackler <augie@google.com>
parents:
38070
diff
changeset
|
8 > from mercurial.utils import stringutil |
28950
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
9 > |
33432
fbfecd1dbfb5
configitems: register the 'bugzilla.mocklog' config
Boris Feld <boris.feld@octobus.net>
parents:
29102
diff
changeset
|
10 > configtable = {} |
fbfecd1dbfb5
configitems: register the 'bugzilla.mocklog' config
Boris Feld <boris.feld@octobus.net>
parents:
29102
diff
changeset
|
11 > configitem = registrar.configitem(configtable) |
fbfecd1dbfb5
configitems: register the 'bugzilla.mocklog' config
Boris Feld <boris.feld@octobus.net>
parents:
29102
diff
changeset
|
12 > |
38070
fc3cca406b2e
py3: add b'' prefixes in tests/test-bugzilla.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
13 > configitem(b'bugzilla', b'mocklog', |
33432
fbfecd1dbfb5
configitems: register the 'bugzilla.mocklog' config
Boris Feld <boris.feld@octobus.net>
parents:
29102
diff
changeset
|
14 > default=None, |
fbfecd1dbfb5
configitems: register the 'bugzilla.mocklog' config
Boris Feld <boris.feld@octobus.net>
parents:
29102
diff
changeset
|
15 > ) |
28950
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
16 > def extsetup(ui): |
38070
fc3cca406b2e
py3: add b'' prefixes in tests/test-bugzilla.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
17 > 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
|
18 > class bzmock(bugzilla.bzaccess): |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
19 > def __init__(self, ui): |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
20 > 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
|
21 > 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
|
22 > def updatebug(self, bugid, newstate, text, committer): |
41343
7370f302be71
py3: port test-bugzilla.t to Python 3
Augie Fackler <augie@google.com>
parents:
38070
diff
changeset
|
23 > with open(pycompat.fsdecode(self._logfile), 'ab') as f: |
7370f302be71
py3: port test-bugzilla.t to Python 3
Augie Fackler <augie@google.com>
parents:
38070
diff
changeset
|
24 > f.write(b'update bugid=%s, newstate=%s, committer=%s\n' |
7370f302be71
py3: port test-bugzilla.t to Python 3
Augie Fackler <augie@google.com>
parents:
38070
diff
changeset
|
25 > % (stringutil.pprint(bugid), |
7370f302be71
py3: port test-bugzilla.t to Python 3
Augie Fackler <augie@google.com>
parents:
38070
diff
changeset
|
26 > stringutil.pprint(newstate), |
7370f302be71
py3: port test-bugzilla.t to Python 3
Augie Fackler <augie@google.com>
parents:
38070
diff
changeset
|
27 > stringutil.pprint(committer))) |
7370f302be71
py3: port test-bugzilla.t to Python 3
Augie Fackler <augie@google.com>
parents:
38070
diff
changeset
|
28 > f.write(b'----\n' + text + b'\n----\n') |
28950
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
29 > def notify(self, bugs, committer): |
41343
7370f302be71
py3: port test-bugzilla.t to Python 3
Augie Fackler <augie@google.com>
parents:
38070
diff
changeset
|
30 > with open(pycompat.fsdecode(self._logfile), 'ab') as f: |
7370f302be71
py3: port test-bugzilla.t to Python 3
Augie Fackler <augie@google.com>
parents:
38070
diff
changeset
|
31 > f.write(b'notify bugs=%s, committer=%s\n' |
7370f302be71
py3: port test-bugzilla.t to Python 3
Augie Fackler <augie@google.com>
parents:
38070
diff
changeset
|
32 > % (stringutil.pprint(bugs), |
7370f302be71
py3: port test-bugzilla.t to Python 3
Augie Fackler <augie@google.com>
parents:
38070
diff
changeset
|
33 > stringutil.pprint(committer))) |
38070
fc3cca406b2e
py3: add b'' prefixes in tests/test-bugzilla.t
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
34 > 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
|
35 > EOF |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
36 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
37 set up mock repository: |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
38 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
39 $ hg init mockremote |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
40 $ 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
|
41 > [extensions] |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
42 > bugzilla = |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
43 > bzmock = $TESTTMP/bzmock.py |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
44 > |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
45 > [bugzilla] |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
46 > version = mock |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
47 > mocklog = $TESTTMP/bzmock.log |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
48 > |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
49 > [hooks] |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
50 > 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
|
51 > |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
52 > [web] |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
53 > 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
|
54 > |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
55 > %include $TESTTMP/bzstyle.hgrc |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
56 > EOF |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
57 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
58 $ 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
|
59 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
60 push with default template: |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
61 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
62 $ echo '[bugzilla]' > bzstyle.hgrc |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
63 $ echo foo > mocklocal/foo |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
64 $ 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
|
65 $ 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
|
66 $ 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
|
67 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
|
68 ---- |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
33432
diff
changeset
|
69 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
|
70 details: |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
71 Fixes bug 123 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
72 ---- |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
73 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
|
74 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
75 push with style: |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
76 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
77 $ cat <<EOF > bzstyle.map |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
78 > 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
|
79 > EOF |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
80 $ 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
|
81 $ echo foo >> mocklocal/foo |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
82 $ 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
|
83 $ 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
|
84 $ 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
|
85 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
|
86 ---- |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
87 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
|
88 ---- |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
89 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
|
90 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
91 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
|
92 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
93 $ cat <<EOF >> bzstyle.hgrc |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
94 > 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
|
95 > {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
|
96 > {desc} |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
97 > EOF |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
98 $ echo foo >> mocklocal/foo |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
99 $ 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
|
100 $ 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
|
101 $ 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
|
102 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
|
103 ---- |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
104 Changeset a770f3e409f2 in mockremote. |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
105 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
|
106 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
107 Fixes bug 789 |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
108 ---- |
9e1c9f016b72
bugzilla: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
diff
changeset
|
109 notify bugs={789: {}}, committer='test' |