[ref-ls] support for line peeking in packet line readers

git-packetline/src/provider/read.rs

@@ -67,6 +67,18 @@ where
     pub fn set_progress_handler(&mut self, handle_progress: Option<F>) {
         self.handle_progress = handle_progress;
     }
+
+    pub fn peek_data_line(&mut self) -> Option<io::Result<Result<&[u8], crate::decode::Error>>> {
+        match self.parent.peek_line() {
+            Some(Ok(Ok(line))) => match line {
+                crate::PacketLine::Data(line) => Some(Ok(Ok(line))),
+                _ => None,
+            },
+            Some(Ok(Err(err))) => Some(Ok(Err(err))),
+            Some(Err(err)) => Some(Err(err)),
+            None => None,
+        }
+    }
 }
 
 impl<'a, T, F> io::BufRead for ReadWithSidebands<'a, T, F>

git-protocol/src/fetch/response.rs

@@ -21,6 +21,15 @@ pub enum Acknowledgement {
     NAK,
 }
 
+impl Acknowledgement {
+    pub fn id(&self) -> Option<&owned::Id> {
+        match self {
+            Acknowledgement::Common(id) => Some(id),
+            _ => None,
+        }
+    }
+}
+
 /// A representation of a complete fetch response
 pub struct Response {
     acks: Option<Vec<Acknowledgement>>,

git-transport/src/client/http/mod.rs

@@ -238,6 +238,10 @@ impl<H: Http, B: ExtendedBufRead> ExtendedBufRead for HeadersThenBody<H, B> {
     fn set_progress_handler(&mut self, handle_progress: Option<HandleProgress>) {
         self.body.set_progress_handler(handle_progress)
     }
+
+    fn peek_data_line(&mut self) -> Option<io::Result<Result<&[u8], git_packetline::decode::Error>>> {
+        self.body.peek_data_line()
+    }
 }
 
 pub fn connect(url: &str, version: crate::Protocol) -> Result<Transport<Impl>, Infallible> {

git-transport/src/client/mod.rs

@@ -142,12 +142,16 @@ impl<'a> RequestWriter<'a> {
 
 pub trait ExtendedBufRead: io::BufRead {
     fn set_progress_handler(&mut self, handle_progress: Option<HandleProgress>);
+    fn peek_data_line(&mut self) -> Option<io::Result<Result<&[u8], git_packetline::decode::Error>>>;
 }
 
 impl<'a, T: io::Read> ExtendedBufRead for git_packetline::provider::ReadWithSidebands<'a, T, HandleProgress> {
     fn set_progress_handler(&mut self, handle_progress: Option<HandleProgress>) {
         self.set_progress_handler(handle_progress)
     }
+    fn peek_data_line(&mut self) -> Option<io::Result<Result<&[u8], git_packetline::decode::Error>>> {
+        self.peek_data_line()
+    }
 }
 
 pub type HandleProgress = Box<dyn FnMut(bool, &[u8])>;

tasks.md

@@ -1,12 +1,12 @@
 ### Cloning
 * **git-transport**
- * a way to support shallow lines during V1 handshake (doesnt' seem to happen in V2 at all)
+ * [ ] a way to support shallow lines during V1 handshake (doesnt' seem to happen in V2 at all)
 * **git-protocol**
   * [ ] delegate interaction to support clone
     * [ ] parse server negotiation response
     * [ ] negotiation via delegate
-    * [ ] pack file receive passed to delegate
-    * [ ] assure there is a way to do fetches with have/want negotiation
+    * [ ] received pack file passed to delegate
+    * [x] assure there is a way to do fetches with have/want negotiation
 * **gixp-pack-receive**
   * [ ] hookup `git-protocol` with delegate to allow for receiving full packs
   * [ ] **gixp-pack-receive** may optionally write received refs to the specified directory