Merge lp:~jelmer/brz/selector into lp:brz

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 7803
Merged at revision: 7865
Proposed branch: lp:~jelmer/brz/selector
Merge into: lp:brz
Diff against target: 21 lines (+5/-4)
1 file modified
breezy/transport/http/urllib.py (+5/-4)
To merge this branch: bzr merge lp:~jelmer/brz/selector
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+446488@code.launchpad.net

Commit message

Allow setting _ConnectRequest.selector

Description of the change

Allow setting _ConnectRequest.selector

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 :

No approved revision specified.

Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :
Download full text (66.7 KiB)

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

... OUTPUT TRIMMED ...

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.pvf3o7vf)
     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.pvf3o7vf/target/debug/deps -C incremental=/tmp/tarmac/branch.pvf3o7vf/target/debug/incremental -L dependency=/tmp/tarmac/branch.pvf3o7vf/target/debug/deps --extern bazaar=/tmp/tarmac/branch.pvf3o7vf/target/debug/deps/libbazaar-1fefae61ee6f8624.rmeta --extern breezy_graph=/tmp/tarmac/branch.pvf3o7vf/target/debug/deps/libbreezy_graph-3ac741af6c177278.rmeta --extern breezy_osutils=/tmp/tarmac/branch.pvf3o7vf/target/debug/deps/libbreezy_osutils-ebb0018ed41faddf.rmeta --extern chrono=/tmp/tarmac/branch.pvf3o7vf/target/debug/deps/libchrono-2778c20b46bee07d.rmeta --extern gettextrs=/tmp/tarmac/branch.pvf3o7vf/target/debug/deps/libgettextrs-1515a37d4b6d5c21.rmeta --extern inventory=/tmp/tarmac/branch.pvf3o7vf/target/debug/deps/libinventory-9c27eb9d33269489.rmeta --extern lazy_static=/tmp/tarmac/branch.pvf3o7vf/target/debug/deps/liblazy_static-1e3d64e37277e545.rmeta --extern log=/tmp/tarmac/branch.pvf3o7vf/target/debug/deps/liblog-0f9e720c351c48de.rmeta --extern nix=/tmp/tarmac/branch.pvf3o7vf/target/debug/deps/libnix-80f73b44d027d9b6.rmeta --extern once_cell=/tmp/tarmac/branch.pvf3o7vf/target/debug/deps/libonce_cell-9b2190a5074f4803.rmeta --extern percent_encoding=/tmp/tarmac/branch.pvf3o7vf/target/debug/deps/libpercent_encoding-709a6...

Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :
Download full text (66.7 KiB)

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

... OUTPUT TRIMMED ...

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.kaobujqo)
     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.kaobujqo/target/debug/deps -C incremental=/tmp/tarmac/branch.kaobujqo/target/debug/incremental -L dependency=/tmp/tarmac/branch.kaobujqo/target/debug/deps --extern bazaar=/tmp/tarmac/branch.kaobujqo/target/debug/deps/libbazaar-1fefae61ee6f8624.rmeta --extern breezy_graph=/tmp/tarmac/branch.kaobujqo/target/debug/deps/libbreezy_graph-3ac741af6c177278.rmeta --extern breezy_osutils=/tmp/tarmac/branch.kaobujqo/target/debug/deps/libbreezy_osutils-ebb0018ed41faddf.rmeta --extern chrono=/tmp/tarmac/branch.kaobujqo/target/debug/deps/libchrono-2778c20b46bee07d.rmeta --extern gettextrs=/tmp/tarmac/branch.kaobujqo/target/debug/deps/libgettextrs-1515a37d4b6d5c21.rmeta --extern inventory=/tmp/tarmac/branch.kaobujqo/target/debug/deps/libinventory-9c27eb9d33269489.rmeta --extern lazy_static=/tmp/tarmac/branch.kaobujqo/target/debug/deps/liblazy_static-1e3d64e37277e545.rmeta --extern log=/tmp/tarmac/branch.kaobujqo/target/debug/deps/liblog-0f9e720c351c48de.rmeta --extern nix=/tmp/tarmac/branch.kaobujqo/target/debug/deps/libnix-80f73b44d027d9b6.rmeta --extern once_cell=/tmp/tarmac/branch.kaobujqo/target/debug/deps/libonce_cell-9b2190a5074f4803.rmeta --extern percent_encoding=/tmp/tarmac/branch.kaobujqo/target/debug/deps/libpercent_encoding-709a6...

lp:~jelmer/brz/selector updated
7803. By Jelmer Vernooij

Ignore type error

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/transport/http/urllib.py'
2--- breezy/transport/http/urllib.py 2023-06-24 13:21:34 +0000
3+++ breezy/transport/http/urllib.py 2023-07-18 05:27:34 +0000
4@@ -436,12 +436,13 @@
5 raise AssertionError()
6 self.proxied_host = request.proxied_host
7
8- @property
9- def selector(self):
10+ def get_selector(self):
11 return self.proxied_host
12
13- def get_selector(self):
14- return self.selector
15+ def set_selector(self, selector):
16+ self.proxied_host = selector
17+
18+ selector = property(get_selector, set_selector) # type: ignore
19
20 def set_proxy(self, proxy, type):
21 """Set the proxy without remembering the proxied host.

Subscribers

People subscribed via source and target branches