author | Patrick Mezard <pmezard@gmail.com> |
Tue, 26 Jul 2011 21:30:12 +0200 | |
changeset 14940 | d78b92353f26 |
parent 14617 | 23f4e1e40988 |
child 15131 | 7c26ce9edbd2 |
permissions | -rw-r--r-- |
3740
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 |
|
12473 | 2 |
$ cat <<EOF >> $HGRCPATH |
3 |
> [extensions] |
|
4 |
> notify= |
|
5 |
> |
|
6 |
> [hooks] |
|
7 |
> incoming.notify = python:hgext.notify.hook |
|
8 |
> |
|
9 |
> [notify] |
|
10 |
> sources = pull |
|
11 |
> diffstat = False |
|
12 |
> |
|
13 |
> [usersubs] |
|
14 |
> foo@bar = * |
|
15 |
> |
|
16 |
> [reposubs] |
|
17 |
> * = baz |
|
18 |
> EOF |
|
19 |
$ hg help notify |
|
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
20 |
notify extension - hooks for sending email push notifications |
12473 | 21 |
|
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
22 |
This extension let you run hooks sending email notifications when changesets |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
23 |
are being pushed, from the sending or receiving side. |
12473 | 24 |
|
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
25 |
First, enable the extension as explained in "hg help extensions", and register |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
26 |
the hook you want to run. "incoming" and "outgoing" hooks are run by the |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
27 |
changesets receiver while the "outgoing" one is for the sender: |
12473 | 28 |
|
29 |
[hooks] |
|
30 |
# one email for each incoming changeset |
|
31 |
incoming.notify = python:hgext.notify.hook |
|
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
32 |
# one email for all incoming changesets |
12473 | 33 |
changegroup.notify = python:hgext.notify.hook |
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
34 |
|
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
35 |
# 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
|
36 |
outgoing.notify = python:hgext.notify.hook |
12473 | 37 |
|
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
38 |
Now the hooks are running, subscribers must be assigned to repositories. Use |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
39 |
the "[usersubs]" section to map repositories to a given email or the |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
40 |
"[reposubs]" section to map emails to a single repository: |
12473 | 41 |
|
42 |
[usersubs] |
|
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
43 |
# key is subscriber email, value is a comma-separated list of glob |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
44 |
# patterns |
12473 | 45 |
user@host = pattern |
46 |
||
47 |
[reposubs] |
|
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
48 |
# key is glob pattern, value is a comma-separated list of subscriber |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
49 |
# emails |
12473 | 50 |
pattern = user@host |
51 |
||
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
52 |
Glob patterns are matched against absolute path to repository root. The |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
53 |
subscriptions can be defined in their own file and referenced with: |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
54 |
|
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
55 |
[notify] |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
56 |
config = /path/to/subscriptionsfile |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
57 |
|
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
58 |
Alternatively, they can be added to Mercurial configuration files by setting |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
59 |
the previous entry to an empty value. |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
60 |
|
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
61 |
At this point, notifications should be generated but will not be sent until |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
62 |
you set the "notify.test" entry to "False". |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
63 |
|
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
64 |
Notifications content can be tweaked with the following configuration entries: |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
65 |
|
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
66 |
notify.test |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
67 |
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
|
68 |
|
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
69 |
notify.sources |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
70 |
Space separated list of change sources. Notifications are sent only if it |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
71 |
includes the incoming or outgoing changes source. Incoming sources can be |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
72 |
"serve" for changes coming from http or ssh, "pull" for pulled changes, |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
73 |
"unbundle" for changes added by "hg unbundle" or "push" for changes being |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
74 |
pushed locally. Outgoing sources are the same except for "unbundle" which is |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
75 |
replaced by "bundle". Default: serve. |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
76 |
|
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
77 |
notify.strip |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
78 |
Number of leading slashes to strip from url paths. By default, notifications |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
79 |
references repositories with their absolute path. "notify.strip" let you |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
80 |
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
|
81 |
"/long/path/repository" into "repository". Default: 0. |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
82 |
|
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
83 |
notify.domain |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
84 |
If subscribers emails or the from email have no domain set, complete them |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
85 |
with this value. |
12473 | 86 |
|
14940
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
87 |
notify.style |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
88 |
Style file to use when formatting emails. |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
89 |
|
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
90 |
notify.template |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
91 |
Template to use when formatting emails. |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
92 |
|
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
93 |
notify.incoming |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
94 |
Template to use when run as incoming hook, override "notify.template". |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
95 |
|
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
96 |
notify.outgoing |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
97 |
Template to use when run as outgoing hook, override "notify.template". |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
98 |
|
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
99 |
notify.changegroup |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
100 |
Template to use when running as changegroup hook, override |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
101 |
"notify.template". |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
102 |
|
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
103 |
notify.maxdiff |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
104 |
Maximum number of diff lines to include in notification email. Set to 0 to |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
105 |
disable the diff, -1 to include all of it. Default: 300. |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
106 |
|
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
107 |
notify.maxsubject |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
108 |
Maximum number of characters in emails subject line. Default: 67. |
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.diffstat |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
111 |
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
|
112 |
|
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
113 |
notify.merge |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
114 |
If True, send notifications for merge changesets. Default: True. |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
115 |
|
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
116 |
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
|
117 |
notifications: |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
118 |
|
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
119 |
email.from |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
120 |
Email "From" address to use if none can be found in generated email content. |
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 |
web.baseurl |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
123 |
Root repository browsing URL to combine with repository paths when making |
d78b92353f26
notify: rewrite user documentation
Patrick Mezard <pmezard@gmail.com>
parents:
14617
diff
changeset
|
124 |
references. See also "notify.strip". |
12473 | 125 |
|
126 |
no commands defined |
|
127 |
$ hg init a |
|
128 |
$ echo a > a/a |
|
3740
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
129 |
|
12473 | 130 |
commit |
131 |
||
132 |
$ hg --cwd a commit -Ama -d '0 0' |
|
133 |
adding a |
|
134 |
||
135 |
||
136 |
clone |
|
137 |
||
138 |
$ hg --traceback clone a b |
|
139 |
updating to branch default |
|
140 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
141 |
$ echo a >> a/a |
|
142 |
||
143 |
commit |
|
144 |
||
145 |
$ hg --traceback --cwd a commit -Amb -d '1 0' |
|
146 |
||
147 |
on Mac OS X 10.5 the tmp path is very long so would get stripped in the subject line |
|
148 |
||
149 |
$ cat <<EOF >> $HGRCPATH |
|
150 |
> [notify] |
|
151 |
> maxsubject = 200 |
|
152 |
> EOF |
|
153 |
||
154 |
the python call below wraps continuation lines, which appear on Mac OS X 10.5 because |
|
155 |
of the very long subject line |
|
156 |
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
|
157 |
|
12473 | 158 |
$ hg --traceback --cwd b pull ../a | \ |
12646
624859bf4314
test-notify: fix fix for line continuation in long mail header lines
Mads Kiilerich <mads@kiilerich.com>
parents:
12644
diff
changeset
|
159 |
> python -c 'import sys,re; print re.sub("\n[\t ]", " ", sys.stdin.read()),' |
12473 | 160 |
pulling from ../a |
161 |
searching for changes |
|
162 |
adding changesets |
|
163 |
adding manifests |
|
164 |
adding file changes |
|
165 |
added 1 changesets with 1 changes to 1 files |
|
166 |
Content-Type: text/plain; charset="us-ascii" |
|
167 |
MIME-Version: 1.0 |
|
168 |
Content-Transfer-Encoding: 7bit |
|
169 |
Date: * (glob) |
|
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12473
diff
changeset
|
170 |
Subject: changeset in $TESTTMP/b: b |
12473 | 171 |
From: test |
172 |
X-Hg-Notification: changeset 0647d048b600 |
|
173 |
Message-Id: <*> (glob) |
|
174 |
To: baz, foo@bar |
|
175 |
||
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12473
diff
changeset
|
176 |
changeset 0647d048b600 in $TESTTMP/b |
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12473
diff
changeset
|
177 |
details: $TESTTMP/b?cmd=changeset;node=0647d048b600 |
12473 | 178 |
description: b |
179 |
||
180 |
diffs (6 lines): |
|
181 |
||
182 |
diff -r cb9a9f314b8b -r 0647d048b600 a |
|
183 |
--- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
184 |
+++ 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
|
185 |
@@ -1,1 +1,2 @@ a |
12473 | 186 |
+a |
187 |
(run 'hg update' to get a working copy) |
|
188 |
$ cat <<EOF >> $HGRCPATH |
|
189 |
> [notify] |
|
12642
bb35840e965c
tests: remove the last traces of $HGTMP
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
190 |
> config = `pwd`/.notify.conf |
12473 | 191 |
> domain = test.com |
12644
0490d2223882
test-notify: stabilize output
Mads Kiilerich <mads@kiilerich.com>
parents:
12642
diff
changeset
|
192 |
> strip = 42 |
12473 | 193 |
> template = Subject: {desc|firstline|strip}\nFrom: {author}\nX-Test: foo\n\nchangeset {node|short} in {webroot}\ndescription:\n\t{desc|tabindent|strip} |
194 |
> |
|
195 |
> [web] |
|
196 |
> baseurl = http://test/ |
|
197 |
> 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
|
198 |
|
12473 | 199 |
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
|
200 |
|
12473 | 201 |
$ 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
|
202 |
repository tip rolled back to revision 0 (undo pull) |
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13225
diff
changeset
|
203 |
working directory now based on revision 0 |
12473 | 204 |
$ hg --cwd b pull ../a 2>&1 | grep 'error.*\.notify\.conf' > /dev/null && echo pull failed |
205 |
pull failed |
|
12642
bb35840e965c
tests: remove the last traces of $HGTMP
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
206 |
$ touch ".notify.conf" |
12473 | 207 |
|
208 |
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
|
209 |
|
12473 | 210 |
$ 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
|
211 |
repository tip rolled back to revision 0 (undo pull) |
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13225
diff
changeset
|
212 |
working directory now based on revision 0 |
12473 | 213 |
$ hg --traceback --cwd b pull ../a | \ |
214 |
> python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
|
215 |
pulling from ../a |
|
216 |
searching for changes |
|
217 |
adding changesets |
|
218 |
adding manifests |
|
219 |
adding file changes |
|
220 |
added 1 changesets with 1 changes to 1 files |
|
221 |
Content-Type: text/plain; charset="us-ascii" |
|
222 |
MIME-Version: 1.0 |
|
223 |
Content-Transfer-Encoding: 7bit |
|
224 |
X-Test: foo |
|
225 |
Date: * (glob) |
|
226 |
Subject: b |
|
227 |
From: test@test.com |
|
228 |
X-Hg-Notification: changeset 0647d048b600 |
|
229 |
Message-Id: <*> (glob) |
|
230 |
To: baz@test.com, foo@bar |
|
231 |
||
12644
0490d2223882
test-notify: stabilize output
Mads Kiilerich <mads@kiilerich.com>
parents:
12642
diff
changeset
|
232 |
changeset 0647d048b600 in b |
12473 | 233 |
description: b |
234 |
diffs (6 lines): |
|
235 |
||
236 |
diff -r cb9a9f314b8b -r 0647d048b600 a |
|
237 |
--- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
238 |
+++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
239 |
@@ -1,1 +1,2 @@ |
|
240 |
a |
|
241 |
+a |
|
242 |
(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
|
243 |
|
12473 | 244 |
$ cat << EOF >> $HGRCPATH |
245 |
> [hooks] |
|
246 |
> incoming.notify = python:hgext.notify.hook |
|
247 |
> |
|
248 |
> [notify] |
|
249 |
> sources = pull |
|
250 |
> diffstat = True |
|
251 |
> EOF |
|
252 |
||
253 |
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
|
254 |
|
12473 | 255 |
$ 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
|
256 |
repository tip rolled back to revision 0 (undo pull) |
1e497df514e2
rollback: clarifies the message about the reverted state (issue2628)
Gilles Moris <gilles.moris@free.fr>
parents:
13225
diff
changeset
|
257 |
working directory now based on revision 0 |
12473 | 258 |
$ hg --traceback --cwd b pull ../a | \ |
259 |
> python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
|
260 |
pulling from ../a |
|
261 |
searching for changes |
|
262 |
adding changesets |
|
263 |
adding manifests |
|
264 |
adding file changes |
|
265 |
added 1 changesets with 1 changes to 1 files |
|
266 |
Content-Type: text/plain; charset="us-ascii" |
|
267 |
MIME-Version: 1.0 |
|
268 |
Content-Transfer-Encoding: 7bit |
|
269 |
X-Test: foo |
|
270 |
Date: * (glob) |
|
271 |
Subject: b |
|
272 |
From: test@test.com |
|
273 |
X-Hg-Notification: changeset 0647d048b600 |
|
274 |
Message-Id: <*> (glob) |
|
275 |
To: baz@test.com, foo@bar |
|
276 |
||
12644
0490d2223882
test-notify: stabilize output
Mads Kiilerich <mads@kiilerich.com>
parents:
12642
diff
changeset
|
277 |
changeset 0647d048b600 in b |
12473 | 278 |
description: b |
279 |
diffstat: |
|
280 |
||
281 |
a | 1 + |
|
282 |
1 files changed, 1 insertions(+), 0 deletions(-) |
|
283 |
||
284 |
diffs (6 lines): |
|
285 |
||
286 |
diff -r cb9a9f314b8b -r 0647d048b600 a |
|
287 |
--- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
288 |
+++ b/a Thu Jan 01 00:00:01 1970 +0000 |
|
289 |
@@ -1,1 +1,2 @@ |
|
290 |
a |
|
291 |
+a |
|
292 |
(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
|
293 |
|
12473 | 294 |
test merge |
7105
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
295 |
|
12473 | 296 |
$ cd a |
297 |
$ hg up -C 0 |
|
298 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
299 |
$ echo a >> a |
|
300 |
$ hg ci -Am adda2 -d '2 0' |
|
301 |
created new head |
|
302 |
$ hg merge |
|
303 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
304 |
(branch merge, don't forget to commit) |
|
305 |
$ hg ci -m merge -d '3 0' |
|
306 |
$ cd .. |
|
307 |
$ hg --traceback --cwd b pull ../a | \ |
|
308 |
> python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
|
309 |
pulling from ../a |
|
310 |
searching for changes |
|
311 |
adding changesets |
|
312 |
adding manifests |
|
313 |
adding file changes |
|
314 |
added 2 changesets with 0 changes to 0 files |
|
315 |
Content-Type: text/plain; charset="us-ascii" |
|
316 |
MIME-Version: 1.0 |
|
317 |
Content-Transfer-Encoding: 7bit |
|
318 |
X-Test: foo |
|
319 |
Date: * (glob) |
|
320 |
Subject: adda2 |
|
321 |
From: test@test.com |
|
322 |
X-Hg-Notification: changeset 0a184ce6067f |
|
323 |
Message-Id: <*> (glob) |
|
324 |
To: baz@test.com, foo@bar |
|
325 |
||
12644
0490d2223882
test-notify: stabilize output
Mads Kiilerich <mads@kiilerich.com>
parents:
12642
diff
changeset
|
326 |
changeset 0a184ce6067f in b |
12473 | 327 |
description: adda2 |
328 |
diffstat: |
|
329 |
||
330 |
a | 1 + |
|
331 |
1 files changed, 1 insertions(+), 0 deletions(-) |
|
332 |
||
333 |
diffs (6 lines): |
|
334 |
||
335 |
diff -r cb9a9f314b8b -r 0a184ce6067f a |
|
336 |
--- a/a Thu Jan 01 00:00:00 1970 +0000 |
|
337 |
+++ b/a Thu Jan 01 00:00:02 1970 +0000 |
|
338 |
@@ -1,1 +1,2 @@ |
|
339 |
a |
|
340 |
+a |
|
341 |
Content-Type: text/plain; charset="us-ascii" |
|
342 |
MIME-Version: 1.0 |
|
343 |
Content-Transfer-Encoding: 7bit |
|
344 |
X-Test: foo |
|
345 |
Date: * (glob) |
|
346 |
Subject: merge |
|
347 |
From: test@test.com |
|
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13446
diff
changeset
|
348 |
X-Hg-Notification: changeset 6a0cf76b2701 |
12473 | 349 |
Message-Id: <*> (glob) |
350 |
To: baz@test.com, foo@bar |
|
351 |
||
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13446
diff
changeset
|
352 |
changeset 6a0cf76b2701 in b |
12473 | 353 |
description: merge |
354 |
(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
|
355 |
|
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
356 |
truncate multi-byte subject |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
357 |
|
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
358 |
$ cat <<EOF >> $HGRCPATH |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
359 |
> [notify] |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
360 |
> maxsubject = 4 |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
361 |
> EOF |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
362 |
$ echo a >> a/a |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
363 |
$ hg --cwd a --encoding utf-8 commit -A -d '0 0' \ |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
364 |
> -m `python -c 'print "\xc3\xa0\xc3\xa1\xc3\xa2\xc3\xa3\xc3\xa4"'` |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
365 |
$ hg --traceback --cwd b --encoding utf-8 pull ../a | \ |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
366 |
> python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),' |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
367 |
pulling from ../a |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
368 |
searching for changes |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
369 |
adding changesets |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
370 |
adding manifests |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
371 |
adding file changes |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
372 |
added 1 changesets with 1 changes to 1 files |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
373 |
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
|
374 |
MIME-Version: 1.0 |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
375 |
Content-Transfer-Encoding: 8bit |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
376 |
X-Test: foo |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
377 |
Date: * (glob) |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
378 |
Subject: \xc3\xa0... (esc) |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
379 |
From: test@test.com |
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13446
diff
changeset
|
380 |
X-Hg-Notification: changeset 7ea05ad269dc |
13225
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
381 |
Message-Id: <*> (glob) |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
382 |
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
|
383 |
|
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13446
diff
changeset
|
384 |
changeset 7ea05ad269dc in b |
13225
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
385 |
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
|
386 |
diffstat: |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
387 |
|
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
388 |
a | 1 + |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
389 |
1 files changed, 1 insertions(+), 0 deletions(-) |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
390 |
|
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
391 |
diffs (7 lines): |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
392 |
|
14162
301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
13446
diff
changeset
|
393 |
diff -r 6a0cf76b2701 -r 7ea05ad269dc a |
13225
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
394 |
--- 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
|
395 |
+++ b/a Thu Jan 01 00:00:00 1970 +0000 |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
396 |
@@ -1,2 +1,3 @@ |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
397 |
a |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
398 |
a |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
399 |
+a |
e3bf16703e26
util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents:
12646
diff
changeset
|
400 |
(run 'hg update' to get a working copy) |