test-glog.t
3484 lines
| 101.7 KiB
| text/troff
|
Tads3Lexer
/ tests / test-glog.t
|
r12003 | @ (34) head | ||
| | ||||
| o (33) head | ||||
| | | ||||
o | (32) expand | ||||
|\ \ | ||||
| o \ (31) expand | ||||
| |\ \ | ||||
| | o \ (30) expand | ||||
| | |\ \ | ||||
| | | o | (29) regular commit | ||||
| | | | | | ||||
| | o | | (28) merge zero known | ||||
| | |\ \ \ | ||||
o | | | | | (27) collapse | ||||
|/ / / / / | ||||
| | o---+ (26) merge one known; far right | ||||
| | | | | | ||||
+---o | | (25) merge one known; far left | ||||
| | | | | | ||||
| | o | | (24) merge one known; immediate right | ||||
| | |\| | | ||||
| | o | | (23) merge one known; immediate left | ||||
| |/| | | | ||||
+---o---+ (22) merge two known; one far left, one far right | ||||
| | / / | ||||
o | | | (21) expand | ||||
|\ \ \ \ | ||||
| o---+-+ (20) merge two known; two far right | ||||
| / / / | ||||
o | | | (19) expand | ||||
|\ \ \ \ | ||||
+---+---o (18) merge two known; two far left | ||||
| | | | | ||||
| o | | (17) expand | ||||
| |\ \ \ | ||||
| | o---+ (16) merge two known; one immediate right, one near right | ||||
| | |/ / | ||||
o | | | (15) expand | ||||
|\ \ \ \ | ||||
| o-----+ (14) merge two known; one immediate right, one far right | ||||
| |/ / / | ||||
o | | | (13) expand | ||||
|\ \ \ \ | ||||
+---o | | (12) merge two known; one immediate right, one far left | ||||
| | |/ / | ||||
| o | | (11) expand | ||||
| |\ \ \ | ||||
| | o---+ (10) merge two known; one immediate left, one near right | ||||
| |/ / / | ||||
o | | | (9) expand | ||||
|\ \ \ \ | ||||
| o-----+ (8) merge two known; one immediate left, one far right | ||||
|/ / / / | ||||
o | | | (7) expand | ||||
|\ \ \ \ | ||||
+---o | | (6) merge two known; one immediate left, one far left | ||||
| |/ / / | ||||
| o | | (5) expand | ||||
| |\ \ \ | ||||
| | o | | (4) merge two known; one immediate left, one immediate right | ||||
| |/|/ / | ||||
| o / / (3) collapse | ||||
|/ / / | ||||
o / / (2) collapse | ||||
|/ / | ||||
o / (1) collapse | ||||
|/ | ||||
o (0) root | ||||
$ commit() | ||||
> { | ||||
> rev=$1 | ||||
> msg=$2 | ||||
> shift 2 | ||||
> if [ "$#" -gt 0 ]; then | ||||
> hg debugsetparents "$@" | ||||
> fi | ||||
> echo $rev > a | ||||
> hg commit -Aqd "$rev 0" -m "($rev) $msg" | ||||
> } | ||||
|
r16146 | $ cat > printrevset.py <<EOF | ||
|
r33959 | > from __future__ import absolute_import | ||
> from mercurial import ( | ||||
> cmdutil, | ||||
> commands, | ||||
> extensions, | ||||
> revsetlang, | ||||
|
r35569 | > smartset, | ||
|
r33959 | > ) | ||
|
r17347 | > | ||
|
r35562 | > def logrevset(repo, pats, opts): | ||
> revs = cmdutil._logrevs(repo, opts) | ||||
> if not revs: | ||||
> return None | ||||
|
r35705 | > match, pats, slowpath = cmdutil._makelogmatcher(repo, revs, pats, opts) | ||
|
r35703 | > return cmdutil._makelogrevset(repo, match, pats, slowpath, opts)[0] | ||
|
r35562 | > | ||
|
r16146 | > def uisetup(ui): | ||
|
r35570 | > def printrevset(orig, repo, pats, opts): | ||
> revs, filematcher = orig(repo, pats, opts) | ||||
|
r16146 | > if opts.get('print_revset'): | ||
|
r35562 | > expr = logrevset(repo, pats, opts) | ||
|
r16316 | > if expr: | ||
|
r31024 | > tree = revsetlang.parse(expr) | ||
|
r35568 | > tree = revsetlang.analyze(tree) | ||
|
r16316 | > else: | ||
> tree = [] | ||||
|
r35570 | > ui = repo.ui | ||
|
r16316 | > ui.write('%r\n' % (opts.get('rev', []),)) | ||
|
r31024 | > ui.write(revsetlang.prettyformat(tree) + '\n') | ||
|
r35569 | > ui.write(smartset.prettyformat(revs) + '\n') | ||
|
r35570 | > revs = smartset.baseset() # display no revisions | ||
> return revs, filematcher | ||||
> extensions.wrapfunction(cmdutil, 'getlogrevs', printrevset) | ||||
> aliases, entry = cmdutil.findcmd('log', commands.table) | ||||
|
r16146 | > entry[1].append(('', 'print-revset', False, | ||
> 'print generated revset and exit (DEPRECATED)')) | ||||
> EOF | ||||
|
r12003 | $ echo "[extensions]" >> $HGRCPATH | ||
|
r16146 | $ echo "printrevset=`pwd`/printrevset.py" >> $HGRCPATH | ||
|
r12003 | |||
$ hg init repo | ||||
$ cd repo | ||||
Empty repo: | ||||
|
r20117 | $ hg log -G | ||
|
r12003 | |||
Building DAG: | ||||
$ commit 0 "root" | ||||
$ commit 1 "collapse" 0 | ||||
$ commit 2 "collapse" 1 | ||||
$ commit 3 "collapse" 2 | ||||
$ commit 4 "merge two known; one immediate left, one immediate right" 1 3 | ||||
$ commit 5 "expand" 3 4 | ||||
$ commit 6 "merge two known; one immediate left, one far left" 2 5 | ||||
$ commit 7 "expand" 2 5 | ||||
$ commit 8 "merge two known; one immediate left, one far right" 0 7 | ||||
$ commit 9 "expand" 7 8 | ||||
$ commit 10 "merge two known; one immediate left, one near right" 0 6 | ||||
$ commit 11 "expand" 6 10 | ||||
$ commit 12 "merge two known; one immediate right, one far left" 1 9 | ||||
$ commit 13 "expand" 9 11 | ||||
$ commit 14 "merge two known; one immediate right, one far right" 0 12 | ||||
$ commit 15 "expand" 13 14 | ||||
$ commit 16 "merge two known; one immediate right, one near right" 0 1 | ||||
$ commit 17 "expand" 12 16 | ||||
$ commit 18 "merge two known; two far left" 1 15 | ||||
$ commit 19 "expand" 15 17 | ||||
$ commit 20 "merge two known; two far right" 0 18 | ||||
$ commit 21 "expand" 19 20 | ||||
$ commit 22 "merge two known; one far left, one far right" 18 21 | ||||
$ commit 23 "merge one known; immediate left" 1 22 | ||||
$ commit 24 "merge one known; immediate right" 0 23 | ||||
$ commit 25 "merge one known; far left" 21 24 | ||||
$ commit 26 "merge one known; far right" 18 25 | ||||
$ commit 27 "collapse" 21 | ||||
$ commit 28 "merge zero known" 1 26 | ||||
$ commit 29 "regular commit" 0 | ||||
$ commit 30 "expand" 28 29 | ||||
$ commit 31 "expand" 21 30 | ||||
$ commit 32 "expand" 27 31 | ||||
$ commit 33 "head" 18 | ||||
$ commit 34 "head" 32 | ||||
|
r20117 | $ hg log -G -q | ||
|
r12003 | @ 34:fea3ac5810e0 | ||
| | ||||
| o 33:68608f5145f9 | ||||
| | | ||||
o | 32:d06dffa21a31 | ||||
|\ \ | ||||
| o \ 31:621d83e11f67 | ||||
| |\ \ | ||||
| | o \ 30:6e11cd4b648f | ||||
| | |\ \ | ||||
| | | o | 29:cd9bb2be7593 | ||||
| | | | | | ||||
| | o | | 28:44ecd0b9ae99 | ||||
| | |\ \ \ | ||||
o | | | | | 27:886ed638191b | ||||
|/ / / / / | ||||
| | o---+ 26:7f25b6c2f0b9 | ||||
| | | | | | ||||
+---o | | 25:91da8ed57247 | ||||
| | | | | | ||||
| | o | | 24:a9c19a3d96b7 | ||||
| | |\| | | ||||
| | o | | 23:a01cddf0766d | ||||
| |/| | | | ||||
+---o---+ 22:e0d9cccacb5d | ||||
| | / / | ||||
o | | | 21:d42a756af44d | ||||
|\ \ \ \ | ||||
| o---+-+ 20:d30ed6450e32 | ||||
| / / / | ||||
o | | | 19:31ddc2c1573b | ||||
|\ \ \ \ | ||||
+---+---o 18:1aa84d96232a | ||||
| | | | | ||||
| o | | 17:44765d7c06e0 | ||||
| |\ \ \ | ||||
| | o---+ 16:3677d192927d | ||||
| | |/ / | ||||
o | | | 15:1dda3f72782d | ||||
|\ \ \ \ | ||||
| o-----+ 14:8eac370358ef | ||||
| |/ / / | ||||
o | | | 13:22d8966a97e3 | ||||
|\ \ \ \ | ||||
+---o | | 12:86b91144a6e9 | ||||
| | |/ / | ||||
| o | | 11:832d76e6bdf2 | ||||
| |\ \ \ | ||||
| | o---+ 10:74c64d036d72 | ||||
| |/ / / | ||||
o | | | 9:7010c0af0a35 | ||||
|\ \ \ \ | ||||
| o-----+ 8:7a0b11f71937 | ||||
|/ / / / | ||||
o | | | 7:b632bb1b1224 | ||||
|\ \ \ \ | ||||
+---o | | 6:b105a072e251 | ||||
| |/ / / | ||||
| o | | 5:4409d547b708 | ||||
| |\ \ \ | ||||
| | o | | 4:26a8bac39d9f | ||||
| |/|/ / | ||||
| o / / 3:27eef8ed80b4 | ||||
|/ / / | ||||
o / / 2:3d9a33b8d1e1 | ||||
|/ / | ||||
o / 1:6db2ef61d156 | ||||
|/ | ||||
o 0:e6eb3150255d | ||||
|
r20117 | $ hg log -G | ||
|
r12003 | @ changeset: 34:fea3ac5810e0 | ||
| tag: tip | ||||
| parent: 32:d06dffa21a31 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:34 1970 +0000 | ||||
| summary: (34) head | ||||
| | ||||
| o changeset: 33:68608f5145f9 | ||||
| | parent: 18:1aa84d96232a | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:33 1970 +0000 | ||||
| | summary: (33) head | ||||
| | | ||||
o | changeset: 32:d06dffa21a31 | ||||
|\ \ parent: 27:886ed638191b | ||||
| | | parent: 31:621d83e11f67 | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:32 1970 +0000 | ||||
| | | summary: (32) expand | ||||
| | | | ||||
| o | changeset: 31:621d83e11f67 | ||||
| |\ \ parent: 21:d42a756af44d | ||||
| | | | parent: 30:6e11cd4b648f | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:31 1970 +0000 | ||||
| | | | summary: (31) expand | ||||
| | | | | ||||
| | o | changeset: 30:6e11cd4b648f | ||||
| | |\ \ parent: 28:44ecd0b9ae99 | ||||
| | | | | parent: 29:cd9bb2be7593 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:30 1970 +0000 | ||||
| | | | | summary: (30) expand | ||||
| | | | | | ||||
| | | o | changeset: 29:cd9bb2be7593 | ||||
| | | | | parent: 0:e6eb3150255d | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:29 1970 +0000 | ||||
| | | | | summary: (29) regular commit | ||||
| | | | | | ||||
| | o | | changeset: 28:44ecd0b9ae99 | ||||
| | |\ \ \ parent: 1:6db2ef61d156 | ||||
| | | | | | parent: 26:7f25b6c2f0b9 | ||||
| | | | | | user: test | ||||
| | | | | | date: Thu Jan 01 00:00:28 1970 +0000 | ||||
| | | | | | summary: (28) merge zero known | ||||
| | | | | | | ||||
o | | | | | changeset: 27:886ed638191b | ||||
|/ / / / / parent: 21:d42a756af44d | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:27 1970 +0000 | ||||
| | | | | summary: (27) collapse | ||||
| | | | | | ||||
| | o---+ changeset: 26:7f25b6c2f0b9 | ||||
| | | | | parent: 18:1aa84d96232a | ||||
| | | | | parent: 25:91da8ed57247 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:26 1970 +0000 | ||||
| | | | | summary: (26) merge one known; far right | ||||
| | | | | | ||||
+---o | | changeset: 25:91da8ed57247 | ||||
| | | | | parent: 21:d42a756af44d | ||||
| | | | | parent: 24:a9c19a3d96b7 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:25 1970 +0000 | ||||
| | | | | summary: (25) merge one known; far left | ||||
| | | | | | ||||
| | o | | changeset: 24:a9c19a3d96b7 | ||||
| | |\| | parent: 0:e6eb3150255d | ||||
| | | | | parent: 23:a01cddf0766d | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:24 1970 +0000 | ||||
| | | | | summary: (24) merge one known; immediate right | ||||
| | | | | | ||||
| | o | | changeset: 23:a01cddf0766d | ||||
| |/| | | parent: 1:6db2ef61d156 | ||||
| | | | | parent: 22:e0d9cccacb5d | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:23 1970 +0000 | ||||
| | | | | summary: (23) merge one known; immediate left | ||||
| | | | | | ||||
+---o---+ changeset: 22:e0d9cccacb5d | ||||
| | | | parent: 18:1aa84d96232a | ||||
| | / / parent: 21:d42a756af44d | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:22 1970 +0000 | ||||
| | | | summary: (22) merge two known; one far left, one far right | ||||
| | | | | ||||
o | | | changeset: 21:d42a756af44d | ||||
|\ \ \ \ parent: 19:31ddc2c1573b | ||||
| | | | | parent: 20:d30ed6450e32 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:21 1970 +0000 | ||||
| | | | | summary: (21) expand | ||||
| | | | | | ||||
| o---+-+ changeset: 20:d30ed6450e32 | ||||
| | | | parent: 0:e6eb3150255d | ||||
| / / / parent: 18:1aa84d96232a | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:20 1970 +0000 | ||||
| | | | summary: (20) merge two known; two far right | ||||
| | | | | ||||
o | | | changeset: 19:31ddc2c1573b | ||||
|\ \ \ \ parent: 15:1dda3f72782d | ||||
| | | | | parent: 17:44765d7c06e0 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:19 1970 +0000 | ||||
| | | | | summary: (19) expand | ||||
| | | | | | ||||
+---+---o changeset: 18:1aa84d96232a | ||||
| | | | parent: 1:6db2ef61d156 | ||||
| | | | parent: 15:1dda3f72782d | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:18 1970 +0000 | ||||
| | | | summary: (18) merge two known; two far left | ||||
| | | | | ||||
| o | | changeset: 17:44765d7c06e0 | ||||
| |\ \ \ parent: 12:86b91144a6e9 | ||||
| | | | | parent: 16:3677d192927d | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:17 1970 +0000 | ||||
| | | | | summary: (17) expand | ||||
| | | | | | ||||
| | o---+ changeset: 16:3677d192927d | ||||
| | | | | parent: 0:e6eb3150255d | ||||
| | |/ / parent: 1:6db2ef61d156 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:16 1970 +0000 | ||||
| | | | summary: (16) merge two known; one immediate right, one near right | ||||
| | | | | ||||
o | | | changeset: 15:1dda3f72782d | ||||
|\ \ \ \ parent: 13:22d8966a97e3 | ||||
| | | | | parent: 14:8eac370358ef | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:15 1970 +0000 | ||||
| | | | | summary: (15) expand | ||||
| | | | | | ||||
| o-----+ changeset: 14:8eac370358ef | ||||
| | | | | parent: 0:e6eb3150255d | ||||
| |/ / / parent: 12:86b91144a6e9 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:14 1970 +0000 | ||||
| | | | summary: (14) merge two known; one immediate right, one far right | ||||
| | | | | ||||
o | | | changeset: 13:22d8966a97e3 | ||||
|\ \ \ \ parent: 9:7010c0af0a35 | ||||
| | | | | parent: 11:832d76e6bdf2 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:13 1970 +0000 | ||||
| | | | | summary: (13) expand | ||||
| | | | | | ||||
+---o | | changeset: 12:86b91144a6e9 | ||||
| | |/ / parent: 1:6db2ef61d156 | ||||
| | | | parent: 9:7010c0af0a35 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:12 1970 +0000 | ||||
| | | | summary: (12) merge two known; one immediate right, one far left | ||||
| | | | | ||||
| o | | changeset: 11:832d76e6bdf2 | ||||
| |\ \ \ parent: 6:b105a072e251 | ||||
| | | | | parent: 10:74c64d036d72 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:11 1970 +0000 | ||||
| | | | | summary: (11) expand | ||||
| | | | | | ||||
| | o---+ changeset: 10:74c64d036d72 | ||||
| | | | | parent: 0:e6eb3150255d | ||||
| |/ / / parent: 6:b105a072e251 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:10 1970 +0000 | ||||
| | | | summary: (10) merge two known; one immediate left, one near right | ||||
| | | | | ||||
o | | | changeset: 9:7010c0af0a35 | ||||
|\ \ \ \ parent: 7:b632bb1b1224 | ||||
| | | | | parent: 8:7a0b11f71937 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:09 1970 +0000 | ||||
| | | | | summary: (9) expand | ||||
| | | | | | ||||
| o-----+ changeset: 8:7a0b11f71937 | ||||
| | | | | parent: 0:e6eb3150255d | ||||
|/ / / / parent: 7:b632bb1b1224 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:08 1970 +0000 | ||||
| | | | summary: (8) merge two known; one immediate left, one far right | ||||
| | | | | ||||
o | | | changeset: 7:b632bb1b1224 | ||||
|\ \ \ \ parent: 2:3d9a33b8d1e1 | ||||
| | | | | parent: 5:4409d547b708 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:07 1970 +0000 | ||||
| | | | | summary: (7) expand | ||||
| | | | | | ||||
+---o | | changeset: 6:b105a072e251 | ||||
| |/ / / parent: 2:3d9a33b8d1e1 | ||||
| | | | parent: 5:4409d547b708 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:06 1970 +0000 | ||||
| | | | summary: (6) merge two known; one immediate left, one far left | ||||
| | | | | ||||
| o | | changeset: 5:4409d547b708 | ||||
| |\ \ \ parent: 3:27eef8ed80b4 | ||||
| | | | | parent: 4:26a8bac39d9f | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:05 1970 +0000 | ||||
| | | | | summary: (5) expand | ||||
| | | | | | ||||
| | o | | changeset: 4:26a8bac39d9f | ||||
| |/|/ / parent: 1:6db2ef61d156 | ||||
| | | | parent: 3:27eef8ed80b4 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:04 1970 +0000 | ||||
| | | | summary: (4) merge two known; one immediate left, one immediate right | ||||
| | | | | ||||
| o | | changeset: 3:27eef8ed80b4 | ||||
|/ / / user: test | ||||
| | | date: Thu Jan 01 00:00:03 1970 +0000 | ||||
| | | summary: (3) collapse | ||||
| | | | ||||
o | | changeset: 2:3d9a33b8d1e1 | ||||
|/ / user: test | ||||
| | date: Thu Jan 01 00:00:02 1970 +0000 | ||||
| | summary: (2) collapse | ||||
| | | ||||
o | changeset: 1:6db2ef61d156 | ||||
|/ user: test | ||||
| date: Thu Jan 01 00:00:01 1970 +0000 | ||||
| summary: (1) collapse | ||||
| | ||||
o changeset: 0:e6eb3150255d | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: (0) root | ||||
File glog: | ||||
|
r20117 | $ hg log -G a | ||
|
r12003 | @ changeset: 34:fea3ac5810e0 | ||
| tag: tip | ||||
| parent: 32:d06dffa21a31 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:34 1970 +0000 | ||||
| summary: (34) head | ||||
| | ||||
| o changeset: 33:68608f5145f9 | ||||
| | parent: 18:1aa84d96232a | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:33 1970 +0000 | ||||
| | summary: (33) head | ||||
| | | ||||
o | changeset: 32:d06dffa21a31 | ||||
|\ \ parent: 27:886ed638191b | ||||
| | | parent: 31:621d83e11f67 | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:32 1970 +0000 | ||||
| | | summary: (32) expand | ||||
| | | | ||||
|
r14042 | | o | changeset: 31:621d83e11f67 | ||
| |\ \ parent: 21:d42a756af44d | ||||
| | | | parent: 30:6e11cd4b648f | ||||
|
r12003 | | | | | user: test | ||
|
r14042 | | | | | date: Thu Jan 01 00:00:31 1970 +0000 | ||
| | | | summary: (31) expand | ||||
|
r12003 | | | | | | ||
|
r14042 | | | o | changeset: 30:6e11cd4b648f | ||
| | |\ \ parent: 28:44ecd0b9ae99 | ||||
| | | | | parent: 29:cd9bb2be7593 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:30 1970 +0000 | ||||
| | | | | summary: (30) expand | ||||
| | | | | | ||||
| | | o | changeset: 29:cd9bb2be7593 | ||||
| | | | | parent: 0:e6eb3150255d | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:29 1970 +0000 | ||||
| | | | | summary: (29) regular commit | ||||
| | | | | | ||||
| | o | | changeset: 28:44ecd0b9ae99 | ||||
| | |\ \ \ parent: 1:6db2ef61d156 | ||||
| | | | | | parent: 26:7f25b6c2f0b9 | ||||
| | | | | | user: test | ||||
| | | | | | date: Thu Jan 01 00:00:28 1970 +0000 | ||||
| | | | | | summary: (28) merge zero known | ||||
| | | | | | | ||||
o | | | | | changeset: 27:886ed638191b | ||||
|/ / / / / parent: 21:d42a756af44d | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:27 1970 +0000 | ||||
| | | | | summary: (27) collapse | ||||
| | | | | | ||||
| | o---+ changeset: 26:7f25b6c2f0b9 | ||||
| | | | | parent: 18:1aa84d96232a | ||||
| | | | | parent: 25:91da8ed57247 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:26 1970 +0000 | ||||
| | | | | summary: (26) merge one known; far right | ||||
| | | | | | ||||
+---o | | changeset: 25:91da8ed57247 | ||||
| | | | | parent: 21:d42a756af44d | ||||
| | | | | parent: 24:a9c19a3d96b7 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:25 1970 +0000 | ||||
| | | | | summary: (25) merge one known; far left | ||||
| | | | | | ||||
| | o | | changeset: 24:a9c19a3d96b7 | ||||
| | |\| | parent: 0:e6eb3150255d | ||||
| | | | | parent: 23:a01cddf0766d | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:24 1970 +0000 | ||||
| | | | | summary: (24) merge one known; immediate right | ||||
| | | | | | ||||
| | o | | changeset: 23:a01cddf0766d | ||||
| |/| | | parent: 1:6db2ef61d156 | ||||
| | | | | parent: 22:e0d9cccacb5d | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:23 1970 +0000 | ||||
| | | | | summary: (23) merge one known; immediate left | ||||
| | | | | | ||||
+---o---+ changeset: 22:e0d9cccacb5d | ||||
| | | | parent: 18:1aa84d96232a | ||||
| | / / parent: 21:d42a756af44d | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:22 1970 +0000 | ||||
| | | | summary: (22) merge two known; one far left, one far right | ||||
|
r12003 | | | | | | ||
|
r14042 | o | | | changeset: 21:d42a756af44d | ||
|\ \ \ \ parent: 19:31ddc2c1573b | ||||
| | | | | parent: 20:d30ed6450e32 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:21 1970 +0000 | ||||
| | | | | summary: (21) expand | ||||
| | | | | | ||||
| o---+-+ changeset: 20:d30ed6450e32 | ||||
| | | | parent: 0:e6eb3150255d | ||||
| / / / parent: 18:1aa84d96232a | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:20 1970 +0000 | ||||
| | | | summary: (20) merge two known; two far right | ||||
|
r12003 | | | | | | ||
|
r14042 | o | | | changeset: 19:31ddc2c1573b | ||
|\ \ \ \ parent: 15:1dda3f72782d | ||||
| | | | | parent: 17:44765d7c06e0 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:19 1970 +0000 | ||||
| | | | | summary: (19) expand | ||||
| | | | | | ||||
+---+---o changeset: 18:1aa84d96232a | ||||
| | | | parent: 1:6db2ef61d156 | ||||
| | | | parent: 15:1dda3f72782d | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:18 1970 +0000 | ||||
| | | | summary: (18) merge two known; two far left | ||||
|
r12003 | | | | | | ||
|
r14042 | | o | | changeset: 17:44765d7c06e0 | ||
| |\ \ \ parent: 12:86b91144a6e9 | ||||
| | | | | parent: 16:3677d192927d | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:17 1970 +0000 | ||||
| | | | | summary: (17) expand | ||||
| | | | | | ||||
| | o---+ changeset: 16:3677d192927d | ||||
| | | | | parent: 0:e6eb3150255d | ||||
| | |/ / parent: 1:6db2ef61d156 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:16 1970 +0000 | ||||
| | | | summary: (16) merge two known; one immediate right, one near right | ||||
|
r12003 | | | | | | ||
o | | | changeset: 15:1dda3f72782d | ||||
|\ \ \ \ parent: 13:22d8966a97e3 | ||||
| | | | | parent: 14:8eac370358ef | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:15 1970 +0000 | ||||
| | | | | summary: (15) expand | ||||
| | | | | | ||||
|
r14042 | | o-----+ changeset: 14:8eac370358ef | ||
| | | | | parent: 0:e6eb3150255d | ||||
| |/ / / parent: 12:86b91144a6e9 | ||||
|
r12003 | | | | | user: test | ||
| | | | date: Thu Jan 01 00:00:14 1970 +0000 | ||||
| | | | summary: (14) merge two known; one immediate right, one far right | ||||
| | | | | ||||
o | | | changeset: 13:22d8966a97e3 | ||||
|\ \ \ \ parent: 9:7010c0af0a35 | ||||
| | | | | parent: 11:832d76e6bdf2 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:13 1970 +0000 | ||||
| | | | | summary: (13) expand | ||||
| | | | | | ||||
+---o | | changeset: 12:86b91144a6e9 | ||||
|
r14042 | | | |/ / parent: 1:6db2ef61d156 | ||
|
r12003 | | | | | parent: 9:7010c0af0a35 | ||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:12 1970 +0000 | ||||
| | | | summary: (12) merge two known; one immediate right, one far left | ||||
| | | | | ||||
|
r14042 | | o | | changeset: 11:832d76e6bdf2 | ||
| |\ \ \ parent: 6:b105a072e251 | ||||
| | | | | parent: 10:74c64d036d72 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:11 1970 +0000 | ||||
| | | | | summary: (11) expand | ||||
| | | | | | ||||
| | o---+ changeset: 10:74c64d036d72 | ||||
| | | | | parent: 0:e6eb3150255d | ||||
| |/ / / parent: 6:b105a072e251 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:10 1970 +0000 | ||||
| | | | summary: (10) merge two known; one immediate left, one near right | ||||
|
r12003 | | | | | | ||
|
r14042 | o | | | changeset: 9:7010c0af0a35 | ||
|\ \ \ \ parent: 7:b632bb1b1224 | ||||
| | | | | parent: 8:7a0b11f71937 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:09 1970 +0000 | ||||
| | | | | summary: (9) expand | ||||
| | | | | | ||||
| o-----+ changeset: 8:7a0b11f71937 | ||||
| | | | | parent: 0:e6eb3150255d | ||||
|/ / / / parent: 7:b632bb1b1224 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:08 1970 +0000 | ||||
| | | | summary: (8) merge two known; one immediate left, one far right | ||||
|
r12003 | | | | | | ||
|
r14042 | o | | | changeset: 7:b632bb1b1224 | ||
|\ \ \ \ parent: 2:3d9a33b8d1e1 | ||||
| | | | | parent: 5:4409d547b708 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:07 1970 +0000 | ||||
| | | | | summary: (7) expand | ||||
| | | | | | ||||
+---o | | changeset: 6:b105a072e251 | ||||
| |/ / / parent: 2:3d9a33b8d1e1 | ||||
| | | | parent: 5:4409d547b708 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:06 1970 +0000 | ||||
| | | | summary: (6) merge two known; one immediate left, one far left | ||||
|
r12003 | | | | | | ||
|
r14042 | | o | | changeset: 5:4409d547b708 | ||
| |\ \ \ parent: 3:27eef8ed80b4 | ||||
| | | | | parent: 4:26a8bac39d9f | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:05 1970 +0000 | ||||
| | | | | summary: (5) expand | ||||
| | | | | | ||||
| | o | | changeset: 4:26a8bac39d9f | ||||
| |/|/ / parent: 1:6db2ef61d156 | ||||
| | | | parent: 3:27eef8ed80b4 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:04 1970 +0000 | ||||
| | | | summary: (4) merge two known; one immediate left, one immediate right | ||||
| | | | | ||||
| o | | changeset: 3:27eef8ed80b4 | ||||
|/ / / user: test | ||||
| | | date: Thu Jan 01 00:00:03 1970 +0000 | ||||
| | | summary: (3) collapse | ||||
|
r12003 | | | | | ||
o | | changeset: 2:3d9a33b8d1e1 | ||||
|/ / user: test | ||||
| | date: Thu Jan 01 00:00:02 1970 +0000 | ||||
| | summary: (2) collapse | ||||
| | | ||||
o | changeset: 1:6db2ef61d156 | ||||
|/ user: test | ||||
| date: Thu Jan 01 00:00:01 1970 +0000 | ||||
| summary: (1) collapse | ||||
| | ||||
o changeset: 0:e6eb3150255d | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: (0) root | ||||
|
r14043 | File glog per revset: | ||
|
r20117 | $ hg log -G -r 'file("a")' | ||
|
r14043 | @ changeset: 34:fea3ac5810e0 | ||
| tag: tip | ||||
| parent: 32:d06dffa21a31 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:34 1970 +0000 | ||||
| summary: (34) head | ||||
| | ||||
| o changeset: 33:68608f5145f9 | ||||
| | parent: 18:1aa84d96232a | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:33 1970 +0000 | ||||
| | summary: (33) head | ||||
| | | ||||
o | changeset: 32:d06dffa21a31 | ||||
|\ \ parent: 27:886ed638191b | ||||
| | | parent: 31:621d83e11f67 | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:32 1970 +0000 | ||||
| | | summary: (32) expand | ||||
| | | | ||||
| o | changeset: 31:621d83e11f67 | ||||
| |\ \ parent: 21:d42a756af44d | ||||
| | | | parent: 30:6e11cd4b648f | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:31 1970 +0000 | ||||
| | | | summary: (31) expand | ||||
| | | | | ||||
| | o | changeset: 30:6e11cd4b648f | ||||
| | |\ \ parent: 28:44ecd0b9ae99 | ||||
| | | | | parent: 29:cd9bb2be7593 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:30 1970 +0000 | ||||
| | | | | summary: (30) expand | ||||
| | | | | | ||||
| | | o | changeset: 29:cd9bb2be7593 | ||||
| | | | | parent: 0:e6eb3150255d | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:29 1970 +0000 | ||||
| | | | | summary: (29) regular commit | ||||
| | | | | | ||||
| | o | | changeset: 28:44ecd0b9ae99 | ||||
| | |\ \ \ parent: 1:6db2ef61d156 | ||||
| | | | | | parent: 26:7f25b6c2f0b9 | ||||
| | | | | | user: test | ||||
| | | | | | date: Thu Jan 01 00:00:28 1970 +0000 | ||||
| | | | | | summary: (28) merge zero known | ||||
| | | | | | | ||||
o | | | | | changeset: 27:886ed638191b | ||||
|/ / / / / parent: 21:d42a756af44d | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:27 1970 +0000 | ||||
| | | | | summary: (27) collapse | ||||
| | | | | | ||||
| | o---+ changeset: 26:7f25b6c2f0b9 | ||||
| | | | | parent: 18:1aa84d96232a | ||||
| | | | | parent: 25:91da8ed57247 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:26 1970 +0000 | ||||
| | | | | summary: (26) merge one known; far right | ||||
| | | | | | ||||
+---o | | changeset: 25:91da8ed57247 | ||||
| | | | | parent: 21:d42a756af44d | ||||
| | | | | parent: 24:a9c19a3d96b7 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:25 1970 +0000 | ||||
| | | | | summary: (25) merge one known; far left | ||||
| | | | | | ||||
| | o | | changeset: 24:a9c19a3d96b7 | ||||
| | |\| | parent: 0:e6eb3150255d | ||||
| | | | | parent: 23:a01cddf0766d | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:24 1970 +0000 | ||||
| | | | | summary: (24) merge one known; immediate right | ||||
| | | | | | ||||
| | o | | changeset: 23:a01cddf0766d | ||||
| |/| | | parent: 1:6db2ef61d156 | ||||
| | | | | parent: 22:e0d9cccacb5d | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:23 1970 +0000 | ||||
| | | | | summary: (23) merge one known; immediate left | ||||
| | | | | | ||||
+---o---+ changeset: 22:e0d9cccacb5d | ||||
| | | | parent: 18:1aa84d96232a | ||||
| | / / parent: 21:d42a756af44d | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:22 1970 +0000 | ||||
| | | | summary: (22) merge two known; one far left, one far right | ||||
| | | | | ||||
o | | | changeset: 21:d42a756af44d | ||||
|\ \ \ \ parent: 19:31ddc2c1573b | ||||
| | | | | parent: 20:d30ed6450e32 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:21 1970 +0000 | ||||
| | | | | summary: (21) expand | ||||
| | | | | | ||||
| o---+-+ changeset: 20:d30ed6450e32 | ||||
| | | | parent: 0:e6eb3150255d | ||||
| / / / parent: 18:1aa84d96232a | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:20 1970 +0000 | ||||
| | | | summary: (20) merge two known; two far right | ||||
| | | | | ||||
o | | | changeset: 19:31ddc2c1573b | ||||
|\ \ \ \ parent: 15:1dda3f72782d | ||||
| | | | | parent: 17:44765d7c06e0 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:19 1970 +0000 | ||||
| | | | | summary: (19) expand | ||||
| | | | | | ||||
+---+---o changeset: 18:1aa84d96232a | ||||
| | | | parent: 1:6db2ef61d156 | ||||
| | | | parent: 15:1dda3f72782d | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:18 1970 +0000 | ||||
| | | | summary: (18) merge two known; two far left | ||||
| | | | | ||||
| o | | changeset: 17:44765d7c06e0 | ||||
| |\ \ \ parent: 12:86b91144a6e9 | ||||
| | | | | parent: 16:3677d192927d | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:17 1970 +0000 | ||||
| | | | | summary: (17) expand | ||||
| | | | | | ||||
| | o---+ changeset: 16:3677d192927d | ||||
| | | | | parent: 0:e6eb3150255d | ||||
| | |/ / parent: 1:6db2ef61d156 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:16 1970 +0000 | ||||
| | | | summary: (16) merge two known; one immediate right, one near right | ||||
| | | | | ||||
o | | | changeset: 15:1dda3f72782d | ||||
|\ \ \ \ parent: 13:22d8966a97e3 | ||||
| | | | | parent: 14:8eac370358ef | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:15 1970 +0000 | ||||
| | | | | summary: (15) expand | ||||
| | | | | | ||||
| o-----+ changeset: 14:8eac370358ef | ||||
| | | | | parent: 0:e6eb3150255d | ||||
| |/ / / parent: 12:86b91144a6e9 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:14 1970 +0000 | ||||
| | | | summary: (14) merge two known; one immediate right, one far right | ||||
| | | | | ||||
o | | | changeset: 13:22d8966a97e3 | ||||
|\ \ \ \ parent: 9:7010c0af0a35 | ||||
| | | | | parent: 11:832d76e6bdf2 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:13 1970 +0000 | ||||
| | | | | summary: (13) expand | ||||
| | | | | | ||||
+---o | | changeset: 12:86b91144a6e9 | ||||
| | |/ / parent: 1:6db2ef61d156 | ||||
| | | | parent: 9:7010c0af0a35 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:12 1970 +0000 | ||||
| | | | summary: (12) merge two known; one immediate right, one far left | ||||
| | | | | ||||
| o | | changeset: 11:832d76e6bdf2 | ||||
| |\ \ \ parent: 6:b105a072e251 | ||||
| | | | | parent: 10:74c64d036d72 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:11 1970 +0000 | ||||
| | | | | summary: (11) expand | ||||
| | | | | | ||||
| | o---+ changeset: 10:74c64d036d72 | ||||
| | | | | parent: 0:e6eb3150255d | ||||
| |/ / / parent: 6:b105a072e251 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:10 1970 +0000 | ||||
| | | | summary: (10) merge two known; one immediate left, one near right | ||||
| | | | | ||||
o | | | changeset: 9:7010c0af0a35 | ||||
|\ \ \ \ parent: 7:b632bb1b1224 | ||||
| | | | | parent: 8:7a0b11f71937 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:09 1970 +0000 | ||||
| | | | | summary: (9) expand | ||||
| | | | | | ||||
| o-----+ changeset: 8:7a0b11f71937 | ||||
| | | | | parent: 0:e6eb3150255d | ||||
|/ / / / parent: 7:b632bb1b1224 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:08 1970 +0000 | ||||
| | | | summary: (8) merge two known; one immediate left, one far right | ||||
| | | | | ||||
o | | | changeset: 7:b632bb1b1224 | ||||
|\ \ \ \ parent: 2:3d9a33b8d1e1 | ||||
| | | | | parent: 5:4409d547b708 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:07 1970 +0000 | ||||
| | | | | summary: (7) expand | ||||
| | | | | | ||||
+---o | | changeset: 6:b105a072e251 | ||||
| |/ / / parent: 2:3d9a33b8d1e1 | ||||
| | | | parent: 5:4409d547b708 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:06 1970 +0000 | ||||
| | | | summary: (6) merge two known; one immediate left, one far left | ||||
| | | | | ||||
| o | | changeset: 5:4409d547b708 | ||||
| |\ \ \ parent: 3:27eef8ed80b4 | ||||
| | | | | parent: 4:26a8bac39d9f | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:05 1970 +0000 | ||||
| | | | | summary: (5) expand | ||||
| | | | | | ||||
| | o | | changeset: 4:26a8bac39d9f | ||||
| |/|/ / parent: 1:6db2ef61d156 | ||||
| | | | parent: 3:27eef8ed80b4 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:04 1970 +0000 | ||||
| | | | summary: (4) merge two known; one immediate left, one immediate right | ||||
| | | | | ||||
| o | | changeset: 3:27eef8ed80b4 | ||||
|/ / / user: test | ||||
| | | date: Thu Jan 01 00:00:03 1970 +0000 | ||||
| | | summary: (3) collapse | ||||
| | | | ||||
o | | changeset: 2:3d9a33b8d1e1 | ||||
|/ / user: test | ||||
| | date: Thu Jan 01 00:00:02 1970 +0000 | ||||
| | summary: (2) collapse | ||||
| | | ||||
o | changeset: 1:6db2ef61d156 | ||||
|/ user: test | ||||
| date: Thu Jan 01 00:00:01 1970 +0000 | ||||
| summary: (1) collapse | ||||
| | ||||
o changeset: 0:e6eb3150255d | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: (0) root | ||||
|
r12003 | |||
|
r14043 | |||
File glog per revset (only merges): | ||||
|
r12003 | |||
|
r14043 | $ hg log -G -r 'file("a")' -m | ||
o changeset: 32:d06dffa21a31 | ||||
|\ parent: 27:886ed638191b | ||||
|
r28627 | | : parent: 31:621d83e11f67 | ||
| : user: test | ||||
| : date: Thu Jan 01 00:00:32 1970 +0000 | ||||
| : summary: (32) expand | ||||
| : | ||||
o : changeset: 31:621d83e11f67 | ||||
|\: parent: 21:d42a756af44d | ||||
| : parent: 30:6e11cd4b648f | ||||
| : user: test | ||||
| : date: Thu Jan 01 00:00:31 1970 +0000 | ||||
| : summary: (31) expand | ||||
| : | ||||
o : changeset: 30:6e11cd4b648f | ||||
|\ \ parent: 28:44ecd0b9ae99 | ||||
| ~ : parent: 29:cd9bb2be7593 | ||||
| : user: test | ||||
| : date: Thu Jan 01 00:00:30 1970 +0000 | ||||
| : summary: (30) expand | ||||
| / | ||||
o : changeset: 28:44ecd0b9ae99 | ||||
|\ \ parent: 1:6db2ef61d156 | ||||
| ~ : parent: 26:7f25b6c2f0b9 | ||||
| : user: test | ||||
| : date: Thu Jan 01 00:00:28 1970 +0000 | ||||
| : summary: (28) merge zero known | ||||
| / | ||||
o : changeset: 26:7f25b6c2f0b9 | ||||
|\ \ parent: 18:1aa84d96232a | ||||
| | : parent: 25:91da8ed57247 | ||||
| | : user: test | ||||
| | : date: Thu Jan 01 00:00:26 1970 +0000 | ||||
| | : summary: (26) merge one known; far right | ||||
| | : | ||||
| o : changeset: 25:91da8ed57247 | ||||
| |\: parent: 21:d42a756af44d | ||||
| | : parent: 24:a9c19a3d96b7 | ||||
| | : user: test | ||||
| | : date: Thu Jan 01 00:00:25 1970 +0000 | ||||
| | : summary: (25) merge one known; far left | ||||
| | : | ||||
| o : changeset: 24:a9c19a3d96b7 | ||||
| |\ \ parent: 0:e6eb3150255d | ||||
| | ~ : parent: 23:a01cddf0766d | ||||
| | : user: test | ||||
| | : date: Thu Jan 01 00:00:24 1970 +0000 | ||||
| | : summary: (24) merge one known; immediate right | ||||
| | / | ||||
| o : changeset: 23:a01cddf0766d | ||||
| |\ \ parent: 1:6db2ef61d156 | ||||
| | ~ : parent: 22:e0d9cccacb5d | ||||
| | : user: test | ||||
| | : date: Thu Jan 01 00:00:23 1970 +0000 | ||||
| | : summary: (23) merge one known; immediate left | ||||
| | / | ||||
| o : changeset: 22:e0d9cccacb5d | ||||
|/:/ parent: 18:1aa84d96232a | ||||
| : parent: 21:d42a756af44d | ||||
| : user: test | ||||
| : date: Thu Jan 01 00:00:22 1970 +0000 | ||||
| : summary: (22) merge two known; one far left, one far right | ||||
| : | ||||
| o changeset: 21:d42a756af44d | ||||
| |\ parent: 19:31ddc2c1573b | ||||
| | | parent: 20:d30ed6450e32 | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:21 1970 +0000 | ||||
| | | summary: (21) expand | ||||
| | | | ||||
+---o changeset: 20:d30ed6450e32 | ||||
| | | parent: 0:e6eb3150255d | ||||
| | ~ parent: 18:1aa84d96232a | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:20 1970 +0000 | ||||
| | summary: (20) merge two known; two far right | ||||
|
r14043 | | | | ||
|
r28627 | | o changeset: 19:31ddc2c1573b | ||
| |\ parent: 15:1dda3f72782d | ||||
| | | parent: 17:44765d7c06e0 | ||||
|
r14043 | | | | user: test | ||
|
r28627 | | | | date: Thu Jan 01 00:00:19 1970 +0000 | ||
| | | summary: (19) expand | ||||
|
r14043 | | | | | ||
|
r28627 | o | | changeset: 18:1aa84d96232a | ||
|\| | parent: 1:6db2ef61d156 | ||||
~ | | parent: 15:1dda3f72782d | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:18 1970 +0000 | ||||
| | summary: (18) merge two known; two far left | ||||
/ / | ||||
| o changeset: 17:44765d7c06e0 | ||||
| |\ parent: 12:86b91144a6e9 | ||||
| | | parent: 16:3677d192927d | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:17 1970 +0000 | ||||
| | | summary: (17) expand | ||||
| | | | ||||
| | o changeset: 16:3677d192927d | ||||
| | |\ parent: 0:e6eb3150255d | ||||
| | ~ ~ parent: 1:6db2ef61d156 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:16 1970 +0000 | ||||
| | summary: (16) merge two known; one immediate right, one near right | ||||
| | | ||||
o | changeset: 15:1dda3f72782d | ||||
|\ \ parent: 13:22d8966a97e3 | ||||
| | | parent: 14:8eac370358ef | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:15 1970 +0000 | ||||
| | | summary: (15) expand | ||||
| | | | ||||
| o | changeset: 14:8eac370358ef | ||||
| |\| parent: 0:e6eb3150255d | ||||
| ~ | parent: 12:86b91144a6e9 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:14 1970 +0000 | ||||
| | summary: (14) merge two known; one immediate right, one far right | ||||
| / | ||||
o | changeset: 13:22d8966a97e3 | ||||
|\ \ parent: 9:7010c0af0a35 | ||||
| | | parent: 11:832d76e6bdf2 | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:13 1970 +0000 | ||||
| | | summary: (13) expand | ||||
| | | | ||||
+---o changeset: 12:86b91144a6e9 | ||||
| | | parent: 1:6db2ef61d156 | ||||
| | ~ parent: 9:7010c0af0a35 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:12 1970 +0000 | ||||
| | summary: (12) merge two known; one immediate right, one far left | ||||
| | | ||||
| o changeset: 11:832d76e6bdf2 | ||||
| |\ parent: 6:b105a072e251 | ||||
| | | parent: 10:74c64d036d72 | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:11 1970 +0000 | ||||
| | | summary: (11) expand | ||||
| | | | ||||
| | o changeset: 10:74c64d036d72 | ||||
| |/| parent: 0:e6eb3150255d | ||||
| | ~ parent: 6:b105a072e251 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:10 1970 +0000 | ||||
| | summary: (10) merge two known; one immediate left, one near right | ||||
| | | ||||
o | changeset: 9:7010c0af0a35 | ||||
|\ \ parent: 7:b632bb1b1224 | ||||
| | | parent: 8:7a0b11f71937 | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:09 1970 +0000 | ||||
| | | summary: (9) expand | ||||
| | | | ||||
| o | changeset: 8:7a0b11f71937 | ||||
|/| | parent: 0:e6eb3150255d | ||||
| ~ | parent: 7:b632bb1b1224 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:08 1970 +0000 | ||||
| | summary: (8) merge two known; one immediate left, one far right | ||||
| / | ||||
o | changeset: 7:b632bb1b1224 | ||||
|\ \ parent: 2:3d9a33b8d1e1 | ||||
| ~ | parent: 5:4409d547b708 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:07 1970 +0000 | ||||
| | summary: (7) expand | ||||
| / | ||||
| o changeset: 6:b105a072e251 | ||||
|/| parent: 2:3d9a33b8d1e1 | ||||
| ~ parent: 5:4409d547b708 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:06 1970 +0000 | ||||
| summary: (6) merge two known; one immediate left, one far left | ||||
| | ||||
o changeset: 5:4409d547b708 | ||||
|\ parent: 3:27eef8ed80b4 | ||||
| ~ parent: 4:26a8bac39d9f | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:05 1970 +0000 | ||||
| summary: (5) expand | ||||
| | ||||
o changeset: 4:26a8bac39d9f | ||||
|\ parent: 1:6db2ef61d156 | ||||
~ ~ parent: 3:27eef8ed80b4 | ||||
user: test | ||||
date: Thu Jan 01 00:00:04 1970 +0000 | ||||
summary: (4) merge two known; one immediate left, one immediate right | ||||
|
r14043 | |||
|
r13631 | |||
|
r12003 | Empty revision range - display nothing: | ||
|
r20117 | $ hg log -G -r 1..0 | ||
|
r12003 | |||
|
r17014 | $ cd .. | ||
#if no-outer-repo | ||||
|
r12003 | From outer space: | ||
|
r20117 | $ hg log -G -l1 repo | ||
|
r12003 | @ changeset: 34:fea3ac5810e0 | ||
| tag: tip | ||||
|
r28627 | ~ parent: 32:d06dffa21a31 | ||
user: test | ||||
date: Thu Jan 01 00:00:34 1970 +0000 | ||||
summary: (34) head | ||||
|
r20117 | $ hg log -G -l1 repo/a | ||
|
r12003 | @ changeset: 34:fea3ac5810e0 | ||
| tag: tip | ||||
|
r28627 | ~ parent: 32:d06dffa21a31 | ||
user: test | ||||
date: Thu Jan 01 00:00:34 1970 +0000 | ||||
summary: (34) head | ||||
|
r20117 | $ hg log -G -l1 repo/missing | ||
|
r12003 | |||
|
r17014 | #endif | ||
|
r12003 | File log with revs != cset revs: | ||
$ hg init flog | ||||
$ cd flog | ||||
$ echo one >one | ||||
$ hg add one | ||||
$ hg commit -mone | ||||
$ echo two >two | ||||
$ hg add two | ||||
$ hg commit -mtwo | ||||
$ echo more >two | ||||
$ hg commit -mmore | ||||
|
r20117 | $ hg log -G two | ||
|
r12003 | @ changeset: 2:12c28321755b | ||
| tag: tip | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: more | ||||
| | ||||
o changeset: 1:5ac72c0599bf | ||||
|
r14042 | | user: test | ||
|
r28627 | ~ date: Thu Jan 01 00:00:00 1970 +0000 | ||
summary: two | ||||
|
r12003 | |||
|
r12399 | Issue1896: File log with explicit style | ||
|
r20117 | $ hg log -G --style=default one | ||
|
r12003 | o changeset: 0:3d578b4a1f53 | ||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: one | ||||
|
r12579 | Issue2395: glog --style header and footer | ||
|
r20117 | $ hg log -G --style=xml one | ||
|
r12579 | <?xml version="1.0"?> | ||
<log> | ||||
o <logentry revision="0" node="3d578b4a1f537d5fcf7301bfa9c0b97adfaa6fb1"> | ||||
<author email="test">test</author> | ||||
<date>1970-01-01T00:00:00+00:00</date> | ||||
<msg xml:space="preserve">one</msg> | ||||
</logentry> | ||||
</log> | ||||
|
r12003 | $ cd .. | ||
Incoming and outgoing: | ||||
$ hg clone -U -r31 repo repo2 | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 31 changesets with 31 changes to 1 files | ||||
|
r34662 | new changesets e6eb3150255d:621d83e11f67 | ||
|
r12003 | $ cd repo2 | ||
$ hg incoming --graph ../repo | ||||
comparing with ../repo | ||||
searching for changes | ||||
o changeset: 34:fea3ac5810e0 | ||||
| tag: tip | ||||
| parent: 32:d06dffa21a31 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:34 1970 +0000 | ||||
| summary: (34) head | ||||
| | ||||
| o changeset: 33:68608f5145f9 | ||||
| parent: 18:1aa84d96232a | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:33 1970 +0000 | ||||
| summary: (33) head | ||||
| | ||||
o changeset: 32:d06dffa21a31 | ||||
| parent: 27:886ed638191b | ||||
| parent: 31:621d83e11f67 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:32 1970 +0000 | ||||
| summary: (32) expand | ||||
| | ||||
o changeset: 27:886ed638191b | ||||
parent: 21:d42a756af44d | ||||
user: test | ||||
date: Thu Jan 01 00:00:27 1970 +0000 | ||||
summary: (27) collapse | ||||
$ cd .. | ||||
$ hg -R repo outgoing --graph repo2 | ||||
comparing with repo2 | ||||
searching for changes | ||||
@ changeset: 34:fea3ac5810e0 | ||||
| tag: tip | ||||
| parent: 32:d06dffa21a31 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:34 1970 +0000 | ||||
| summary: (34) head | ||||
| | ||||
| o changeset: 33:68608f5145f9 | ||||
| parent: 18:1aa84d96232a | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:33 1970 +0000 | ||||
| summary: (33) head | ||||
| | ||||
o changeset: 32:d06dffa21a31 | ||||
| parent: 27:886ed638191b | ||||
| parent: 31:621d83e11f67 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:32 1970 +0000 | ||||
| summary: (32) expand | ||||
| | ||||
o changeset: 27:886ed638191b | ||||
parent: 21:d42a756af44d | ||||
user: test | ||||
date: Thu Jan 01 00:00:27 1970 +0000 | ||||
summary: (27) collapse | ||||
File + limit with revs != cset revs: | ||||
$ cd repo | ||||
$ touch b | ||||
$ hg ci -Aqm0 | ||||
|
r20117 | $ hg log -G -l2 a | ||
|
r12003 | o changeset: 34:fea3ac5810e0 | ||
| parent: 32:d06dffa21a31 | ||||
|
r28627 | ~ user: test | ||
date: Thu Jan 01 00:00:34 1970 +0000 | ||||
summary: (34) head | ||||
o changeset: 33:68608f5145f9 | ||||
| parent: 18:1aa84d96232a | ||||
~ user: test | ||||
date: Thu Jan 01 00:00:33 1970 +0000 | ||||
summary: (33) head | ||||
|
r12003 | |||
File + limit + -ra:b, (b - a) < limit: | ||||
|
r20117 | $ hg log -G -l3000 -r32:tip a | ||
|
r12003 | o changeset: 34:fea3ac5810e0 | ||
| parent: 32:d06dffa21a31 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:34 1970 +0000 | ||||
| summary: (34) head | ||||
| | ||||
| o changeset: 33:68608f5145f9 | ||||
| | parent: 18:1aa84d96232a | ||||
|
r28627 | | ~ user: test | ||
| date: Thu Jan 01 00:00:33 1970 +0000 | ||||
| summary: (33) head | ||||
| | ||||
o changeset: 32:d06dffa21a31 | ||||
|\ parent: 27:886ed638191b | ||||
~ ~ parent: 31:621d83e11f67 | ||||
user: test | ||||
date: Thu Jan 01 00:00:32 1970 +0000 | ||||
summary: (32) expand | ||||
|
r12003 | |||
|
r14043 | Point out a common and an uncommon unshown parent | ||
|
r20117 | $ hg log -G -r 'rev(8) or rev(9)' | ||
|
r14043 | o changeset: 9:7010c0af0a35 | ||
|\ parent: 7:b632bb1b1224 | ||||
|
r28627 | | ~ parent: 8:7a0b11f71937 | ||
| user: test | ||||
| date: Thu Jan 01 00:00:09 1970 +0000 | ||||
| summary: (9) expand | ||||
| | ||||
o changeset: 8:7a0b11f71937 | ||||
|\ parent: 0:e6eb3150255d | ||||
~ ~ parent: 7:b632bb1b1224 | ||||
user: test | ||||
date: Thu Jan 01 00:00:08 1970 +0000 | ||||
summary: (8) merge two known; one immediate left, one far right | ||||
|
r14043 | |||
|
r12003 | File + limit + -ra:b, b < tip: | ||
|
r14043 | |||
|
r20117 | $ hg log -G -l1 -r32:34 a | ||
|
r12003 | o changeset: 34:fea3ac5810e0 | ||
| parent: 32:d06dffa21a31 | ||||
|
r28627 | ~ user: test | ||
date: Thu Jan 01 00:00:34 1970 +0000 | ||||
summary: (34) head | ||||
|
r12003 | |||
|
r14043 | file(File) + limit + -ra:b, b < tip: | ||
|
r20117 | $ hg log -G -l1 -r32:34 -r 'file("a")' | ||
|
r14133 | o changeset: 34:fea3ac5810e0 | ||
| parent: 32:d06dffa21a31 | ||||
|
r28627 | ~ user: test | ||
date: Thu Jan 01 00:00:34 1970 +0000 | ||||
summary: (34) head | ||||
|
r14043 | |||
limit(file(File) and a::b), b < tip: | ||||
|
r20117 | $ hg log -G -r 'limit(file("a") and 32::34, 1)' | ||
|
r14043 | o changeset: 32:d06dffa21a31 | ||
|\ parent: 27:886ed638191b | ||||
|
r28627 | ~ ~ parent: 31:621d83e11f67 | ||
user: test | ||||
date: Thu Jan 01 00:00:32 1970 +0000 | ||||
summary: (32) expand | ||||
|
r14043 | |||
File + limit + -ra:b, b < tip: | ||||
|
r20117 | $ hg log -G -r 'limit(file("a") and 34::32, 1)' | ||
|
r14043 | |||
|
r12003 | File + limit + -ra:b, b < tip, (b - a) < limit: | ||
|
r14043 | |||
|
r20117 | $ hg log -G -l10 -r33:34 a | ||
|
r12003 | o changeset: 34:fea3ac5810e0 | ||
| parent: 32:d06dffa21a31 | ||||
|
r28627 | ~ user: test | ||
date: Thu Jan 01 00:00:34 1970 +0000 | ||||
summary: (34) head | ||||
o changeset: 33:68608f5145f9 | ||||
| parent: 18:1aa84d96232a | ||||
~ user: test | ||||
date: Thu Jan 01 00:00:33 1970 +0000 | ||||
summary: (33) head | ||||
|
r12003 | |||
|
r12951 | Do not crash or produce strange graphs if history is buggy | ||
|
r16149 | $ hg branch branch | ||
marked working directory as branch branch | ||||
(branches are permanent and global, did you want a bookmark?) | ||||
|
r12951 | $ commit 36 "buggy merge: identical parents" 35 35 | ||
|
r20117 | $ hg log -G -l5 | ||
|
r16149 | @ changeset: 36:08a19a744424 | ||
| branch: branch | ||||
|
r12951 | | tag: tip | ||
| parent: 35:9159c3644c5e | ||||
| parent: 35:9159c3644c5e | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:36 1970 +0000 | ||||
| summary: (36) buggy merge: identical parents | ||||
| | ||||
o changeset: 35:9159c3644c5e | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: 0 | ||||
| | ||||
o changeset: 34:fea3ac5810e0 | ||||
| parent: 32:d06dffa21a31 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:34 1970 +0000 | ||||
| summary: (34) head | ||||
| | ||||
| o changeset: 33:68608f5145f9 | ||||
| | parent: 18:1aa84d96232a | ||||
|
r28627 | | ~ user: test | ||
| date: Thu Jan 01 00:00:33 1970 +0000 | ||||
| summary: (33) head | ||||
| | ||||
o changeset: 32:d06dffa21a31 | ||||
|\ parent: 27:886ed638191b | ||||
~ ~ parent: 31:621d83e11f67 | ||||
user: test | ||||
date: Thu Jan 01 00:00:32 1970 +0000 | ||||
summary: (32) expand | ||||
|
r14081 | |||
Test log -G options | ||||
|
r16148 | $ testlog() { | ||
> hg log -G --print-revset "$@" | ||||
> hg log --template 'nodetag {rev}\n' "$@" | grep nodetag \ | ||||
> | sed 's/.*nodetag/nodetag/' > log.nodes | ||||
> hg log -G --template 'nodetag {rev}\n' "$@" | grep nodetag \ | ||||
> | sed 's/.*nodetag/nodetag/' > glog.nodes | ||||
|
r27556 | > (cmp log.nodes glog.nodes || diff -u log.nodes glog.nodes) \ | ||
> | grep '^[-+@ ]' || : | ||||
|
r16148 | > } | ||
|
r16170 | glog always reorders nodes which explains the difference with log | ||
$ testlog -r 27 -r 25 -r 21 -r 34 -r 32 -r 31 | ||||
|
r16316 | ['27', '25', '21', '34', '32', '31'] | ||
[] | ||||
|
r35569 | <baseset- [21, 25, 27, 31, 32, 34]> | ||
|
r16170 | --- log.nodes * (glob) | ||
+++ glog.nodes * (glob) | ||||
@@ -1,6 +1,6 @@ | ||||
-nodetag 27 | ||||
-nodetag 25 | ||||
-nodetag 21 | ||||
nodetag 34 | ||||
nodetag 32 | ||||
nodetag 31 | ||||
+nodetag 27 | ||||
+nodetag 25 | ||||
+nodetag 21 | ||||
|
r16148 | $ testlog -u test -u not-a-user | ||
|
r16316 | [] | ||
|
r35568 | (or | ||
(list | ||||
(func | ||||
(symbol 'user') | ||||
(string 'test')) | ||||
(func | ||||
(symbol 'user') | ||||
(string 'not-a-user')))) | ||||
|
r35569 | <filteredset | ||
<spanset- 0:37>, | ||||
<addset | ||||
<filteredset | ||||
<fullreposet+ 0:37>, | ||||
<user 'test'>>, | ||||
<filteredset | ||||
<fullreposet+ 0:37>, | ||||
<user 'not-a-user'>>>> | ||||
|
r16149 | $ testlog -b not-a-branch | ||
|
r16405 | abort: unknown revision 'not-a-branch'! | ||
|
r16149 | abort: unknown revision 'not-a-branch'! | ||
abort: unknown revision 'not-a-branch'! | ||||
|
r16407 | $ testlog -b 35 -b 36 --only-branch branch | ||
|
r16316 | [] | ||
|
r35568 | (or | ||
(list | ||||
(func | ||||
(symbol 'branch') | ||||
(string 'default')) | ||||
|
r35662 | (or | ||
(list | ||||
(func | ||||
(symbol 'branch') | ||||
(string 'branch')) | ||||
(func | ||||
(symbol 'branch') | ||||
(string 'branch')))))) | ||||
|
r35569 | <filteredset | ||
<spanset- 0:37>, | ||||
<addset | ||||
<filteredset | ||||
<fullreposet+ 0:37>, | ||||
<branch 'default'>>, | ||||
<addset | ||||
<filteredset | ||||
<fullreposet+ 0:37>, | ||||
<branch 'branch'>>, | ||||
<filteredset | ||||
<fullreposet+ 0:37>, | ||||
<branch 'branch'>>>>> | ||||
|
r16150 | $ testlog -k expand -k merge | ||
|
r16316 | [] | ||
|
r35568 | (or | ||
(list | ||||
(func | ||||
(symbol 'keyword') | ||||
(string 'expand')) | ||||
(func | ||||
(symbol 'keyword') | ||||
(string 'merge')))) | ||||
|
r35569 | <filteredset | ||
<spanset- 0:37>, | ||||
<addset | ||||
<filteredset | ||||
<fullreposet+ 0:37>, | ||||
<keyword 'expand'>>, | ||||
<filteredset | ||||
<fullreposet+ 0:37>, | ||||
<keyword 'merge'>>>> | ||||
|
r16183 | $ testlog --only-merges | ||
|
r16316 | [] | ||
|
r35568 | (func | ||
(symbol 'merge') | ||||
None) | ||||
|
r35569 | <filteredset | ||
<spanset- 0:37>, | ||||
<merge>> | ||||
|
r35568 | $ testlog --no-merges | ||
[] | ||||
(not | ||||
|
r16315 | (func | ||
|
r34075 | (symbol 'merge') | ||
|
r16315 | None)) | ||
|
r35569 | <filteredset | ||
<spanset- 0:37>, | ||||
<not | ||||
<filteredset | ||||
<spanset- 0:37>, | ||||
<merge>>>> | ||||
|
r16183 | $ testlog --date '2 0 to 4 0' | ||
|
r16316 | [] | ||
|
r35568 | (func | ||
(symbol 'date') | ||||
(string '2 0 to 4 0')) | ||||
|
r35569 | <filteredset | ||
<spanset- 0:37>, | ||||
<date '2 0 to 4 0'>> | ||||
|
r14083 | $ hg log -G -d 'brace ) in a date' | ||
|
r32462 | hg: parse error: invalid date: 'brace ) in a date' | ||
|
r14083 | [255] | ||
|
r16172 | $ testlog --prune 31 --prune 32 | ||
|
r16316 | [] | ||
|
r35662 | (not | ||
(or | ||||
(list | ||||
(func | ||||
(symbol 'ancestors') | ||||
(string '31')) | ||||
(func | ||||
(symbol 'ancestors') | ||||
(string '32'))))) | ||||
|
r35569 | <filteredset | ||
|
r35662 | <spanset- 0:37>, | ||
<not | ||||
<addset | ||||
|
r35569 | <filteredset | ||
<spanset- 0:37>, | ||||
|
r35662 | <generatorsetdesc+>>, | ||
<filteredset | ||||
<spanset- 0:37>, | ||||
<generatorsetdesc+>>>>> | ||||
|
r16159 | |||
|
r16173 | Dedicated repo for --follow and paths filtering. The g is crafted to | ||
have 2 filelog topological heads in a linear changeset graph. | ||||
|
r16159 | |||
$ cd .. | ||||
$ hg init follow | ||||
$ cd follow | ||||
|
r16408 | $ testlog --follow | ||
[] | ||||
[] | ||||
|
r35569 | <baseset []> | ||
|
r24059 | $ testlog -rnull | ||
['null'] | ||||
[] | ||||
|
r35569 | <baseset [-1]> | ||
|
r16159 | $ echo a > a | ||
|
r16171 | $ echo aa > aa | ||
|
r16173 | $ echo f > f | ||
|
r16408 | $ hg ci -Am "add a" a aa f | ||
|
r16159 | $ hg cp a b | ||
|
r16173 | $ hg cp f g | ||
|
r16159 | $ hg ci -m "copy a b" | ||
$ mkdir dir | ||||
$ hg mv b dir | ||||
|
r16173 | $ echo g >> g | ||
$ echo f >> f | ||||
|
r16159 | $ hg ci -m "mv b dir/b" | ||
$ hg mv a b | ||||
|
r16173 | $ hg cp -f f g | ||
|
r16159 | $ echo a > d | ||
$ hg add d | ||||
$ hg ci -m "mv a b; add d" | ||||
$ hg mv dir/b e | ||||
$ hg ci -m "mv dir/b e" | ||||
|
r20117 | $ hg log -G --template '({rev}) {desc|firstline}\n' | ||
|
r16159 | @ (4) mv dir/b e | ||
| | ||||
o (3) mv a b; add d | ||||
| | ||||
o (2) mv b dir/b | ||||
| | ||||
o (1) copy a b | ||||
| | ||||
o (0) add a | ||||
|
r16160 | $ testlog a | ||
|
r16316 | [] | ||
|
r35568 | (func | ||
(symbol 'filelog') | ||||
(string 'a')) | ||||
|
r35569 | <filteredset | ||
<spanset- 0:5>, set([0])> | ||||
|
r16160 | $ testlog a b | ||
|
r16316 | [] | ||
|
r35568 | (or | ||
(list | ||||
(func | ||||
(symbol 'filelog') | ||||
(string 'a')) | ||||
(func | ||||
(symbol 'filelog') | ||||
(string 'b')))) | ||||
|
r35569 | <filteredset | ||
<spanset- 0:5>, | ||||
<addset | ||||
<baseset+ [0]>, | ||||
<baseset+ [1]>>> | ||||
|
r16160 | |||
Test falling back to slow path for non-existing files | ||||
|
r16159 | $ testlog a c | ||
|
r16316 | [] | ||
|
r35568 | (func | ||
(symbol '_matchfiles') | ||||
(list | ||||
(string 'r:') | ||||
(string 'd:relpath') | ||||
(string 'p:a') | ||||
(string 'p:c'))) | ||||
|
r35569 | <filteredset | ||
<spanset- 0:5>, | ||||
<matchfiles patterns=['a', 'c'], include=[] exclude=[], default='relpath', rev=None>> | ||||
|
r16161 | |||
Test multiple --include/--exclude/paths | ||||
$ testlog --include a --include e --exclude b --exclude e a e | ||||
|
r16316 | [] | ||
|
r35568 | (func | ||
(symbol '_matchfiles') | ||||
(list | ||||
(string 'r:') | ||||
(string 'd:relpath') | ||||
(string 'p:a') | ||||
(string 'p:e') | ||||
(string 'i:a') | ||||
(string 'i:e') | ||||
(string 'x:b') | ||||
(string 'x:e'))) | ||||
|
r35569 | <filteredset | ||
<spanset- 0:5>, | ||||
<matchfiles patterns=['a', 'e'], include=['a', 'e'] exclude=['b', 'e'], default='relpath', rev=None>> | ||||
|
r16171 | |||
Test glob expansion of pats | ||||
|
r22947 | $ expandglobs=`$PYTHON -c "import mercurial.util; \ | ||
|
r33687 | > print(mercurial.util.expandglobs and 'true' or 'false')"` | ||
|
r16171 | $ if [ $expandglobs = "true" ]; then | ||
> testlog 'a*'; | ||||
> else | ||||
> testlog a*; | ||||
> fi; | ||||
|
r16316 | [] | ||
|
r35568 | (func | ||
(symbol 'filelog') | ||||
(string 'aa')) | ||||
|
r35569 | <filteredset | ||
<spanset- 0:5>, set([0])> | ||||
|
r16173 | |||
|
r21998 | Test --follow on a non-existent directory | ||
|
r16173 | |||
$ testlog -f dir | ||||
abort: cannot follow file not in parent revision: "dir" | ||||
abort: cannot follow file not in parent revision: "dir" | ||||
abort: cannot follow file not in parent revision: "dir" | ||||
|
r21998 | Test --follow on a directory | ||
$ hg up -q '.^' | ||||
$ testlog -f dir | ||||
[] | ||||
|
r35704 | (func | ||
(symbol '_matchfiles') | ||||
(list | ||||
(string 'r:') | ||||
(string 'd:relpath') | ||||
(string 'p:dir'))) | ||||
|
r35569 | <filteredset | ||
|
r35704 | <generatorsetdesc->, | ||
|
r35569 | <matchfiles patterns=['dir'], include=[] exclude=[], default='relpath', rev=None>> | ||
|
r21998 | $ hg up -q tip | ||
|
r16173 | Test --follow on file not in parent revision | ||
$ testlog -f a | ||||
abort: cannot follow file not in parent revision: "a" | ||||
abort: cannot follow file not in parent revision: "a" | ||||
abort: cannot follow file not in parent revision: "a" | ||||
Test --follow and patterns | ||||
$ testlog -f 'glob:*' | ||||
|
r21998 | [] | ||
|
r35704 | (func | ||
(symbol '_matchfiles') | ||||
(list | ||||
(string 'r:') | ||||
(string 'd:relpath') | ||||
(string 'p:glob:*'))) | ||||
|
r35569 | <filteredset | ||
|
r35704 | <generatorsetdesc->, | ||
|
r35569 | <matchfiles patterns=['glob:*'], include=[] exclude=[], default='relpath', rev=None>> | ||
|
r16173 | |||
Test --follow on a single rename | ||||
$ hg up -q 2 | ||||
$ testlog -f a | ||||
|
r16316 | [] | ||
|
r35704 | [] | ||
<generatorsetdesc-> | ||||
|
r16173 | |||
Test --follow and multiple renames | ||||
$ hg up -q tip | ||||
$ testlog -f e | ||||
|
r16316 | [] | ||
|
r35704 | [] | ||
<generatorsetdesc-> | ||||
|
r16173 | |||
Test --follow and multiple filelog heads | ||||
$ hg up -q 2 | ||||
$ testlog -f g | ||||
|
r16316 | [] | ||
|
r35704 | [] | ||
<generatorsetdesc-> | ||||
|
r16173 | $ cat log.nodes | ||
nodetag 2 | ||||
nodetag 1 | ||||
nodetag 0 | ||||
$ hg up -q tip | ||||
$ testlog -f g | ||||
|
r16316 | [] | ||
|
r35704 | [] | ||
<generatorsetdesc-> | ||||
|
r16173 | $ cat log.nodes | ||
nodetag 3 | ||||
nodetag 2 | ||||
nodetag 0 | ||||
Test --follow and multiple files | ||||
$ testlog -f g e | ||||
|
r16316 | [] | ||
|
r35704 | [] | ||
<generatorsetdesc-> | ||||
|
r16173 | $ cat log.nodes | ||
nodetag 4 | ||||
nodetag 3 | ||||
nodetag 2 | ||||
nodetag 1 | ||||
nodetag 0 | ||||
|
r24064 | Test --follow null parent | ||
$ hg up -q null | ||||
$ testlog -f | ||||
[] | ||||
[] | ||||
|
r35569 | <baseset []> | ||
|
r24064 | |||
|
r16174 | Test --follow-first | ||
$ hg up -q 3 | ||||
$ echo ee > e | ||||
$ hg ci -Am "add another e" e | ||||
created new head | ||||
$ hg merge --tool internal:other 4 | ||||
0 files updated, 1 files merged, 1 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
$ echo merge > e | ||||
$ hg ci -m "merge 5 and 4" | ||||
$ testlog --follow-first | ||||
|
r16316 | [] | ||
|
r35704 | [] | ||
<generatorsetdesc-> | ||||
|
r16174 | |||
Cannot compare with log --follow-first FILE as it never worked | ||||
$ hg log -G --print-revset --follow-first e | ||||
|
r16316 | [] | ||
|
r35704 | [] | ||
<generatorsetdesc-> | ||||
|
r16174 | $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n' | ||
@ 6 merge 5 and 4 | ||||
|\ | ||||
|
r28627 | | ~ | ||
o 5 add another e | ||||
| | ||||
~ | ||||
|
r16174 | |||
|
r16180 | Test --copies | ||
$ hg log -G --copies --template "{rev} {desc|firstline} \ | ||||
> copies: {file_copies_switch}\n" | ||||
@ 6 merge 5 and 4 copies: | ||||
|\ | ||||
| o 5 add another e copies: | ||||
| | | ||||
o | 4 mv dir/b e copies: e (dir/b) | ||||
|/ | ||||
o 3 mv a b; add d copies: b (a)g (f) | ||||
| | ||||
o 2 mv b dir/b copies: dir/b (b) | ||||
| | ||||
o 1 copy a b copies: b (a)g (f) | ||||
| | ||||
o 0 add a copies: | ||||
|
r16181 | Test "set:..." and parent revision | ||
$ hg up -q 4 | ||||
|
r16182 | $ testlog "set:copied()" | ||
|
r16316 | [] | ||
|
r35568 | (func | ||
(symbol '_matchfiles') | ||||
(list | ||||
(string 'r:') | ||||
(string 'd:relpath') | ||||
(string 'p:set:copied()'))) | ||||
|
r35569 | <filteredset | ||
<spanset- 0:7>, | ||||
<matchfiles patterns=['set:copied()'], include=[] exclude=[], default='relpath', rev=None>> | ||||
|
r16316 | $ testlog --include "set:copied()" | ||
[] | ||||
|
r35568 | (func | ||
(symbol '_matchfiles') | ||||
(list | ||||
(string 'r:') | ||||
(string 'd:relpath') | ||||
(string 'i:set:copied()'))) | ||||
|
r35569 | <filteredset | ||
<spanset- 0:7>, | ||||
<matchfiles patterns=[], include=['set:copied()'] exclude=[], default='relpath', rev=None>> | ||||
|
r16316 | $ testlog -r "sort(file('set:copied()'), -rev)" | ||
["sort(file('set:copied()'), -rev)"] | ||||
[] | ||||
|
r35569 | <baseset []> | ||
|
r16184 | |||
Test --removed | ||||
$ testlog --removed | ||||
|
r16316 | [] | ||
[] | ||||
|
r35569 | <spanset- 0:7> | ||
|
r16184 | $ testlog --removed a | ||
|
r16316 | [] | ||
|
r35568 | (func | ||
(symbol '_matchfiles') | ||||
(list | ||||
(string 'r:') | ||||
(string 'd:relpath') | ||||
(string 'p:a'))) | ||||
|
r35569 | <filteredset | ||
<spanset- 0:7>, | ||||
<matchfiles patterns=['a'], include=[] exclude=[], default='relpath', rev=None>> | ||||
|
r35568 | $ testlog --removed --follow a | ||
[] | ||||
|
r35704 | (func | ||
(symbol '_matchfiles') | ||||
(list | ||||
(string 'r:') | ||||
(string 'd:relpath') | ||||
(string 'p:a'))) | ||||
|
r35569 | <filteredset | ||
|
r35704 | <generatorsetdesc->, | ||
|
r35569 | <matchfiles patterns=['a'], include=[] exclude=[], default='relpath', rev=None>> | ||
|
r16186 | |||
Test --patch and --stat with --follow and --follow-first | ||||
$ hg up -q 3 | ||||
$ hg log -G --git --patch b | ||||
o changeset: 1:216d4c92cf98 | ||||
| user: test | ||||
|
r28627 | ~ date: Thu Jan 01 00:00:00 1970 +0000 | ||
summary: copy a b | ||||
diff --git a/a b/b | ||||
copy from a | ||||
copy to b | ||||
|
r16186 | |||
$ hg log -G --git --stat b | ||||
o changeset: 1:216d4c92cf98 | ||||
| user: test | ||||
|
r28627 | ~ date: Thu Jan 01 00:00:00 1970 +0000 | ||
summary: copy a b | ||||
b | 0 | ||||
1 files changed, 0 insertions(+), 0 deletions(-) | ||||
|
r16186 | |||
$ hg log -G --git --patch --follow b | ||||
o changeset: 1:216d4c92cf98 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: copy a b | ||||
| | ||||
| diff --git a/a b/b | ||||
| copy from a | ||||
| copy to b | ||||
| | ||||
o changeset: 0:f8035bb17114 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: add a | ||||
diff --git a/a b/a | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/a | ||||
@@ -0,0 +1,1 @@ | ||||
+a | ||||
$ hg log -G --git --stat --follow b | ||||
o changeset: 1:216d4c92cf98 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: copy a b | ||||
| | ||||
|
r20972 | | b | 0 | ||
|
r16186 | | 1 files changed, 0 insertions(+), 0 deletions(-) | ||
| | ||||
o changeset: 0:f8035bb17114 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: add a | ||||
a | 1 + | ||||
1 files changed, 1 insertions(+), 0 deletions(-) | ||||
$ hg up -q 6 | ||||
$ hg log -G --git --patch --follow-first e | ||||
@ changeset: 6:fc281d8ff18d | ||||
|\ tag: tip | ||||
|
r28627 | | ~ parent: 5:99b31f1c2782 | ||
| parent: 4:17d952250a9d | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: merge 5 and 4 | ||||
| | ||||
| diff --git a/e b/e | ||||
| --- a/e | ||||
| +++ b/e | ||||
| @@ -1,1 +1,1 @@ | ||||
| -ee | ||||
| +merge | ||||
| | ||||
o changeset: 5:99b31f1c2782 | ||||
| parent: 3:5918b8d165d1 | ||||
~ user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: add another e | ||||
diff --git a/e b/e | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/e | ||||
@@ -0,0 +1,1 @@ | ||||
+ee | ||||
|
r16316 | |||
Test old-style --rev | ||||
$ hg tag 'foo-bar' | ||||
$ testlog -r 'foo-bar' | ||||
['foo-bar'] | ||||
[] | ||||
|
r35569 | <baseset [6]> | ||
|
r16408 | |||
Test --follow and forward --rev | ||||
$ hg up -q 6 | ||||
$ echo g > g | ||||
$ hg ci -Am 'add g' g | ||||
created new head | ||||
$ hg up -q 2 | ||||
$ hg log -G --template "{rev} {desc|firstline}\n" | ||||
o 8 add g | ||||
| | ||||
| o 7 Added tag foo-bar for changeset fc281d8ff18d | ||||
|/ | ||||
o 6 merge 5 and 4 | ||||
|\ | ||||
| o 5 add another e | ||||
| | | ||||
o | 4 mv dir/b e | ||||
|/ | ||||
o 3 mv a b; add d | ||||
| | ||||
@ 2 mv b dir/b | ||||
| | ||||
o 1 copy a b | ||||
| | ||||
o 0 add a | ||||
|
r25665 | $ hg archive -r 7 archive | ||
$ grep changessincelatesttag archive/.hg_archival.txt | ||||
changessincelatesttag: 1 | ||||
$ rm -r archive | ||||
changessincelatesttag with no prior tag | ||||
$ hg archive -r 4 archive | ||||
$ grep changessincelatesttag archive/.hg_archival.txt | ||||
changessincelatesttag: 5 | ||||
|
r22860 | $ hg export 'all()' | ||
# HG changeset patch | ||||
# User test | ||||
# Date 0 0 | ||||
# Thu Jan 01 00:00:00 1970 +0000 | ||||
# Node ID f8035bb17114da16215af3436ec5222428ace8ee | ||||
# Parent 0000000000000000000000000000000000000000 | ||||
add a | ||||
diff -r 000000000000 -r f8035bb17114 a | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/a Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+a | ||||
diff -r 000000000000 -r f8035bb17114 aa | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/aa Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+aa | ||||
diff -r 000000000000 -r f8035bb17114 f | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/f Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+f | ||||
# HG changeset patch | ||||
# User test | ||||
# Date 0 0 | ||||
# Thu Jan 01 00:00:00 1970 +0000 | ||||
# Node ID 216d4c92cf98ff2b4641d508b76b529f3d424c92 | ||||
# Parent f8035bb17114da16215af3436ec5222428ace8ee | ||||
copy a b | ||||
diff -r f8035bb17114 -r 216d4c92cf98 b | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/b Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+a | ||||
diff -r f8035bb17114 -r 216d4c92cf98 g | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/g Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+f | ||||
# HG changeset patch | ||||
# User test | ||||
# Date 0 0 | ||||
# Thu Jan 01 00:00:00 1970 +0000 | ||||
# Node ID bb573313a9e8349099b6ea2b2fb1fc7f424446f3 | ||||
# Parent 216d4c92cf98ff2b4641d508b76b529f3d424c92 | ||||
mv b dir/b | ||||
diff -r 216d4c92cf98 -r bb573313a9e8 b | ||||
--- a/b Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -1,1 +0,0 @@ | ||||
-a | ||||
diff -r 216d4c92cf98 -r bb573313a9e8 dir/b | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/dir/b Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+a | ||||
diff -r 216d4c92cf98 -r bb573313a9e8 f | ||||
--- a/f Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/f Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -1,1 +1,2 @@ | ||||
f | ||||
+f | ||||
diff -r 216d4c92cf98 -r bb573313a9e8 g | ||||
--- a/g Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/g Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -1,1 +1,2 @@ | ||||
f | ||||
+g | ||||
# HG changeset patch | ||||
# User test | ||||
# Date 0 0 | ||||
# Thu Jan 01 00:00:00 1970 +0000 | ||||
# Node ID 5918b8d165d1364e78a66d02e66caa0133c5d1ed | ||||
# Parent bb573313a9e8349099b6ea2b2fb1fc7f424446f3 | ||||
mv a b; add d | ||||
diff -r bb573313a9e8 -r 5918b8d165d1 a | ||||
--- a/a Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -1,1 +0,0 @@ | ||||
-a | ||||
diff -r bb573313a9e8 -r 5918b8d165d1 b | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/b Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+a | ||||
diff -r bb573313a9e8 -r 5918b8d165d1 d | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/d Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+a | ||||
diff -r bb573313a9e8 -r 5918b8d165d1 g | ||||
--- a/g Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/g Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -1,2 +1,2 @@ | ||||
f | ||||
-g | ||||
+f | ||||
# HG changeset patch | ||||
# User test | ||||
# Date 0 0 | ||||
# Thu Jan 01 00:00:00 1970 +0000 | ||||
# Node ID 17d952250a9d03cc3dc77b199ab60e959b9b0260 | ||||
# Parent 5918b8d165d1364e78a66d02e66caa0133c5d1ed | ||||
mv dir/b e | ||||
diff -r 5918b8d165d1 -r 17d952250a9d dir/b | ||||
--- a/dir/b Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -1,1 +0,0 @@ | ||||
-a | ||||
diff -r 5918b8d165d1 -r 17d952250a9d e | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/e Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+a | ||||
# HG changeset patch | ||||
# User test | ||||
# Date 0 0 | ||||
# Thu Jan 01 00:00:00 1970 +0000 | ||||
# Node ID 99b31f1c2782e2deb1723cef08930f70fc84b37b | ||||
# Parent 5918b8d165d1364e78a66d02e66caa0133c5d1ed | ||||
add another e | ||||
diff -r 5918b8d165d1 -r 99b31f1c2782 e | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/e Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+ee | ||||
# HG changeset patch | ||||
# User test | ||||
# Date 0 0 | ||||
# Thu Jan 01 00:00:00 1970 +0000 | ||||
# Node ID fc281d8ff18d999ad6497b3d27390bcd695dcc73 | ||||
# Parent 99b31f1c2782e2deb1723cef08930f70fc84b37b | ||||
# Parent 17d952250a9d03cc3dc77b199ab60e959b9b0260 | ||||
merge 5 and 4 | ||||
diff -r 99b31f1c2782 -r fc281d8ff18d dir/b | ||||
--- a/dir/b Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -1,1 +0,0 @@ | ||||
-a | ||||
diff -r 99b31f1c2782 -r fc281d8ff18d e | ||||
--- a/e Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/e Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -1,1 +1,1 @@ | ||||
-ee | ||||
+merge | ||||
# HG changeset patch | ||||
# User test | ||||
# Date 0 0 | ||||
# Thu Jan 01 00:00:00 1970 +0000 | ||||
# Node ID 02dbb8e276b8ab7abfd07cab50c901647e75c2dd | ||||
# Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73 | ||||
Added tag foo-bar for changeset fc281d8ff18d | ||||
diff -r fc281d8ff18d -r 02dbb8e276b8 .hgtags | ||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/.hgtags Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -0,0 +1,1 @@ | ||||
+fc281d8ff18d999ad6497b3d27390bcd695dcc73 foo-bar | ||||
# HG changeset patch | ||||
# User test | ||||
# Date 0 0 | ||||
# Thu Jan 01 00:00:00 1970 +0000 | ||||
# Node ID 24c2e826ddebf80f9dcd60b856bdb8e6715c5449 | ||||
# Parent fc281d8ff18d999ad6497b3d27390bcd695dcc73 | ||||
add g | ||||
diff -r fc281d8ff18d -r 24c2e826ddeb g | ||||
--- a/g Thu Jan 01 00:00:00 1970 +0000 | ||||
+++ b/g Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -1,2 +1,1 @@ | ||||
-f | ||||
-f | ||||
+g | ||||
|
r16408 | $ testlog --follow -r6 -r8 -r5 -r7 -r4 | ||
|
r35702 | ['6', '8', '5', '7', '4'] | ||
|
r35570 | [] | ||
<generatorsetdesc-> | ||||
|
r16408 | |||
|
r16409 | Test --follow-first and forward --rev | ||
$ testlog --follow-first -r6 -r8 -r5 -r7 -r4 | ||||
|
r35702 | ['6', '8', '5', '7', '4'] | ||
|
r35664 | [] | ||
<generatorsetdesc-> | ||||
|
r16409 | |||
|
r16408 | Test --follow and backward --rev | ||
$ testlog --follow -r6 -r5 -r7 -r8 -r4 | ||||
|
r35702 | ['6', '5', '7', '8', '4'] | ||
|
r35570 | [] | ||
<generatorsetdesc-> | ||||
|
r16408 | |||
|
r16409 | Test --follow-first and backward --rev | ||
$ testlog --follow-first -r6 -r5 -r7 -r8 -r4 | ||||
|
r35702 | ['6', '5', '7', '8', '4'] | ||
|
r35664 | [] | ||
<generatorsetdesc-> | ||||
|
r16411 | |||
|
r24200 | Test --follow with --rev of graphlog extension | ||
$ hg --config extensions.graphlog= glog -qfr1 | ||||
o 1:216d4c92cf98 | ||||
| | ||||
o 0:f8035bb17114 | ||||
|
r16411 | Test subdir | ||
$ hg up -q 3 | ||||
$ cd dir | ||||
$ testlog . | ||||
[] | ||||
|
r35568 | (func | ||
(symbol '_matchfiles') | ||||
(list | ||||
(string 'r:') | ||||
(string 'd:relpath') | ||||
(string 'p:.'))) | ||||
|
r35569 | <filteredset | ||
<spanset- 0:9>, | ||||
<matchfiles patterns=['.'], include=[] exclude=[], default='relpath', rev=None>> | ||||
|
r16434 | $ testlog ../b | ||
[] | ||||
|
r35568 | (func | ||
(symbol 'filelog') | ||||
(string '../b')) | ||||
|
r35569 | <filteredset | ||
<spanset- 0:9>, set([1])> | ||||
|
r16434 | $ testlog -f ../b | ||
[] | ||||
|
r35704 | [] | ||
<generatorsetdesc-> | ||||
|
r16431 | $ cd .. | ||
Test --hidden | ||||
|
r18208 | (enable obsolete) | ||
|
r16431 | |||
|
r22955 | $ cat >> $HGRCPATH << EOF | ||
> [experimental] | ||||
|
r34867 | > evolution.createmarkers=True | ||
|
r16431 | > EOF | ||
|
r18208 | |||
$ hg debugobsolete `hg id --debug -i -r 8` | ||||
|
r33542 | obsoleted 1 changesets | ||
|
r16431 | $ testlog | ||
[] | ||||
[] | ||||
|
r35569 | <spanset- 0:9> | ||
|
r16431 | $ testlog --hidden | ||
[] | ||||
[] | ||||
|
r35569 | <spanset- 0:9> | ||
|
r20117 | $ hg log -G --template '{rev} {desc}\n' | ||
|
r17434 | o 7 Added tag foo-bar for changeset fc281d8ff18d | ||
| | ||||
o 6 merge 5 and 4 | ||||
|\ | ||||
| o 5 add another e | ||||
| | | ||||
o | 4 mv dir/b e | ||||
|/ | ||||
@ 3 mv a b; add d | ||||
| | ||||
o 2 mv b dir/b | ||||
| | ||||
o 1 copy a b | ||||
| | ||||
o 0 add a | ||||
|
r16913 | |||
|
r17120 | A template without trailing newline should do something sane | ||
|
r20117 | $ hg log -G -r ::2 --template '{rev} {desc}' | ||
|
r17120 | o 2 mv b dir/b | ||
| | ||||
o 1 copy a b | ||||
| | ||||
|
r17434 | o 0 add a | ||
|
r17120 | |||
Extra newlines must be preserved | ||||
|
r20117 | $ hg log -G -r ::2 --template '\n{rev} {desc}\n\n' | ||
|
r17120 | o | ||
| 2 mv b dir/b | ||||
| | ||||
o | ||||
| 1 copy a b | ||||
| | ||||
|
r17434 | o | ||
0 add a | ||||
|
r17120 | |||
The almost-empty template should do something sane too ... | ||||
|
r20117 | $ hg log -G -r ::2 --template '\n' | ||
|
r17120 | o | ||
| | ||||
o | ||||
| | ||||
|
r17434 | o | ||
|
r17120 | |||
|
r18467 | issue3772 | ||
|
r20117 | $ hg log -G -r :null | ||
|
r20699 | o changeset: 0:f8035bb17114 | ||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: add a | ||||
| | ||||
|
r18467 | o changeset: -1:000000000000 | ||
user: | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
|
r20117 | $ hg log -G -r null:null | ||
|
r18468 | o changeset: -1:000000000000 | ||
user: | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
|
r18467 | |||
|
r24202 | should not draw line down to null due to the magic of fullreposet | ||
$ hg log -G -r 'all()' | tail -6 | ||||
| | ||||
o changeset: 0:f8035bb17114 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: add a | ||||
|
r25265 | $ hg log -G -r 'branch(default)' | tail -6 | ||
| | ||||
o changeset: 0:f8035bb17114 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: add a | ||||
|
r25765 | working-directory revision | ||
$ hg log -G -qr '. + wdir()' | ||||
o 2147483647:ffffffffffff | ||||
| | ||||
@ 3:5918b8d165d1 | ||||
| | ||||
|
r28627 | ~ | ||
|
r25765 | |||
|
r27216 | node template with changeset_printer: | ||
|
r32045 | $ hg log -Gqr 5:7 --config ui.graphnodetemplate='"{rev}"' | ||
|
r27216 | 7 7:02dbb8e276b8 | ||
| | ||||
6 6:fc281d8ff18d | ||||
|\ | ||||
|
r28627 | | ~ | ||
5 5:99b31f1c2782 | ||||
| | ||||
~ | ||||
|
r27216 | |||
node template with changeset_templater (shared cache variable): | ||||
$ hg log -Gr 5:7 -T '{latesttag % "{rev} {tag}+{distance}"}\n' \ | ||||
> --config ui.graphnodetemplate='{ifeq(latesttagdistance, 0, "#", graphnode)}' | ||||
o 7 foo-bar+1 | ||||
| | ||||
# 6 foo-bar+0 | ||||
|\ | ||||
|
r28627 | | ~ | ||
o 5 null+5 | ||||
| | ||||
~ | ||||
|
r27216 | |||
|
r28428 | label() should just work in node template: | ||
$ hg log -Gqr 7 --config extensions.color= --color=debug \ | ||||
> --config ui.graphnodetemplate='{label("branch.{branch}", rev)}' | ||||
[branch.default|7] [log.node|7:02dbb8e276b8] | ||||
| | ||||
|
r28627 | ~ | ||
|
r28428 | |||
|
r16913 | $ cd .. | ||
|
r28600 | |||
change graph edge styling | ||||
$ cd repo | ||||
$ cat << EOF >> $HGRCPATH | ||||
|
r28617 | > [experimental] | ||
|
r28600 | > graphstyle.parent = | | ||
> graphstyle.grandparent = : | ||||
|
r28601 | > graphstyle.missing = | ||
|
r28600 | > EOF | ||
$ hg log -G -r 'file("a")' -m | ||||
@ changeset: 36:08a19a744424 | ||||
: branch: branch | ||||
: tag: tip | ||||
: parent: 35:9159c3644c5e | ||||
: parent: 35:9159c3644c5e | ||||
: user: test | ||||
: date: Thu Jan 01 00:00:36 1970 +0000 | ||||
: summary: (36) buggy merge: identical parents | ||||
: | ||||
o changeset: 32:d06dffa21a31 | ||||
|\ parent: 27:886ed638191b | ||||
| : parent: 31:621d83e11f67 | ||||
| : user: test | ||||
| : date: Thu Jan 01 00:00:32 1970 +0000 | ||||
| : summary: (32) expand | ||||
| : | ||||
o : changeset: 31:621d83e11f67 | ||||
|\: parent: 21:d42a756af44d | ||||
| : parent: 30:6e11cd4b648f | ||||
| : user: test | ||||
| : date: Thu Jan 01 00:00:31 1970 +0000 | ||||
| : summary: (31) expand | ||||
| : | ||||
o : changeset: 30:6e11cd4b648f | ||||
|\ \ parent: 28:44ecd0b9ae99 | ||||
|
r28601 | | ~ : parent: 29:cd9bb2be7593 | ||
| : user: test | ||||
| : date: Thu Jan 01 00:00:30 1970 +0000 | ||||
| : summary: (30) expand | ||||
| / | ||||
o : changeset: 28:44ecd0b9ae99 | ||||
|\ \ parent: 1:6db2ef61d156 | ||||
| ~ : parent: 26:7f25b6c2f0b9 | ||||
| : user: test | ||||
| : date: Thu Jan 01 00:00:28 1970 +0000 | ||||
| : summary: (28) merge zero known | ||||
| / | ||||
o : changeset: 26:7f25b6c2f0b9 | ||||
|\ \ parent: 18:1aa84d96232a | ||||
| | : parent: 25:91da8ed57247 | ||||
| | : user: test | ||||
| | : date: Thu Jan 01 00:00:26 1970 +0000 | ||||
| | : summary: (26) merge one known; far right | ||||
| | : | ||||
| o : changeset: 25:91da8ed57247 | ||||
| |\: parent: 21:d42a756af44d | ||||
| | : parent: 24:a9c19a3d96b7 | ||||
| | : user: test | ||||
| | : date: Thu Jan 01 00:00:25 1970 +0000 | ||||
| | : summary: (25) merge one known; far left | ||||
| | : | ||||
| o : changeset: 24:a9c19a3d96b7 | ||||
| |\ \ parent: 0:e6eb3150255d | ||||
| | ~ : parent: 23:a01cddf0766d | ||||
| | : user: test | ||||
| | : date: Thu Jan 01 00:00:24 1970 +0000 | ||||
| | : summary: (24) merge one known; immediate right | ||||
| | / | ||||
| o : changeset: 23:a01cddf0766d | ||||
| |\ \ parent: 1:6db2ef61d156 | ||||
| | ~ : parent: 22:e0d9cccacb5d | ||||
| | : user: test | ||||
| | : date: Thu Jan 01 00:00:23 1970 +0000 | ||||
| | : summary: (23) merge one known; immediate left | ||||
| | / | ||||
| o : changeset: 22:e0d9cccacb5d | ||||
|/:/ parent: 18:1aa84d96232a | ||||
| : parent: 21:d42a756af44d | ||||
| : user: test | ||||
| : date: Thu Jan 01 00:00:22 1970 +0000 | ||||
| : summary: (22) merge two known; one far left, one far right | ||||
| : | ||||
| o changeset: 21:d42a756af44d | ||||
| |\ parent: 19:31ddc2c1573b | ||||
| | | parent: 20:d30ed6450e32 | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:21 1970 +0000 | ||||
| | | summary: (21) expand | ||||
| | | | ||||
+---o changeset: 20:d30ed6450e32 | ||||
| | | parent: 0:e6eb3150255d | ||||
| | ~ parent: 18:1aa84d96232a | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:20 1970 +0000 | ||||
| | summary: (20) merge two known; two far right | ||||
| | | ||||
| o changeset: 19:31ddc2c1573b | ||||
| |\ parent: 15:1dda3f72782d | ||||
| | | parent: 17:44765d7c06e0 | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:19 1970 +0000 | ||||
| | | summary: (19) expand | ||||
| | | | ||||
o | | changeset: 18:1aa84d96232a | ||||
|\| | parent: 1:6db2ef61d156 | ||||
~ | | parent: 15:1dda3f72782d | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:18 1970 +0000 | ||||
| | summary: (18) merge two known; two far left | ||||
/ / | ||||
| o changeset: 17:44765d7c06e0 | ||||
| |\ parent: 12:86b91144a6e9 | ||||
| | | parent: 16:3677d192927d | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:17 1970 +0000 | ||||
| | | summary: (17) expand | ||||
| | | | ||||
| | o changeset: 16:3677d192927d | ||||
| | |\ parent: 0:e6eb3150255d | ||||
| | ~ ~ parent: 1:6db2ef61d156 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:16 1970 +0000 | ||||
| | summary: (16) merge two known; one immediate right, one near right | ||||
| | | ||||
o | changeset: 15:1dda3f72782d | ||||
|\ \ parent: 13:22d8966a97e3 | ||||
| | | parent: 14:8eac370358ef | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:15 1970 +0000 | ||||
| | | summary: (15) expand | ||||
| | | | ||||
| o | changeset: 14:8eac370358ef | ||||
| |\| parent: 0:e6eb3150255d | ||||
| ~ | parent: 12:86b91144a6e9 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:14 1970 +0000 | ||||
| | summary: (14) merge two known; one immediate right, one far right | ||||
| / | ||||
o | changeset: 13:22d8966a97e3 | ||||
|\ \ parent: 9:7010c0af0a35 | ||||
| | | parent: 11:832d76e6bdf2 | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:13 1970 +0000 | ||||
| | | summary: (13) expand | ||||
| | | | ||||
+---o changeset: 12:86b91144a6e9 | ||||
| | | parent: 1:6db2ef61d156 | ||||
| | ~ parent: 9:7010c0af0a35 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:12 1970 +0000 | ||||
| | summary: (12) merge two known; one immediate right, one far left | ||||
| | | ||||
| o changeset: 11:832d76e6bdf2 | ||||
| |\ parent: 6:b105a072e251 | ||||
| | | parent: 10:74c64d036d72 | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:11 1970 +0000 | ||||
| | | summary: (11) expand | ||||
| | | | ||||
| | o changeset: 10:74c64d036d72 | ||||
| |/| parent: 0:e6eb3150255d | ||||
| | ~ parent: 6:b105a072e251 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:10 1970 +0000 | ||||
| | summary: (10) merge two known; one immediate left, one near right | ||||
| | | ||||
o | changeset: 9:7010c0af0a35 | ||||
|\ \ parent: 7:b632bb1b1224 | ||||
| | | parent: 8:7a0b11f71937 | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:09 1970 +0000 | ||||
| | | summary: (9) expand | ||||
| | | | ||||
| o | changeset: 8:7a0b11f71937 | ||||
|/| | parent: 0:e6eb3150255d | ||||
| ~ | parent: 7:b632bb1b1224 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:08 1970 +0000 | ||||
| | summary: (8) merge two known; one immediate left, one far right | ||||
| / | ||||
o | changeset: 7:b632bb1b1224 | ||||
|\ \ parent: 2:3d9a33b8d1e1 | ||||
| ~ | parent: 5:4409d547b708 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:07 1970 +0000 | ||||
| | summary: (7) expand | ||||
| / | ||||
| o changeset: 6:b105a072e251 | ||||
|/| parent: 2:3d9a33b8d1e1 | ||||
| ~ parent: 5:4409d547b708 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:06 1970 +0000 | ||||
| summary: (6) merge two known; one immediate left, one far left | ||||
| | ||||
o changeset: 5:4409d547b708 | ||||
|\ parent: 3:27eef8ed80b4 | ||||
| ~ parent: 4:26a8bac39d9f | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:05 1970 +0000 | ||||
| summary: (5) expand | ||||
| | ||||
o changeset: 4:26a8bac39d9f | ||||
|\ parent: 1:6db2ef61d156 | ||||
~ ~ parent: 3:27eef8ed80b4 | ||||
user: test | ||||
date: Thu Jan 01 00:00:04 1970 +0000 | ||||
summary: (4) merge two known; one immediate left, one immediate right | ||||
|
r28600 | |||
|
r28999 | Setting HGPLAIN ignores graphmod styling: | ||
$ HGPLAIN=1 hg log -G -r 'file("a")' -m | ||||
@ changeset: 36:08a19a744424 | ||||
| branch: branch | ||||
| tag: tip | ||||
| parent: 35:9159c3644c5e | ||||
| parent: 35:9159c3644c5e | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:36 1970 +0000 | ||||
| summary: (36) buggy merge: identical parents | ||||
| | ||||
o changeset: 32:d06dffa21a31 | ||||
|\ parent: 27:886ed638191b | ||||
| | parent: 31:621d83e11f67 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:32 1970 +0000 | ||||
| | summary: (32) expand | ||||
| | | ||||
o | changeset: 31:621d83e11f67 | ||||
|\| parent: 21:d42a756af44d | ||||
| | parent: 30:6e11cd4b648f | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:31 1970 +0000 | ||||
| | summary: (31) expand | ||||
| | | ||||
o | changeset: 30:6e11cd4b648f | ||||
|\ \ parent: 28:44ecd0b9ae99 | ||||
| | | parent: 29:cd9bb2be7593 | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:30 1970 +0000 | ||||
| | | summary: (30) expand | ||||
| | | | ||||
o | | changeset: 28:44ecd0b9ae99 | ||||
|\ \ \ parent: 1:6db2ef61d156 | ||||
| | | | parent: 26:7f25b6c2f0b9 | ||||
| | | | user: test | ||||
| | | | date: Thu Jan 01 00:00:28 1970 +0000 | ||||
| | | | summary: (28) merge zero known | ||||
| | | | | ||||
o | | | changeset: 26:7f25b6c2f0b9 | ||||
|\ \ \ \ parent: 18:1aa84d96232a | ||||
| | | | | parent: 25:91da8ed57247 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:26 1970 +0000 | ||||
| | | | | summary: (26) merge one known; far right | ||||
| | | | | | ||||
| o-----+ changeset: 25:91da8ed57247 | ||||
| | | | | parent: 21:d42a756af44d | ||||
| | | | | parent: 24:a9c19a3d96b7 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:25 1970 +0000 | ||||
| | | | | summary: (25) merge one known; far left | ||||
| | | | | | ||||
| o | | | changeset: 24:a9c19a3d96b7 | ||||
| |\ \ \ \ parent: 0:e6eb3150255d | ||||
| | | | | | parent: 23:a01cddf0766d | ||||
| | | | | | user: test | ||||
| | | | | | date: Thu Jan 01 00:00:24 1970 +0000 | ||||
| | | | | | summary: (24) merge one known; immediate right | ||||
| | | | | | | ||||
| o---+ | | changeset: 23:a01cddf0766d | ||||
| | | | | | parent: 1:6db2ef61d156 | ||||
| | | | | | parent: 22:e0d9cccacb5d | ||||
| | | | | | user: test | ||||
| | | | | | date: Thu Jan 01 00:00:23 1970 +0000 | ||||
| | | | | | summary: (23) merge one known; immediate left | ||||
| | | | | | | ||||
| o-------+ changeset: 22:e0d9cccacb5d | ||||
| | | | | | parent: 18:1aa84d96232a | ||||
|/ / / / / parent: 21:d42a756af44d | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:22 1970 +0000 | ||||
| | | | | summary: (22) merge two known; one far left, one far right | ||||
| | | | | | ||||
| | | | o changeset: 21:d42a756af44d | ||||
| | | | |\ parent: 19:31ddc2c1573b | ||||
| | | | | | parent: 20:d30ed6450e32 | ||||
| | | | | | user: test | ||||
| | | | | | date: Thu Jan 01 00:00:21 1970 +0000 | ||||
| | | | | | summary: (21) expand | ||||
| | | | | | | ||||
+-+-------o changeset: 20:d30ed6450e32 | ||||
| | | | | parent: 0:e6eb3150255d | ||||
| | | | | parent: 18:1aa84d96232a | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:20 1970 +0000 | ||||
| | | | | summary: (20) merge two known; two far right | ||||
| | | | | | ||||
| | | | o changeset: 19:31ddc2c1573b | ||||
| | | | |\ parent: 15:1dda3f72782d | ||||
| | | | | | parent: 17:44765d7c06e0 | ||||
| | | | | | user: test | ||||
| | | | | | date: Thu Jan 01 00:00:19 1970 +0000 | ||||
| | | | | | summary: (19) expand | ||||
| | | | | | | ||||
o---+---+ | changeset: 18:1aa84d96232a | ||||
| | | | | parent: 1:6db2ef61d156 | ||||
/ / / / / parent: 15:1dda3f72782d | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:18 1970 +0000 | ||||
| | | | | summary: (18) merge two known; two far left | ||||
| | | | | | ||||
| | | | o changeset: 17:44765d7c06e0 | ||||
| | | | |\ parent: 12:86b91144a6e9 | ||||
| | | | | | parent: 16:3677d192927d | ||||
| | | | | | user: test | ||||
| | | | | | date: Thu Jan 01 00:00:17 1970 +0000 | ||||
| | | | | | summary: (17) expand | ||||
| | | | | | | ||||
+-+-------o changeset: 16:3677d192927d | ||||
| | | | | parent: 0:e6eb3150255d | ||||
| | | | | parent: 1:6db2ef61d156 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:16 1970 +0000 | ||||
| | | | | summary: (16) merge two known; one immediate right, one near right | ||||
| | | | | | ||||
| | | o | changeset: 15:1dda3f72782d | ||||
| | | |\ \ parent: 13:22d8966a97e3 | ||||
| | | | | | parent: 14:8eac370358ef | ||||
| | | | | | user: test | ||||
| | | | | | date: Thu Jan 01 00:00:15 1970 +0000 | ||||
| | | | | | summary: (15) expand | ||||
| | | | | | | ||||
+-------o | changeset: 14:8eac370358ef | ||||
| | | | |/ parent: 0:e6eb3150255d | ||||
| | | | | parent: 12:86b91144a6e9 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:14 1970 +0000 | ||||
| | | | | summary: (14) merge two known; one immediate right, one far right | ||||
| | | | | | ||||
| | | o | changeset: 13:22d8966a97e3 | ||||
| | | |\ \ parent: 9:7010c0af0a35 | ||||
| | | | | | parent: 11:832d76e6bdf2 | ||||
| | | | | | user: test | ||||
| | | | | | date: Thu Jan 01 00:00:13 1970 +0000 | ||||
| | | | | | summary: (13) expand | ||||
| | | | | | | ||||
| +---+---o changeset: 12:86b91144a6e9 | ||||
| | | | | parent: 1:6db2ef61d156 | ||||
| | | | | parent: 9:7010c0af0a35 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:12 1970 +0000 | ||||
| | | | | summary: (12) merge two known; one immediate right, one far left | ||||
| | | | | | ||||
| | | | o changeset: 11:832d76e6bdf2 | ||||
| | | | |\ parent: 6:b105a072e251 | ||||
| | | | | | parent: 10:74c64d036d72 | ||||
| | | | | | user: test | ||||
| | | | | | date: Thu Jan 01 00:00:11 1970 +0000 | ||||
| | | | | | summary: (11) expand | ||||
| | | | | | | ||||
+---------o changeset: 10:74c64d036d72 | ||||
| | | | |/ parent: 0:e6eb3150255d | ||||
| | | | | parent: 6:b105a072e251 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:10 1970 +0000 | ||||
| | | | | summary: (10) merge two known; one immediate left, one near right | ||||
| | | | | | ||||
| | | o | changeset: 9:7010c0af0a35 | ||||
| | | |\ \ parent: 7:b632bb1b1224 | ||||
| | | | | | parent: 8:7a0b11f71937 | ||||
| | | | | | user: test | ||||
| | | | | | date: Thu Jan 01 00:00:09 1970 +0000 | ||||
| | | | | | summary: (9) expand | ||||
| | | | | | | ||||
+-------o | changeset: 8:7a0b11f71937 | ||||
| | | |/ / parent: 0:e6eb3150255d | ||||
| | | | | parent: 7:b632bb1b1224 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:08 1970 +0000 | ||||
| | | | | summary: (8) merge two known; one immediate left, one far right | ||||
| | | | | | ||||
| | | o | changeset: 7:b632bb1b1224 | ||||
| | | |\ \ parent: 2:3d9a33b8d1e1 | ||||
| | | | | | parent: 5:4409d547b708 | ||||
| | | | | | user: test | ||||
| | | | | | date: Thu Jan 01 00:00:07 1970 +0000 | ||||
| | | | | | summary: (7) expand | ||||
| | | | | | | ||||
| | | +---o changeset: 6:b105a072e251 | ||||
| | | | |/ parent: 2:3d9a33b8d1e1 | ||||
| | | | | parent: 5:4409d547b708 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:06 1970 +0000 | ||||
| | | | | summary: (6) merge two known; one immediate left, one far left | ||||
| | | | | | ||||
| | | o | changeset: 5:4409d547b708 | ||||
| | | |\ \ parent: 3:27eef8ed80b4 | ||||
| | | | | | parent: 4:26a8bac39d9f | ||||
| | | | | | user: test | ||||
| | | | | | date: Thu Jan 01 00:00:05 1970 +0000 | ||||
| | | | | | summary: (5) expand | ||||
| | | | | | | ||||
| +---o | | changeset: 4:26a8bac39d9f | ||||
| | | |/ / parent: 1:6db2ef61d156 | ||||
| | | | | parent: 3:27eef8ed80b4 | ||||
| | | | | user: test | ||||
| | | | | date: Thu Jan 01 00:00:04 1970 +0000 | ||||
| | | | | summary: (4) merge two known; one immediate left, one immediate right | ||||
| | | | | | ||||
.. unless HGPLAINEXCEPT=graph is set: | ||||
$ HGPLAIN=1 HGPLAINEXCEPT=graph hg log -G -r 'file("a")' -m | ||||
@ changeset: 36:08a19a744424 | ||||
: branch: branch | ||||
: tag: tip | ||||
: parent: 35:9159c3644c5e | ||||
: parent: 35:9159c3644c5e | ||||
: user: test | ||||
: date: Thu Jan 01 00:00:36 1970 +0000 | ||||
: summary: (36) buggy merge: identical parents | ||||
: | ||||
o changeset: 32:d06dffa21a31 | ||||
|\ parent: 27:886ed638191b | ||||
| : parent: 31:621d83e11f67 | ||||
| : user: test | ||||
| : date: Thu Jan 01 00:00:32 1970 +0000 | ||||
| : summary: (32) expand | ||||
| : | ||||
o : changeset: 31:621d83e11f67 | ||||
|\: parent: 21:d42a756af44d | ||||
| : parent: 30:6e11cd4b648f | ||||
| : user: test | ||||
| : date: Thu Jan 01 00:00:31 1970 +0000 | ||||
| : summary: (31) expand | ||||
| : | ||||
o : changeset: 30:6e11cd4b648f | ||||
|\ \ parent: 28:44ecd0b9ae99 | ||||
| ~ : parent: 29:cd9bb2be7593 | ||||
| : user: test | ||||
| : date: Thu Jan 01 00:00:30 1970 +0000 | ||||
| : summary: (30) expand | ||||
| / | ||||
o : changeset: 28:44ecd0b9ae99 | ||||
|\ \ parent: 1:6db2ef61d156 | ||||
| ~ : parent: 26:7f25b6c2f0b9 | ||||
| : user: test | ||||
| : date: Thu Jan 01 00:00:28 1970 +0000 | ||||
| : summary: (28) merge zero known | ||||
| / | ||||
o : changeset: 26:7f25b6c2f0b9 | ||||
|\ \ parent: 18:1aa84d96232a | ||||
| | : parent: 25:91da8ed57247 | ||||
| | : user: test | ||||
| | : date: Thu Jan 01 00:00:26 1970 +0000 | ||||
| | : summary: (26) merge one known; far right | ||||
| | : | ||||
| o : changeset: 25:91da8ed57247 | ||||
| |\: parent: 21:d42a756af44d | ||||
| | : parent: 24:a9c19a3d96b7 | ||||
| | : user: test | ||||
| | : date: Thu Jan 01 00:00:25 1970 +0000 | ||||
| | : summary: (25) merge one known; far left | ||||
| | : | ||||
| o : changeset: 24:a9c19a3d96b7 | ||||
| |\ \ parent: 0:e6eb3150255d | ||||
| | ~ : parent: 23:a01cddf0766d | ||||
| | : user: test | ||||
| | : date: Thu Jan 01 00:00:24 1970 +0000 | ||||
| | : summary: (24) merge one known; immediate right | ||||
| | / | ||||
| o : changeset: 23:a01cddf0766d | ||||
| |\ \ parent: 1:6db2ef61d156 | ||||
| | ~ : parent: 22:e0d9cccacb5d | ||||
| | : user: test | ||||
| | : date: Thu Jan 01 00:00:23 1970 +0000 | ||||
| | : summary: (23) merge one known; immediate left | ||||
| | / | ||||
| o : changeset: 22:e0d9cccacb5d | ||||
|/:/ parent: 18:1aa84d96232a | ||||
| : parent: 21:d42a756af44d | ||||
| : user: test | ||||
| : date: Thu Jan 01 00:00:22 1970 +0000 | ||||
| : summary: (22) merge two known; one far left, one far right | ||||
| : | ||||
| o changeset: 21:d42a756af44d | ||||
| |\ parent: 19:31ddc2c1573b | ||||
| | | parent: 20:d30ed6450e32 | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:21 1970 +0000 | ||||
| | | summary: (21) expand | ||||
| | | | ||||
+---o changeset: 20:d30ed6450e32 | ||||
| | | parent: 0:e6eb3150255d | ||||
| | ~ parent: 18:1aa84d96232a | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:20 1970 +0000 | ||||
| | summary: (20) merge two known; two far right | ||||
| | | ||||
| o changeset: 19:31ddc2c1573b | ||||
| |\ parent: 15:1dda3f72782d | ||||
| | | parent: 17:44765d7c06e0 | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:19 1970 +0000 | ||||
| | | summary: (19) expand | ||||
| | | | ||||
o | | changeset: 18:1aa84d96232a | ||||
|\| | parent: 1:6db2ef61d156 | ||||
~ | | parent: 15:1dda3f72782d | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:18 1970 +0000 | ||||
| | summary: (18) merge two known; two far left | ||||
/ / | ||||
| o changeset: 17:44765d7c06e0 | ||||
| |\ parent: 12:86b91144a6e9 | ||||
| | | parent: 16:3677d192927d | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:17 1970 +0000 | ||||
| | | summary: (17) expand | ||||
| | | | ||||
| | o changeset: 16:3677d192927d | ||||
| | |\ parent: 0:e6eb3150255d | ||||
| | ~ ~ parent: 1:6db2ef61d156 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:16 1970 +0000 | ||||
| | summary: (16) merge two known; one immediate right, one near right | ||||
| | | ||||
o | changeset: 15:1dda3f72782d | ||||
|\ \ parent: 13:22d8966a97e3 | ||||
| | | parent: 14:8eac370358ef | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:15 1970 +0000 | ||||
| | | summary: (15) expand | ||||
| | | | ||||
| o | changeset: 14:8eac370358ef | ||||
| |\| parent: 0:e6eb3150255d | ||||
| ~ | parent: 12:86b91144a6e9 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:14 1970 +0000 | ||||
| | summary: (14) merge two known; one immediate right, one far right | ||||
| / | ||||
o | changeset: 13:22d8966a97e3 | ||||
|\ \ parent: 9:7010c0af0a35 | ||||
| | | parent: 11:832d76e6bdf2 | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:13 1970 +0000 | ||||
| | | summary: (13) expand | ||||
| | | | ||||
+---o changeset: 12:86b91144a6e9 | ||||
| | | parent: 1:6db2ef61d156 | ||||
| | ~ parent: 9:7010c0af0a35 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:12 1970 +0000 | ||||
| | summary: (12) merge two known; one immediate right, one far left | ||||
| | | ||||
| o changeset: 11:832d76e6bdf2 | ||||
| |\ parent: 6:b105a072e251 | ||||
| | | parent: 10:74c64d036d72 | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:11 1970 +0000 | ||||
| | | summary: (11) expand | ||||
| | | | ||||
| | o changeset: 10:74c64d036d72 | ||||
| |/| parent: 0:e6eb3150255d | ||||
| | ~ parent: 6:b105a072e251 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:10 1970 +0000 | ||||
| | summary: (10) merge two known; one immediate left, one near right | ||||
| | | ||||
o | changeset: 9:7010c0af0a35 | ||||
|\ \ parent: 7:b632bb1b1224 | ||||
| | | parent: 8:7a0b11f71937 | ||||
| | | user: test | ||||
| | | date: Thu Jan 01 00:00:09 1970 +0000 | ||||
| | | summary: (9) expand | ||||
| | | | ||||
| o | changeset: 8:7a0b11f71937 | ||||
|/| | parent: 0:e6eb3150255d | ||||
| ~ | parent: 7:b632bb1b1224 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:08 1970 +0000 | ||||
| | summary: (8) merge two known; one immediate left, one far right | ||||
| / | ||||
o | changeset: 7:b632bb1b1224 | ||||
|\ \ parent: 2:3d9a33b8d1e1 | ||||
| ~ | parent: 5:4409d547b708 | ||||
| | user: test | ||||
| | date: Thu Jan 01 00:00:07 1970 +0000 | ||||
| | summary: (7) expand | ||||
| / | ||||
| o changeset: 6:b105a072e251 | ||||
|/| parent: 2:3d9a33b8d1e1 | ||||
| ~ parent: 5:4409d547b708 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:06 1970 +0000 | ||||
| summary: (6) merge two known; one immediate left, one far left | ||||
| | ||||
o changeset: 5:4409d547b708 | ||||
|\ parent: 3:27eef8ed80b4 | ||||
| ~ parent: 4:26a8bac39d9f | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:05 1970 +0000 | ||||
| summary: (5) expand | ||||
| | ||||
o changeset: 4:26a8bac39d9f | ||||
|\ parent: 1:6db2ef61d156 | ||||
~ ~ parent: 3:27eef8ed80b4 | ||||
user: test | ||||
date: Thu Jan 01 00:00:04 1970 +0000 | ||||
summary: (4) merge two known; one immediate left, one immediate right | ||||
|
r29134 | Draw only part of a grandparent line differently with "<N><char>"; only the | ||
last N lines (for positive N) or everything but the first N lines (for | ||||
negative N) along the current node use the style, the rest of the edge uses | ||||
the parent edge styling. | ||||
|
r28999 | |||
|
r29134 | Last 3 lines: | ||
$ cat << EOF >> $HGRCPATH | ||||
> [experimental] | ||||
> graphstyle.parent = ! | ||||
> graphstyle.grandparent = 3. | ||||
> graphstyle.missing = | ||||
> EOF | ||||
$ hg log -G -r '36:18 & file("a")' -m | ||||
@ changeset: 36:08a19a744424 | ||||
! branch: branch | ||||
! tag: tip | ||||
! parent: 35:9159c3644c5e | ||||
! parent: 35:9159c3644c5e | ||||
! user: test | ||||
. date: Thu Jan 01 00:00:36 1970 +0000 | ||||
. summary: (36) buggy merge: identical parents | ||||
. | ||||
o changeset: 32:d06dffa21a31 | ||||
!\ parent: 27:886ed638191b | ||||
! ! parent: 31:621d83e11f67 | ||||
! ! user: test | ||||
! . date: Thu Jan 01 00:00:32 1970 +0000 | ||||
! . summary: (32) expand | ||||
! . | ||||
o ! changeset: 31:621d83e11f67 | ||||
!\! parent: 21:d42a756af44d | ||||
! ! parent: 30:6e11cd4b648f | ||||
! ! user: test | ||||
|
r29184 | ! ! date: Thu Jan 01 00:00:31 1970 +0000 | ||
! ! summary: (31) expand | ||||
! ! | ||||
|
r29134 | o ! changeset: 30:6e11cd4b648f | ||
!\ \ parent: 28:44ecd0b9ae99 | ||||
! ~ ! parent: 29:cd9bb2be7593 | ||||
! ! user: test | ||||
|
r29184 | ! ! date: Thu Jan 01 00:00:30 1970 +0000 | ||
! ! summary: (30) expand | ||||
|
r29134 | ! / | ||
o ! changeset: 28:44ecd0b9ae99 | ||||
!\ \ parent: 1:6db2ef61d156 | ||||
! ~ ! parent: 26:7f25b6c2f0b9 | ||||
! ! user: test | ||||
|
r29184 | ! ! date: Thu Jan 01 00:00:28 1970 +0000 | ||
! ! summary: (28) merge zero known | ||||
|
r29134 | ! / | ||
o ! changeset: 26:7f25b6c2f0b9 | ||||
!\ \ parent: 18:1aa84d96232a | ||||
! ! ! parent: 25:91da8ed57247 | ||||
! ! ! user: test | ||||
|
r29184 | ! ! ! date: Thu Jan 01 00:00:26 1970 +0000 | ||
! ! ! summary: (26) merge one known; far right | ||||
! ! ! | ||||
|
r29134 | ! o ! changeset: 25:91da8ed57247 | ||
! !\! parent: 21:d42a756af44d | ||||
! ! ! parent: 24:a9c19a3d96b7 | ||||
! ! ! user: test | ||||
|
r29184 | ! ! ! date: Thu Jan 01 00:00:25 1970 +0000 | ||
! ! ! summary: (25) merge one known; far left | ||||
! ! ! | ||||
|
r29134 | ! o ! changeset: 24:a9c19a3d96b7 | ||
! !\ \ parent: 0:e6eb3150255d | ||||
! ! ~ ! parent: 23:a01cddf0766d | ||||
! ! ! user: test | ||||
|
r29184 | ! ! ! date: Thu Jan 01 00:00:24 1970 +0000 | ||
! ! ! summary: (24) merge one known; immediate right | ||||
|
r29134 | ! ! / | ||
! o ! changeset: 23:a01cddf0766d | ||||
! !\ \ parent: 1:6db2ef61d156 | ||||
! ! ~ ! parent: 22:e0d9cccacb5d | ||||
! ! ! user: test | ||||
|
r29184 | ! ! ! date: Thu Jan 01 00:00:23 1970 +0000 | ||
! ! ! summary: (23) merge one known; immediate left | ||||
|
r29134 | ! ! / | ||
! o ! changeset: 22:e0d9cccacb5d | ||||
!/!/ parent: 18:1aa84d96232a | ||||
! ! parent: 21:d42a756af44d | ||||
! ! user: test | ||||
|
r29184 | ! ! date: Thu Jan 01 00:00:22 1970 +0000 | ||
! ! summary: (22) merge two known; one far left, one far right | ||||
! ! | ||||
|
r29134 | ! o changeset: 21:d42a756af44d | ||
! !\ parent: 19:31ddc2c1573b | ||||
! ! ! parent: 20:d30ed6450e32 | ||||
! ! ! user: test | ||||
! ! ! date: Thu Jan 01 00:00:21 1970 +0000 | ||||
! ! ! summary: (21) expand | ||||
! ! ! | ||||
+---o changeset: 20:d30ed6450e32 | ||||
! ! | parent: 0:e6eb3150255d | ||||
! ! ~ parent: 18:1aa84d96232a | ||||
! ! user: test | ||||
! ! date: Thu Jan 01 00:00:20 1970 +0000 | ||||
! ! summary: (20) merge two known; two far right | ||||
! ! | ||||
! o changeset: 19:31ddc2c1573b | ||||
! |\ parent: 15:1dda3f72782d | ||||
! ~ ~ parent: 17:44765d7c06e0 | ||||
! user: test | ||||
! date: Thu Jan 01 00:00:19 1970 +0000 | ||||
! summary: (19) expand | ||||
! | ||||
o changeset: 18:1aa84d96232a | ||||
|\ parent: 1:6db2ef61d156 | ||||
~ ~ parent: 15:1dda3f72782d | ||||
user: test | ||||
date: Thu Jan 01 00:00:18 1970 +0000 | ||||
summary: (18) merge two known; two far left | ||||
All but the first 3 lines: | ||||
$ cat << EOF >> $HGRCPATH | ||||
> [experimental] | ||||
> graphstyle.parent = ! | ||||
> graphstyle.grandparent = -3. | ||||
> graphstyle.missing = | ||||
> EOF | ||||
$ hg log -G -r '36:18 & file("a")' -m | ||||
@ changeset: 36:08a19a744424 | ||||
! branch: branch | ||||
! tag: tip | ||||
. parent: 35:9159c3644c5e | ||||
. parent: 35:9159c3644c5e | ||||
. user: test | ||||
. date: Thu Jan 01 00:00:36 1970 +0000 | ||||
. summary: (36) buggy merge: identical parents | ||||
. | ||||
o changeset: 32:d06dffa21a31 | ||||
!\ parent: 27:886ed638191b | ||||
! ! parent: 31:621d83e11f67 | ||||
! . user: test | ||||
! . date: Thu Jan 01 00:00:32 1970 +0000 | ||||
! . summary: (32) expand | ||||
! . | ||||
o ! changeset: 31:621d83e11f67 | ||||
!\! parent: 21:d42a756af44d | ||||
! ! parent: 30:6e11cd4b648f | ||||
|
r29184 | ! ! user: test | ||
! ! date: Thu Jan 01 00:00:31 1970 +0000 | ||||
! ! summary: (31) expand | ||||
! ! | ||||
|
r29134 | o ! changeset: 30:6e11cd4b648f | ||
!\ \ parent: 28:44ecd0b9ae99 | ||||
! ~ ! parent: 29:cd9bb2be7593 | ||||
|
r29184 | ! ! user: test | ||
! ! date: Thu Jan 01 00:00:30 1970 +0000 | ||||
! ! summary: (30) expand | ||||
|
r29134 | ! / | ||
o ! changeset: 28:44ecd0b9ae99 | ||||
!\ \ parent: 1:6db2ef61d156 | ||||
! ~ ! parent: 26:7f25b6c2f0b9 | ||||
|
r29184 | ! ! user: test | ||
! ! date: Thu Jan 01 00:00:28 1970 +0000 | ||||
! ! summary: (28) merge zero known | ||||
|
r29134 | ! / | ||
o ! changeset: 26:7f25b6c2f0b9 | ||||
!\ \ parent: 18:1aa84d96232a | ||||
! ! ! parent: 25:91da8ed57247 | ||||
|
r29184 | ! ! ! user: test | ||
! ! ! date: Thu Jan 01 00:00:26 1970 +0000 | ||||
! ! ! summary: (26) merge one known; far right | ||||
! ! ! | ||||
|
r29134 | ! o ! changeset: 25:91da8ed57247 | ||
! !\! parent: 21:d42a756af44d | ||||
! ! ! parent: 24:a9c19a3d96b7 | ||||
|
r29184 | ! ! ! user: test | ||
! ! ! date: Thu Jan 01 00:00:25 1970 +0000 | ||||
! ! ! summary: (25) merge one known; far left | ||||
! ! ! | ||||
|
r29134 | ! o ! changeset: 24:a9c19a3d96b7 | ||
! !\ \ parent: 0:e6eb3150255d | ||||
! ! ~ ! parent: 23:a01cddf0766d | ||||
|
r29184 | ! ! ! user: test | ||
! ! ! date: Thu Jan 01 00:00:24 1970 +0000 | ||||
! ! ! summary: (24) merge one known; immediate right | ||||
|
r29134 | ! ! / | ||
! o ! changeset: 23:a01cddf0766d | ||||
! !\ \ parent: 1:6db2ef61d156 | ||||
! ! ~ ! parent: 22:e0d9cccacb5d | ||||
|
r29184 | ! ! ! user: test | ||
! ! ! date: Thu Jan 01 00:00:23 1970 +0000 | ||||
! ! ! summary: (23) merge one known; immediate left | ||||
|
r29134 | ! ! / | ||
! o ! changeset: 22:e0d9cccacb5d | ||||
!/!/ parent: 18:1aa84d96232a | ||||
! ! parent: 21:d42a756af44d | ||||
|
r29184 | ! ! user: test | ||
! ! date: Thu Jan 01 00:00:22 1970 +0000 | ||||
! ! summary: (22) merge two known; one far left, one far right | ||||
! ! | ||||
|
r29134 | ! o changeset: 21:d42a756af44d | ||
! !\ parent: 19:31ddc2c1573b | ||||
! ! ! parent: 20:d30ed6450e32 | ||||
! ! ! user: test | ||||
! ! ! date: Thu Jan 01 00:00:21 1970 +0000 | ||||
! ! ! summary: (21) expand | ||||
! ! ! | ||||
+---o changeset: 20:d30ed6450e32 | ||||
! ! | parent: 0:e6eb3150255d | ||||
! ! ~ parent: 18:1aa84d96232a | ||||
! ! user: test | ||||
! ! date: Thu Jan 01 00:00:20 1970 +0000 | ||||
! ! summary: (20) merge two known; two far right | ||||
! ! | ||||
! o changeset: 19:31ddc2c1573b | ||||
! |\ parent: 15:1dda3f72782d | ||||
! ~ ~ parent: 17:44765d7c06e0 | ||||
! user: test | ||||
! date: Thu Jan 01 00:00:19 1970 +0000 | ||||
! summary: (19) expand | ||||
! | ||||
o changeset: 18:1aa84d96232a | ||||
|\ parent: 1:6db2ef61d156 | ||||
~ ~ parent: 15:1dda3f72782d | ||||
user: test | ||||
date: Thu Jan 01 00:00:18 1970 +0000 | ||||
summary: (18) merge two known; two far left | ||||
|
r28600 | $ cd .. | ||
|
r28891 | |||
Change graph shorten, test better with graphstyle.missing not none | ||||
$ cd repo | ||||
$ cat << EOF >> $HGRCPATH | ||||
> [experimental] | ||||
> graphstyle.parent = | | ||||
> graphstyle.grandparent = : | ||||
> graphstyle.missing = ' | ||||
> graphshorten = true | ||||
> EOF | ||||
$ hg log -G -r 'file("a")' -m -T '{rev} {desc}' | ||||
@ 36 (36) buggy merge: identical parents | ||||
o 32 (32) expand | ||||
|\ | ||||
o : 31 (31) expand | ||||
|\: | ||||
o : 30 (30) expand | ||||
|\ \ | ||||
o \ \ 28 (28) merge zero known | ||||
|\ \ \ | ||||
o \ \ \ 26 (26) merge one known; far right | ||||
|\ \ \ \ | ||||
| o-----+ 25 (25) merge one known; far left | ||||
| o ' ' : 24 (24) merge one known; immediate right | ||||
| |\ \ \ \ | ||||
| o---+ ' : 23 (23) merge one known; immediate left | ||||
| o-------+ 22 (22) merge two known; one far left, one far right | ||||
|/ / / / / | ||||
| ' ' ' o 21 (21) expand | ||||
| ' ' ' |\ | ||||
+-+-------o 20 (20) merge two known; two far right | ||||
| ' ' ' o 19 (19) expand | ||||
| ' ' ' |\ | ||||
o---+---+ | 18 (18) merge two known; two far left | ||||
/ / / / / | ||||
' ' ' | o 17 (17) expand | ||||
' ' ' | |\ | ||||
+-+-------o 16 (16) merge two known; one immediate right, one near right | ||||
' ' ' o | 15 (15) expand | ||||
' ' ' |\ \ | ||||
+-------o | 14 (14) merge two known; one immediate right, one far right | ||||
' ' ' | |/ | ||||
' ' ' o | 13 (13) expand | ||||
' ' ' |\ \ | ||||
' +---+---o 12 (12) merge two known; one immediate right, one far left | ||||
' ' ' | o 11 (11) expand | ||||
' ' ' | |\ | ||||
+---------o 10 (10) merge two known; one immediate left, one near right | ||||
' ' ' | |/ | ||||
' ' ' o | 9 (9) expand | ||||
' ' ' |\ \ | ||||
+-------o | 8 (8) merge two known; one immediate left, one far right | ||||
' ' ' |/ / | ||||
' ' ' o | 7 (7) expand | ||||
' ' ' |\ \ | ||||
' ' ' +---o 6 (6) merge two known; one immediate left, one far left | ||||
' ' ' | '/ | ||||
' ' ' o ' 5 (5) expand | ||||
' ' ' |\ \ | ||||
' +---o ' ' 4 (4) merge two known; one immediate left, one immediate right | ||||
' ' ' '/ / | ||||
behavior with newlines | ||||
$ hg log -G -r ::2 -T '{rev} {desc}' | ||||
o 2 (2) collapse | ||||
o 1 (1) collapse | ||||
o 0 (0) root | ||||
$ hg log -G -r ::2 -T '{rev} {desc}\n' | ||||
o 2 (2) collapse | ||||
o 1 (1) collapse | ||||
o 0 (0) root | ||||
$ hg log -G -r ::2 -T '{rev} {desc}\n\n' | ||||
o 2 (2) collapse | ||||
| | ||||
o 1 (1) collapse | ||||
| | ||||
o 0 (0) root | ||||
$ hg log -G -r ::2 -T '\n{rev} {desc}' | ||||
o | ||||
| 2 (2) collapse | ||||
o | ||||
| 1 (1) collapse | ||||
o | ||||
0 (0) root | ||||
$ hg log -G -r ::2 -T '{rev} {desc}\n\n\n' | ||||
o 2 (2) collapse | ||||
| | ||||
| | ||||
o 1 (1) collapse | ||||
| | ||||
| | ||||
o 0 (0) root | ||||
$ cd .. | ||||
|
r28998 | |||
When inserting extra line nodes to handle more than 2 parents, ensure that | ||||
the right node styles are used (issue5174): | ||||
$ hg init repo-issue5174 | ||||
$ cd repo-issue5174 | ||||
$ echo a > f0 | ||||
$ hg ci -Aqm 0 | ||||
$ echo a > f1 | ||||
$ hg ci -Aqm 1 | ||||
$ echo a > f2 | ||||
$ hg ci -Aqm 2 | ||||
$ hg co ".^" | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo a > f3 | ||||
$ hg ci -Aqm 3 | ||||
$ hg co ".^^" | ||||
0 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
$ echo a > f4 | ||||
$ hg ci -Aqm 4 | ||||
$ hg merge -r 2 | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
$ hg ci -qm 5 | ||||
$ hg merge -r 3 | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
$ hg ci -qm 6 | ||||
$ hg log -G -r '0 | 1 | 2 | 6' | ||||
@ changeset: 6:851fe89689ad | ||||
:\ tag: tip | ||||
: : parent: 5:4f1e3cf15f5d | ||||
: : parent: 3:b74ba7084d2d | ||||
: : user: test | ||||
: : date: Thu Jan 01 00:00:00 1970 +0000 | ||||
: : summary: 6 | ||||
: : | ||||
: \ | ||||
: :\ | ||||
: o : changeset: 2:3e6599df4cce | ||||
: :/ user: test | ||||
: : date: Thu Jan 01 00:00:00 1970 +0000 | ||||
: : summary: 2 | ||||
: : | ||||
: o changeset: 1:bd9a55143933 | ||||
:/ user: test | ||||
: date: Thu Jan 01 00:00:00 1970 +0000 | ||||
: summary: 1 | ||||
: | ||||
o changeset: 0:870a5edc339c | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: 0 | ||||
|
r31552 | $ cd .. | ||
Multiple roots (issue5440): | ||||
$ hg init multiroots | ||||
$ cd multiroots | ||||
$ cat <<EOF > .hg/hgrc | ||||
> [ui] | ||||
> logtemplate = '{rev} {desc}\n\n' | ||||
> EOF | ||||
$ touch foo | ||||
$ hg ci -Aqm foo | ||||
$ hg co -q null | ||||
$ touch bar | ||||
$ hg ci -Aqm bar | ||||
$ hg log -Gr null: | ||||
@ 1 bar | ||||
| | ||||
| o 0 foo | ||||
|/ | ||||
o -1 | ||||
$ hg log -Gr null+0 | ||||
o 0 foo | ||||
| | ||||
o -1 | ||||
$ hg log -Gr null+1 | ||||
@ 1 bar | ||||
| | ||||
o -1 | ||||
$ cd .. | ||||