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