Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 21c2dd5

Browse files
ByronByron
committed
pack multi-index info subcommand (#301)
1 parent e6a3d43 commit 21c2dd5

5 files changed

Lines changed: 59 additions & 9 deletions

File tree

‎README.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,13 @@ Please see _'Development Status'_ for a listing of all crates and their capabili
3535
* [x] **create** - create a pack from given objects or tips of the commit graph.
3636
* [ ] **send** - create a pack and send it using the pack protocol to stdout, similar to 'git-upload-pack',
3737
for consumption by **pack-receive** or _git-receive-pack_
38-
* **index**
39-
* [x] [create](https://asciinema.org/a/352941) - create an index file by streaming a pack file as done during clone
40-
* [x] support for thin packs (as needed for fetch/pull)
38+
- **multi-index**
39+
* [x] **info** - print information about the file
40+
* [x] **create** - create a multi-index from pack indices
41+
* [x] **verify** - check the file for consistency
42+
- **index**
43+
* [x] [create](https://asciinema.org/a/352941) - create an index file by streaming a pack file as done during clone
44+
* [x] support for thin packs (as needed for fetch/pull)
4145
* **commit-graph**
4246
* [x] **verify** - assure that a commit-graph is consistent
4347
* **repository**

‎gitoxide-core/src/pack/multi_index.rs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use std::{io::BufWriter, path::PathBuf, sync::atomic::AtomicBool};
22

3+
use crate::OutputFormat;
34
use git_repository as git;
45
use git_repository::Progress;
56

@@ -32,3 +33,38 @@ pub fn create(
3233
out.into_inner()?.commit()?;
3334
Ok(())
3435
}
36+
37+
mod info {
38+
use std::path::PathBuf;
39+
40+
#[cfg_attr(feature = "serde1", derive(serde::Serialize))]
41+
pub struct Statistics {
42+
pub path: PathBuf,
43+
pub num_objects: u32,
44+
pub index_names: Vec<PathBuf>,
45+
pub object_hash: String,
46+
}
47+
}
48+
49+
pub fn info(
50+
multi_index_path: PathBuf,
51+
format: OutputFormat,
52+
out: impl std::io::Write,
53+
mut err: impl std::io::Write,
54+
) -> anyhow::Result<()> {
55+
let file = git::odb::pack::multi_index::File::at(&multi_index_path)?;
56+
if format == OutputFormat::Human {
57+
writeln!(err, "Defaulting to JSON as human format isn't implemented").ok();
58+
}
59+
#[cfg(feature = "serde1")]
60+
serde_json::to_writer_pretty(
61+
out,
62+
&info::Statistics {
63+
path: multi_index_path,
64+
num_objects: file.num_objects(),
65+
index_names: file.index_names().to_vec(),
66+
object_hash: file.object_hash().to_string(),
67+
},
68+
)?;
69+
Ok(())
70+
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ pub fn info(
120120
treeish: Option<&str>,
121121
extended: bool,
122122
format: OutputFormat,
123-
out: &mut dyn io::Write,
124-
err: &mut dyn io::Write,
123+
out: impl io::Write,
124+
mut err: impl io::Write,
125125
) -> anyhow::Result<()> {
126126
if format == OutputFormat::Human {
127127
writeln!(err, "Only JSON is implemented - using that instead")?;
@@ -148,7 +148,7 @@ pub fn entries(
148148
recursive: bool,
149149
extended: bool,
150150
format: OutputFormat,
151-
out: &mut dyn io::Write,
151+
mut out: impl io::Write,
152152
) -> anyhow::Result<()> {
153153
if format != OutputFormat::Human {
154154
bail!("Only human output format is supported at the moment");
@@ -158,13 +158,13 @@ pub fn entries(
158158
let tree = treeish_to_tree(treeish, &repo)?;
159159

160160
if recursive {
161-
let mut delegate = entries::Traverse::new(extended.then(|| &repo), out.into());
161+
let mut delegate = entries::Traverse::new(extended.then(|| &repo), Some(&mut out));
162162
tree.traverse().breadthfirst(&mut delegate)?;
163163
} else {
164164
for entry in tree.iter() {
165165
let entry = entry?;
166166
format_entry(
167-
&mut *out,
167+
&mut out,
168168
&entry.inner,
169169
entry.inner.filename,
170170
extended

‎src/plumbing/main.rs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,14 @@ pub fn main() -> Result<()> {
378378
)
379379
.map(|_| ()),
380380
pack::Subcommands::MultiIndex(multi_index::Platform { multi_index_path, cmd }) => match cmd {
381+
pack::multi_index::Subcommands::Info => prepare_and_run(
382+
"pack-multi-index-info",
383+
verbose,
384+
progress,
385+
progress_keep_open,
386+
core::pack::multi_index::PROGRESS_RANGE,
387+
move |_progress, out, err| core::pack::multi_index::info(multi_index_path, format, out, err),
388+
),
381389
pack::multi_index::Subcommands::Verify => prepare_and_run(
382390
"pack-multi-index-verify",
383391
verbose,

‎src/plumbing/options.rs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ pub mod pack {
257257
#[derive(Debug, clap::Parser)]
258258
pub struct Platform {
259259
/// The path to the index file.
260-
#[clap(short = 'i', long, default_value = ".git/objects/packs/multi-pack-index")]
260+
#[clap(short = 'i', long, default_value = ".git/objects/pack/multi-pack-index")]
261261
pub multi_index_path: PathBuf,
262262

263263
/// Subcommands
@@ -267,6 +267,8 @@ pub mod pack {
267267

268268
#[derive(Debug, clap::Subcommand)]
269269
pub enum Subcommands {
270+
/// Print general information about a multi-index file
271+
Info,
270272
/// Verify a multi-index quickly without inspecting objects themselves
271273
Verify,
272274
/// Create a multi-pack index from one or more pack index files, overwriting possibloy existing files.

0 commit comments

Comments
 (0)