Mercurial > hg
view tests/test-absorb-edit-lines.t @ 42609:326fdce22fb2
rust: switch hg-core and hg-cpython to rust 2018 edition
Many interesting changes have happened in Rust since the Oxidation Plan was
introduced, like the 2018 edition and procedural macros:
- Opting in to the 2018 edition is a clear benefit in terms of future
proofing, new (nice to have) syntactical sugar notwithstanding. It
also has a new non-lexical, non-AST based borrow checker that has
fewer bugs(!) and allows us to write correct code that in some cases
would have been rejected by the old one.
- Procedural macros allow us to use the PyO3 crate which maintainers have
expressed the clear goal of compiling on stable, which would help in
code maintainability compared to rust-cpython.
In this patch are the following changes:
- Removing most `extern crate` uses
- Updating `use` clauses (`crate` keyword, nested `use`)
- Removing `mod.rs` in favor of an aptly named module file
Like discussed in the mailing list (
https://www.mercurial-scm.org/pipermail/mercurial-devel/2019-July/132316.html
), until Rust integration in Mercurial is considered to be out of the
experimental phase, the maximum version of Rust allowed is whatever the latest
version Debian packages.
Differential Revision: https://phab.mercurial-scm.org/D6597
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Tue, 02 Jul 2019 17:15:03 +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