Skip to content

Commit b590a9d

Browse files
committed
Merge branch 'add-topo-walk'
2 parents 45edd2e + 1cfeb11 commit b590a9d

File tree

36 files changed

+1643
-653
lines changed

36 files changed

+1643
-653
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/log.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use clap::Parser;
88
use gix::{
99
bstr::{BString, ByteSlice},
1010
date::time::format,
11-
traverse::commit::Sorting,
11+
traverse::commit::simple::Sorting,
1212
};
1313

1414
fn main() {

gitoxide-core/src/hours/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ where
175175
}
176176
commit_idx += 1;
177177
}
178-
Err(gix::traverse::commit::ancestors::Error::Find { .. }) => {
178+
Err(gix::traverse::commit::simple::Error::Find { .. }) => {
179179
is_shallow = true;
180180
break;
181181
}

gitoxide-core/src/pack/create.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ where
130130
.collect::<Result<Vec<_>, _>>()?;
131131
let handle = repo.objects.into_shared_arc().to_cache_arc();
132132
let iter = Box::new(
133-
traverse::commit::Ancestors::new(tips, traverse::commit::ancestors::State::default(), handle.clone())
133+
traverse::commit::Simple::new(tips, handle.clone())
134134
.map(|res| res.map_err(|err| Box::new(err) as Box<_>).map(|c| c.id))
135135
.inspect(move |_| progress.inc()),
136136
);
@@ -361,7 +361,7 @@ pub mod input_iteration {
361361
#[derive(Debug, thiserror::Error)]
362362
pub enum Error {
363363
#[error("input objects couldn't be iterated completely")]
364-
Iteration(#[from] traverse::commit::ancestors::Error),
364+
Iteration(#[from] traverse::commit::simple::Error),
365365
#[error("An error occurred while reading hashes from standard input")]
366366
InputLinesIo(#[from] std::io::Error),
367367
#[error("Could not decode hex hash provided on standard input")]

gitoxide-core/src/query/engine/update.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ pub fn update(
429429
break;
430430
}
431431
}
432-
Err(gix::traverse::commit::ancestors::Error::Find { .. }) => {
432+
Err(gix::traverse::commit::simple::Error::Find { .. }) => {
433433
writeln!(err, "shallow repository - commit history is truncated").ok();
434434
break;
435435
}

gitoxide-core/src/repository/commitgraph/list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pub(crate) mod function {
22
use std::{borrow::Cow, ffi::OsString};
33

44
use anyhow::{bail, Context};
5-
use gix::{prelude::ObjectIdExt, traverse::commit::Sorting};
5+
use gix::{prelude::ObjectIdExt, traverse::commit::simple::Sorting};
66

77
use crate::OutputFormat;
88

gitoxide-core/src/repository/revision/list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub const PROGRESS_RANGE: std::ops::RangeInclusive<u8> = 0..=2;
1717

1818
pub(crate) mod function {
1919
use anyhow::{bail, Context};
20-
use gix::{hashtable::HashMap, traverse::commit::Sorting, Progress};
20+
use gix::{hashtable::HashMap, traverse::commit::simple::Sorting, Progress};
2121
use layout::{
2222
backends::svg::SVGWriter,
2323
core::{base::Orientation, geometry::Point, style::StyleAttr},

gix-config/src/file/impls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ impl<'a> TryFrom<&'a BStr> for File<'a> {
4242

4343
impl From<File<'_>> for BString {
4444
fn from(c: File<'_>) -> Self {
45-
c.into()
45+
c.to_bstring()
4646
}
4747
}
4848

gix-config/src/parse/comment.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ impl Display for Comment<'_> {
3939

4040
impl From<Comment<'_>> for BString {
4141
fn from(c: Comment<'_>) -> Self {
42-
c.into()
42+
c.to_bstring()
4343
}
4444
}
4545

gix-config/src/parse/event.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ impl Display for Event<'_> {
7272

7373
impl From<Event<'_>> for BString {
7474
fn from(event: Event<'_>) -> Self {
75-
event.into()
75+
event.to_bstring()
7676
}
7777
}
7878

0 commit comments

Comments
 (0)