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