##// END OF EJS Templates
Fix test-notify for systems without or with a different version of diffstat....
Thomas Arendsen Hein -
r3747:b5c4d749 default
parent child Browse files
Show More
@@ -1,38 +1,39 b''
1 #!/bin/sh
1 #!/bin/sh
2
2
3 cat <<EOF >> $HGRCPATH
3 cat <<EOF >> $HGRCPATH
4 [extensions]
4 [extensions]
5 notify=
5 notify=
6
6
7 [hooks]
7 [hooks]
8 incoming.notify = python:hgext.notify.hook
8 incoming.notify = python:hgext.notify.hook
9
9
10 [notify]
10 [notify]
11 config = $HGTMP/.notify.conf
11 config = $HGTMP/.notify.conf
12 sources = pull
12 sources = pull
13 domain = test.com
13 domain = test.com
14 strip = 3
14 strip = 3
15 template = Subject: {desc|firstline|strip}\nFrom: {author}\n\nchangeset {node|short} in {webroot}\ndescription:\n\t{desc|tabindent|strip}
15 template = Subject: {desc|firstline|strip}\nFrom: {author}\n\nchangeset {node|short} in {webroot}\ndescription:\n\t{desc|tabindent|strip}
16 diffstat = False
16
17
17 [web]
18 [web]
18 baseurl = http://test/
19 baseurl = http://test/
19
20
20 [usersubs]
21 [usersubs]
21 foo@bar = *
22 foo@bar = *
22 EOF
23 EOF
23
24
24 hg init a
25 hg init a
25 echo a > a/a
26 echo a > a/a
26 echo % commit
27 echo % commit
27 hg --traceback --cwd a commit -Ama -d '0 0'
28 hg --traceback --cwd a commit -Ama -d '0 0'
28
29
29 echo % clone
30 echo % clone
30 hg --traceback clone a b
31 hg --traceback clone a b
31
32
32 echo a >> a/a
33 echo a >> a/a
33 echo % commit
34 echo % commit
34 hg --traceback --cwd a commit -Amb -d '1 0'
35 hg --traceback --cwd a commit -Amb -d '1 0'
35
36
36 echo % pull
37 echo % pull
37 hg --traceback --cwd b pull ../a 2>&1 | sed -e 's/\(Message-Id:\).*/\1/' \
38 hg --traceback --cwd b pull ../a 2>&1 | sed -e 's/\(Message-Id:\).*/\1/' \
38 -e 's/changeset \([0-9a-f]*\) in .*/changeset \1/'
39 -e 's/changeset \([0-9a-f]*\) in .*/changeset \1/'
@@ -1,35 +1,30 b''
1 % commit
1 % commit
2 adding a
2 adding a
3 % clone
3 % clone
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 % commit
5 % commit
6 % pull
6 % pull
7 pulling from ../a
7 pulling from ../a
8 searching for changes
8 searching for changes
9 adding changesets
9 adding changesets
10 adding manifests
10 adding manifests
11 adding file changes
11 adding file changes
12 added 1 changesets with 1 changes to 1 files
12 added 1 changesets with 1 changes to 1 files
13 Subject: b
13 Subject: b
14 From: test@test.com
14 From: test@test.com
15 X-Hg-Notification: changeset 0647d048b600
15 X-Hg-Notification: changeset 0647d048b600
16 Message-Id:
16 Message-Id:
17 To: foo@bar
17 To: foo@bar
18
18
19 changeset 0647d048b600
19 changeset 0647d048b600
20 description:
20 description:
21 b
21 b
22 diffstat:
23
24 1 file changed, 1 insertion(+)
25 a | 1 +
26
27 diffs (6 lines):
22 diffs (6 lines):
28
23
29 diff -r cb9a9f314b8b -r 0647d048b600 a
24 diff -r cb9a9f314b8b -r 0647d048b600 a
30 --- a/a Thu Jan 01 00:00:00 1970 +0000
25 --- a/a Thu Jan 01 00:00:00 1970 +0000
31 +++ b/a Thu Jan 01 00:00:01 1970 +0000
26 +++ b/a Thu Jan 01 00:00:01 1970 +0000
32 @@ -1,1 +1,2 @@ a
27 @@ -1,1 +1,2 @@ a
33 a
28 a
34 +a
29 +a
35 (run 'hg update' to get a working copy)
30 (run 'hg update' to get a working copy)
General Comments 0
You need to be logged in to leave comments. Login now