Mercurial > hg
comparison tests/test-merge-commit.t @ 37282:009d0283de5f
debugcommands: drop base revision from debugindex
Revlog index data consists of generic index metadata that will
likely be implemented across all storage engines and revlog-specifc
metadata.
Most tests printing index data only care about the generic fields.
This commit drops the printing of the base revision from
`hg debugindex`. This value is an implementation detail of
revlogs / delta chains. If tests are interested in verifying this
implementation detail, `hg debugdeltachain` is a better command.
Most tests were skipping over this field anyway. Tests that weren't
looked like they were newer. So my guess is we forgot to make them
skip the field to match the style of the older tests. This reinforces
my belief that the base revision is not worth having in
`hg debugindex`.
Differential Revision: https://phab.mercurial-scm.org/D3027
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Mon, 02 Apr 2018 16:28:20 -0700 |
| parents | eb586ed5d8ce |
| children | d4e62df1c73d |
comparison
equal
deleted
inserted
replaced
| 37281:806b07d7c7d6 | 37282:009d0283de5f |
|---|---|
| 33 line2 | 33 line2 |
| 34 | 34 |
| 35 $ hg ci -m '3: merge with local rename' | 35 $ hg ci -m '3: merge with local rename' |
| 36 | 36 |
| 37 $ hg debugindex bar | 37 $ hg debugindex bar |
| 38 rev offset length ..... linkrev nodeid p1 p2 (re) | 38 rev offset length linkrev nodeid p1 p2 |
| 39 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) | 39 0 0 77 2 d35118874825 000000000000 000000000000 |
| 40 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) | 40 1 77 76 3 5345f5ab8abd 000000000000 d35118874825 |
| 41 | 41 |
| 42 $ hg debugrename bar | 42 $ hg debugrename bar |
| 43 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 | 43 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 |
| 44 | 44 |
| 45 $ hg debugindex foo | 45 $ hg debugindex foo |
| 46 rev offset length ..... linkrev nodeid p1 p2 (re) | 46 rev offset length linkrev nodeid p1 p2 |
| 47 0 0 7 ..... 0 690b295714ae 000000000000 000000000000 (re) | 47 0 0 7 0 690b295714ae 000000000000 000000000000 |
| 48 1 7 13 ..... 1 9e25c27b8757 690b295714ae 000000000000 (re) | 48 1 7 13 1 9e25c27b8757 690b295714ae 000000000000 |
| 49 | 49 |
| 50 | 50 |
| 51 Revert the content change from rev 2: | 51 Revert the content change from rev 2: |
| 52 | 52 |
| 53 $ hg up -C 2 | 53 $ hg up -C 2 |
| 86 line2 | 86 line2 |
| 87 | 87 |
| 88 $ hg ci -m '5: merge' | 88 $ hg ci -m '5: merge' |
| 89 | 89 |
| 90 $ hg debugindex bar | 90 $ hg debugindex bar |
| 91 rev offset length ..... linkrev nodeid p1 p2 (re) | 91 rev offset length linkrev nodeid p1 p2 |
| 92 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) | 92 0 0 77 2 d35118874825 000000000000 000000000000 |
| 93 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) | 93 1 77 76 3 5345f5ab8abd 000000000000 d35118874825 |
| 94 2 153 7 ..... 4 ff4b45017382 d35118874825 000000000000 (re) | 94 2 153 7 4 ff4b45017382 d35118874825 000000000000 |
| 95 3 160 13 ..... 5 3701b4893544 ff4b45017382 5345f5ab8abd (re) | 95 3 160 13 5 3701b4893544 ff4b45017382 5345f5ab8abd |
| 96 | 96 |
| 97 | 97 |
| 98 Same thing, but with the merge on 3 having the rename | 98 Same thing, but with the merge on 3 having the rename |
| 99 on the remote parent: | 99 on the remote parent: |
| 100 | 100 |
| 121 line2 | 121 line2 |
| 122 | 122 |
| 123 $ hg ci -m '3: merge with remote rename' | 123 $ hg ci -m '3: merge with remote rename' |
| 124 | 124 |
| 125 $ hg debugindex bar | 125 $ hg debugindex bar |
| 126 rev offset length ..... linkrev nodeid p1 p2 (re) | 126 rev offset length linkrev nodeid p1 p2 |
| 127 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) | 127 0 0 77 2 d35118874825 000000000000 000000000000 |
| 128 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) | 128 1 77 76 3 5345f5ab8abd 000000000000 d35118874825 |
| 129 | 129 |
| 130 $ hg debugrename bar | 130 $ hg debugrename bar |
| 131 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 | 131 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 |
| 132 | 132 |
| 133 $ hg debugindex foo | 133 $ hg debugindex foo |
| 134 rev offset length ..... linkrev nodeid p1 p2 (re) | 134 rev offset length linkrev nodeid p1 p2 |
| 135 0 0 7 ..... 0 690b295714ae 000000000000 000000000000 (re) | 135 0 0 7 0 690b295714ae 000000000000 000000000000 |
| 136 1 7 13 ..... 1 9e25c27b8757 690b295714ae 000000000000 (re) | 136 1 7 13 1 9e25c27b8757 690b295714ae 000000000000 |
| 137 | 137 |
| 138 | 138 |
| 139 Revert the content change from rev 2: | 139 Revert the content change from rev 2: |
| 140 | 140 |
| 141 $ hg up -C 2 | 141 $ hg up -C 2 |
| 174 line2 | 174 line2 |
| 175 | 175 |
| 176 $ hg ci -m '5: merge' | 176 $ hg ci -m '5: merge' |
| 177 | 177 |
| 178 $ hg debugindex bar | 178 $ hg debugindex bar |
| 179 rev offset length ..... linkrev nodeid p1 p2 (re) | 179 rev offset length linkrev nodeid p1 p2 |
| 180 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) | 180 0 0 77 2 d35118874825 000000000000 000000000000 |
| 181 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) | 181 1 77 76 3 5345f5ab8abd 000000000000 d35118874825 |
| 182 2 153 7 ..... 4 ff4b45017382 d35118874825 000000000000 (re) | 182 2 153 7 4 ff4b45017382 d35118874825 000000000000 |
| 183 3 160 13 ..... 5 3701b4893544 ff4b45017382 5345f5ab8abd (re) | 183 3 160 13 5 3701b4893544 ff4b45017382 5345f5ab8abd |
| 184 | 184 |
| 185 $ cd .. | 185 $ cd .. |