author | Patrick Mezard <pmezard@gmail.com> |
Sun, 13 Dec 2009 18:06:24 +0100 | |
changeset 10060 | f780b1098efc |
parent 9820 | 0b999aec64e8 |
child 10112 | 703db37d186b |
permissions | -rw-r--r-- |
8935
f4f0e902b750
extensions: change descriptions for hook-providing extensions
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
8894
diff
changeset
|
1 |
notify extension - hooks for sending email notifications at commit/push time |
7132
e9a2525d8834
tests: fix output for test-notify
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7116
diff
changeset
|
2 |
|
9104
c9c5aa12a46e
notify: cleanup module docstring
Martin Geisler <mg@lazybytes.net>
parents:
9068
diff
changeset
|
3 |
Subscriptions can be managed through a hgrc file. Default mode is to print |
c9c5aa12a46e
notify: cleanup module docstring
Martin Geisler <mg@lazybytes.net>
parents:
9068
diff
changeset
|
4 |
messages to stdout, for testing and configuring. |
7132
e9a2525d8834
tests: fix output for test-notify
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7116
diff
changeset
|
5 |
|
9104
c9c5aa12a46e
notify: cleanup module docstring
Martin Geisler <mg@lazybytes.net>
parents:
9068
diff
changeset
|
6 |
To use, configure the notify extension and enable it in hgrc like this: |
7132
e9a2525d8834
tests: fix output for test-notify
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7116
diff
changeset
|
7 |
|
9291
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
8 |
[extensions] |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
9 |
hgext.notify = |
7132
e9a2525d8834
tests: fix output for test-notify
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7116
diff
changeset
|
10 |
|
9291
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
11 |
[hooks] |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
12 |
# one email for each incoming changeset |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
13 |
incoming.notify = python:hgext.notify.hook |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
14 |
# batch emails when many changesets incoming at one time |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
15 |
changegroup.notify = python:hgext.notify.hook |
7132
e9a2525d8834
tests: fix output for test-notify
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7116
diff
changeset
|
16 |
|
9291
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
17 |
[notify] |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
18 |
# config items go here |
7132
e9a2525d8834
tests: fix output for test-notify
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7116
diff
changeset
|
19 |
|
9105
6188f2cc4a37
notify: fix indentation in module docstring
Martin Geisler <mg@lazybytes.net>
parents:
9104
diff
changeset
|
20 |
Required configuration items: |
7132
e9a2525d8834
tests: fix output for test-notify
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7116
diff
changeset
|
21 |
|
9291
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
22 |
config = /path/to/file # file containing subscriptions |
7132
e9a2525d8834
tests: fix output for test-notify
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7116
diff
changeset
|
23 |
|
9105
6188f2cc4a37
notify: fix indentation in module docstring
Martin Geisler <mg@lazybytes.net>
parents:
9104
diff
changeset
|
24 |
Optional configuration items: |
9104
c9c5aa12a46e
notify: cleanup module docstring
Martin Geisler <mg@lazybytes.net>
parents:
9068
diff
changeset
|
25 |
|
9291
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
26 |
test = True # print messages to stdout for testing |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
27 |
strip = 3 # number of slashes to strip for url paths |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
28 |
domain = example.com # domain to use if committer missing domain |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
29 |
style = ... # style file to use when formatting email |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
30 |
template = ... # template to use when formatting email |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
31 |
incoming = ... # template to use when run as incoming hook |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
32 |
changegroup = ... # template when run as changegroup hook |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
33 |
maxdiff = 300 # max lines of diffs to include (0=none, -1=all) |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
34 |
maxsubject = 67 # truncate subject line longer than this |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
35 |
diffstat = True # add a diffstat before the diff content |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
36 |
sources = serve # notify if source of incoming changes in this list |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
37 |
# (serve == ssh or http, push, pull, bundle) |
9522 | 38 |
merge = False # send notification for merges (default True) |
9291
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
39 |
[email] |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
40 |
from = user@host.com # email address to send as if none given |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
41 |
[web] |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
42 |
baseurl = http://hgserver/... # root of hg web site for browsing commits |
7132
e9a2525d8834
tests: fix output for test-notify
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7116
diff
changeset
|
43 |
|
9105
6188f2cc4a37
notify: fix indentation in module docstring
Martin Geisler <mg@lazybytes.net>
parents:
9104
diff
changeset
|
44 |
The notify config file has same format as a regular hgrc file. It has two |
6188f2cc4a37
notify: fix indentation in module docstring
Martin Geisler <mg@lazybytes.net>
parents:
9104
diff
changeset
|
45 |
sections so you can express subscriptions in whatever way is handier for you. |
7132
e9a2525d8834
tests: fix output for test-notify
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7116
diff
changeset
|
46 |
|
9291
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
47 |
[usersubs] |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
48 |
# key is subscriber email, value is ","-separated list of glob patterns |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
49 |
user@host = pattern |
7132
e9a2525d8834
tests: fix output for test-notify
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7116
diff
changeset
|
50 |
|
9291
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
51 |
[reposubs] |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
52 |
# key is glob pattern, value is ","-separated list of subscriber emails |
cd5b6a11b607
minirst: indent literal blocks with two spaces
Martin Geisler <mg@lazybytes.net>
parents:
9157
diff
changeset
|
53 |
pattern = user@host |
7132
e9a2525d8834
tests: fix output for test-notify
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7116
diff
changeset
|
54 |
|
9105
6188f2cc4a37
notify: fix indentation in module docstring
Martin Geisler <mg@lazybytes.net>
parents:
9104
diff
changeset
|
55 |
Glob patterns are matched against path to repository root. |
7132
e9a2525d8834
tests: fix output for test-notify
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7116
diff
changeset
|
56 |
|
9105
6188f2cc4a37
notify: fix indentation in module docstring
Martin Geisler <mg@lazybytes.net>
parents:
9104
diff
changeset
|
57 |
If you like, you can put notify config file in repository that users can push |
6188f2cc4a37
notify: fix indentation in module docstring
Martin Geisler <mg@lazybytes.net>
parents:
9104
diff
changeset
|
58 |
changes to, they can manage their own subscriptions. |
4009
86098ec4b77a
fix hg help <ext> for extension that do not define any command
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3747
diff
changeset
|
59 |
|
86098ec4b77a
fix hg help <ext> for extension that do not define any command
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
3747
diff
changeset
|
60 |
no commands defined |
3740
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
61 |
% commit |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
62 |
adding a |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
63 |
% clone |
9611
a3d73b3e1f8a
hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents:
9522
diff
changeset
|
64 |
updating to branch default |
3740
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
65 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
66 |
% commit |
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
|
67 |
% pull (minimal config) |
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
|
68 |
pulling from ../a |
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
|
69 |
searching for changes |
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
|
70 |
adding changesets |
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
|
71 |
adding manifests |
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
|
72 |
adding file changes |
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
|
73 |
added 1 changesets with 1 changes to 1 files |
7116
e981725da3fe
notify: mime-encode messages
Christian Ebert <blacktrash@gmx.net>
parents:
7105
diff
changeset
|
74 |
Content-Type: text/plain; charset="us-ascii" |
e981725da3fe
notify: mime-encode messages
Christian Ebert <blacktrash@gmx.net>
parents:
7105
diff
changeset
|
75 |
MIME-Version: 1.0 |
e981725da3fe
notify: mime-encode messages
Christian Ebert <blacktrash@gmx.net>
parents:
7105
diff
changeset
|
76 |
Content-Transfer-Encoding: 7bit |
4479
afa1f57ae484
Add sending date to notify message.
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
4094
diff
changeset
|
77 |
Date: |
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
|
78 |
Subject: changeset in test-notify/b: b |
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
|
79 |
From: test |
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
|
80 |
X-Hg-Notification: changeset 0647d048b600 |
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
|
81 |
Message-Id: |
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
|
82 |
To: baz, foo@bar |
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
|
83 |
|
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
|
84 |
changeset 0647d048b600 in test-notify/b |
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
|
85 |
details: test-notify/b?cmd=changeset;node=0647d048b600 |
6359
25e74cd3f023
test-notify: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com>
parents:
6338
diff
changeset
|
86 |
description: b |
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
|
87 |
|
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
|
88 |
diffs (6 lines): |
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
|
89 |
|
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
|
90 |
diff -r cb9a9f314b8b -r 0647d048b600 a |
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
|
91 |
--- a/a Thu Jan 01 00:00:00 1970 +0000 |
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
|
92 |
+++ b/a Thu Jan 01 00:00:01 1970 +0000 |
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
4517
diff
changeset
|
93 |
@@ -1,1 +1,2 @@ |
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
|
94 |
a |
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
|
95 |
+a |
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
|
96 |
(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
|
97 |
% fail for config file is missing |
5371a213b0f4
ui: make readsections() abort when configuration cannot be read.
Patrick Mezard <pmezard@gmail.com>
parents:
4479
diff
changeset
|
98 |
rolling back last transaction |
5371a213b0f4
ui: make readsections() abort when configuration cannot be read.
Patrick Mezard <pmezard@gmail.com>
parents:
4479
diff
changeset
|
99 |
pull failed |
3740
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
100 |
% 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
|
101 |
rolling back last transaction |
3740
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
102 |
pulling from ../a |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
103 |
searching for changes |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
104 |
adding changesets |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
105 |
adding manifests |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
106 |
adding file changes |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
107 |
added 1 changesets with 1 changes to 1 files |
7116
e981725da3fe
notify: mime-encode messages
Christian Ebert <blacktrash@gmx.net>
parents:
7105
diff
changeset
|
108 |
Content-Type: text/plain; charset="us-ascii" |
e981725da3fe
notify: mime-encode messages
Christian Ebert <blacktrash@gmx.net>
parents:
7105
diff
changeset
|
109 |
MIME-Version: 1.0 |
e981725da3fe
notify: mime-encode messages
Christian Ebert <blacktrash@gmx.net>
parents:
7105
diff
changeset
|
110 |
Content-Transfer-Encoding: 7bit |
7673
af4871b73be7
notify: fix neglect of custom headers set via template
Christian Ebert <blacktrash@gmx.net>
parents:
7172
diff
changeset
|
111 |
X-Test: foo |
4479
afa1f57ae484
Add sending date to notify message.
Mathieu Clabaut <mathieu.clabaut@gmail.com>
parents:
4094
diff
changeset
|
112 |
Date: |
3740
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
113 |
Subject: b |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
114 |
From: test@test.com |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
115 |
X-Hg-Notification: changeset 0647d048b600 |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
116 |
Message-Id: |
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
|
117 |
To: baz@test.com, foo@bar |
3740
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
118 |
|
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
119 |
changeset 0647d048b600 |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
120 |
description: |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
121 |
b |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
122 |
diffs (6 lines): |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
123 |
|
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
124 |
diff -r cb9a9f314b8b -r 0647d048b600 a |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
125 |
--- a/a Thu Jan 01 00:00:00 1970 +0000 |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
126 |
+++ b/a Thu Jan 01 00:00:01 1970 +0000 |
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
4517
diff
changeset
|
127 |
@@ -1,1 +1,2 @@ |
3740
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
128 |
a |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
129 |
+a |
aef384dbc731
add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
130 |
(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
|
131 |
% pull |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
132 |
rolling back last transaction |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
133 |
pulling from ../a |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
134 |
searching for changes |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
135 |
adding changesets |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
136 |
adding manifests |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
137 |
adding file changes |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
138 |
added 1 changesets with 1 changes to 1 files |
7116
e981725da3fe
notify: mime-encode messages
Christian Ebert <blacktrash@gmx.net>
parents:
7105
diff
changeset
|
139 |
Content-Type: text/plain; charset="us-ascii" |
e981725da3fe
notify: mime-encode messages
Christian Ebert <blacktrash@gmx.net>
parents:
7105
diff
changeset
|
140 |
MIME-Version: 1.0 |
e981725da3fe
notify: mime-encode messages
Christian Ebert <blacktrash@gmx.net>
parents:
7105
diff
changeset
|
141 |
Content-Transfer-Encoding: 7bit |
7673
af4871b73be7
notify: fix neglect of custom headers set via template
Christian Ebert <blacktrash@gmx.net>
parents:
7172
diff
changeset
|
142 |
X-Test: foo |
7105
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
143 |
Date: |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
144 |
Subject: b |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
145 |
From: test@test.com |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
146 |
X-Hg-Notification: changeset 0647d048b600 |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
147 |
Message-Id: |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
148 |
To: baz@test.com, foo@bar |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
149 |
|
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
150 |
changeset 0647d048b600 |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
151 |
description: |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
152 |
b |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
153 |
diffstat: |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
154 |
|
7547
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7172
diff
changeset
|
155 |
a | 1 + |
4949729ee9ee
python implementation of diffstat
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7172
diff
changeset
|
156 |
1 files changed, 1 insertions(+), 0 deletions(-) |
7105
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
157 |
|
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
158 |
diffs (6 lines): |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
159 |
|
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
160 |
diff -r cb9a9f314b8b -r 0647d048b600 a |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
161 |
--- a/a Thu Jan 01 00:00:00 1970 +0000 |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
162 |
+++ b/a Thu Jan 01 00:00:01 1970 +0000 |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
163 |
@@ -1,1 +1,2 @@ |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
164 |
a |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
165 |
+a |
31837416ef4d
tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6359
diff
changeset
|
166 |
(run 'hg update' to get a working copy) |
7664
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
167 |
% test merge |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
168 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
169 |
created new head |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
170 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
171 |
(branch merge, don't forget to commit) |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
172 |
pulling from ../a |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
173 |
searching for changes |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
174 |
adding changesets |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
175 |
adding manifests |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
176 |
adding file changes |
9820
0b999aec64e8
bundle: don't send too many changesets (Issue1704)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
9611
diff
changeset
|
177 |
added 2 changesets with 0 changes to 0 files |
7664
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
178 |
Content-Type: text/plain; charset="us-ascii" |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
179 |
MIME-Version: 1.0 |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
180 |
Content-Transfer-Encoding: 7bit |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
181 |
X-Test: foo |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
182 |
Date: |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
183 |
Subject: adda2 |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
184 |
From: test@test.com |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
185 |
X-Hg-Notification: changeset 0a184ce6067f |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
186 |
Message-Id: |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
187 |
To: baz@test.com, foo@bar |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
188 |
|
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
189 |
changeset 0a184ce6067f |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
190 |
description: |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
191 |
adda2 |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
192 |
diffstat: |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
193 |
|
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
194 |
a | 1 + |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
195 |
1 files changed, 1 insertions(+), 0 deletions(-) |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
196 |
|
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
197 |
diffs (6 lines): |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
198 |
|
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
199 |
diff -r cb9a9f314b8b -r 0a184ce6067f a |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
200 |
--- a/a Thu Jan 01 00:00:00 1970 +0000 |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
201 |
+++ b/a Thu Jan 01 00:00:02 1970 +0000 |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
202 |
@@ -1,1 +1,2 @@ |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
203 |
a |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
204 |
+a |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
205 |
Content-Type: text/plain; charset="us-ascii" |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
206 |
MIME-Version: 1.0 |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
207 |
Content-Transfer-Encoding: 7bit |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
208 |
X-Test: foo |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
209 |
Date: |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
210 |
Subject: merge |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
211 |
From: test@test.com |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
212 |
X-Hg-Notification: changeset 22c88b85aa27 |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
213 |
Message-Id: |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
214 |
To: baz@test.com, foo@bar |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
215 |
|
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
216 |
changeset 22c88b85aa27 |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
217 |
description: |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
218 |
merge |
3cc74ee75b0d
diffstat: don't fail on merges
Patrick Mezard <pmezard@gmail.com>
parents:
7658
diff
changeset
|
219 |
(run 'hg update' to get a working copy) |