Mercurial > hg
annotate tests/test-notify.t @ 48876:42d2b31cee0b
tests: remove from __future__ from inline Python in tests
This is no longer required since we require Python 3 and the linter
no longer requires these statements.
Differential Revision: https://phab.mercurial-scm.org/D12255
author | Gregory Szorc <gregory.szorc@gmail.com> |
---|---|
date | Sun, 20 Feb 2022 15:28:44 -0700 |
parents | af0b21d5a930 |
children | fe3303436b79 |
rev | line source |
---|---|
33718
fa9f7b5d4397
tests: fix test-notify.t to use $PYTHON
Augie Fackler <augie@google.com>
parents:
29102
diff
changeset
|
1 $ cat > $TESTTMP/filter.py <<EOF |
44655
47e6ec977555
tests: prevent printing \r to stdout
Gregory Szorc <gregory.szorc@gmail.com>
parents:
44627
diff
changeset
|
2 > import io |
33969
cefad71d1a45
tests: update test-notify to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33718
diff
changeset
|
3 > import re |
cefad71d1a45
tests: update test-notify to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
33718
diff
changeset
|
4 > import sys |
44655
47e6ec977555
tests: prevent printing \r to stdout
Gregory Szorc <gregory.szorc@gmail.com>
parents:
44627
diff
changeset
|
5 > if sys.version_info[0] >= 3: |
47e6ec977555
tests: prevent printing \r to stdout
Gregory Szorc <gregory.szorc@gmail.com>
parents:
44627
diff
changeset
|
6 > sys.stdout = io.TextIOWrapper( |
47e6ec977555
tests: prevent printing \r to stdout
Gregory Szorc <gregory.szorc@gmail.com>
parents:
44627
diff
changeset
|
7 > sys.stdout.buffer, |
47e6ec977555
tests: prevent printing \r to stdout
Gregory Szorc <gregory.szorc@gmail.com>
parents:
44627
diff
changeset
|
8 > sys.stdout.encoding, |
47e6ec977555
tests: prevent printing \r to stdout
Gregory Szorc <gregory.szorc@gmail.com>
parents:
44627
diff
changeset
|
9 > sys.stdout.errors, |
47e6ec977555
tests: prevent printing \r to stdout
Gregory Szorc <gregory.szorc@gmail.com>
parents:
44627
diff
changeset
|
10 > newline="\n", |
47e6ec977555
tests: prevent printing \r to stdout
Gregory Szorc <gregory.szorc@gmail.com>
parents:
44627
diff
changeset
|
11 > line_buffering=sys.stdout.line_buffering, |
47e6ec977555
tests: prevent printing \r to stdout
Gregory Szorc <gregory.szorc@gmail.com>
parents:
44627
diff
changeset
|
12 > ) |
33718
fa9f7b5d4397
tests: fix test-notify.t to use $PYTHON
Augie Fackler <augie@google.com>
parents:
29102
diff
changeset
|
13 > print(re.sub("\n[ \t]", " ", sys.stdin.read()), end="") |
fa9f7b5d4397
tests: fix test-notify.t to use $PYTHON
Augie Fackler <augie@google.com>
parents:
29102
diff
changeset
|
14 > EOF |
3740
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
15 |
12473 | 16 $ cat <<EOF >> $HGRCPATH |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
17 > [experimental] |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
18 > evolution = true |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
19 > |
12473 | 20 > [extensions] |
21 > notify= | |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
22 > strip= |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
23 > |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
24 > [phases] |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
25 > publish=False |
12473 | 26 > |
27 > [hooks] | |
28 > incoming.notify = python:hgext.notify.hook | |
29 > | |
30 > [notify] | |
31 > sources = pull | |
32 > diffstat = False | |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
33 > reply-to-predecessor = True |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
34 > messageidseed = notifyseed |
12473 | 35 > |
36 > [usersubs] | |
37 > foo@bar = * | |
38 > | |
39 > [reposubs] | |
40 > * = baz | |
41 > EOF | |
42 $ hg help notify | |
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
43 notify extension - hooks for sending email push notifications |
12473 | 44 |
16950
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
45 This extension implements hooks to send email notifications when changesets |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
46 are sent from or received by the local repository. |
12473 | 47 |
27729
58f8b29c37ff
minirst: change hgrole to use single quotes
timeless <timeless@mozdev.org>
parents:
22947
diff
changeset
|
48 First, enable the extension as explained in 'hg help extensions', and register |
16950
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
49 the hook you want to run. "incoming" and "changegroup" hooks are run when |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
50 changesets are received, while "outgoing" hooks are for changesets sent to |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
51 another repository: |
12473 | 52 |
53 [hooks] | |
54 # one email for each incoming changeset | |
55 incoming.notify = python:hgext.notify.hook | |
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
56 # one email for all incoming changesets |
12473 | 57 changegroup.notify = python:hgext.notify.hook |
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
58 |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
59 # one email for all outgoing changesets |
14617
23f4e1e40988
notify: send changesets on 'outgoing' hook, updated doc
Ingo Bressler <dev@ingobressler.net>
parents:
14162
diff
changeset
|
60 outgoing.notify = python:hgext.notify.hook |
12473 | 61 |
16950
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
62 This registers the hooks. To enable notification, subscribers must be assigned |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
63 to repositories. The "[usersubs]" section maps multiple repositories to a |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
64 given recipient. The "[reposubs]" section maps multiple recipients to a single |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
65 repository: |
12473 | 66 |
67 [usersubs] | |
17754
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
68 # key is subscriber email, value is a comma-separated list of repo patterns |
12473 | 69 user@host = pattern |
70 | |
71 [reposubs] | |
17754
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
72 # key is repo pattern, value is a comma-separated list of subscriber emails |
12473 | 73 pattern = user@host |
74 | |
17754
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
75 A "pattern" is a "glob" matching the absolute path to a repository, optionally |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
76 combined with a revset expression. A revset expression, if present, is |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
77 separated from the glob by a hash. Example: |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
78 |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
79 [reposubs] |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
80 */widgets#branch(release) = qa-team@example.com |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
81 |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
82 This sends to "qa-team@example.com" whenever a changeset on the "release" |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
83 branch triggers a notification in any repository ending in "widgets". |
16950
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
84 |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
85 In order to place them under direct user management, "[usersubs]" and |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
86 "[reposubs]" sections may be placed in a separate "hgrc" file and incorporated |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
87 by reference: |
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
88 |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
89 [notify] |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
90 config = /path/to/subscriptionsfile |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
91 |
16950
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
92 Notifications will not be sent until the "notify.test" value is set to |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
93 "False"; see below. |
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
94 |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
95 Notifications content can be tweaked with the following configuration entries: |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
96 |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
97 notify.test |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
98 If "True", print messages to stdout instead of sending them. Default: True. |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
99 |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
100 notify.sources |
16950
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
101 Space-separated list of change sources. Notifications are activated only |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
102 when a changeset's source is in this list. Sources may be: |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
103 |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
104 "serve" changesets received via http or ssh |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
105 "pull" changesets received via "hg pull" |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
106 "unbundle" changesets received via "hg unbundle" |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
107 "push" changesets sent or received via "hg push" |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
108 "bundle" changesets sent via "hg unbundle" |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
109 |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
110 Default: serve. |
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
111 |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
112 notify.strip |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
113 Number of leading slashes to strip from url paths. By default, notifications |
16950
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
114 reference repositories with their absolute path. "notify.strip" lets you |
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
115 turn them into relative paths. For example, "notify.strip=3" will change |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
116 "/long/path/repository" into "repository". Default: 0. |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
117 |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
118 notify.domain |
42904
d26a6706b070
notify: add option for deterministic message-id generation
Joerg Sonnenberger <joerg@bec.de>
parents:
41526
diff
changeset
|
119 Default email domain for sender or recipients with no explicit domain. It is |
d26a6706b070
notify: add option for deterministic message-id generation
Joerg Sonnenberger <joerg@bec.de>
parents:
41526
diff
changeset
|
120 also used for the domain part of the "Message-Id" when using |
d26a6706b070
notify: add option for deterministic message-id generation
Joerg Sonnenberger <joerg@bec.de>
parents:
41526
diff
changeset
|
121 "notify.messageidseed". |
d26a6706b070
notify: add option for deterministic message-id generation
Joerg Sonnenberger <joerg@bec.de>
parents:
41526
diff
changeset
|
122 |
d26a6706b070
notify: add option for deterministic message-id generation
Joerg Sonnenberger <joerg@bec.de>
parents:
41526
diff
changeset
|
123 notify.messageidseed |
d26a6706b070
notify: add option for deterministic message-id generation
Joerg Sonnenberger <joerg@bec.de>
parents:
41526
diff
changeset
|
124 Create deterministic "Message-Id" headers for the mails based on the seed |
d26a6706b070
notify: add option for deterministic message-id generation
Joerg Sonnenberger <joerg@bec.de>
parents:
41526
diff
changeset
|
125 and the revision identifier of the first commit in the changeset. |
12473 | 126 |
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
127 notify.style |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
128 Style file to use when formatting emails. |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
129 |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
130 notify.template |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
131 Template to use when formatting emails. |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
132 |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
133 notify.incoming |
16950
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
134 Template to use when run as an incoming hook, overriding "notify.template". |
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
135 |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
136 notify.outgoing |
16950
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
137 Template to use when run as an outgoing hook, overriding "notify.template". |
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
138 |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
139 notify.changegroup |
16950
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
140 Template to use when running as a changegroup hook, overriding |
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
141 "notify.template". |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
142 |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
143 notify.maxdiff |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
144 Maximum number of diff lines to include in notification email. Set to 0 to |
16950
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
145 disable the diff, or -1 to include all of it. Default: 300. |
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
146 |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
147 notify.maxdiffstat |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
148 Maximum number of diffstat lines to include in notification email. Set to -1 |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
149 to include all of it. Default: -1. |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
150 |
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
151 notify.maxsubject |
16950
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
152 Maximum number of characters in email's subject line. Default: 67. |
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
153 |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
154 notify.diffstat |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
155 Set to True to include a diffstat before diff content. Default: True. |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
156 |
38028
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
157 notify.showfunc |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
158 If set, override "diff.showfunc" for the diff content. Default: None. |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
159 |
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
160 notify.merge |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
161 If True, send notifications for merge changesets. Default: True. |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
162 |
15561
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
163 notify.mbox |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
164 If set, append mails to this mbox file instead of sending. Default: None. |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
165 |
15654
2a7fa7c641d8
notify: change behavior of "changegroup" hook
Nikolaus Schueler <nikolaus.schueler@lantiq.com>
parents:
15562
diff
changeset
|
166 notify.fromauthor |
16950
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
167 If set, use the committer of the first changeset in a changegroup for the |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
168 "From" field of the notification mail. If not set, take the user from the |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
169 pushing repo. Default: False. |
15654
2a7fa7c641d8
notify: change behavior of "changegroup" hook
Nikolaus Schueler <nikolaus.schueler@lantiq.com>
parents:
15562
diff
changeset
|
170 |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
171 notify.reply-to-predecessor (EXPERIMENTAL) |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
172 If set and the changeset has a predecessor in the repository, try to thread |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
173 the notification mail with the predecessor. This adds the "In-Reply-To" |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
174 header to the notification mail with a reference to the predecessor with the |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
175 smallest revision number. Mail threads can still be torn, especially when |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
176 changesets are folded. |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
177 |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
178 This option must be used in combination with "notify.messageidseed". |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
179 |
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
180 If set, the following entries will also be used to customize the |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
181 notifications: |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
182 |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
183 email.from |
16950
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
184 Email "From" address to use if none can be found in the generated email |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
185 content. |
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
186 |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
187 web.baseurl |
16950
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
188 Root repository URL to combine with repository paths when making references. |
0fdd8193c8b5
notify: various fixes to docstring
David Champion <dgc@uchicago.edu>
parents:
16500
diff
changeset
|
189 See also "notify.strip". |
12473 | 190 |
191 no commands defined | |
192 $ hg init a | |
193 $ echo a > a/a | |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
194 $ echo b > a/b |
3740
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
195 |
12473 | 196 commit |
197 | |
198 $ hg --cwd a commit -Ama -d '0 0' | |
199 adding a | |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
200 adding b |
12473 | 201 |
202 clone | |
203 | |
204 $ hg --traceback clone a b | |
205 updating to branch default | |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
206 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12473 | 207 $ echo a >> a/a |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
208 $ echo b >> a/b |
12473 | 209 |
210 commit | |
211 | |
212 $ hg --traceback --cwd a commit -Amb -d '1 0' | |
213 | |
214 on Mac OS X 10.5 the tmp path is very long so would get stripped in the subject line | |
215 | |
216 $ cat <<EOF >> $HGRCPATH | |
217 > [notify] | |
218 > maxsubject = 200 | |
219 > EOF | |
220 | |
221 the python call below wraps continuation lines, which appear on Mac OS X 10.5 because | |
222 of the very long subject line | |
223 pull (minimal config) | |
6359
25e74cd3f023
test-notify: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
4517
diff
changeset
|
224 |
43334
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
225 $ hg --traceback --cwd b --config notify.domain=example.com --config notify.messageidseed=example pull ../a | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
226 > "$PYTHON" $TESTDIR/unwrap-message-id.py | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
227 > "$PYTHON" $TESTTMP/filter.py |
12473 | 228 pulling from ../a |
229 searching for changes | |
230 adding changesets | |
231 adding manifests | |
232 adding file changes | |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
233 added 1 changesets with 2 changes to 2 files |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
234 new changesets 00a13f371396 (1 drafts) |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
33969
diff
changeset
|
235 MIME-Version: 1.0 |
12473 | 236 Content-Type: text/plain; charset="us-ascii" |
237 Content-Transfer-Encoding: 7bit | |
238 Date: * (glob) | |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12473
diff
changeset
|
239 Subject: changeset in $TESTTMP/b: b |
42904
d26a6706b070
notify: add option for deterministic message-id generation
Joerg Sonnenberger <joerg@bec.de>
parents:
41526
diff
changeset
|
240 From: test@example.com |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
241 X-Hg-Notification: changeset 00a13f371396 |
43334
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
242 Message-Id: <hg.ba3098a36bd4c297288d16788623a841f81f618ea961a0f0fd65de7eb1191b66@example.com> |
42904
d26a6706b070
notify: add option for deterministic message-id generation
Joerg Sonnenberger <joerg@bec.de>
parents:
41526
diff
changeset
|
243 To: baz@example.com, foo@bar |
12473 | 244 |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
245 changeset 00a13f371396 in $TESTTMP/b |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
246 details: $TESTTMP/b?cmd=changeset;node=00a13f371396 |
12473 | 247 description: b |
248 | |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
249 diffs (12 lines): |
12473 | 250 |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
251 diff -r 0cd96de13884 -r 00a13f371396 a |
12473 | 252 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
253 +++ b/a Thu Jan 01 00:00:01 1970 +0000 | |
12646
624859bf4314
test-notify: fix fix for line continuation in long mail header lines
Mads Kiilerich <mads@kiilerich.com>
parents:
12644
diff
changeset
|
254 @@ -1,1 +1,2 @@ a |
12473 | 255 +a |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
256 diff -r 0cd96de13884 -r 00a13f371396 b |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
257 --- a/b Thu Jan 01 00:00:00 1970 +0000 |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
258 +++ b/b Thu Jan 01 00:00:01 1970 +0000 |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
259 @@ -1,1 +1,2 @@ b |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
260 +b |
12473 | 261 (run 'hg update' to get a working copy) |
33718
fa9f7b5d4397
tests: fix test-notify.t to use $PYTHON
Augie Fackler <augie@google.com>
parents:
29102
diff
changeset
|
262 |
12473 | 263 $ cat <<EOF >> $HGRCPATH |
264 > [notify] | |
12642
bb35840e965c
tests: remove the last traces of $HGTMP
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
265 > config = `pwd`/.notify.conf |
12473 | 266 > domain = test.com |
12644
0490d2223882
test-notify: stabilize output
Mads Kiilerich <mads@kiilerich.com>
parents:
12642
diff
changeset
|
267 > strip = 42 |
12473 | 268 > template = Subject: {desc|firstline|strip}\nFrom: {author}\nX-Test: foo\n\nchangeset {node|short} in {webroot}\ndescription:\n\t{desc|tabindent|strip} |
269 > | |
270 > [web] | |
271 > baseurl = http://test/ | |
272 > EOF | |
4094
fbf0e9acfd83
notify: don't try to fix addresses if notify.domain is not set
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4009
diff
changeset
|
273 |
12473 | 274 fail for config file is missing |
4094
fbf0e9acfd83
notify: don't try to fix addresses if notify.domain is not set
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4009
diff
changeset
|
275 |
12473 | 276 $ hg --cwd b rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13225
diff
changeset
|
277 repository tip rolled back to revision 0 (undo pull) |
12473 | 278 $ hg --cwd b pull ../a 2>&1 | grep 'error.*\.notify\.conf' > /dev/null && echo pull failed |
279 pull failed | |
12642
bb35840e965c
tests: remove the last traces of $HGTMP
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
280 $ touch ".notify.conf" |
12473 | 281 |
282 pull | |
4094
fbf0e9acfd83
notify: don't try to fix addresses if notify.domain is not set
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4009
diff
changeset
|
283 |
12473 | 284 $ hg --cwd b rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13225
diff
changeset
|
285 repository tip rolled back to revision 0 (undo pull) |
43334
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
286 $ hg --traceback --cwd b pull ../a | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
287 > "$PYTHON" $TESTDIR/unwrap-message-id.py | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
288 > "$PYTHON" $TESTTMP/filter.py |
12473 | 289 pulling from ../a |
290 searching for changes | |
291 adding changesets | |
292 adding manifests | |
293 adding file changes | |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
294 added 1 changesets with 2 changes to 2 files |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
295 new changesets 00a13f371396 (1 drafts) |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
33969
diff
changeset
|
296 MIME-Version: 1.0 |
12473 | 297 Content-Type: text/plain; charset="us-ascii" |
298 Content-Transfer-Encoding: 7bit | |
299 X-Test: foo | |
300 Date: * (glob) | |
301 Subject: b | |
302 From: test@test.com | |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
303 X-Hg-Notification: changeset 00a13f371396 |
12473 | 304 Message-Id: <*> (glob) |
305 To: baz@test.com, foo@bar | |
306 | |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
307 changeset 00a13f371396 in b |
12473 | 308 description: b |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
309 diffs (12 lines): |
12473 | 310 |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
311 diff -r 0cd96de13884 -r 00a13f371396 a |
12473 | 312 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
313 +++ b/a Thu Jan 01 00:00:01 1970 +0000 | |
33718
fa9f7b5d4397
tests: fix test-notify.t to use $PYTHON
Augie Fackler <augie@google.com>
parents:
29102
diff
changeset
|
314 @@ -1,1 +1,2 @@ a |
12473 | 315 +a |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
316 diff -r 0cd96de13884 -r 00a13f371396 b |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
317 --- a/b Thu Jan 01 00:00:00 1970 +0000 |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
318 +++ b/b Thu Jan 01 00:00:01 1970 +0000 |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
319 @@ -1,1 +1,2 @@ b |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
320 +b |
12473 | 321 (run 'hg update' to get a working copy) |
4517
5371a213b0f4
ui: make readsections() abort when configuration cannot be read.
Patrick Mezard <pmezard@gmail.com>
parents:
4479
diff
changeset
|
322 |
12473 | 323 $ cat << EOF >> $HGRCPATH |
324 > [hooks] | |
325 > incoming.notify = python:hgext.notify.hook | |
326 > | |
327 > [notify] | |
328 > sources = pull | |
329 > diffstat = True | |
330 > EOF | |
331 | |
332 pull | |
4094
fbf0e9acfd83
notify: don't try to fix addresses if notify.domain is not set
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4009
diff
changeset
|
333 |
12473 | 334 $ hg --cwd b rollback |
13446
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13225
diff
changeset
|
335 repository tip rolled back to revision 0 (undo pull) |
43334
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
336 $ hg --traceback --config notify.maxdiffstat=1 --cwd b pull ../a | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
337 > "$PYTHON" $TESTDIR/unwrap-message-id.py | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
338 > "$PYTHON" $TESTTMP/filter.py |
12473 | 339 pulling from ../a |
340 searching for changes | |
341 adding changesets | |
342 adding manifests | |
343 adding file changes | |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
344 added 1 changesets with 2 changes to 2 files |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
345 new changesets 00a13f371396 (1 drafts) |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
33969
diff
changeset
|
346 MIME-Version: 1.0 |
12473 | 347 Content-Type: text/plain; charset="us-ascii" |
348 Content-Transfer-Encoding: 7bit | |
349 X-Test: foo | |
350 Date: * (glob) | |
351 Subject: b | |
352 From: test@test.com | |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
353 X-Hg-Notification: changeset 00a13f371396 |
12473 | 354 Message-Id: <*> (glob) |
355 To: baz@test.com, foo@bar | |
356 | |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
357 changeset 00a13f371396 in b |
12473 | 358 description: b |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
359 diffstat (truncated from 2 to 1 lines): |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
360 a | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) |
12473 | 361 |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
362 diffs (12 lines): |
12473 | 363 |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
364 diff -r 0cd96de13884 -r 00a13f371396 a |
12473 | 365 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
366 +++ b/a Thu Jan 01 00:00:01 1970 +0000 | |
33718
fa9f7b5d4397
tests: fix test-notify.t to use $PYTHON
Augie Fackler <augie@google.com>
parents:
29102
diff
changeset
|
367 @@ -1,1 +1,2 @@ a |
12473 | 368 +a |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
369 diff -r 0cd96de13884 -r 00a13f371396 b |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
370 --- a/b Thu Jan 01 00:00:00 1970 +0000 |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
371 +++ b/b Thu Jan 01 00:00:01 1970 +0000 |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
372 @@ -1,1 +1,2 @@ b |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
373 +b |
12473 | 374 (run 'hg update' to get a working copy) |
7105
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
375 |
12473 | 376 test merge |
7105
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
377 |
12473 | 378 $ cd a |
379 $ hg up -C 0 | |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
380 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12473 | 381 $ echo a >> a |
382 $ hg ci -Am adda2 -d '2 0' | |
383 created new head | |
384 $ hg merge | |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
385 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12473 | 386 (branch merge, don't forget to commit) |
387 $ hg ci -m merge -d '3 0' | |
388 $ cd .. | |
43334
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
389 $ hg --traceback --cwd b pull ../a | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
390 > "$PYTHON" $TESTDIR/unwrap-message-id.py | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
391 > "$PYTHON" $TESTTMP/filter.py |
12473 | 392 pulling from ../a |
393 searching for changes | |
394 adding changesets | |
395 adding manifests | |
396 adding file changes | |
397 added 2 changesets with 0 changes to 0 files | |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
398 new changesets 3332653e1f3c:fccf66cd0c35 (2 drafts) |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
33969
diff
changeset
|
399 MIME-Version: 1.0 |
12473 | 400 Content-Type: text/plain; charset="us-ascii" |
401 Content-Transfer-Encoding: 7bit | |
402 X-Test: foo | |
403 Date: * (glob) | |
404 Subject: adda2 | |
405 From: test@test.com | |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
406 X-Hg-Notification: changeset 3332653e1f3c |
12473 | 407 Message-Id: <*> (glob) |
408 To: baz@test.com, foo@bar | |
409 | |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
410 changeset 3332653e1f3c in b |
12473 | 411 description: adda2 |
412 diffstat: | |
33718
fa9f7b5d4397
tests: fix test-notify.t to use $PYTHON
Augie Fackler <augie@google.com>
parents:
29102
diff
changeset
|
413 a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) |
12473 | 414 |
415 diffs (6 lines): | |
416 | |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
417 diff -r 0cd96de13884 -r 3332653e1f3c a |
12473 | 418 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
419 +++ b/a Thu Jan 01 00:00:02 1970 +0000 | |
33718
fa9f7b5d4397
tests: fix test-notify.t to use $PYTHON
Augie Fackler <augie@google.com>
parents:
29102
diff
changeset
|
420 @@ -1,1 +1,2 @@ a |
12473 | 421 +a |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
33969
diff
changeset
|
422 MIME-Version: 1.0 |
12473 | 423 Content-Type: text/plain; charset="us-ascii" |
424 Content-Transfer-Encoding: 7bit | |
425 X-Test: foo | |
426 Date: * (glob) | |
427 Subject: merge | |
428 From: test@test.com | |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
429 X-Hg-Notification: changeset fccf66cd0c35 |
12473 | 430 Message-Id: <*> (glob) |
431 To: baz@test.com, foo@bar | |
432 | |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
433 changeset fccf66cd0c35 in b |
12473 | 434 description: merge |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
435 diffstat: |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
436 b | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
437 |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
438 diffs (6 lines): |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
439 |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
440 diff -r 3332653e1f3c -r fccf66cd0c35 b |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
441 --- a/b Thu Jan 01 00:00:02 1970 +0000 |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
442 +++ b/b Thu Jan 01 00:00:03 1970 +0000 |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
443 @@ -1,1 +1,2 @@ b |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
444 +b |
12473 | 445 (run 'hg update' to get a working copy) |
13225
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
446 |
15561
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
447 non-ascii content and truncation of multi-byte subject |
13225
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
448 |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
449 $ cat <<EOF >> $HGRCPATH |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
450 > [notify] |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
451 > maxsubject = 4 |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
452 > EOF |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
453 $ echo a >> a/a |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
454 $ hg --cwd a --encoding utf-8 commit -A -d '0 0' \ |
43331
90ee1f61504e
py3: fix generated non-ascii message in test-notify.t
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
43323
diff
changeset
|
455 > -m `"$PYTHON" -c 'import sys; getattr(sys.stdout, "buffer", sys.stdout).write(b"\xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4")'` |
13225
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
456 $ hg --traceback --cwd b --encoding utf-8 pull ../a | \ |
43334
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
457 > "$PYTHON" $TESTDIR/unwrap-message-id.py | \ |
39707
5abc47d4ca6b
tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents:
38028
diff
changeset
|
458 > "$PYTHON" $TESTTMP/filter.py |
13225
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
459 pulling from ../a |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
460 searching for changes |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
461 adding changesets |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
462 adding manifests |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
463 adding file changes |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
464 added 1 changesets with 1 changes to 1 files |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
465 new changesets 0f25f9c22b4c (1 drafts) |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
33969
diff
changeset
|
466 MIME-Version: 1.0 |
13225
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
467 Content-Type: text/plain; charset="us-ascii" |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
468 Content-Transfer-Encoding: 8bit |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
469 X-Test: foo |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
470 Date: * (glob) |
43331
90ee1f61504e
py3: fix generated non-ascii message in test-notify.t
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
43323
diff
changeset
|
471 Subject: =?utf-8?b?w6AuLi4=?= (py3 !) |
13225
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
472 From: test@test.com |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
473 X-Hg-Notification: changeset 0f25f9c22b4c |
13225
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
474 Message-Id: <*> (glob) |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
475 To: baz@test.com, foo@bar |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
476 |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
477 changeset 0f25f9c22b4c in b |
13225
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
478 description: \xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4 (esc) |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
479 diffstat: |
33718
fa9f7b5d4397
tests: fix test-notify.t to use $PYTHON
Augie Fackler <augie@google.com>
parents:
29102
diff
changeset
|
480 a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) |
13225
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
481 |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
482 diffs (7 lines): |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
483 |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
484 diff -r fccf66cd0c35 -r 0f25f9c22b4c a |
13225
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
485 --- a/a Thu Jan 01 00:00:03 1970 +0000 |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
486 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
33718
fa9f7b5d4397
tests: fix test-notify.t to use $PYTHON
Augie Fackler <augie@google.com>
parents:
29102
diff
changeset
|
487 @@ -1,2 +1,3 @@ a a |
13225
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
488 +a |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
489 (run 'hg update' to get a working copy) |
15561
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
490 |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
491 long lines |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
492 |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
493 $ cat <<EOF >> $HGRCPATH |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
494 > [notify] |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
495 > maxsubject = 67 |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
496 > test = False |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
497 > mbox = mbox |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
498 > EOF |
41526
1be7a9b994a2
py3: add some b'' prefixes in test-notify.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents:
39912
diff
changeset
|
499 $ "$PYTHON" -c 'open("a/a", "ab").write(b"no" * 500 + b"\xd1\x84" + b"\n")' |
15561
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
500 $ hg --cwd a commit -A -m "long line" |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
501 $ hg --traceback --cwd b pull ../a |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
502 pulling from ../a |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
503 searching for changes |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
504 adding changesets |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
505 adding manifests |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
506 adding file changes |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
507 added 1 changesets with 1 changes to 1 files |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
508 new changesets a846b5f6ebb7 (1 drafts) |
15561
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
509 notify: sending 2 subscribers 1 changes |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
510 (run 'hg update' to get a working copy) |
43334
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
511 $ cat b/mbox | "$PYTHON" $TESTDIR/unwrap-message-id.py | "$PYTHON" $TESTTMP/filter.py |
15561
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
512 From test@test.com ... ... .. ..:..:.. .... (re) |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
513 MIME-Version: 1.0 |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
33969
diff
changeset
|
514 Content-Type: text/plain; charset="*" (glob) |
15562
a82b6038ff08
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)
Mads Kiilerich <mads@kiilerich.com>
parents:
15561
diff
changeset
|
515 Content-Transfer-Encoding: quoted-printable |
15561
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
516 X-Test: foo |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
517 Date: * (glob) |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
518 Subject: long line |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
519 From: test@test.com |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
520 X-Hg-Notification: changeset a846b5f6ebb7 |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
521 Message-Id: <hg.e7dc7658565793ff33c797e72b7d1f3799347b042af3c40df6d17c8d5c3e560a@test.com> |
15561
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
522 To: baz@test.com, foo@bar |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
523 |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
524 changeset a846b5f6ebb7 in b |
15561
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
525 description: long line |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
526 diffstat: |
33718
fa9f7b5d4397
tests: fix test-notify.t to use $PYTHON
Augie Fackler <augie@google.com>
parents:
29102
diff
changeset
|
527 a | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) |
15561
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
528 |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
529 diffs (8 lines): |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
530 |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
531 diff -r 0f25f9c22b4c -r a846b5f6ebb7 a |
15561
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
532 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
533 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
33718
fa9f7b5d4397
tests: fix test-notify.t to use $PYTHON
Augie Fackler <augie@google.com>
parents:
29102
diff
changeset
|
534 @@ -1,3 +1,4 @@ a a a |
15562
a82b6038ff08
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)
Mads Kiilerich <mads@kiilerich.com>
parents:
15561
diff
changeset
|
535 +nonononononononononononononononononononononononononononononononononononono= |
a82b6038ff08
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)
Mads Kiilerich <mads@kiilerich.com>
parents:
15561
diff
changeset
|
536 nononononononononononononononononononononononononononononononononononononon= |
a82b6038ff08
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)
Mads Kiilerich <mads@kiilerich.com>
parents:
15561
diff
changeset
|
537 ononononononononononononononononononononononononononononononononononononono= |
a82b6038ff08
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)
Mads Kiilerich <mads@kiilerich.com>
parents:
15561
diff
changeset
|
538 nononononononononononononononononononononononononononononononononononononon= |
a82b6038ff08
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)
Mads Kiilerich <mads@kiilerich.com>
parents:
15561
diff
changeset
|
539 ononononononononononononononononononononononononononononononononononononono= |
a82b6038ff08
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)
Mads Kiilerich <mads@kiilerich.com>
parents:
15561
diff
changeset
|
540 nononononononononononononononononononononononononononononononononononononon= |
a82b6038ff08
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)
Mads Kiilerich <mads@kiilerich.com>
parents:
15561
diff
changeset
|
541 ononononononononononononononononononononononononononononononononononononono= |
a82b6038ff08
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)
Mads Kiilerich <mads@kiilerich.com>
parents:
15561
diff
changeset
|
542 nononononononononononononononononononononononononononononononononononononon= |
a82b6038ff08
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)
Mads Kiilerich <mads@kiilerich.com>
parents:
15561
diff
changeset
|
543 ononononononononononononononononononononononononononononononononononononono= |
a82b6038ff08
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)
Mads Kiilerich <mads@kiilerich.com>
parents:
15561
diff
changeset
|
544 nononononononononononononononononononononononononononononononononononononon= |
a82b6038ff08
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)
Mads Kiilerich <mads@kiilerich.com>
parents:
15561
diff
changeset
|
545 ononononononononononononononononononononononononononononononononononononono= |
a82b6038ff08
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)
Mads Kiilerich <mads@kiilerich.com>
parents:
15561
diff
changeset
|
546 nononononononononononononononononononononononononononononononononononononon= |
a82b6038ff08
mail: use quoted-printable for mime encoding to avoid too long lines (issue3075)
Mads Kiilerich <mads@kiilerich.com>
parents:
15561
diff
changeset
|
547 ononononononononononononononononononononononononononononononononononononono= |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
33969
diff
changeset
|
548 nonononononononononononono=D1=84 |
15561
ca572e94d8e7
notify: add option for writing to mbox
Mads Kiilerich <mads@kiilerich.com>
parents:
15447
diff
changeset
|
549 |
17754
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
550 revset selection: send to address that matches branch and repo |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
551 |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
552 $ cat << EOF >> $HGRCPATH |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
553 > [hooks] |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
554 > incoming.notify = python:hgext.notify.hook |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
555 > |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
556 > [notify] |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
557 > sources = pull |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
558 > test = True |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
559 > diffstat = False |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
560 > maxdiff = 0 |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
561 > |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
562 > [reposubs] |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
563 > */a#branch(test) = will_no_be_send@example.com |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
564 > */b#branch(test) = notify@example.com |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
565 > EOF |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
566 $ hg --cwd a branch test |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
567 marked working directory as branch test |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
568 (branches are permanent and global, did you want a bookmark?) |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
569 $ echo a >> a/a |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
570 $ hg --cwd a ci -m test -d '1 0' |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
571 $ echo a >> a/a |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
572 $ hg --cwd a ci -m test -d '1 0' |
43334
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
573 $ hg --traceback --cwd b pull ../a | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
574 > "$PYTHON" $TESTDIR/unwrap-message-id.py | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
575 > "$PYTHON" $TESTTMP/filter.py |
17754
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
576 pulling from ../a |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
577 searching for changes |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
578 adding changesets |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
579 adding manifests |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
580 adding file changes |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
581 added 2 changesets with 2 changes to 1 files |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
582 new changesets f7e5aaed4080:485bf79b9464 (2 drafts) |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
33969
diff
changeset
|
583 MIME-Version: 1.0 |
17754
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
584 Content-Type: text/plain; charset="us-ascii" |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
585 Content-Transfer-Encoding: 7bit |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
586 X-Test: foo |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
587 Date: * (glob) |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
588 Subject: test |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
589 From: test@test.com |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
590 X-Hg-Notification: changeset f7e5aaed4080 |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
591 Message-Id: <hg.12e9ae631e2529e9cfbe7a93be0dd8a401280700640f802a60f20d7be659251d@test.com> |
17754
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
592 To: baz@test.com, foo@bar, notify@example.com |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
593 |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
594 changeset f7e5aaed4080 in b |
17754
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
595 description: test |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
596 MIME-Version: 1.0 |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
597 Content-Type: text/plain; charset="us-ascii" |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
598 Content-Transfer-Encoding: 7bit |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
599 X-Test: foo |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
600 Date: * (glob) |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
601 Subject: test |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
602 From: test@test.com |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
603 X-Hg-Notification: changeset 485bf79b9464 |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
604 Message-Id: <hg.15281d60c27d9d5fb70435d33ebc24cb5aa580f2535988dcb9923c26e8bc5c47@test.com> |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
605 To: baz@test.com, foo@bar, notify@example.com |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
606 |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
607 changeset 485bf79b9464 in b |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
608 description: test |
17754
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
609 (run 'hg update' to get a working copy) |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
610 |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
611 revset selection: don't send to address that waits for mails |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
612 from different branch |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
613 |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
614 $ hg --cwd a update default |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
615 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
616 $ echo a >> a/a |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
617 $ hg --cwd a ci -m test -d '1 0' |
43334
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
618 $ hg --traceback --cwd b pull ../a | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
619 > "$PYTHON" $TESTDIR/unwrap-message-id.py | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
620 > "$PYTHON" $TESTTMP/filter.py |
17754
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
621 pulling from ../a |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
622 searching for changes |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
623 adding changesets |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
624 adding manifests |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
625 adding file changes |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
626 added 1 changesets with 0 changes to 0 files (+1 heads) |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
627 new changesets 645eb6690ecf (1 drafts) |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
33969
diff
changeset
|
628 MIME-Version: 1.0 |
17754
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
629 Content-Type: text/plain; charset="us-ascii" |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
630 Content-Transfer-Encoding: 7bit |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
631 X-Test: foo |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
632 Date: * (glob) |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
633 Subject: test |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
634 From: test@test.com |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
635 X-Hg-Notification: changeset 645eb6690ecf |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
636 Message-Id: <hg.ba26b2c63e7deb44e86c934aeea147edde12a11b6ac94bda103dcab5028dc928@test.com> |
17754
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
637 To: baz@test.com, foo@bar |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
638 |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
639 changeset 645eb6690ecf in b |
17754
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
640 description: test |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
641 (run 'hg heads' to see heads) |
19e9bf7c0927
notify: support revset selection for subscriptions
Michal Sznajder <michalsznajder@gmail.com>
parents:
16950
diff
changeset
|
642 |
28951
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
643 default template: |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
644 |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
645 $ grep -v '^template =' $HGRCPATH > "$HGRCPATH.new" |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
646 $ mv "$HGRCPATH.new" $HGRCPATH |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
647 $ echo a >> a/a |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
648 $ hg --cwd a commit -m 'default template' |
43334
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
649 $ hg --cwd b pull ../a -q | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
650 > "$PYTHON" $TESTDIR/unwrap-message-id.py | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
651 > "$PYTHON" $TESTTMP/filter.py |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
33969
diff
changeset
|
652 MIME-Version: 1.0 |
28951
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
653 Content-Type: text/plain; charset="us-ascii" |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
654 Content-Transfer-Encoding: 7bit |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
655 Date: * (glob) |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
656 Subject: changeset in b: default template |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
657 From: test@test.com |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
658 X-Hg-Notification: changeset 5cd4346eed47 |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
659 Message-Id: <hg.8caa7941b24fc673d10910cb072e2d167362a3c5111cafefa47190d9b831f0a3@test.com> |
28951
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
660 To: baz@test.com, foo@bar |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
661 |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
662 changeset 5cd4346eed47 in $TESTTMP/b |
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
663 details: http://test/b?cmd=changeset;node=5cd4346eed47 |
28951
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
664 description: default template |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
665 |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
666 with style: |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
667 |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
668 $ cat <<EOF > notifystyle.map |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
669 > changeset = "Subject: {desc|firstline|strip} |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
670 > From: {author} |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
671 > {""} |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
672 > changeset {node|short}" |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
673 > EOF |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
674 $ cat <<EOF >> $HGRCPATH |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
675 > [notify] |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
676 > style = $TESTTMP/notifystyle.map |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
677 > EOF |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
678 $ echo a >> a/a |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
679 $ hg --cwd a commit -m 'with style' |
43334
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
680 $ hg --cwd b pull ../a -q | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
681 > "$PYTHON" $TESTDIR/unwrap-message-id.py | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
682 > "$PYTHON" $TESTTMP/filter.py |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
33969
diff
changeset
|
683 MIME-Version: 1.0 |
28951
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
684 Content-Type: text/plain; charset="us-ascii" |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
685 Content-Transfer-Encoding: 7bit |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
686 Date: * (glob) |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
687 Subject: with style |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
688 From: test@test.com |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
689 X-Hg-Notification: changeset ec8d9d852f56 |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
690 Message-Id: <hg.ccd5049818a6a277251189ce1d6d0cca10723d58214199e7178894adb99ed918@test.com> |
28951
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
691 To: baz@test.com, foo@bar |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
692 |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
693 changeset ec8d9d852f56 |
28951
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
694 |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
695 with template (overrides style): |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
696 |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
697 $ cat <<EOF >> $HGRCPATH |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
698 > template = Subject: {node|short}: {desc|firstline|strip} |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
699 > From: {author} |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
700 > {""} |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
701 > {desc} |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
702 > EOF |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
703 $ echo a >> a/a |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
704 $ hg --cwd a commit -m 'with template' |
43334
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
705 $ hg --cwd b pull ../a -q | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
706 > "$PYTHON" $TESTDIR/unwrap-message-id.py | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
707 > "$PYTHON" $TESTTMP/filter.py |
34310
2d0c306a88c2
mail: encode long unicode lines in emails properly (issue5687)
Igor Ippolitov <iippolitov@gmail.com>
parents:
33969
diff
changeset
|
708 MIME-Version: 1.0 |
28951
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
709 Content-Type: text/plain; charset="us-ascii" |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
710 Content-Transfer-Encoding: 7bit |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
711 Date: * (glob) |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
712 Subject: 14721b538ae3: with template |
28951
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
713 From: test@test.com |
37777
a4cac7b0ea4f
notify: add maxdiffstat option to truncate long file lists
Joerg Sonnenberger <joerg@bec.de>
parents:
36394
diff
changeset
|
714 X-Hg-Notification: changeset 14721b538ae3 |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
715 Message-Id: <hg.7edb9765307a5a24528f3964672e794e2d21f2479e96c099bf52e02abd17b3a2@test.com> |
28951
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
716 To: baz@test.com, foo@bar |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
717 |
1bba1b43525a
notify: do not load style file if template is specified (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
27729
diff
changeset
|
718 with template |
38028
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
719 |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
720 showfunc diff |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
721 $ cat <<EOF >> $HGRCPATH |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
722 > showfunc = True |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
723 > template = |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
724 > maxdiff = -1 |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
725 > EOF |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
726 $ cd a |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
727 $ cat > f1 << EOF |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
728 > int main() { |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
729 > int a = 0; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
730 > int b = 1; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
731 > int c = 2; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
732 > int d = 3; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
733 > return a + b + c + d; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
734 > } |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
735 > EOF |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
736 $ hg commit -Am addfunction |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
737 adding f1 |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
738 $ hg debugobsolete eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee b86bc16ff894f057d023b306936f290954857187 |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
739 1 new obsolescence markers |
43334
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
740 $ hg --cwd ../b pull ../a | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
741 > "$PYTHON" $TESTDIR/unwrap-message-id.py |
38028
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
742 pulling from ../a |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
743 searching for changes |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
744 adding changesets |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
745 adding manifests |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
746 adding file changes |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
747 added 1 changesets with 1 changes to 1 files |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
748 1 new obsolescence markers |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
749 new changesets b86bc16ff894 (1 drafts) |
38028
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
750 MIME-Version: 1.0 |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
751 Content-Type: text/plain; charset="us-ascii" |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
752 Content-Transfer-Encoding: 7bit |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
753 Date: * (glob) |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
754 Subject: addfunction |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
755 From: test@test.com |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
756 X-Hg-Notification: changeset b86bc16ff894 |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
757 Message-Id: <hg.4c7cacfbbd6ba170656be0c8fc0d7599bd925c0d545b836816be9983e6d08448@test.com> |
38028
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
758 To: baz@test.com, foo@bar |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
759 |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
760 changeset b86bc16ff894 |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
761 diffs (11 lines): |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
762 |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
763 diff -r 14721b538ae3 -r b86bc16ff894 f1 |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
764 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
765 +++ b/f1 Thu Jan 01 00:00:00 1970 +0000 |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
766 @@ -0,0 +1,7 @@ |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
767 +int main() { |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
768 + int a = 0; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
769 + int b = 1; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
770 + int c = 2; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
771 + int d = 3; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
772 + return a + b + c + d; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
773 +} |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
774 (run 'hg update' to get a working copy) |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
775 $ cat > f1 << EOF |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
776 > int main() { |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
777 > int a = 0; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
778 > int b = 1; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
779 > int c = 2; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
780 > int e = 3; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
781 > return a + b + c + e; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
782 > } |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
783 > EOF |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
784 $ hg commit -m changefunction |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
785 $ hg debugobsolete 485bf79b9464197b2ed2debd0b16252ad64ed458 e81040e9838c704d8bf17658cb11758f24e40b6b |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
786 1 new obsolescence markers |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
787 obsoleted 1 changesets |
43334
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
788 $ hg --cwd ../b --config notify.showfunc=True pull ../a | \ |
4128ffba4431
tests: handle Message-Id email header possible wrapping
Denis Laxalde <denis@laxalde.org>
parents:
43331
diff
changeset
|
789 > "$PYTHON" $TESTDIR/unwrap-message-id.py |
38028
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
790 pulling from ../a |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
791 searching for changes |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
792 adding changesets |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
793 adding manifests |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
794 adding file changes |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
795 added 1 changesets with 1 changes to 1 files |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
796 1 new obsolescence markers |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
797 obsoleted 1 changesets |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
798 new changesets e81040e9838c (1 drafts) |
38028
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
799 MIME-Version: 1.0 |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
800 Content-Type: text/plain; charset="us-ascii" |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
801 Content-Transfer-Encoding: 7bit |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
802 Date: * (glob) |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
803 Subject: changefunction |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
804 From: test@test.com |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
805 X-Hg-Notification: changeset e81040e9838c |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
806 Message-Id: <hg.99b80bf1c5d0bf8f8a7e60107c1aa1da367a5943b2a70a8b36517d701557edff@test.com> |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
807 In-Reply-To: <hg.15281d60c27d9d5fb70435d33ebc24cb5aa580f2535988dcb9923c26e8bc5c47@test.com> |
38028
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
808 To: baz@test.com, foo@bar |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
809 |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
810 changeset e81040e9838c |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
811 diffs (12 lines): |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
812 |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
813 diff -r b86bc16ff894 -r e81040e9838c f1 |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
814 --- a/f1 Thu Jan 01 00:00:00 1970 +0000 |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
815 +++ b/f1 Thu Jan 01 00:00:00 1970 +0000 |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
816 @@ -2,6 +2,6 @@ int main() { |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
817 int a = 0; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
818 int b = 1; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
819 int c = 2; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
820 - int d = 3; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
821 - return a + b + c + d; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
822 + int e = 3; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
823 + return a + b + c + e; |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
824 } |
d1134ca5b1a3
notify: add option to include function names in the diff output
Joerg Sonnenberger <joerg@bec.de>
parents:
37777
diff
changeset
|
825 (run 'hg update' to get a working copy) |
44627
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
826 |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
827 Retry the In-Reply-To, but make sure the oldest known change is older. |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
828 This can happen when folding commits that have been rebased by another user. |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
829 |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
830 $ hg --cwd ../b strip tip |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
831 saved backup bundle to $TESTTMP/b/.hg/strip-backup/e81040e9838c-10aad4de-backup.hg |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
832 $ hg debugobsolete f7e5aaed408029cfe9890318245e87ef44739fdd e81040e9838c704d8bf17658cb11758f24e40b6b |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
833 1 new obsolescence markers |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
834 obsoleted 1 changesets |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
835 $ hg --cwd ../b --config notify.showfunc=True pull ../a | \ |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
836 > "$PYTHON" $TESTDIR/unwrap-message-id.py |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
837 pulling from ../a |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
838 searching for changes |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
839 adding changesets |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
840 adding manifests |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
841 adding file changes |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
842 added 1 changesets with 1 changes to 1 files |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
843 2 new obsolescence markers |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
844 obsoleted 2 changesets |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
845 new changesets e81040e9838c (1 drafts) |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
846 MIME-Version: 1.0 |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
847 Content-Type: text/plain; charset="us-ascii" |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
848 Content-Transfer-Encoding: 7bit |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
849 Date: * (glob) |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
850 Subject: changefunction |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
851 From: test@test.com |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
852 X-Hg-Notification: changeset e81040e9838c |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
853 Message-Id: <hg.99b80bf1c5d0bf8f8a7e60107c1aa1da367a5943b2a70a8b36517d701557edff@test.com> |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
854 In-Reply-To: <hg.12e9ae631e2529e9cfbe7a93be0dd8a401280700640f802a60f20d7be659251d@test.com> |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
855 To: baz@test.com, foo@bar |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
856 |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
857 changeset e81040e9838c |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
858 diffs (12 lines): |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
859 |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
860 diff -r b86bc16ff894 -r e81040e9838c f1 |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
861 --- a/f1 Thu Jan 01 00:00:00 1970 +0000 |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
862 +++ b/f1 Thu Jan 01 00:00:00 1970 +0000 |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
863 @@ -2,6 +2,6 @@ int main() { |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
864 int a = 0; |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
865 int b = 1; |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
866 int c = 2; |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
867 - int d = 3; |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
868 - return a + b + c + d; |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
869 + int e = 3; |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
870 + return a + b + c + e; |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
871 } |
947e6df4ff77
notify: optional mail threading based on obsmarker
Joerg Sonnenberger <joerg@bec.de>
parents:
43334
diff
changeset
|
872 (run 'hg update' to get a working copy) |