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