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
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
|
Load commonly used test logic
$ . "$TESTDIR/testutil"
$ git init -q --bare repo.git
$ git clone repo.git gitrepo
Cloning into 'gitrepo'...
warning: You appear to have cloned an empty repository.
done.
$ cd gitrepo
$ echo alpha > alpha
$ git add alpha
$ fn_git_commit -m "add alpha"
$ git push --quiet --set-upstream origin master
Branch 'master' set up to track remote branch 'master' from 'origin'. (?)
$ cd ..
$ hg clone repo.git hgrepo
importing 1 git commits
new changesets ff7a2f2d8d70 (1 drafts)
updating to bookmark master
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd hgrepo
$ hg book master
$ echo beta > beta
$ hg add beta
$ fn_hg_commit -u "test" -m 'add beta'
$ hg push
pushing to $TESTTMP/repo.git
searching for changes
adding objects
remote: found 0 deltas to reuse
added 1 commits with 1 trees and 1 blobs
updating reference refs/heads/master
$ echo gamma >> beta
$ fn_hg_commit -u "test <test@example.com> (comment)" -m 'modify beta'
$ hg push
pushing to $TESTTMP/repo.git
searching for changes
adding objects
remote: found 0 deltas to reuse
added 1 commits with 1 trees and 1 blobs
updating reference refs/heads/master
$ echo gamma > gamma
$ hg add gamma
$ fn_hg_commit -u "<test@example.com>" -m 'add gamma'
$ hg push
pushing to $TESTTMP/repo.git
searching for changes
adding objects
remote: found 0 deltas to reuse
added 1 commits with 1 trees and 1 blobs
updating reference refs/heads/master
$ echo delta > delta
$ hg add delta
$ fn_hg_commit -u "name<test@example.com>" -m 'add delta'
$ hg push
pushing to $TESTTMP/repo.git
searching for changes
adding objects
remote: found 0 deltas to reuse
added 1 commits with 1 trees and 1 blobs
updating reference refs/heads/master
$ echo epsilon > epsilon
$ hg add epsilon
$ fn_hg_commit -u "name <test@example.com" -m 'add epsilon'
$ hg push
pushing to $TESTTMP/repo.git
searching for changes
adding objects
remote: found 0 deltas to reuse
added 1 commits with 1 trees and 1 blobs
updating reference refs/heads/master
$ echo zeta > zeta
$ hg add zeta
$ fn_hg_commit -u " test " -m 'add zeta'
$ hg push
pushing to $TESTTMP/repo.git
searching for changes
adding objects
remote: found 0 deltas to reuse
added 1 commits with 1 trees and 1 blobs
updating reference refs/heads/master
$ echo eta > eta
$ hg add eta
$ fn_hg_commit -u "test < test@example.com >" -m 'add eta'
$ hg push
pushing to $TESTTMP/repo.git
searching for changes
adding objects
remote: found 0 deltas to reuse
added 1 commits with 1 trees and 1 blobs
updating reference refs/heads/master
$ echo theta > theta
$ hg add theta
$ fn_hg_commit -u "test >test@example.com>" -m 'add theta'
$ hg push
pushing to $TESTTMP/repo.git
searching for changes
adding objects
remote: found 0 deltas to reuse
added 1 commits with 1 trees and 1 blobs
updating reference refs/heads/master
$ hg log --graph
@ changeset: 8:c5d1976ab12c
| bookmark: master
| tag: default/master
| tag: tip
| user: test >test@example.com>
| date: Mon Jan 01 00:00:18 2007 +0000
| summary: add theta
|
o changeset: 7:0e2fb4d21667
| user: test < test@example.com >
| date: Mon Jan 01 00:00:17 2007 +0000
| summary: add eta
|
o changeset: 6:faa3aae96199
| user: test
| date: Mon Jan 01 00:00:16 2007 +0000
| summary: add zeta
|
o changeset: 5:2cf6ad5a1afc
| user: name <test@example.com
| date: Mon Jan 01 00:00:15 2007 +0000
| summary: add epsilon
|
o changeset: 4:3131b2a71396
| user: name<test@example.com>
| date: Mon Jan 01 00:00:14 2007 +0000
| summary: add delta
|
o changeset: 3:6b854d65d0d6
| user: <test@example.com>
| date: Mon Jan 01 00:00:13 2007 +0000
| summary: add gamma
|
o changeset: 2:46303c652e79
| user: test <test@example.com> (comment)
| date: Mon Jan 01 00:00:12 2007 +0000
| summary: modify beta
|
o changeset: 1:47580592d3d6
| user: test
| date: Mon Jan 01 00:00:11 2007 +0000
| summary: add beta
|
o changeset: 0:ff7a2f2d8d70
user: test <test@example.org>
date: Mon Jan 01 00:00:10 2007 +0000
summary: add alpha
$ cd ..
$ hg clone repo.git hgrepo2
importing 9 git commits
new changesets ff7a2f2d8d70:1fbf3aa91221 (9 drafts)
updating to bookmark master
8 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R hgrepo2 log --graph
@ changeset: 8:1fbf3aa91221
| bookmark: master
| tag: default/master
| tag: tip
| user: test ?test@example.com <test ?test@example.com>
| date: Mon Jan 01 00:00:18 2007 +0000
| summary: add theta
|
o changeset: 7:20310508f06d
| user: test <test@example.com>
| date: Mon Jan 01 00:00:17 2007 +0000
| summary: add eta
|
o changeset: 6:e3d81af8a8c1
| user: test
| date: Mon Jan 01 00:00:16 2007 +0000
| summary: add zeta
|
o changeset: 5:78f609fd208f
| user: name <test@example.com>
| date: Mon Jan 01 00:00:15 2007 +0000
| summary: add epsilon
|
o changeset: 4:42fa61d57718
| user: name <test@example.com>
| date: Mon Jan 01 00:00:14 2007 +0000
| summary: add delta
|
o changeset: 3:6b854d65d0d6
| user: <test@example.com>
| date: Mon Jan 01 00:00:13 2007 +0000
| summary: add gamma
|
o changeset: 2:46303c652e79
| user: test <test@example.com> (comment)
| date: Mon Jan 01 00:00:12 2007 +0000
| summary: modify beta
|
o changeset: 1:47580592d3d6
| user: test
| date: Mon Jan 01 00:00:11 2007 +0000
| summary: add beta
|
o changeset: 0:ff7a2f2d8d70
user: test <test@example.org>
date: Mon Jan 01 00:00:10 2007 +0000
summary: add alpha
$ git --git-dir=repo.git log --pretty=medium master
commit 2fe60ba69727981e6ede78be70354c3a9e30e21d
Author: test ?test@example.com <test ?test@example.com>
Date: Mon Jan 1 00:00:18 2007 +0000
add theta
commit 9f2f7cafdbf2e467928db98de8275141001d3081
Author: test <test@example.com>
Date: Mon Jan 1 00:00:17 2007 +0000
add eta
commit 172a6f8d8064d73dff7013e395a9fe3cfc3ff807
Author: test <none@none>
Date: Mon Jan 1 00:00:16 2007 +0000
add zeta
commit 71badb8e343a7da391a9b5d98909fbd2ca7d78f2
Author: name <test@example.com>
Date: Mon Jan 1 00:00:15 2007 +0000
add epsilon
commit 9a9ae7b7f310d4a1a3e732a747ca26f06934f8d8
Author: name <test@example.com>
Date: Mon Jan 1 00:00:14 2007 +0000
add delta
commit e4149a32e81e380193f59aa8773349201b8ed7f7
Author: <test@example.com>
Date: Mon Jan 1 00:00:13 2007 +0000
add gamma
commit fae95aef5889a80103c2fbd5d14ff6eb8c9daf93
Author: test ext:(%20%28comment%29) <test@example.com>
Date: Mon Jan 1 00:00:12 2007 +0000
modify beta
commit 0f378ab6c2c6b5514bd873d3faf8ac4b8095b001
Author: test <none@none>
Date: Mon Jan 1 00:00:11 2007 +0000
add beta
commit 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03
Author: test <test@example.org>
Date: Mon Jan 1 00:00:10 2007 +0000
add alpha
|
