Mercurial > hg
view tests/test-absorb-edit-lines.t @ 47072:4c041c71ec01
revlog: introduce an explicit tracking of what the revlog is about
Since the dawn of time, people have been forced to rely to lossy introspection
of the index filename to determine what the purpose and role of the revlog they
encounter is. This is hacky, error prone, inflexible, abstraction-leaky,
<insert-your-own-complaints-here>.
In f63299ee7e4d Raphaël introduced a new attribute to track this information:
`revlog_kind`. However it is initialized in an odd place and various instances
end up not having it set. In addition is only tracking some of the information
we end up having to introspect in various pieces of code.
So we add a new attribute that holds more data and is more strictly enforced.
This work is done in collaboration with Raphaël.
The `revlog_kind` one will be removed/adapted in the next changeset. We expect
to be able to clean up various existing piece of code and to simplify coming
work around the newer revlog format.
Differential Revision: https://phab.mercurial-scm.org/D10352
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 06 Apr 2021 05:20:24 +0200 |
parents | 31dfa7dac4c9 |
children | 3cd57e2be49b |
line wrap: on
line source
$ cat >> $HGRCPATH << EOF > [extensions] > absorb= > EOF $ hg init repo1 $ cd repo1 Make some commits: $ for i in 1 2 3; do > echo $i >> a > hg commit -A a -m "commit $i" -q > done absorb --edit-lines will run the editor if filename is provided: $ hg absorb --edit-lines --apply-changes nothing applied [1] $ HGEDITOR=cat hg absorb --edit-lines --apply-changes a HG: editing a HG: "y" means the line to the right exists in the changeset to the top HG: HG: /---- 4ec16f85269a commit 1 HG: |/--- 5c5f95224a50 commit 2 HG: ||/-- 43f0a75bede7 commit 3 HG: ||| yyy : 1 yy : 2 y : 3 nothing applied [1] Edit the file using --edit-lines: $ cat > editortext << EOF > y : a > yy : b > y : c > yy : d > y y : e > y : f > yyy : g > EOF $ HGEDITOR='cat editortext >' hg absorb -q --edit-lines --apply-changes a $ hg cat -r 0 a d e f g $ hg cat -r 1 a b c d g $ hg cat -r 2 a a b e g