Skip to content

Commit b842691

Browse files
ByronByron
committed
Merge branch 'reset'
2 parents 3939a45 + 67a0220 commit b842691

File tree

65 files changed

+1966
-588
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1966
-588
lines changed

‎Cargo.lock‎

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

‎crate-status.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,9 @@ Make it the best-performing implementation and the most convenient one.
456456

457457
### gix-status
458458
* [x] differences between index and worktree to turn index into worktree
459-
* [ ] differences between tree and index to turn tree into index
459+
- [ ] rename tracking
460+
* [ ] differences between index and index to learn what changed
461+
- [ ] rename tracking
460462
* [ ] untracked files
461463
* [ ] fast answer to 'is it dirty'.
462464
*

‎gitoxide-core/src/repository/index/entries.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,9 +404,10 @@ pub(crate) mod function {
404404
out,
405405
"{} {}{:?} {} {}{}{}",
406406
match entry.flags.stage() {
407-
0 => "BASE ",
408-
1 => "OURS ",
409-
2 => "THEIRS ",
407+
0 => " ",
408+
1 => "BASE ",
409+
2 => "OURS ",
410+
3 => "THEIRS ",
410411
_ => "UNKNOWN",
411412
},
412413
if entry.flags.is_empty() {

‎gitoxide-core/src/repository/status.rs‎

Lines changed: 141 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ use gix::bstr::{BStr, BString};
44
use gix::index::Entry;
55
use gix::prelude::FindExt;
66
use gix::Progress;
7-
use gix_status::index_as_worktree::content::FastEq;
8-
use gix_status::index_as_worktree::Change;
7+
use gix_status::index_as_worktree::traits::FastEq;
8+
use gix_status::index_as_worktree::{Change, Conflict, EntryStatus};
99

1010
pub enum Submodules {
1111
/// display all information about submodules, including ref changes, modifications and untracked files.
@@ -20,6 +20,8 @@ pub struct Options {
2020
pub format: OutputFormat,
2121
pub submodules: Submodules,
2222
pub thread_limit: Option<usize>,
23+
pub statistics: bool,
24+
pub allow_write: bool,
2325
}
2426

2527
pub fn show(
@@ -33,12 +35,14 @@ pub fn show(
3335
// TODO: implement this
3436
submodules: _,
3537
thread_limit,
38+
allow_write,
39+
statistics,
3640
}: Options,
3741
) -> anyhow::Result<()> {
3842
if format != OutputFormat::Human {
3943
bail!("Only human format is supported right now");
4044
}
41-
let mut index = repo.index()?;
45+
let mut index = repo.index_or_empty()?;
4246
let index = gix::threading::make_mut(&mut index);
4347
let pathspec = repo.pathspec(
4448
pathspecs,
@@ -48,73 +52,174 @@ pub fn show(
4852
)?;
4953
let mut progress = progress.add_child("traverse index");
5054
let start = std::time::Instant::now();
51-
gix_status::index_as_worktree(
55+
let options = gix_status::index_as_worktree::Options {
56+
fs: repo.filesystem_options()?,
57+
thread_limit,
58+
stat: repo.stat_options()?,
59+
attributes: match repo
60+
.attributes_only(
61+
index,
62+
gix::worktree::stack::state::attributes::Source::WorktreeThenIdMapping,
63+
)?
64+
.detach()
65+
.state_mut()
66+
{
67+
gix::worktree::stack::State::AttributesStack(attrs) => std::mem::take(attrs),
68+
// TODO: this should be nicer by creating attributes directly, but it's a private API
69+
_ => unreachable!("state must be attributes stack only"),
70+
},
71+
};
72+
let mut printer = Printer {
73+
out,
74+
changes: Vec::new(),
75+
};
76+
let outcome = gix_status::index_as_worktree(
5277
index,
5378
repo.work_dir()
5479
.context("This operation cannot be run on a bare repository")?,
55-
&mut Printer(out),
80+
&mut printer,
5681
FastEq,
82+
Submodule,
5783
{
5884
let odb = repo.objects.clone().into_arc()?;
5985
move |id, buf| odb.find_blob(id, buf)
6086
},
6187
&mut progress,
6288
pathspec.detach()?,
63-
gix_status::index_as_worktree::Options {
64-
fs: repo.filesystem_options()?,
65-
thread_limit,
66-
stat: repo.stat_options()?,
67-
},
89+
repo.filter_pipeline(Some(gix::hash::ObjectId::empty_tree(repo.object_hash())))?
90+
.0
91+
.into_parts()
92+
.0,
93+
&gix::interrupt::IS_INTERRUPTED,
94+
options,
6895
)?;
6996

97+
if outcome.entries_to_update != 0 && allow_write {
98+
{
99+
let entries = index.entries_mut();
100+
for (entry_index, change) in printer.changes {
101+
let entry = &mut entries[entry_index];
102+
match change {
103+
ApplyChange::SetSizeToZero => {
104+
entry.stat.size = 0;
105+
}
106+
ApplyChange::NewStat(new_stat) => {
107+
entry.stat = new_stat;
108+
}
109+
}
110+
}
111+
}
112+
index.write(gix::index::write::Options {
113+
extensions: Default::default(),
114+
skip_hash: false, // TODO: make this based on configuration
115+
})?;
116+
}
117+
118+
if statistics {
119+
writeln!(err, "{outcome:#?}").ok();
120+
}
121+
70122
writeln!(err, "\nhead -> index and untracked files aren't implemented yet")?;
71123
progress.show_throughput(start);
72124
Ok(())
73125
}
74126

75-
struct Printer<W>(W);
127+
#[derive(Clone)]
128+
struct Submodule;
129+
130+
impl gix_status::index_as_worktree::traits::SubmoduleStatus for Submodule {
131+
type Output = ();
132+
type Error = std::convert::Infallible;
133+
134+
fn status(&mut self, _entry: &Entry, _rela_path: &BStr) -> Result<Option<Self::Output>, Self::Error> {
135+
Ok(None)
136+
}
137+
}
138+
139+
struct Printer<W> {
140+
out: W,
141+
changes: Vec<(usize, ApplyChange)>,
142+
}
143+
144+
enum ApplyChange {
145+
SetSizeToZero,
146+
NewStat(gix::index::entry::Stat),
147+
}
76148

77149
impl<'index, W> gix_status::index_as_worktree::VisitEntry<'index> for Printer<W>
78150
where
79151
W: std::io::Write,
80152
{
81153
type ContentChange = ();
154+
type SubmoduleStatus = ();
82155

83156
fn visit_entry(
84157
&mut self,
85-
entry: &'index Entry,
158+
_entries: &'index [Entry],
159+
_entry: &'index Entry,
160+
entry_index: usize,
86161
rela_path: &'index BStr,
87-
change: Option<Change<Self::ContentChange>>,
88-
conflict: bool,
162+
status: EntryStatus<Self::ContentChange>,
89163
) {
90-
self.visit_inner(entry, rela_path, change, conflict).ok();
164+
self.visit_inner(entry_index, rela_path, status).ok();
91165
}
92166
}
93167

94168
impl<W: std::io::Write> Printer<W> {
95-
fn visit_inner(
96-
&mut self,
97-
_entry: &Entry,
98-
rela_path: &BStr,
99-
change: Option<Change<()>>,
100-
conflict: bool,
101-
) -> anyhow::Result<()> {
102-
if let Some(change) = conflict
103-
.then_some('U')
104-
.or_else(|| change.as_ref().and_then(change_to_char))
105-
{
106-
writeln!(&mut self.0, "{change} {rela_path}")?;
107-
}
108-
Ok(())
169+
fn visit_inner(&mut self, entry_index: usize, rela_path: &BStr, status: EntryStatus<()>) -> std::io::Result<()> {
170+
let char_storage;
171+
let status = match status {
172+
EntryStatus::Conflict(conflict) => as_str(conflict),
173+
EntryStatus::Change(change) => {
174+
if matches!(
175+
change,
176+
Change::Modification {
177+
set_entry_stat_size_zero: true,
178+
..
179+
}
180+
) {
181+
self.changes.push((entry_index, ApplyChange::SetSizeToZero))
182+
}
183+
char_storage = change_to_char(&change);
184+
std::str::from_utf8(std::slice::from_ref(&char_storage)).expect("valid ASCII")
185+
}
186+
EntryStatus::NeedsUpdate(stat) => {
187+
self.changes.push((entry_index, ApplyChange::NewStat(stat)));
188+
return Ok(());
189+
}
190+
EntryStatus::IntentToAdd => "A",
191+
};
192+
193+
writeln!(&mut self.out, "{status: >3} {rela_path}")
194+
}
195+
}
196+
197+
fn as_str(c: Conflict) -> &'static str {
198+
match c {
199+
Conflict::BothDeleted => "DD",
200+
Conflict::AddedByUs => "AU",
201+
Conflict::DeletedByThem => "UD",
202+
Conflict::AddedByThem => "UA",
203+
Conflict::DeletedByUs => "DU",
204+
Conflict::BothAdded => "AA",
205+
Conflict::BothModified => "UU",
109206
}
110207
}
111208

112-
fn change_to_char(change: &Change<()>) -> Option<char> {
209+
fn change_to_char(change: &Change<()>) -> u8 {
113210
// Known status letters: https://github.com/git/git/blob/6807fcfedab84bc8cd0fbf721bc13c4e68cda9ae/diff.h#L613
114-
Some(match change {
115-
Change::Removed => 'D',
116-
Change::Type => 'T',
117-
Change::Modification { .. } => 'M',
118-
Change::IntentToAdd => return None,
119-
})
211+
match change {
212+
Change::Removed => b'D',
213+
Change::Type => b'T',
214+
Change::SubmoduleModification(_) => b'M',
215+
Change::Modification {
216+
executable_bit_changed, ..
217+
} => {
218+
if *executable_bit_changed {
219+
b'X'
220+
} else {
221+
b'M'
222+
}
223+
}
224+
}
120225
}

‎gix-command/tests/command.rs‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,32 +82,26 @@ mod spawn {
8282

8383
#[test]
8484
fn sh_shell_specific_script_code_with_single_extra_arg() -> crate::Result {
85-
let out = gix_command::prepare("echo")
85+
let out = gix_command::prepare("printf")
8686
.with_shell()
8787
.arg("1")
8888
.spawn()?
8989
.wait_with_output()?;
9090
assert!(out.status.success());
91-
#[cfg(not(windows))]
92-
assert_eq!(out.stdout.as_bstr(), "1\n");
93-
#[cfg(windows)]
94-
assert_eq!(out.stdout.as_bstr(), "1\r\n");
91+
assert_eq!(out.stdout.as_bstr(), "1");
9592
Ok(())
9693
}
9794

9895
#[test]
9996
fn sh_shell_specific_script_code_with_multiple_extra_args() -> crate::Result {
100-
let out = gix_command::prepare("echo")
97+
let out = gix_command::prepare("printf")
10198
.with_shell()
102-
.arg("1")
103-
.arg("2")
99+
.arg("%s")
100+
.arg("arg")
104101
.spawn()?
105102
.wait_with_output()?;
106103
assert!(out.status.success());
107-
#[cfg(not(windows))]
108-
assert_eq!(out.stdout.as_bstr(), "1 2\n");
109-
#[cfg(windows)]
110-
assert_eq!(out.stdout.as_bstr(), "1 2\r\n");
104+
assert_eq!(out.stdout.as_bstr(), "arg");
111105
Ok(())
112106
}
113107
}

‎gix-features/src/hash.rs‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ pub fn hasher(kind: gix_hash::Kind) -> Sha1 {
9696
#[cfg(all(feature = "progress", any(feature = "rustsha1", feature = "fast-sha1")))]
9797
pub fn bytes_of_file(
9898
path: &std::path::Path,
99-
num_bytes_from_start: usize,
99+
num_bytes_from_start: u64,
100100
kind: gix_hash::Kind,
101101
progress: &mut dyn crate::progress::Progress,
102102
should_interrupt: &std::sync::atomic::AtomicBool,
@@ -110,28 +110,42 @@ pub fn bytes_of_file(
110110
)
111111
}
112112

113-
/// Similar to [`bytes_of_file`], but operates on an already open file.
113+
/// Similar to [`bytes_of_file`], but operates on a stream of bytes.
114114
#[cfg(all(feature = "progress", any(feature = "rustsha1", feature = "fast-sha1")))]
115115
pub fn bytes(
116116
read: &mut dyn std::io::Read,
117-
num_bytes_from_start: usize,
117+
num_bytes_from_start: u64,
118118
kind: gix_hash::Kind,
119119
progress: &mut dyn crate::progress::Progress,
120120
should_interrupt: &std::sync::atomic::AtomicBool,
121121
) -> std::io::Result<gix_hash::ObjectId> {
122-
let mut hasher = hasher(kind);
122+
bytes_with_hasher(read, num_bytes_from_start, hasher(kind), progress, should_interrupt)
123+
}
124+
125+
/// Similar to [`bytes()`], but takes a `hasher` instead of a hash kind.
126+
#[cfg(all(feature = "progress", any(feature = "rustsha1", feature = "fast-sha1")))]
127+
pub fn bytes_with_hasher(
128+
read: &mut dyn std::io::Read,
129+
num_bytes_from_start: u64,
130+
mut hasher: Sha1,
131+
progress: &mut dyn crate::progress::Progress,
132+
should_interrupt: &std::sync::atomic::AtomicBool,
133+
) -> std::io::Result<gix_hash::ObjectId> {
123134
let start = std::time::Instant::now();
124135
// init progress before the possibility for failure, as convenience in case people want to recover
125-
progress.init(Some(num_bytes_from_start), crate::progress::bytes());
136+
progress.init(
137+
Some(num_bytes_from_start as prodash::progress::Step),
138+
crate::progress::bytes(),
139+
);
126140

127141
const BUF_SIZE: usize = u16::MAX as usize;
128142
let mut buf = [0u8; BUF_SIZE];
129143
let mut bytes_left = num_bytes_from_start;
130144

131145
while bytes_left > 0 {
132-
let out = &mut buf[..BUF_SIZE.min(bytes_left)];
146+
let out = &mut buf[..BUF_SIZE.min(bytes_left as usize)];
133147
read.read_exact(out)?;
134-
bytes_left -= out.len();
148+
bytes_left -= out.len() as u64;
135149
progress.inc_by(out.len());
136150
hasher.update(out);
137151
if should_interrupt.load(std::sync::atomic::Ordering::SeqCst) {

0 commit comments

Comments
 (0)