2019-12-10 02:24:31 +03:00
|
|
|
#chg-compatible
|
|
|
|
|
2020-01-20 13:42:49 +03:00
|
|
|
$ disable treemanifest
|
2020-01-20 13:42:49 +03:00
|
|
|
$ enable smartlog
|
|
|
|
$ readconfig <<EOF
|
2020-08-21 03:33:07 +03:00
|
|
|
> [format]
|
|
|
|
> use-segmented-changelog=1
|
2016-04-19 13:19:20 +03:00
|
|
|
> [experimental]
|
|
|
|
> graphstyle.grandparent=|
|
|
|
|
> graphstyle.missing=|
|
2014-10-18 00:35:52 +04:00
|
|
|
> EOF
|
|
|
|
|
|
|
|
Build up a repo
|
|
|
|
|
|
|
|
$ hg init repo
|
|
|
|
$ cd repo
|
2015-09-16 02:13:13 +03:00
|
|
|
|
|
|
|
Confirm smartlog doesn't error on an empty repo
|
|
|
|
$ hg smartlog
|
|
|
|
|
|
|
|
Continue repo setup
|
2014-10-18 00:35:52 +04:00
|
|
|
$ hg book master
|
2015-09-16 02:13:13 +03:00
|
|
|
$ hg sl -r 'smartlog() + master'
|
2014-10-18 00:35:52 +04:00
|
|
|
$ touch a1 && hg add a1 && hg ci -ma1
|
|
|
|
$ touch a2 && hg add a2 && hg ci -ma2
|
|
|
|
$ hg book feature1
|
|
|
|
$ touch b && hg add b && hg ci -mb
|
|
|
|
$ hg up -q master
|
|
|
|
$ touch c1 && hg add c1 && hg ci -mc1
|
|
|
|
$ touch c2 && hg add c2 && hg ci -mc2
|
|
|
|
$ hg book feature2
|
|
|
|
$ touch d && hg add d && hg ci -md
|
2019-03-15 06:07:03 +03:00
|
|
|
|
2020-07-02 23:11:57 +03:00
|
|
|
$ hg debugmakepublic master
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg log -G -T "{node|short} {bookmarks} {desc}" -r 'sort(:, topo)'
|
2020-08-21 03:33:07 +03:00
|
|
|
@ db92053d5c83 feature2 d
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
│ o 49cdb4091aca feature1 b
|
|
|
|
│ │
|
|
|
|
o │ 38d85b506754 master c2
|
|
|
|
│ │
|
|
|
|
o │ ec7553f7b382 c1
|
|
|
|
├─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o b68836a6e2ca a2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
o df4fd610a3d6 a1
|
2014-10-18 00:35:52 +04:00
|
|
|
|
|
|
|
|
|
|
|
Basic test
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog -T '{node|short} {bookmarks} {desc}'
|
|
|
|
@ db92053d5c83 feature2 d
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
o 38d85b506754 master c2
|
2020-10-20 03:05:23 +03:00
|
|
|
╷
|
|
|
|
╷ o 49cdb4091aca feature1 b
|
|
|
|
╭─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o b68836a6e2ca a2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
2014-10-18 00:35:52 +04:00
|
|
|
|
2014-11-11 05:45:39 +03:00
|
|
|
With commit info
|
|
|
|
$ echo "hello" >c2 && hg ci --amend
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog -T '{node|short} {bookmarks} {desc}' --commit-info
|
|
|
|
@ 05d10250273e feature2 d M c2
|
2020-10-20 03:05:23 +03:00
|
|
|
│ A d
|
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
o 38d85b506754 master c2
|
2020-10-20 03:05:23 +03:00
|
|
|
╷
|
|
|
|
╷ o 49cdb4091aca feature1 b
|
|
|
|
╭─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o b68836a6e2ca a2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
2014-11-11 05:45:39 +03:00
|
|
|
|
2015-01-21 23:20:33 +03:00
|
|
|
As a revset
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg log -G -T '{node|short} {bookmarks} {desc}' -r 'smartlog()'
|
|
|
|
@ 05d10250273e feature2 d
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
│ o 49cdb4091aca feature1 b
|
|
|
|
│ │
|
|
|
|
o │ 38d85b506754 master c2
|
|
|
|
├─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o b68836a6e2ca a2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
2015-01-21 23:20:33 +03:00
|
|
|
|
2015-02-20 01:39:54 +03:00
|
|
|
With --master
|
2019-03-15 06:07:03 +03:00
|
|
|
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog -T '{node|short} {bookmarks} {desc}' --master 'desc(a2)'
|
2020-08-21 03:33:07 +03:00
|
|
|
o 49cdb4091aca feature1 b
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
│ @ 05d10250273e feature2 d
|
|
|
|
│ │
|
|
|
|
│ o 38d85b506754 master c2
|
|
|
|
├─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o b68836a6e2ca a2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
2015-02-20 01:39:54 +03:00
|
|
|
|
2015-01-21 23:20:33 +03:00
|
|
|
Specific revs
|
2020-10-14 22:55:48 +03:00
|
|
|
$ hg smartlog -T '{node|short} {bookmarks} {desc}' -r 'desc(b)' -r 'desc(c2)' --master null
|
2020-08-21 03:33:07 +03:00
|
|
|
o 49cdb4091aca feature1 b
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
│ o 38d85b506754 master c2
|
|
|
|
├─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o b68836a6e2ca a2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
2014-11-11 05:45:39 +03:00
|
|
|
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog -T '{node|short} {bookmarks} {desc}' -r 'smartlog()' -r 'desc(a1)'
|
2020-10-14 22:55:48 +03:00
|
|
|
@ 05d10250273e feature2 d
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-10-14 22:55:48 +03:00
|
|
|
o 38d85b506754 master c2
|
2020-10-20 03:05:23 +03:00
|
|
|
╷
|
|
|
|
╷ o 49cdb4091aca feature1 b
|
|
|
|
╭─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o b68836a6e2ca a2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
o df4fd610a3d6 a1
|
2015-01-21 23:20:33 +03:00
|
|
|
|
2015-02-20 02:50:16 +03:00
|
|
|
|
|
|
|
Test master ordering
|
2020-06-29 21:24:57 +03:00
|
|
|
$ hg debugmakepublic 49cdb4091aca
|
2019-03-15 06:07:03 +03:00
|
|
|
|
2015-02-20 02:50:16 +03:00
|
|
|
$ hg boo -f master -r 49cdb4091aca
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog -T '{node|short} {bookmarks} {desc}'
|
|
|
|
o 49cdb4091aca feature1 master b
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
│ @ 05d10250273e feature2 d
|
|
|
|
│ │
|
|
|
|
│ o 38d85b506754 c2
|
|
|
|
│ │
|
|
|
|
│ o ec7553f7b382 c1
|
|
|
|
├─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o b68836a6e2ca a2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
2015-02-20 03:03:41 +03:00
|
|
|
|
|
|
|
Test overriding master
|
2020-06-29 21:24:57 +03:00
|
|
|
$ hg debugmakepublic 38d85b506754
|
2019-03-15 06:07:03 +03:00
|
|
|
|
2015-02-20 03:03:41 +03:00
|
|
|
$ hg boo -f master -r 38d85b506754
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog -T '{node|short} {bookmarks} {desc}'
|
|
|
|
@ 05d10250273e feature2 d
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
o 38d85b506754 master c2
|
2020-10-20 03:05:23 +03:00
|
|
|
╷
|
|
|
|
╷ o 49cdb4091aca feature1 b
|
|
|
|
╭─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o b68836a6e2ca a2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
2015-02-20 03:03:41 +03:00
|
|
|
|
2020-06-29 21:24:57 +03:00
|
|
|
$ hg debugmakepublic feature1
|
2019-03-15 06:07:03 +03:00
|
|
|
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog -T '{node|short} {bookmarks} {desc}' --master feature1
|
|
|
|
o 49cdb4091aca feature1 b
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
│ @ 05d10250273e feature2 d
|
|
|
|
│ │
|
|
|
|
│ o 38d85b506754 master c2
|
|
|
|
│ │
|
|
|
|
│ o ec7553f7b382 c1
|
|
|
|
├─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o b68836a6e2ca a2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
2015-02-20 03:03:41 +03:00
|
|
|
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog -T '{node|short} {bookmarks} {desc}' --config smartlog.master=feature1
|
|
|
|
o 49cdb4091aca feature1 b
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
│ @ 05d10250273e feature2 d
|
|
|
|
│ │
|
|
|
|
│ o 38d85b506754 master c2
|
|
|
|
│ │
|
|
|
|
│ o ec7553f7b382 c1
|
|
|
|
├─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o b68836a6e2ca a2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
2015-02-20 03:03:41 +03:00
|
|
|
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog -T '{node|short} {bookmarks} {desc}' --config smartlog.master=feature2 --master feature1
|
|
|
|
o 49cdb4091aca feature1 b
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
│ @ 05d10250273e feature2 d
|
|
|
|
│ │
|
|
|
|
│ o 38d85b506754 master c2
|
|
|
|
│ │
|
|
|
|
│ o ec7553f7b382 c1
|
|
|
|
├─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o b68836a6e2ca a2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
2015-02-24 09:54:08 +03:00
|
|
|
|
2020-06-29 21:24:57 +03:00
|
|
|
$ hg debugmakepublic .
|
2019-03-15 06:07:03 +03:00
|
|
|
|
2015-04-30 01:00:31 +03:00
|
|
|
Test with weird bookmark names
|
|
|
|
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg book -r 'desc(b)' foo-bar
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog -r 'foo-bar + .' -T '{node|short} {bookmarks} {desc}'
|
|
|
|
@ 05d10250273e feature2 d
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-10-14 22:55:48 +03:00
|
|
|
o 38d85b506754 master c2
|
2020-10-20 03:05:23 +03:00
|
|
|
╷
|
|
|
|
╷ o 49cdb4091aca feature1 foo-bar b
|
|
|
|
╭─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o b68836a6e2ca a2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
2019-03-15 06:07:03 +03:00
|
|
|
|
2020-06-29 21:24:57 +03:00
|
|
|
$ hg debugmakepublic foo-bar
|
2019-03-15 06:07:03 +03:00
|
|
|
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog --config smartlog.master=foo-bar -T '{node|short} {bookmarks} {desc}'
|
|
|
|
o 49cdb4091aca feature1 foo-bar b
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
│ @ 05d10250273e feature2 d
|
|
|
|
│ │
|
|
|
|
│ o 38d85b506754 master c2
|
|
|
|
│ │
|
|
|
|
│ o ec7553f7b382 c1
|
|
|
|
├─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o b68836a6e2ca a2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog --config smartlog.master=xxxx -T '{node|short} {bookmarks} {desc}'
|
2015-05-19 03:36:21 +03:00
|
|
|
abort: unknown revision 'xxxx'!
|
|
|
|
[255]
|
2016-02-11 18:11:59 +03:00
|
|
|
|
2016-02-12 04:31:42 +03:00
|
|
|
Test with two unrelated histories
|
|
|
|
$ hg update null
|
|
|
|
0 files updated, 0 files merged, 5 files removed, 0 files unresolved
|
|
|
|
(leaving bookmark feature2)
|
|
|
|
$ touch u1 && hg add u1 && hg ci -mu1
|
|
|
|
$ touch u2 && hg add u2 && hg ci -mu2
|
|
|
|
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog -T '{node|short} {bookmarks} {desc}'
|
|
|
|
@ 806aaef35296 u2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
o 8749dc393678 u1
|
2016-03-31 21:26:15 +03:00
|
|
|
|
2020-08-21 03:33:07 +03:00
|
|
|
o 05d10250273e feature2 d
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
o 38d85b506754 master c2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
o ec7553f7b382 c1
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
│ o 49cdb4091aca feature1 foo-bar b
|
|
|
|
├─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o b68836a6e2ca a2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
2016-02-12 04:31:42 +03:00
|
|
|
|
2016-02-11 18:11:59 +03:00
|
|
|
|
2016-09-16 18:36:10 +03:00
|
|
|
A draft stack at the top
|
|
|
|
$ cd ..
|
|
|
|
$ hg init repo2
|
|
|
|
$ cd repo2
|
|
|
|
$ hg debugbuilddag '+4'
|
|
|
|
$ hg bookmark curr
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg bookmark master -r 'desc(r1)'
|
|
|
|
$ hg debugmakepublic -r 'desc(r1)'
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog -T '{node|short} {bookmarks} {desc}' --all
|
|
|
|
o 2dc09a01254d r3
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
o 01241442b3c2 r2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
o 66f7d451a68b master r1
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog -T '{node|short} {bookmarks} {desc}' --all --config smartlog.indentnonpublic=1
|
|
|
|
o 2dc09a01254d r3
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
o 01241442b3c2 r2
|
2020-10-20 03:05:23 +03:00
|
|
|
╭─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o 66f7d451a68b master r1
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
2016-09-17 04:22:36 +03:00
|
|
|
|
|
|
|
Different number of lines per node
|
|
|
|
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog -T '{node|short}\n{bookmarks}\n{desc}\n{author}\n{date|isodate}\n' --all --config smartlog.indentnonpublic=1
|
|
|
|
o 2dc09a01254d
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
│ r3
|
|
|
|
│ debugbuilddag
|
|
|
|
│ 1970-01-01 00:00 +0000
|
2020-08-21 03:33:07 +03:00
|
|
|
o 01241442b3c2
|
2020-10-20 03:05:23 +03:00
|
|
|
╭─╯
|
|
|
|
│ r2
|
|
|
|
│ debugbuilddag
|
|
|
|
│ 1970-01-01 00:00 +0000
|
2020-08-21 03:33:07 +03:00
|
|
|
o 66f7d451a68b
|
2020-10-20 03:05:23 +03:00
|
|
|
│ master
|
|
|
|
~ r1
|
|
|
|
debugbuilddag
|
|
|
|
1970-01-01 00:00 +0000
|
2016-09-17 04:22:36 +03:00
|
|
|
|
|
|
|
Add other draft stacks
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg up 'desc(r1)' -q
|
2016-09-17 04:22:36 +03:00
|
|
|
$ echo 1 > a
|
|
|
|
$ hg ci -A a -m a -q
|
|
|
|
$ echo 2 >> a
|
|
|
|
$ hg ci -A a -m a -q
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg up 'desc(r2)' -q
|
2016-09-17 04:22:36 +03:00
|
|
|
$ echo 2 > b
|
|
|
|
$ hg ci -A b -m b -q
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog -T '{node|short} {bookmarks} {desc}' --all --config smartlog.indentnonpublic=1
|
|
|
|
o a60fccdcd9e9 a
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
o 8d92afe5abfd a
|
2020-10-20 03:05:23 +03:00
|
|
|
╭─╯
|
|
|
|
│ @ 401cd6213b51 b
|
|
|
|
│ │
|
|
|
|
│ │ o 2dc09a01254d r3
|
|
|
|
│ ├─╯
|
|
|
|
│ o 01241442b3c2 r2
|
|
|
|
├─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o 66f7d451a68b master r1
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
templates: fix help messages for template keywords
Summary:
Many of the template keywords in our extensions were being registered
incorrectly, causing their help output to be rendered incorrectly in the
"hg help templates" output. The ones in smartlog.py were particularly bad, as
most of them showed only their description, without displaying the name of the
template. In smartlog.py only singlepublicsuccessor was being displayed
correctly, because it's docstring explicitly included it's own name at the
start.
This fixes all of our extensions to consistently use the
registrar.templatekeyword() decorator to register the keywords. This decorator
automatically prefixes the help message with the keyword name. The
mercurial/extensions.py code will explicitly check to see if an extension
contains an "templatekeyword" attribute, and if so it will register any
keywords contained in this registry after calling extsetup().
Test Plan:
Added new unit tests to check the output of "hg help templates" for the
affected keywords.
Reviewers: #sourcecontrol, kulshrax, ikostia, rmcelroy
Reviewed By: rmcelroy
Subscribers: rmcelroy, net-systems-diffs@, yogeshwer, mjpieters
Differential Revision: https://phabricator.intern.facebook.com/D4427729
Signature: t1:4427729:1484831476:17b478a5e867dfc3f85402588c381bf8b1831107
2017-01-19 23:52:54 +03:00
|
|
|
|
2017-06-15 20:06:09 +03:00
|
|
|
Recent arg select days correctly
|
|
|
|
$ echo 1 >> b
|
2020-08-19 10:31:05 +03:00
|
|
|
$ myday=`hg debugsh -c 'import time; ui.write(str(int(time.time()) - 24 * 3600 * 20))'`
|
2017-06-15 20:06:09 +03:00
|
|
|
$ hg commit --date "$myday 0" -m test2
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg update 'desc(r0)' -q
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg log -Gr 'smartlog(master="master", heads=((date(-15) & draft()) + .))' -T '{node|short} {bookmarks} {desc}'
|
|
|
|
o 66f7d451a68b master r1
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
@ 1ea73414a91b r0
|
2017-06-15 20:06:09 +03:00
|
|
|
|
|
|
|
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg log -Gr 'smartlog((date(-25) & draft()) + .)' -T '{bookmarks} {desc}'
|
|
|
|
o test2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
o b
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
o r2
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
o master r1
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
@ r0
|
2017-06-15 20:06:09 +03:00
|
|
|
|
2017-07-21 17:10:08 +03:00
|
|
|
Make sure public commits that are descendants of master are not drawn
|
|
|
|
$ cd ..
|
|
|
|
$ hg init repo3
|
|
|
|
$ cd repo3
|
|
|
|
$ hg debugbuilddag '+5'
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg bookmark master -r 'desc(r1)'
|
|
|
|
$ hg debugmakepublic -r 'desc(r1)'
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog -T '{node|short} {bookmarks} {desc}' --all --config smartlog.indentnonpublic=1
|
|
|
|
o bebd167eb94d r4
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
o 2dc09a01254d r3
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
2020-08-21 03:33:07 +03:00
|
|
|
o 01241442b3c2 r2
|
2020-10-20 03:05:23 +03:00
|
|
|
╭─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o 66f7d451a68b master r1
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg debugmakepublic 'desc(r3)'
|
|
|
|
$ hg up -q 'desc(r4)'
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog -T '{node|short} {bookmarks} {desc}' --all --config smartlog.indentnonpublic=1
|
|
|
|
@ bebd167eb94d r4
|
2020-10-20 03:05:23 +03:00
|
|
|
╭─╯
|
2020-08-21 03:33:07 +03:00
|
|
|
o 2dc09a01254d r3
|
2020-10-20 03:05:23 +03:00
|
|
|
╷
|
2020-08-21 03:33:07 +03:00
|
|
|
o 66f7d451a68b master r1
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg debugmakepublic 'desc(r4)'
|
2020-08-21 03:33:07 +03:00
|
|
|
$ hg smartlog -T '{node|short} {bookmarks} {desc}' --all --config smartlog.indentnonpublic=1
|
|
|
|
@ bebd167eb94d r4
|
2020-10-20 03:05:23 +03:00
|
|
|
╷
|
2020-08-21 03:33:07 +03:00
|
|
|
o 66f7d451a68b master r1
|
2020-10-20 03:05:23 +03:00
|
|
|
│
|
|
|
|
~
|
2017-06-15 20:06:09 +03:00
|
|
|
|