Mercurial > public > mercurial-scm > hg
diff tests/test-merge-commit.t @ 37283:d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
These fields are an implementation detail of revlog storage. As
such, they are not part of the generic storage "index" interface
and shouldn't be displayed by default.
Because we don't have another way to display these fields, we've
retained support for printing these fields via --verbose.
Yes, I know we should probably be doing all this formatting using
modern formatting/templater APIs. I didn't feel like scope
bloating this patch.
Differential Revision: https://phab.mercurial-scm.org/D3028
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Mon, 02 Apr 2018 16:47:53 -0700 |
| parents | 009d0283de5f |
| children | 91a0bc50b288 |
line wrap: on
line diff
--- a/tests/test-merge-commit.t Mon Apr 02 16:28:20 2018 -0700 +++ b/tests/test-merge-commit.t Mon Apr 02 16:47:53 2018 -0700 @@ -35,17 +35,17 @@ $ hg ci -m '3: merge with local rename' $ hg debugindex bar - rev offset length linkrev nodeid p1 p2 - 0 0 77 2 d35118874825 000000000000 000000000000 - 1 77 76 3 5345f5ab8abd 000000000000 d35118874825 + rev linkrev nodeid p1 p2 + 0 2 d35118874825 000000000000 000000000000 + 1 3 5345f5ab8abd 000000000000 d35118874825 $ hg debugrename bar bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 $ hg debugindex foo - rev offset length linkrev nodeid p1 p2 - 0 0 7 0 690b295714ae 000000000000 000000000000 - 1 7 13 1 9e25c27b8757 690b295714ae 000000000000 + rev linkrev nodeid p1 p2 + 0 0 690b295714ae 000000000000 000000000000 + 1 1 9e25c27b8757 690b295714ae 000000000000 Revert the content change from rev 2: @@ -88,11 +88,11 @@ $ hg ci -m '5: merge' $ hg debugindex bar - rev offset length linkrev nodeid p1 p2 - 0 0 77 2 d35118874825 000000000000 000000000000 - 1 77 76 3 5345f5ab8abd 000000000000 d35118874825 - 2 153 7 4 ff4b45017382 d35118874825 000000000000 - 3 160 13 5 3701b4893544 ff4b45017382 5345f5ab8abd + rev linkrev nodeid p1 p2 + 0 2 d35118874825 000000000000 000000000000 + 1 3 5345f5ab8abd 000000000000 d35118874825 + 2 4 ff4b45017382 d35118874825 000000000000 + 3 5 3701b4893544 ff4b45017382 5345f5ab8abd Same thing, but with the merge on 3 having the rename @@ -123,17 +123,17 @@ $ hg ci -m '3: merge with remote rename' $ hg debugindex bar - rev offset length linkrev nodeid p1 p2 - 0 0 77 2 d35118874825 000000000000 000000000000 - 1 77 76 3 5345f5ab8abd 000000000000 d35118874825 + rev linkrev nodeid p1 p2 + 0 2 d35118874825 000000000000 000000000000 + 1 3 5345f5ab8abd 000000000000 d35118874825 $ hg debugrename bar bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 $ hg debugindex foo - rev offset length linkrev nodeid p1 p2 - 0 0 7 0 690b295714ae 000000000000 000000000000 - 1 7 13 1 9e25c27b8757 690b295714ae 000000000000 + rev linkrev nodeid p1 p2 + 0 0 690b295714ae 000000000000 000000000000 + 1 1 9e25c27b8757 690b295714ae 000000000000 Revert the content change from rev 2: @@ -176,10 +176,10 @@ $ hg ci -m '5: merge' $ hg debugindex bar - rev offset length linkrev nodeid p1 p2 - 0 0 77 2 d35118874825 000000000000 000000000000 - 1 77 76 3 5345f5ab8abd 000000000000 d35118874825 - 2 153 7 4 ff4b45017382 d35118874825 000000000000 - 3 160 13 5 3701b4893544 ff4b45017382 5345f5ab8abd + rev linkrev nodeid p1 p2 + 0 2 d35118874825 000000000000 000000000000 + 1 3 5345f5ab8abd 000000000000 d35118874825 + 2 4 ff4b45017382 d35118874825 000000000000 + 3 5 3701b4893544 ff4b45017382 5345f5ab8abd $ cd ..