annotate tests/test-notify.t @ 14775:219273cc548d

i18n-ru: translated new config.txt
author Alexander Sauta <demosito@gmail.com>
date Tue, 21 Jun 2011 01:49:45 +0400
parents 23f4e1e40988
children d78b92353f26
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3740
aef384dbc731 add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
2 $ cat <<EOF >> $HGRCPATH
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
3 > [extensions]
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
4 > notify=
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
5 >
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
6 > [hooks]
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
7 > incoming.notify = python:hgext.notify.hook
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
8 >
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
9 > [notify]
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
10 > sources = pull
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
11 > diffstat = False
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
12 >
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
13 > [usersubs]
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
14 > foo@bar = *
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
15 >
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
16 > [reposubs]
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
17 > * = baz
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
18 > EOF
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
19 $ hg help notify
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
20 notify extension - hooks for sending email notifications at commit/push time
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
21
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
22 Subscriptions can be managed through a hgrc file. Default mode is to print
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
23 messages to stdout, for testing and configuring.
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
24
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
25 To use, configure the notify extension and enable it in hgrc like this:
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
26
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
27 [extensions]
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
28 notify =
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
29
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
30 [hooks]
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
31 # one email for each incoming changeset
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
32 incoming.notify = python:hgext.notify.hook
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
33 # batch emails when many changesets incoming at one time
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
34 changegroup.notify = python:hgext.notify.hook
14617
23f4e1e40988 notify: send changesets on 'outgoing' hook, updated doc
Ingo Bressler <dev@ingobressler.net>
parents: 14162
diff changeset
35 # batch emails when many changesets outgoing at one time (client side)
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
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
37
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
38 [notify]
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
39 # config items go here
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
40
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
41 Required configuration items:
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
42
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
43 config = /path/to/file # file containing subscriptions
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
44
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
45 Optional configuration items:
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
46
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
47 test = True # print messages to stdout for testing
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
48 strip = 3 # number of slashes to strip for url paths
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
49 domain = example.com # domain to use if committer missing domain
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
50 style = ... # style file to use when formatting email
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
51 template = ... # template to use when formatting email
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
52 incoming = ... # template to use when run as incoming hook
14617
23f4e1e40988 notify: send changesets on 'outgoing' hook, updated doc
Ingo Bressler <dev@ingobressler.net>
parents: 14162
diff changeset
53 outgoing = ... # template to use when run as outgoing hook
23f4e1e40988 notify: send changesets on 'outgoing' hook, updated doc
Ingo Bressler <dev@ingobressler.net>
parents: 14162
diff changeset
54 changegroup = ... # template to use when run as changegroup hook
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
55 maxdiff = 300 # max lines of diffs to include (0=none, -1=all)
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
56 maxsubject = 67 # truncate subject line longer than this
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
57 diffstat = True # add a diffstat before the diff content
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
58 sources = serve # notify if source of incoming changes in this list
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
59 # (serve == ssh or http, push, pull, bundle)
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
60 merge = False # send notification for merges (default True)
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
61 [email]
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
62 from = user@host.com # email address to send as if none given
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
63 [web]
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
64 baseurl = http://hgserver/... # root of hg web site for browsing commits
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
65
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
66 The notify config file has same format as a regular hgrc file. It has two
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
67 sections so you can express subscriptions in whatever way is handier for you.
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
68
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
69 [usersubs]
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
70 # key is subscriber email, value is ","-separated list of glob patterns
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
71 user@host = pattern
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
72
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
73 [reposubs]
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
74 # key is glob pattern, value is ","-separated list of subscriber emails
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
75 pattern = user@host
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
76
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
77 Glob patterns are matched against path to repository root.
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
78
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
79 If you like, you can put notify config file in repository that users can push
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
80 changes to, they can manage their own subscriptions.
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
81
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
82 no commands defined
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
83 $ hg init a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
84 $ echo a > a/a
3740
aef384dbc731 add test for the notify extension
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
85
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
86 commit
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
87
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
88 $ hg --cwd a commit -Ama -d '0 0'
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
89 adding a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
90
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
91
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
92 clone
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
93
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
94 $ hg --traceback clone a b
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
95 updating to branch default
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
96 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
97 $ echo a >> a/a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
98
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
99 commit
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
100
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
101 $ hg --traceback --cwd a commit -Amb -d '1 0'
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
102
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
103 on Mac OS X 10.5 the tmp path is very long so would get stripped in the subject line
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
104
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
105 $ cat <<EOF >> $HGRCPATH
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
106 > [notify]
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
107 > maxsubject = 200
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
108 > EOF
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
109
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
110 the python call below wraps continuation lines, which appear on Mac OS X 10.5 because
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
111 of the very long subject line
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
112 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
113
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
114 $ 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
115 > python -c 'import sys,re; print re.sub("\n[\t ]", " ", sys.stdin.read()),'
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
116 pulling from ../a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
117 searching for changes
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
118 adding changesets
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
119 adding manifests
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
120 adding file changes
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
121 added 1 changesets with 1 changes to 1 files
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
122 Content-Type: text/plain; charset="us-ascii"
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
123 MIME-Version: 1.0
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
124 Content-Transfer-Encoding: 7bit
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
125 Date: * (glob)
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12473
diff changeset
126 Subject: changeset in $TESTTMP/b: b
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
127 From: test
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
128 X-Hg-Notification: changeset 0647d048b600
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
129 Message-Id: <*> (glob)
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
130 To: baz, foo@bar
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
131
12640
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12473
diff changeset
132 changeset 0647d048b600 in $TESTTMP/b
6cc4b14fb76b tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents: 12473
diff changeset
133 details: $TESTTMP/b?cmd=changeset;node=0647d048b600
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
134 description: b
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
135
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
136 diffs (6 lines):
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
137
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
138 diff -r cb9a9f314b8b -r 0647d048b600 a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
139 --- a/a Thu Jan 01 00:00:00 1970 +0000
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
140 +++ 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
141 @@ -1,1 +1,2 @@ a
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
142 +a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
143 (run 'hg update' to get a working copy)
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
144 $ cat <<EOF >> $HGRCPATH
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
145 > [notify]
12642
bb35840e965c tests: remove the last traces of $HGTMP
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
146 > config = `pwd`/.notify.conf
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
147 > domain = test.com
12644
0490d2223882 test-notify: stabilize output
Mads Kiilerich <mads@kiilerich.com>
parents: 12642
diff changeset
148 > strip = 42
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
149 > template = Subject: {desc|firstline|strip}\nFrom: {author}\nX-Test: foo\n\nchangeset {node|short} in {webroot}\ndescription:\n\t{desc|tabindent|strip}
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
150 >
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
151 > [web]
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
152 > baseurl = http://test/
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
153 > 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
154
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
155 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
156
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
157 $ 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
158 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
159 working directory now based on revision 0
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
160 $ hg --cwd b pull ../a 2>&1 | grep 'error.*\.notify\.conf' > /dev/null && echo pull failed
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
161 pull failed
12642
bb35840e965c tests: remove the last traces of $HGTMP
Mads Kiilerich <mads@kiilerich.com>
parents: 12640
diff changeset
162 $ touch ".notify.conf"
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
163
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
164 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
165
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
166 $ 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
167 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
168 working directory now based on revision 0
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
169 $ hg --traceback --cwd b pull ../a | \
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
170 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
171 pulling from ../a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
172 searching for changes
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
173 adding changesets
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
174 adding manifests
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
175 adding file changes
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
176 added 1 changesets with 1 changes to 1 files
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
177 Content-Type: text/plain; charset="us-ascii"
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
178 MIME-Version: 1.0
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
179 Content-Transfer-Encoding: 7bit
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
180 X-Test: foo
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
181 Date: * (glob)
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
182 Subject: b
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
183 From: test@test.com
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
184 X-Hg-Notification: changeset 0647d048b600
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
185 Message-Id: <*> (glob)
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
186 To: baz@test.com, foo@bar
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
187
12644
0490d2223882 test-notify: stabilize output
Mads Kiilerich <mads@kiilerich.com>
parents: 12642
diff changeset
188 changeset 0647d048b600 in b
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
189 description: b
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
190 diffs (6 lines):
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
191
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
192 diff -r cb9a9f314b8b -r 0647d048b600 a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
193 --- a/a Thu Jan 01 00:00:00 1970 +0000
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
194 +++ b/a Thu Jan 01 00:00:01 1970 +0000
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
195 @@ -1,1 +1,2 @@
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
196 a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
197 +a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
198 (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
199
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
200 $ cat << EOF >> $HGRCPATH
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
201 > [hooks]
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
202 > incoming.notify = python:hgext.notify.hook
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
203 >
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
204 > [notify]
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
205 > sources = pull
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
206 > diffstat = True
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
207 > EOF
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
208
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
209 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
210
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
211 $ 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
212 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
213 working directory now based on revision 0
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
214 $ hg --traceback --cwd b pull ../a | \
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
215 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
216 pulling from ../a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
217 searching for changes
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
218 adding changesets
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
219 adding manifests
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
220 adding file changes
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
221 added 1 changesets with 1 changes to 1 files
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
222 Content-Type: text/plain; charset="us-ascii"
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
223 MIME-Version: 1.0
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
224 Content-Transfer-Encoding: 7bit
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
225 X-Test: foo
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
226 Date: * (glob)
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
227 Subject: b
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
228 From: test@test.com
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
229 X-Hg-Notification: changeset 0647d048b600
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
230 Message-Id: <*> (glob)
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
231 To: baz@test.com, foo@bar
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
232
12644
0490d2223882 test-notify: stabilize output
Mads Kiilerich <mads@kiilerich.com>
parents: 12642
diff changeset
233 changeset 0647d048b600 in b
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
234 description: b
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
235 diffstat:
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
236
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
237 a | 1 +
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
238 1 files changed, 1 insertions(+), 0 deletions(-)
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
239
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
240 diffs (6 lines):
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
241
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
242 diff -r cb9a9f314b8b -r 0647d048b600 a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
243 --- a/a Thu Jan 01 00:00:00 1970 +0000
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
244 +++ b/a Thu Jan 01 00:00:01 1970 +0000
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
245 @@ -1,1 +1,2 @@
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
246 a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
247 +a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
248 (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
249
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
250 test merge
7105
31837416ef4d tests: add some testing for patch.diffstat()
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6359
diff changeset
251
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
252 $ cd a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
253 $ hg up -C 0
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
254 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
255 $ echo a >> a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
256 $ hg ci -Am adda2 -d '2 0'
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
257 created new head
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
258 $ hg merge
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
259 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
260 (branch merge, don't forget to commit)
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
261 $ hg ci -m merge -d '3 0'
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
262 $ cd ..
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
263 $ hg --traceback --cwd b pull ../a | \
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
264 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
265 pulling from ../a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
266 searching for changes
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
267 adding changesets
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
268 adding manifests
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
269 adding file changes
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
270 added 2 changesets with 0 changes to 0 files
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
271 Content-Type: text/plain; charset="us-ascii"
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
272 MIME-Version: 1.0
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
273 Content-Transfer-Encoding: 7bit
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
274 X-Test: foo
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
275 Date: * (glob)
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
276 Subject: adda2
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
277 From: test@test.com
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
278 X-Hg-Notification: changeset 0a184ce6067f
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
279 Message-Id: <*> (glob)
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
280 To: baz@test.com, foo@bar
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
281
12644
0490d2223882 test-notify: stabilize output
Mads Kiilerich <mads@kiilerich.com>
parents: 12642
diff changeset
282 changeset 0a184ce6067f in b
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
283 description: adda2
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
284 diffstat:
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
285
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
286 a | 1 +
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
287 1 files changed, 1 insertions(+), 0 deletions(-)
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
288
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
289 diffs (6 lines):
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
290
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
291 diff -r cb9a9f314b8b -r 0a184ce6067f a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
292 --- a/a Thu Jan 01 00:00:00 1970 +0000
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
293 +++ b/a Thu Jan 01 00:00:02 1970 +0000
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
294 @@ -1,1 +1,2 @@
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
295 a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
296 +a
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
297 Content-Type: text/plain; charset="us-ascii"
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
298 MIME-Version: 1.0
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
299 Content-Transfer-Encoding: 7bit
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
300 X-Test: foo
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
301 Date: * (glob)
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
302 Subject: merge
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
303 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
304 X-Hg-Notification: changeset 6a0cf76b2701
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
305 Message-Id: <*> (glob)
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
306 To: baz@test.com, foo@bar
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
307
14162
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 13446
diff changeset
308 changeset 6a0cf76b2701 in b
12473
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
309 description: merge
52aac5c5c2a6 tests: unify test-notify
Matt Mackall <mpm@selenic.com>
parents: 11889
diff changeset
310 (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
311
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
312 truncate multi-byte subject
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
313
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
314 $ cat <<EOF >> $HGRCPATH
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
315 > [notify]
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
316 > maxsubject = 4
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
317 > EOF
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
318 $ echo a >> a/a
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
319 $ 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
320 > -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
321 $ 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
322 > 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
323 pulling from ../a
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
324 searching for changes
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
325 adding changesets
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
326 adding manifests
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
327 adding file changes
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
328 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
329 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
330 MIME-Version: 1.0
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
331 Content-Transfer-Encoding: 8bit
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
332 X-Test: foo
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
333 Date: * (glob)
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
334 Subject: \xc3\xa0... (esc)
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
335 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
336 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
337 Message-Id: <*> (glob)
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
338 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
339
14162
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 13446
diff changeset
340 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
341 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
342 diffstat:
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
343
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
344 a | 1 +
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
345 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
346
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
347 diffs (7 lines):
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
348
14162
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 13446
diff changeset
349 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
350 --- 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
351 +++ 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
352 @@ -1,2 +1,3 @@
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
353 a
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
354 a
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
355 +a
e3bf16703e26 util: fix ellipsis() not to break multi-byte sequence (issue2564)
Yuya Nishihara <yuya@tcha.org>
parents: 12646
diff changeset
356 (run 'hg update' to get a working copy)