Skip to content

Commit 3827ac6

Browse files
ByronByron
committed
Merge branch 'rename-tracking'
2 parents 441a64b + f3a2ca8 commit 3827ac6

File tree

4 files changed

+173
-141
lines changed

4 files changed

+173
-141
lines changed

Diff for: ‎etc/check-package-size.sh

+23-23
Original file line numberDiff line numberDiff line change
@@ -15,49 +15,49 @@ function indent () {
1515
}
1616

1717
echo "in root: gitoxide CLI"
18-
(enter cargo-smart-release && indent cargo diet -n --package-size-limit 100KB)
18+
(enter cargo-smart-release && indent cargo diet -n --package-size-limit 110KB)
1919
(enter gix-actor && indent cargo diet -n --package-size-limit 5KB)
20-
(enter gix-pathspec && indent cargo diet -n --package-size-limit 25KB)
21-
(enter gix-refspec && indent cargo diet -n --package-size-limit 25KB)
22-
(enter gix-path && indent cargo diet -n --package-size-limit 20KB)
23-
(enter gix-attributes && indent cargo diet -n --package-size-limit 20KB)
24-
(enter gix-discover && indent cargo diet -n --package-size-limit 25KB)
25-
(enter gix-index && indent cargo diet -n --package-size-limit 55KB)
26-
(enter gix-worktree && indent cargo diet -n --package-size-limit 35KB)
20+
(enter gix-pathspec && indent cargo diet -n --package-size-limit 30KB)
21+
(enter gix-refspec && indent cargo diet -n --package-size-limit 30KB)
22+
(enter gix-path && indent cargo diet -n --package-size-limit 25KB)
23+
(enter gix-attributes && indent cargo diet -n --package-size-limit 25KB)
24+
(enter gix-discover && indent cargo diet -n --package-size-limit 30KB)
25+
(enter gix-index && indent cargo diet -n --package-size-limit 60KB)
26+
(enter gix-worktree && indent cargo diet -n --package-size-limit 40KB)
2727
(enter gix-quote && indent cargo diet -n --package-size-limit 10KB)
28-
(enter gix-revision && indent cargo diet -n --package-size-limit 35KB)
28+
(enter gix-revision && indent cargo diet -n --package-size-limit 40KB)
2929
(enter gix-bitmap && indent cargo diet -n --package-size-limit 10KB)
30-
(enter gix-tempfile && indent cargo diet -n --package-size-limit 30KB)
30+
(enter gix-tempfile && indent cargo diet -n --package-size-limit 35KB)
3131
(enter gix-lock && indent cargo diet -n --package-size-limit 20KB)
32-
(enter gix-config && indent cargo diet -n --package-size-limit 120KB)
32+
(enter gix-config && indent cargo diet -n --package-size-limit 140KB)
3333
(enter gix-config-value && indent cargo diet -n --package-size-limit 20KB)
3434
(enter gix-command && indent cargo diet -n --package-size-limit 10KB)
3535
(enter gix-hash && indent cargo diet -n --package-size-limit 30KB)
36-
(enter gix-chunk && indent cargo diet -n --package-size-limit 10KB)
36+
(enter gix-chunk && indent cargo diet -n --package-size-limit 15KB)
3737
(enter gix-rebase && indent cargo diet -n --package-size-limit 5KB)
3838
(enter gix-sequencer && indent cargo diet -n --package-size-limit 5KB)
39-
(enter gix-features && indent cargo diet -n --package-size-limit 55KB)
39+
(enter gix-features && indent cargo diet -n --package-size-limit 65KB)
4040
(enter gix-ref && indent cargo diet -n --package-size-limit 55KB)
4141
(enter gix-diff && indent cargo diet -n --package-size-limit 10KB)
4242
(enter gix-traverse && indent cargo diet -n --package-size-limit 10KB)
43-
(enter gix-url && indent cargo diet -n --package-size-limit 25KB)
43+
(enter gix-url && indent cargo diet -n --package-size-limit 35KB)
4444
(enter gix-validate && indent cargo diet -n --package-size-limit 5KB)
45-
(enter gix-date && indent cargo diet -n --package-size-limit 15KB)
45+
(enter gix-date && indent cargo diet -n --package-size-limit 25KB)
4646
(enter gix-hashtable && indent cargo diet -n --package-size-limit 5KB)
4747
(enter gix-filter && indent cargo diet -n --package-size-limit 5KB)
4848
(enter gix-lfs && indent cargo diet -n --package-size-limit 5KB)
4949
(enter gix-note && indent cargo diet -n --package-size-limit 5KB)
5050
(enter gix-fetchhead && indent cargo diet -n --package-size-limit 5KB)
51-
(enter gix-sec && indent cargo diet -n --package-size-limit 15KB)
51+
(enter gix-sec && indent cargo diet -n --package-size-limit 25KB)
5252
(enter gix-tix && indent cargo diet -n --package-size-limit 5KB)
53-
(enter gix-credentials && indent cargo diet -n --package-size-limit 30KB)
53+
(enter gix-credentials && indent cargo diet -n --package-size-limit 35KB)
5454
(enter gix-prompt && indent cargo diet -n --package-size-limit 15KB)
5555
(enter gix-object && indent cargo diet -n --package-size-limit 25KB)
56-
(enter gix-commitgraph && indent cargo diet -n --package-size-limit 30KB)
57-
(enter gix-pack && indent cargo diet -n --package-size-limit 125KB)
58-
(enter gix-odb && indent cargo diet -n --package-size-limit 130KB)
56+
(enter gix-commitgraph && indent cargo diet -n --package-size-limit 35KB)
57+
(enter gix-pack && indent cargo diet -n --package-size-limit 135KB)
58+
(enter gix-odb && indent cargo diet -n --package-size-limit 140KB)
5959
(enter gix-protocol && indent cargo diet -n --package-size-limit 80KB)
60-
(enter gix-packetline && indent cargo diet -n --package-size-limit 35KB)
60+
(enter gix-packetline && indent cargo diet -n --package-size-limit 45KB)
6161
(enter gix && indent cargo diet -n --package-size-limit 280KB)
62-
(enter gix-transport && indent cargo diet -n --package-size-limit 85KB)
63-
(enter gitoxide-core && indent cargo diet -n --package-size-limit 100KB)
62+
(enter gix-transport && indent cargo diet -n --package-size-limit 95KB)
63+
(enter gitoxide-core && indent cargo diet -n --package-size-limit 120KB)

Diff for: ‎gitoxide-core/src/query/engine/command.rs

+8-7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use crate::query::engine::update::FileMode;
33
use crate::query::Command;
44
use anyhow::Context;
55
use gix::bstr::ByteSlice;
6+
use gix::prelude::ObjectIdExt;
67
use gix::Progress;
78
use rusqlite::{params, OptionalExtension};
89
use std::collections::HashMap;
@@ -57,9 +58,11 @@ impl query::Engine {
5758
usize,
5859
) = row?;
5960
let id = gix::ObjectId::from(hash);
61+
let commit_time = id.attach(&self.repo).object()?.into_commit().committer()?.time;
6062
let mode = FileMode::from_usize(mode).context("invalid file mode")?;
6163
info.push(trace_path::Info {
6264
id,
65+
commit_time,
6366
file_id,
6467
mode,
6568
diff: has_diff.then_some(trace_path::Diff {
@@ -85,20 +88,15 @@ impl query::Engine {
8588
.unwrap_or_default();
8689
let mut found = 0;
8790
progress.show_throughput(start);
88-
let start = std::time::Instant::now();
89-
progress.init(Some(self.commits.len()), gix::progress::count("commits"));
90-
progress.set_name("associate info");
9191
for info in self
9292
.commits
9393
.iter()
94-
.inspect(|_| progress.inc())
9594
.filter_map(|c| info.binary_search_by(|i| i.id.cmp(c)).ok().map(|idx| &info[idx]))
9695
{
9796
found += 1;
9897
info.write_to(&mut out, &self.repo, &seen, max_diff_lines)?;
9998
}
10099
let missing = info.len() - found;
101-
progress.show_throughput(start);
102100
if missing > 0 {
103101
writeln!(
104102
out,
@@ -140,6 +138,7 @@ mod trace_path {
140138
#[derive(Debug)]
141139
pub struct Info {
142140
pub id: gix::ObjectId,
141+
pub commit_time: gix::date::Time,
143142
pub file_id: usize,
144143
pub mode: FileMode,
145144
pub diff: Option<Diff>,
@@ -159,8 +158,9 @@ mod trace_path {
159158
Some(source_id) => {
160159
writeln!(
161160
out,
162-
"{}|{} {} {} ➡ {}",
161+
"{}| {} | {} {} {} ➡ {}",
163162
self.diff.unwrap_or_default().format(max_diff_lines),
163+
self.commit_time.format(gix::date::time::format::SHORT),
164164
id.shorten_or_id(),
165165
self.mode.as_str(),
166166
path_by_id[&source_id],
@@ -170,8 +170,9 @@ mod trace_path {
170170
None => {
171171
writeln!(
172172
out,
173-
"{}|{} {} {}",
173+
"{}| {} | {} {} {}",
174174
self.diff.unwrap_or_default().format(max_diff_lines),
175+
self.commit_time.format(gix::date::time::format::SHORT),
175176
id.shorten_or_id(),
176177
self.mode.as_str(),
177178
path_by_id[&self.file_id]

0 commit comments

Comments
 (0)