##// END OF EJS Templates
tests: ignore slash direction in paths in test-notify-changegroup.t...
Mads Kiilerich -
r15766:8e185480 default
parent child Browse files
Show More
@@ -1,214 +1,214 b''
1
1
2 $ cat <<EOF >> $HGRCPATH
2 $ cat <<EOF >> $HGRCPATH
3 > [extensions]
3 > [extensions]
4 > notify=
4 > notify=
5 >
5 >
6 > [hooks]
6 > [hooks]
7 > changegroup.notify = python:hgext.notify.hook
7 > changegroup.notify = python:hgext.notify.hook
8 >
8 >
9 > [notify]
9 > [notify]
10 > sources = push
10 > sources = push
11 > diffstat = False
11 > diffstat = False
12 > maxsubject = 10
12 > maxsubject = 10
13 >
13 >
14 > [usersubs]
14 > [usersubs]
15 > foo@bar = *
15 > foo@bar = *
16 >
16 >
17 > [reposubs]
17 > [reposubs]
18 > * = baz
18 > * = baz
19 > EOF
19 > EOF
20 $ hg init a
20 $ hg init a
21
21
22 clone
22 clone
23
23
24 $ hg --traceback clone a b
24 $ hg --traceback clone a b
25 updating to branch default
25 updating to branch default
26 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
26 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
27 $ echo a > b/a
27 $ echo a > b/a
28
28
29 commit
29 commit
30
30
31 $ hg --traceback --cwd b commit -Ama
31 $ hg --traceback --cwd b commit -Ama
32 adding a
32 adding a
33 $ echo a >> b/a
33 $ echo a >> b/a
34
34
35 commit
35 commit
36
36
37 $ hg --traceback --cwd b commit -Amb
37 $ hg --traceback --cwd b commit -Amb
38
38
39 push
39 push
40
40
41 $ hg --traceback --cwd b push ../a 2>&1 |
41 $ hg --traceback --cwd b push ../a 2>&1 |
42 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
42 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
43 pushing to ../a
43 pushing to ../a
44 searching for changes
44 searching for changes
45 adding changesets
45 adding changesets
46 adding manifests
46 adding manifests
47 adding file changes
47 adding file changes
48 added 2 changesets with 2 changes to 1 files
48 added 2 changesets with 2 changes to 1 files
49 Content-Type: text/plain; charset="us-ascii"
49 Content-Type: text/plain; charset="us-ascii"
50 MIME-Version: 1.0
50 MIME-Version: 1.0
51 Content-Transfer-Encoding: 7bit
51 Content-Transfer-Encoding: 7bit
52 Date: * (glob)
52 Date: * (glob)
53 Subject: * (glob)
53 Subject: * (glob)
54 From: test
54 From: test
55 X-Hg-Notification: changeset cb9a9f314b8b
55 X-Hg-Notification: changeset cb9a9f314b8b
56 Message-Id: <*> (glob)
56 Message-Id: <*> (glob)
57 To: baz, foo@bar
57 To: baz, foo@bar
58
58
59 changeset cb9a9f314b8b in $TESTTMP/a (glob)
59 changeset cb9a9f314b8b in $TESTTMP/a (glob)
60 details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
60 details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
61 summary: a
61 summary: a
62
62
63 changeset ba677d0156c1 in $TESTTMP/a (glob)
63 changeset ba677d0156c1 in $TESTTMP/a (glob)
64 details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
64 details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
65 summary: b
65 summary: b
66
66
67 diffs (6 lines):
67 diffs (6 lines):
68
68
69 diff -r 000000000000 -r ba677d0156c1 a
69 diff -r 000000000000 -r ba677d0156c1 a
70 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
70 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
71 +++ b/a Thu Jan 01 00:00:00 1970 +0000
71 +++ b/a Thu Jan 01 00:00:00 1970 +0000
72 @@ -0,0 +1,2 @@
72 @@ -0,0 +1,2 @@
73 +a
73 +a
74 +a
74 +a
75 $ hg --cwd a rollback
75 $ hg --cwd a rollback
76 repository tip rolled back to revision -1 (undo push)
76 repository tip rolled back to revision -1 (undo push)
77
77
78 unbundle with unrelated source
78 unbundle with unrelated source
79
79
80 $ hg --cwd b bundle ../test.hg ../a
80 $ hg --cwd b bundle ../test.hg ../a
81 searching for changes
81 searching for changes
82 2 changesets found
82 2 changesets found
83 $ hg --cwd a unbundle ../test.hg
83 $ hg --cwd a unbundle ../test.hg
84 adding changesets
84 adding changesets
85 adding manifests
85 adding manifests
86 adding file changes
86 adding file changes
87 added 2 changesets with 2 changes to 1 files
87 added 2 changesets with 2 changes to 1 files
88 (run 'hg update' to get a working copy)
88 (run 'hg update' to get a working copy)
89 $ hg --cwd a rollback
89 $ hg --cwd a rollback
90 repository tip rolled back to revision -1 (undo unbundle)
90 repository tip rolled back to revision -1 (undo unbundle)
91
91
92 unbundle with correct source
92 unbundle with correct source
93
93
94 $ hg --config notify.sources=unbundle --cwd a unbundle ../test.hg 2>&1 |
94 $ hg --config notify.sources=unbundle --cwd a unbundle ../test.hg 2>&1 |
95 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
95 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
96 adding changesets
96 adding changesets
97 adding manifests
97 adding manifests
98 adding file changes
98 adding file changes
99 added 2 changesets with 2 changes to 1 files
99 added 2 changesets with 2 changes to 1 files
100 Content-Type: text/plain; charset="us-ascii"
100 Content-Type: text/plain; charset="us-ascii"
101 MIME-Version: 1.0
101 MIME-Version: 1.0
102 Content-Transfer-Encoding: 7bit
102 Content-Transfer-Encoding: 7bit
103 Date: * (glob)
103 Date: * (glob)
104 Subject: * (glob)
104 Subject: * (glob)
105 From: test
105 From: test
106 X-Hg-Notification: changeset cb9a9f314b8b
106 X-Hg-Notification: changeset cb9a9f314b8b
107 Message-Id: <*> (glob)
107 Message-Id: <*> (glob)
108 To: baz, foo@bar
108 To: baz, foo@bar
109
109
110 changeset cb9a9f314b8b in $TESTTMP/a (glob)
110 changeset cb9a9f314b8b in $TESTTMP/a (glob)
111 details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
111 details: $TESTTMP/a?cmd=changeset;node=cb9a9f314b8b
112 summary: a
112 summary: a
113
113
114 changeset ba677d0156c1 in $TESTTMP/a (glob)
114 changeset ba677d0156c1 in $TESTTMP/a (glob)
115 details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
115 details: $TESTTMP/a?cmd=changeset;node=ba677d0156c1
116 summary: b
116 summary: b
117
117
118 diffs (6 lines):
118 diffs (6 lines):
119
119
120 diff -r 000000000000 -r ba677d0156c1 a
120 diff -r 000000000000 -r ba677d0156c1 a
121 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
121 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
122 +++ b/a Thu Jan 01 00:00:00 1970 +0000
122 +++ b/a Thu Jan 01 00:00:00 1970 +0000
123 @@ -0,0 +1,2 @@
123 @@ -0,0 +1,2 @@
124 +a
124 +a
125 +a
125 +a
126 (run 'hg update' to get a working copy)
126 (run 'hg update' to get a working copy)
127
127
128 Check that using the first committer as the author of a changeset works:
128 Check that using the first committer as the author of a changeset works:
129 Check that the config option works.
129 Check that the config option works.
130 Check that the first committer is indeed used for "From:".
130 Check that the first committer is indeed used for "From:".
131 Check that the merge user is NOT used for "From:"
131 Check that the merge user is NOT used for "From:"
132
132
133 Create new file
133 Create new file
134
134
135 $ echo a > b/b
135 $ echo a > b/b
136 $ echo b >> b/b
136 $ echo b >> b/b
137 $ echo c >> b/b
137 $ echo c >> b/b
138 $ hg --traceback --cwd b commit -Amnewfile -u committer_1
138 $ hg --traceback --cwd b commit -Amnewfile -u committer_1
139 adding b
139 adding b
140
140
141 commit as one user
141 commit as one user
142
142
143 $ echo x > b/b
143 $ echo x > b/b
144 $ echo b >> b/b
144 $ echo b >> b/b
145 $ echo c >> b/b
145 $ echo c >> b/b
146 $ hg --traceback --cwd b commit -Amx -u committer_2
146 $ hg --traceback --cwd b commit -Amx -u committer_2
147
147
148 commit as other user, change file so we can do an (automatic) merge
148 commit as other user, change file so we can do an (automatic) merge
149
149
150 $ hg --cwd b up 2
150 $ hg --cwd b up 2
151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
152 $ echo a > b/b
152 $ echo a > b/b
153 $ echo b >> b/b
153 $ echo b >> b/b
154 $ echo y >> b/b
154 $ echo y >> b/b
155 $ hg --traceback --cwd b commit -Amy -u committer_3
155 $ hg --traceback --cwd b commit -Amy -u committer_3
156 created new head
156 created new head
157
157
158 merge as a different user
158 merge as a different user
159
159
160 $ hg --cwd b merge --config notify.fromauthor=True
160 $ hg --cwd b merge --config notify.fromauthor=True
161 merging b
161 merging b
162 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
162 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
163 (branch merge, don't forget to commit)
163 (branch merge, don't forget to commit)
164
164
165 $ hg --traceback --cwd b commit -Am "merged"
165 $ hg --traceback --cwd b commit -Am "merged"
166
166
167 push
167 push
168
168
169 $ hg --traceback --cwd b --config notify.fromauthor=True push ../a 2>&1 |
169 $ hg --traceback --cwd b --config notify.fromauthor=True push ../a 2>&1 |
170 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
170 > python -c 'import sys,re; print re.sub("\n\t", " ", sys.stdin.read()),'
171 pushing to ../a
171 pushing to ../a
172 searching for changes
172 searching for changes
173 adding changesets
173 adding changesets
174 adding manifests
174 adding manifests
175 adding file changes
175 adding file changes
176 added 4 changesets with 4 changes to 1 files
176 added 4 changesets with 4 changes to 1 files
177 Content-Type: text/plain; charset="us-ascii"
177 Content-Type: text/plain; charset="us-ascii"
178 MIME-Version: 1.0
178 MIME-Version: 1.0
179 Content-Transfer-Encoding: 7bit
179 Content-Transfer-Encoding: 7bit
180 Date: * (glob)
180 Date: * (glob)
181 Subject: * (glob)
181 Subject: * (glob)
182 From: committer_1
182 From: committer_1
183 X-Hg-Notification: changeset 84e487dddc58
183 X-Hg-Notification: changeset 84e487dddc58
184 Message-Id: <*> (glob)
184 Message-Id: <*> (glob)
185 To: baz, foo@bar
185 To: baz, foo@bar
186
186
187 changeset 84e487dddc58 in $TESTTMP/a
187 changeset 84e487dddc58 in $TESTTMP/a (glob)
188 details: $TESTTMP/a?cmd=changeset;node=84e487dddc58
188 details: $TESTTMP/a?cmd=changeset;node=84e487dddc58
189 summary: newfile
189 summary: newfile
190
190
191 changeset b29c7a2b6b0c in $TESTTMP/a
191 changeset b29c7a2b6b0c in $TESTTMP/a (glob)
192 details: $TESTTMP/a?cmd=changeset;node=b29c7a2b6b0c
192 details: $TESTTMP/a?cmd=changeset;node=b29c7a2b6b0c
193 summary: x
193 summary: x
194
194
195 changeset 0957c7d64886 in $TESTTMP/a
195 changeset 0957c7d64886 in $TESTTMP/a (glob)
196 details: $TESTTMP/a?cmd=changeset;node=0957c7d64886
196 details: $TESTTMP/a?cmd=changeset;node=0957c7d64886
197 summary: y
197 summary: y
198
198
199 changeset 485b4e6b0249 in $TESTTMP/a
199 changeset 485b4e6b0249 in $TESTTMP/a (glob)
200 details: $TESTTMP/a?cmd=changeset;node=485b4e6b0249
200 details: $TESTTMP/a?cmd=changeset;node=485b4e6b0249
201 summary: merged
201 summary: merged
202
202
203 diffs (7 lines):
203 diffs (7 lines):
204
204
205 diff -r ba677d0156c1 -r 485b4e6b0249 b
205 diff -r ba677d0156c1 -r 485b4e6b0249 b
206 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
206 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
207 +++ b/b Thu Jan 01 00:00:00 1970 +0000
207 +++ b/b Thu Jan 01 00:00:00 1970 +0000
208 @@ -0,0 +1,3 @@
208 @@ -0,0 +1,3 @@
209 +x
209 +x
210 +b
210 +b
211 +y
211 +y
212 $ hg --cwd a rollback
212 $ hg --cwd a rollback
213 repository tip rolled back to revision 1 (undo push)
213 repository tip rolled back to revision 1 (undo push)
214
214
General Comments 0
You need to be logged in to leave comments. Login now