Mercurial > hg-stable
view tests/test-absorb-edit-lines.t @ 40636:054d0fcba2c4
commandserver: add experimental option to use separate message channel
This is loosely based on the idea of the TortoiseHg's pipeui extension,
which attaches ui.label to message text so the command-server client can
capture prompt text, for example.
https://bitbucket.org/tortoisehg/thg/src/4.7.2/tortoisehg/util/pipeui.py
I was thinking that this functionality could be generalized to templating,
but changed mind as doing template stuff would be unnecessarily complex.
It's merely a status message, a simple serialization option should suffice.
Since this slightly changes the command-server protocol, it's gated by a
config knob. If the config is enabled, and if it's supported by the server,
"message-encoding: <name>" is advertised so the client can stop parsing
'o'/'e' channel data and read encoded messages from the 'm' channel. As we
might add new message encodings in future releases, client can specify a list
of encoding names in preferred order.
This patch includes 'cbor' encoding as example. Perhaps, 'json' should be
supported as well.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sun, 18 Jan 2015 18:49:59 +0900 |
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