Merge lp://staging/~jelmer/brz/uncommit-rs into lp://staging/brz

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 7864
Merged at revision: 7863
Proposed branch: lp://staging/~jelmer/brz/uncommit-rs
Merge into: lp://staging/brz
Diff against target: 344 lines (+163/-23)
12 files modified
Cargo.lock (+1/-0)
Cargo.toml (+1/-0)
breezy/uncommit.py (+2/-20)
crates/bazaar/src/lib.rs (+14/-0)
crates/cmd-py/src/lib.rs (+28/-0)
src/branch.rs (+1/-1)
src/graphshim.rs (+28/-0)
src/lib.rs (+7/-0)
src/pybranch.rs (+7/-1)
src/pytags.rs (+17/-1)
src/tags.rs (+19/-0)
src/uncommit.rs (+38/-0)
To merge this branch: bzr merge lp://staging/~jelmer/brz/uncommit-rs
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+445742@code.staging.launchpad.net

Commit message

Move uncommit to rust

Description of the change

Move uncommit to rust

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :
Download full text (61.6 KiB)

The attempt to merge lp:~jelmer/brz/uncommit-rs into lp:brz failed. Command exited with 2.
Below is the output from the failed tests.

... OUTPUT TRIMMED ...

  | ^^^^^^^^^^^^^
  |
  = note: `#[warn(unused_imports)]` on by default

warning: constant `BENCODE_REVISION_SERIALIZER_V1` is never used
   --> crates/bazaar/src/bencode_serializer.rs:314:7
    |
314 | const BENCODE_REVISION_SERIALIZER_V1: BEncodeRevisionSerializer1 = BEncodeRevisionSerializer1 {};
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: `#[warn(dead_code)]` on by default

warning: constant `HASH_LIMIT` is never used
  --> crates/bazaar/src/groupcompress/delta.rs:23:7
   |
23 | const HASH_LIMIT: usize = 64;
   | ^^^^^^^^^^

warning: constant `RABIN_SHIFT` is never used
  --> crates/bazaar/src/groupcompress/delta.rs:25:7
   |
25 | const RABIN_SHIFT: usize = 23;
   | ^^^^^^^^^^^

warning: constant `RABIN_WINDOW` is never used
  --> crates/bazaar/src/groupcompress/delta.rs:26:7
   |
26 | const RABIN_WINDOW: usize = 16;
   | ^^^^^^^^^^^^

warning: constant `EXTRA_NULLS` is never used
  --> crates/bazaar/src/groupcompress/delta.rs:31:7
   |
31 | const EXTRA_NULLS: usize = 4;
   | ^^^^^^^^^^^

warning: constant `T` is never used
  --> crates/bazaar/src/groupcompress/delta.rs:33:7
   |
33 | const T: &[u32; 256] = &[
   | ^

warning: constant `U` is never used
  --> crates/bazaar/src/groupcompress/delta.rs:68:7
   |
68 | const U: &[u32; 256] = &[
   | ^

warning: struct `SourceInfo` is never constructed
   --> crates/bazaar/src/groupcompress/delta.rs:103:8
    |
103 | struct SourceInfo {
    | ^^^^^^^^^^

warning: constant `DELTA_SIZE_MIN` is never used
   --> crates/bazaar/src/groupcompress/delta.rs:118:7
    |
118 | const DELTA_SIZE_MIN: u64 = 3;
    | ^^^^^^^^^^^^^^

warning: function `get_delta_hdr_size` is never used
   --> crates/bazaar/src/groupcompress/delta.rs:120:4
    |
120 | fn get_delta_hdr_size(datap: &mut &[u8], top: &[u8]) -> u64 {
    | ^^^^^^^^^^^^^^^^^^

warning: function `get_text` is never used
   --> crates/bazaar/src/groupcompress/delta.rs:141:4
    |
141 | fn get_text(buff: &mut [u8; 128], ptr: &[u8]) {
    | ^^^^^^^^

warning: function `rabin_hash` is never used
   --> crates/bazaar/src/groupcompress/delta.rs:171:4
    |
171 | fn rabin_hash(data: &[u8]) -> u32 {
    | ^^^^^^^^^^

warning: function `surrogate_escape` is never used
   --> crates/bazaar/src/xml_serializer.rs:112:4
    |
112 | fn surrogate_escape(b: u8) -> Vec<u8> {
    | ^^^^^^^^^^^^^^^^

   Compiling breezy v3.4.0 (/tmp/tarmac/branch.zfhss7el)
     Running `rustc --crate-name breezy --edition=2021 src/lib.rs --error-format=json --json=diagnostic-rendered-ansi,artifacts,future-incompat --crate-type lib --emit=dep-info,metadata,link -C embed-bitcode=no -C debuginfo=2 --cfg 'feature="default"' --cfg 'feature="i18n"' --cfg 'feature="pyo3"' -C metadata=e6f4e0e9f93ecd37 -C extra-filename=-e6f4e0e9f93ecd37 --out-dir /tmp/tarmac/branch.zfhss7el/target/debug/deps -C incremental=/tmp/tarmac/branch.zfhss7el/target/debug/incremental -L dependency=/tmp/tarmac/branch.zfhss7el/target/debug/deps --extern bazaar=/tmp/tarmac/branch....

lp://staging/~jelmer/brz/uncommit-rs updated
7864. By Jelmer Vernooij

Reformat

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches