mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
visibility: use x graphnode for invisible commits
Summary: The `-` graphnode can be confusing as `-` is also used for horizontal graph lines. There are no good ASCII characters to use for invisible commits, so revert to just using `x` so that they match obsolete commits. Reviewed By: quark-zju Differential Revision: D15293717 fbshipit-source-id: 5d1f327ddd8c3f104a99f494309a79b10ad71401
This commit is contained in:
Mark Thomas
Facebook Github Bot
parent
16c156f11f
commit
3584341a18
@ -654,9 +654,7 @@ def showgraphnode(repo, ctx, **args):
|
||||
wpnodes = wpnodes[:1]
|
||||
if ctx.node() in wpnodes:
|
||||
return "@"
|
||||
elif ctx.invisible():
|
||||
return "-"
|
||||
elif ctx.obsolete():
|
||||
elif ctx.invisible() or ctx.obsolete():
|
||||
return "x"
|
||||
elif ctx.closesbranch():
|
||||
return "_"
|
||||
|
||||
@ -27,13 +27,13 @@ obsmarker graphs. Create a fake one to check behaviour.
|
||||
$ tglogm --hidden
|
||||
@ 5: 21c93100b04c 'commit5'
|
||||
|
|
||||
| - 4: 672a4910c364 'commit4' (Rewritten using amend into 21c93100b04c) (Rewritten using loop into 932f02c9fad3)
|
||||
| x 4: 672a4910c364 'commit4' (Rewritten using amend into 21c93100b04c) (Rewritten using loop into 932f02c9fad3)
|
||||
|/
|
||||
| - 3: d3c8fd338cf4 'commit3' (Rewritten using amend into 672a4910c364)
|
||||
| x 3: d3c8fd338cf4 'commit3' (Rewritten using amend into 672a4910c364)
|
||||
|/
|
||||
| - 2: 932f02c9fad3 'commit2' (Rewritten using amend into d3c8fd338cf4)
|
||||
| x 2: 932f02c9fad3 'commit2' (Rewritten using amend into d3c8fd338cf4)
|
||||
|/
|
||||
| - 1: e6c779c67aa9 'commit1' (Rewritten using loop into 932f02c9fad3)
|
||||
| x 1: e6c779c67aa9 'commit1' (Rewritten using loop into 932f02c9fad3)
|
||||
|/
|
||||
o 0: d20a80d4def3 'base'
|
||||
|
||||
|
||||
@ -246,9 +246,9 @@ Test pushing to a futuristic server that doesn't support obsmarkers at all will
|
||||
|
|
||||
o 16: 4c6ed9931ef5 's5'
|
||||
|
|
||||
| - 15: 6b21e03c2693 'c5 (amended)' (Rewritten using pushrebase into 7a5f07a2de1e)
|
||||
| x 15: 6b21e03c2693 'c5 (amended)' (Rewritten using pushrebase into 7a5f07a2de1e)
|
||||
|/
|
||||
| - 14: 9407986f3421 'c5' (Rewritten using amend into 6b21e03c2693)
|
||||
| x 14: 9407986f3421 'c5' (Rewritten using amend into 6b21e03c2693)
|
||||
|/
|
||||
o 13: 56ff167c1749 'c4 (amended)'
|
||||
|
|
||||
@ -256,9 +256,9 @@ Test pushing to a futuristic server that doesn't support obsmarkers at all will
|
||||
|
|
||||
o 11: 34295f2adc09 's3'
|
||||
|
|
||||
| - 10: 254a42c0dcef 'c4 (amended)' (Rewritten using pushrebase into 56ff167c1749)
|
||||
| x 10: 254a42c0dcef 'c4 (amended)' (Rewritten using pushrebase into 56ff167c1749)
|
||||
|/
|
||||
| - 9: 3f1b3b3d517f 'c4' (Rewritten using amend into 254a42c0dcef)
|
||||
| x 9: 3f1b3b3d517f 'c4' (Rewritten using amend into 254a42c0dcef)
|
||||
|/
|
||||
o 8: 5cfa12ac15ac 'c3'
|
||||
|
|
||||
@ -270,11 +270,11 @@ Test pushing to a futuristic server that doesn't support obsmarkers at all will
|
||||
|
|
||||
o 4: 06569a64c141 's1'
|
||||
|
|
||||
| - 3: e52ebff26308 'c2 (amended)' (Rewritten using pushrebase into bc165ecd11df)
|
||||
| x 3: e52ebff26308 'c2 (amended)' (Rewritten using pushrebase into bc165ecd11df)
|
||||
| |
|
||||
| | - 2: f558c5855324 'c2' (Rewritten using amend into e52ebff26308)
|
||||
| | x 2: f558c5855324 'c2' (Rewritten using amend into e52ebff26308)
|
||||
| |/
|
||||
| - 1: b0c40d8745c8 'c1' (Rewritten using pushrebase into 466bbcaf803c)
|
||||
| x 1: b0c40d8745c8 'c1' (Rewritten using pushrebase into 466bbcaf803c)
|
||||
|/
|
||||
o 0: a7d6a32ae4ec 'base'
|
||||
|
||||
|
||||
@ -440,7 +440,7 @@ Drawdag
|
||||
> EOS
|
||||
|
||||
$ tglogm
|
||||
- 8: b2faf047aa50 'I'
|
||||
x 8: b2faf047aa50 'I'
|
||||
|
|
||||
o 7: a1093b439e1b 'H'
|
||||
|
|
||||
@ -448,13 +448,13 @@ Drawdag
|
||||
| |
|
||||
| o 5: 64a8289d2492 'F'
|
||||
| |
|
||||
| | - 4: 17d61397e601 'D' (Rewritten using rebase into a1093b439e1b)
|
||||
| | x 4: 17d61397e601 'D' (Rewritten using rebase into a1093b439e1b)
|
||||
| | |
|
||||
| o | 3: 7fb047a69f22 'E'
|
||||
|/ /
|
||||
| | - 2: 26805aba1e60 'C' (Rewritten using rebase into 17d61397e601)
|
||||
| | x 2: 26805aba1e60 'C' (Rewritten using rebase into 17d61397e601)
|
||||
| |/
|
||||
| - 1: 112478962961 'B' (Rewritten using split into 7fb047a69f22, 64a8289d2492, dd319aacbb51)
|
||||
| x 1: 112478962961 'B' (Rewritten using split into 7fb047a69f22, 64a8289d2492, dd319aacbb51)
|
||||
|/
|
||||
o 0: 426bada5c675 'A'
|
||||
|
||||
@ -1184,7 +1184,7 @@ Test pullcreatemarkers can do this
|
||||
|
|
||||
o 27eaac8d0756 file2 D2345
|
||||
|
|
||||
| - f07a12cd100a file1 D1234 (Rewritten using land into ec3b92425d5b)
|
||||
| x f07a12cd100a file1 D1234 (Rewritten using land into ec3b92425d5b)
|
||||
|/
|
||||
@ d20a80d4def3 base
|
||||
|
||||
|
||||
@ -233,9 +233,9 @@ It should also have mutations made on both sides visible.
|
||||
| |/
|
||||
| o 4: c70a9bd6bfd1 'E'
|
||||
|/
|
||||
| - 3: 6ba5de8abe43 'D' (Rewritten using rebase into 6caded0e9807) (Rewritten using rebase into d8fc5ae9b7ef)
|
||||
| x 3: 6ba5de8abe43 'D' (Rewritten using rebase into 6caded0e9807) (Rewritten using rebase into d8fc5ae9b7ef)
|
||||
| |
|
||||
| - 2: 2d0f0af04f18 'C' (Rewritten using amend into c70a9bd6bfd1)
|
||||
| x 2: 2d0f0af04f18 'C' (Rewritten using amend into c70a9bd6bfd1)
|
||||
|/
|
||||
o 1: dae3b312bb78 'Z'
|
||||
|
|
||||
|
||||
@ -35,7 +35,7 @@ Simple creation and amending of draft commits
|
||||
|
|
||||
o 4: bc066ca12b45 draft 'draft1 amend1'
|
||||
|
|
||||
| - 3: ca9d66205aca draft 'draft1'
|
||||
| x 3: ca9d66205aca draft 'draft1'
|
||||
|/
|
||||
o 2: 4f416a252ac8 public 'public2'
|
||||
|
|
||||
@ -53,7 +53,7 @@ Simple creation and amending of draft commits
|
||||
$ tglogp --hidden
|
||||
@ 4: bc066ca12b45 draft 'draft1 amend1'
|
||||
|
|
||||
| - 3: ca9d66205aca draft 'draft1'
|
||||
| x 3: ca9d66205aca draft 'draft1'
|
||||
|/
|
||||
o 2: 4f416a252ac8 public 'public2'
|
||||
|
|
||||
@ -434,11 +434,11 @@ Undo
|
||||
Viewing the log graph with filtering disabled shows the commits that have been undone
|
||||
from as invisible commits.
|
||||
$ tglogm --hidden
|
||||
- 8: ec992ff1fd78 'E'
|
||||
x 8: ec992ff1fd78 'E'
|
||||
|
|
||||
- 7: 1d30cc995ea7 'D'
|
||||
x 7: 1d30cc995ea7 'D'
|
||||
|
|
||||
- 6: 23910a6fe564 'C'
|
||||
x 6: 23910a6fe564 'C'
|
||||
|
|
||||
@ 5: e60094faeb72 'B amended'
|
||||
|
|
||||
@ -509,7 +509,7 @@ Test that hiddenoverride has no effect on pinning hidden revisions.
|
||||
|
|
||||
| @ 2: 917a077edb8d 'B' (Rewritten using rewrite into a77c932a84af)
|
||||
| |
|
||||
| - 1: ac2f7407182b 'A' (Rewritten using rewrite into 05eb30556340)
|
||||
| x 1: ac2f7407182b 'A' (Rewritten using rewrite into 05eb30556340)
|
||||
|/
|
||||
o 0: 48b9aae0607f 'Z'
|
||||
|
||||
@ -658,7 +658,7 @@ Unamend and Uncommit
|
||||
$ tglogm --hidden
|
||||
@ 2: 8e8ec65c0bb7 'commit2'
|
||||
|
|
||||
| - 1: 4c5b9b3e14b9 'commit1' (Rewritten using amend into 8e8ec65c0bb7)
|
||||
| x 1: 4c5b9b3e14b9 'commit1' (Rewritten using amend into 8e8ec65c0bb7)
|
||||
|/
|
||||
o 0: df4f53cec30a 'base'
|
||||
|
||||
@ -670,7 +670,7 @@ Unamend and Uncommit
|
||||
o 0: df4f53cec30a 'base'
|
||||
|
||||
$ tglogm --hidden
|
||||
- 2: 8e8ec65c0bb7 'commit2'
|
||||
x 2: 8e8ec65c0bb7 'commit2'
|
||||
|
|
||||
| @ 1: 4c5b9b3e14b9 'commit1'
|
||||
|/
|
||||
@ -682,9 +682,9 @@ Unamend and Uncommit
|
||||
@ 0: df4f53cec30a 'base'
|
||||
|
||||
$ tglogm --hidden
|
||||
- 2: 8e8ec65c0bb7 'commit2'
|
||||
x 2: 8e8ec65c0bb7 'commit2'
|
||||
|
|
||||
| - 1: 4c5b9b3e14b9 'commit1'
|
||||
| x 1: 4c5b9b3e14b9 'commit1'
|
||||
|/
|
||||
@ 0: df4f53cec30a 'base'
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user