##// END OF EJS Templates
tests: synchronize the git and Mercurial username...
Matt Harbison -
r47827:4c7bc42a stable
parent child Browse files
Show More
@@ -7,6 +7,7 b' Setup:'
7 > GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME
7 > GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME
8 > GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL
8 > GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL
9 > GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE
9 > GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE
10 > HGUSER="test <test@example.org>"; export HGUSER
10 > count=10
11 > count=10
11 > gitcommit() {
12 > gitcommit() {
12 > GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000";
13 > GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000";
@@ -196,7 +197,7 b' clean up untracked file'
196 hg log FILE
197 hg log FILE
197
198
198 $ echo a >> alpha
199 $ echo a >> alpha
199 $ hg ci -m 'more alpha' --traceback --date '1583522787 18000'
200 $ hg ci -m 'more alpha' --traceback --date '1583558723 18000'
200 $ echo b >> beta
201 $ echo b >> beta
201 $ hg ci -m 'more beta'
202 $ hg ci -m 'more beta'
202 heads mismatch, rebuilding dagcache
203 heads mismatch, rebuilding dagcache
@@ -205,16 +206,16 b' hg log FILE'
205 heads mismatch, rebuilding dagcache
206 heads mismatch, rebuilding dagcache
206 $ hg log -G alpha
207 $ hg log -G alpha
207 heads mismatch, rebuilding dagcache
208 heads mismatch, rebuilding dagcache
208 @ changeset: 4:6626247b7dc8
209 @ changeset: 4:cf6ddf5d9b8a
209 : bookmark: master
210 : bookmark: master
210 : tag: tip
211 : tag: tip
211 : user: test <test>
212 : user: test <test@example.org>
212 : date: Thu Jan 01 00:00:00 1970 +0000
213 : date: Thu Jan 01 00:00:00 1970 +0000
213 : summary: even more alpha
214 : summary: even more alpha
214 :
215 :
215 o changeset: 2:a1983dd7fb19
216 o changeset: 2:5b2c80b027ce
216 : user: test <test>
217 : user: test <test@example.org>
217 : date: Fri Mar 06 14:26:27 2020 -0500
218 : date: Sat Mar 07 00:25:23 2020 -0500
218 : summary: more alpha
219 : summary: more alpha
219 :
220 :
220 o changeset: 0:c5864c9d16fb
221 o changeset: 0:c5864c9d16fb
@@ -223,8 +224,8 b' hg log FILE'
223 summary: Add alpha
224 summary: Add alpha
224
225
225 $ hg log -G beta
226 $ hg log -G beta
226 o changeset: 3:d8ee22687733
227 o changeset: 3:980d4f79a9c6
227 : user: test <test>
228 : user: test <test@example.org>
228 : date: Thu Jan 01 00:00:00 1970 +0000
229 : date: Thu Jan 01 00:00:00 1970 +0000
229 : summary: more beta
230 : summary: more beta
230 :
231 :
@@ -235,7 +236,7 b' hg log FILE'
235
236
236
237
237 $ hg log -r "children(3d9be8deba43)" -T"{node|short} {children}\n"
238 $ hg log -r "children(3d9be8deba43)" -T"{node|short} {children}\n"
238 a1983dd7fb19 3:d8ee22687733
239 5b2c80b027ce 3:980d4f79a9c6
239
240
240 hg annotate
241 hg annotate
241
242
@@ -279,23 +280,25 b' hg and git status both clean'
279 node|shortest works correctly
280 node|shortest works correctly
280 $ hg log -T '{node}\n' | sort
281 $ hg log -T '{node}\n' | sort
281 3d9be8deba43482be2c81a4cb4be1f10d85fa8bc
282 3d9be8deba43482be2c81a4cb4be1f10d85fa8bc
282 6626247b7dc8f231b183b8a4761c89139baca2ad
283 5b2c80b027ce4250f88957326c199a2dc48dad60
283 a1983dd7fb19cbd83ad5a1c2fc8bf3d775dea12f
284 980d4f79a9c617d60d0fe1fb383753c4a61bea8e
284 ae1ab744f95bfd5b07cf573baef98a778058537b
285 c1a41c49866ecc9c5411be932653e5b430961dd5
285 c5864c9d16fb3431fe2c175ff84dc6accdbb2c18
286 c5864c9d16fb3431fe2c175ff84dc6accdbb2c18
286 d8ee22687733a1991813560b15128cd9734f4b48
287 cf6ddf5d9b8a120bf90020342bcf7a96d0167279
287 $ hg log -r ae1ab744f95bfd5b07cf573baef98a778058537b --template "{shortest(node,1)}\n"
288 $ hg log -r c1a41c49866ecc9c5411be932653e5b430961dd5 --template "{shortest(node,1)}\n"
288 ae
289 c1
289
290
290 This covers gitlog._partialmatch()
291 This covers gitlog._partialmatch()
291 $ hg log -r a
292 $ hg log -r c
292 abort: ambiguous revision identifier: a
293 abort: ambiguous revision identifier: c
293 [10]
294 [10]
294 $ hg log -r a1
295 $ hg log -r c1
295 changeset: 2:a1983dd7fb19
296 changeset: 5:c1a41c49866e
296 user: test <test>
297 bookmark: master
297 date: Fri Mar 06 14:26:27 2020 -0500
298 tag: tip
298 summary: more alpha
299 user: test <test@example.org>
300 date: Thu Jan 01 00:00:00 1970 +0000
301 summary: Introduce file a/mu
299
302
300 $ hg log -r dead
303 $ hg log -r dead
301 abort: unknown revision 'dead'
304 abort: unknown revision 'dead'
@@ -355,14 +358,14 b' Contents of each commit should be the sa'
355
358
356 $ hg ex -r .
359 $ hg ex -r .
357 # HG changeset patch
360 # HG changeset patch
358 # User test <test>
361 # User test <test@example.org>
359 # Date 0 0
362 # Date 0 0
360 # Thu Jan 01 00:00:00 1970 +0000
363 # Thu Jan 01 00:00:00 1970 +0000
361 # Node ID 80adc61cf57e99f6a412d83fee6239d1556cefcf
364 # Node ID 6024eda7986da123aa6797dd4603bd399d49bf5c
362 # Parent ae1ab744f95bfd5b07cf573baef98a778058537b
365 # Parent c1a41c49866ecc9c5411be932653e5b430961dd5
363 test interactive commit
366 test interactive commit
364
367
365 diff -r ae1ab744f95b -r 80adc61cf57e alpha
368 diff -r c1a41c49866e -r 6024eda7986d alpha
366 --- a/alpha Thu Jan 01 00:00:00 1970 +0000
369 --- a/alpha Thu Jan 01 00:00:00 1970 +0000
367 +++ b/alpha Thu Jan 01 00:00:00 1970 +0000
370 +++ b/alpha Thu Jan 01 00:00:00 1970 +0000
368 @@ -1,3 +1,4 @@
371 @@ -1,3 +1,4 @@
@@ -371,8 +374,8 b' Contents of each commit should be the sa'
371 a
374 a
372 +bar
375 +bar
373 $ git show
376 $ git show
374 commit 80adc61cf57e99f6a412d83fee6239d1556cefcf
377 commit 6024eda7986da123aa6797dd4603bd399d49bf5c
375 Author: test <test>
378 Author: test <test@example.org>
376 Date: Thu Jan 1 00:00:00 1970 +0000
379 Date: Thu Jan 1 00:00:00 1970 +0000
377
380
378 test interactive commit
381 test interactive commit
@@ -396,28 +399,26 b' Deleting files should also work (this wa'
396 This covers changelog.tiprev() (issue6510)
399 This covers changelog.tiprev() (issue6510)
397 $ hg log -r '(.^^):'
400 $ hg log -r '(.^^):'
398 heads mismatch, rebuilding dagcache
401 heads mismatch, rebuilding dagcache
399 changeset: 5:ae1ab744f95b
402 changeset: 5:c1a41c49866e
400 user: test <test>
403 user: test <test@example.org>
401 date: Thu Jan 01 00:00:00 1970 +0000
404 date: Thu Jan 01 00:00:00 1970 +0000
402 summary: Introduce file a/mu
405 summary: Introduce file a/mu
403
406
404 changeset: 6:80adc61cf57e
407 changeset: 6:6024eda7986d
405 user: test <test>
408 user: test <test@example.org>
406 date: Thu Jan 01 00:00:00 1970 +0000
409 date: Thu Jan 01 00:00:00 1970 +0000
407 summary: test interactive commit
410 summary: test interactive commit
408
411
409 changeset: 7:116aee5ecdff
412 changeset: 7:1a0fee76bfc4
410 bookmark: master
413 bookmark: master
411 tag: tip
414 tag: tip
412 user: test <test>
415 user: test <test@example.org>
413 date: Thu Jan 01 00:00:00 1970 +0000
416 date: Thu Jan 01 00:00:00 1970 +0000
414 summary: remove beta
417 summary: remove beta
415
418
416 This covers changelog.headrevs() with a non-None arg
419 This covers changelog.headrevs() with a non-None arg
417
418 TODO: Fix the user name. The stray > char also break `hg ci --amend`.
419 $ hg log -r 'heads(.)' -Tcompact
420 $ hg log -r 'heads(.)' -Tcompact
420 7[tip][master] 116aee5ecdff 1970-01-01 00:00 +0000 test>
421 7[tip][master] 1a0fee76bfc4 1970-01-01 00:00 +0000 test
421 remove beta
422 remove beta
422
423
423
424
General Comments 0
You need to be logged in to leave comments. Login now