[pack] write packs to a directory with the proper name

Sebastian Thiel committed 5 years ago

Commit 3fbca7d1 parent f10adea8 files · +31 −25Browse files

Unified · Split

8 files

@@ -1210,6 +1210,7 @@ dependencies = [ · 1209 unmodified lines
1210	1210	"rayon",
1211	1211	"serde",
1212	1212	"serde_json",
	1213	+ "tempfile",
1213	1214	]
1214	1215
1215	1216	[[package]]

@@ -22,6 +22,8 @@ pub struct FromEntriesIter<I, W> { · 21 unmodified lines
22	22	pub input: I,
23	23	/// A way of writing encoded bytes.
24	24	output: hash::Write<W>,
	25	+ /// Our trailing hash when done writing all input entries
	26	+ trailer: Option<git_hash::ObjectId>,
25	27	/// The amount of objects in the iteration and the version of the packfile to be written.
26	28	/// Will be `None` to signal the header was written already.
27	29	header_info: Option<(crate::data::Version, u32)>,
@@ -62,6 +64,7 @@ where · 34 unmodified lines
62	64	FromEntriesIter {
63	65	input,
64	66	output: hash::Write::new(output, hash_kind),
	67	+ trailer: None,
65	68	entry_version: version,
66	69	header_info: Some((version, num_entries)),
67	70	is_done: false,
@@ -75,6 +78,12 @@ where · 7 unmodified lines
75	78	self.output.inner
76	79	}
77	80
	81	+ /// Returns the trailing hash over all written entries once done.
	82	+ /// It's `None` if we are not yet done writing.
	83	+ pub fn digest(&self) -> Option<git_hash::ObjectId> {
	84	+ self.trailer.clone()
	85	+ }
	86	+
78	87	fn next_inner(&mut self) -> Result<u64, Error<E>> {
79	88	let mut written = 0u64;
80	89	if let Some((version, num_entries)) = self.header_info.take() {
@@ -98,6 +107,7 @@ where · 17 unmodified lines
98	107	written += digest.len() as u64;
99	108	self.output.flush()?;
100	109	self.is_done = true;
	110	+ self.trailer = Some(git_hash::ObjectId::from(digest));
101	111	}
102	112	};
103	113	Ok(written)

@@ -36,6 +36,7 @@ anyhow = "1.0.31" · 35 unmodified lines
36	36	quick-error = "2.0.0"
37	37	bytesize = "1.0.1"
38	38	serde_json = { version = "1.0.56", optional = true }
	39	+tempfile = "3.1.0"
39	40
40	41	# for async-client
41	42	async-trait = { version = "0.1.50", optional = true }

@@ -74,7 +74,7 @@ pub fn create( · 73 unmodified lines
74	74	repository: impl AsRef<Path>,
75	75	tips: impl IntoIterator<Item = impl AsRef<OsStr>>,
76	76	input: Option<impl io::BufRead + Send + 'static>,
77		− out: impl io::Write,
	77	+ output_directory: impl AsRef<Path>,
78	78	mut progress: impl Progress,
79	79	ctx: Context,
80	80	) -> anyhow::Result<()> {
@@ -154,25 +154,27 @@ pub fn create( · 73 unmodified lines
154	154	write_progress.init(None, progress::bytes());
155	155	let start = Instant::now();
156	156
	157	+ let mut pack_file = tempfile::NamedTempFile::new_in(&output_directory)?;
157	158	let mut output_iter = pack::data::output::bytes::FromEntriesIter::new(
158	159	entries.inspect(\|e\| {
159	160	if let Ok(entries) = e {
160	161	entries_progress.inc_by(entries.len())
161	162	}
162	163	}),
163		− out,
	164	+ &mut pack_file,
164	165	num_objects as u32,
165	166	pack::data::Version::default(),
166	167	hash::Kind::default(),
167	168	);
168		− while let Some(io_res) = output_iter.next() {
	169	+ for io_res in output_iter.by_ref() {
169	170	if interrupt::is_triggered() {
170	171	bail!("Cancelled by user")
171	172	}
172	173	let written = io_res?;
173	174	write_progress.inc_by(written as usize);
174	175	}
175		− output_iter.into_write().flush()?;
	176	+ let hash = output_iter.digest().expect("iteration is done");
	177	+ pack_file.persist(output_directory.as_ref().join(format!("{}.pack", hash)))?;
176	178
177	179	write_progress.show_throughput(start);
178	180	entries_progress.show_throughput(start);

@@ -22,15 +22,10 @@ pub fn main() -> Result<()> { · 21 unmodified lines
22	22	repository,
23	23	expansion,
24	24	tips,
	25	+ output_directory,
25	26	}) => {
26	27	let (_handle, progress) = prepare(verbose, "pack-create", Some(core::pack::create::PROGRESS_RANGE));
27	28	let has_tips = !tips.is_empty();
28		− let stdout = stdout();
29		− let stdout_lock = stdout.lock();
30		− #[cfg(feature = "atty")]
31		− if atty::is(atty::Stream::Stdout) {
32		− anyhow::bail!("Refusing to output pack data stream to stdout.")
33		− }
34	29	let input = if has_tips {
35	30	None
36	31	} else {
@@ -51,7 +46,7 @@ pub fn main() -> Result<()> { · 14 unmodified lines
51	46	repository.unwrap_or_else(\|\| PathBuf::from(".")),
52	47	tips,
53	48	input,
54		− stdout_lock,
	49	+ output_directory,
55	50	DoOrDiscard::from(progress),
56	51	core::pack::create::Context {
57	52	expansion,

@@ -176,6 +176,10 @@ pub struct PackCreate { · 175 unmodified lines
176	176	/// Possible values are "none" and "tree-traversal". Default is "none".
177	177	pub expansion: Option<core::pack::create::ObjectExpansion>,
178	178
	179	+ /// the directory into which to write the pack file.
	180	+ #[argh(option, short = 'o')]
	181	+ pub output_directory: PathBuf,
	182	+
179	183	/// the tips from which to start the commit graph iteration.
180	184	///
181	185	/// If empty, we expect to read objects on stdin and default to 'none' as expansion mode.

@@ -28,23 +28,16 @@ pub fn main() -> Result<()> { · 27 unmodified lines
28	28	repository,
29	29	expansion,
30	30	tips,
	31	+ output_directory,
31	32	} => {
32	33	let has_tips = !tips.is_empty();
33		− let has_tui = progress;
34		− if atty::is(if has_tui {
35		− atty::Stream::Stderr
36		− } else {
37		− atty::Stream::Stdout
38		− }) {
39		− anyhow::bail!("Refusing to output pack data stream to stderr.")
40		− }
41	34	prepare_and_run(
42	35	"pack-create",
43	36	verbose,
44	37	progress,
45	38	progress_keep_open,
46	39	core::pack::create::PROGRESS_RANGE,
47		− move \|progress, out, err\| {
	40	+ move \|progress, _out, _err\| {
48	41	let input = if has_tips {
49	42	None
50	43	} else {
@@ -67,11 +60,7 @@ pub fn main() -> Result<()> { · 16 unmodified lines
67	60	}),
68	61	};
69	62	let progress = git_features::progress::DoOrDiscard::from(progress);
70		− if has_tui {
71		− core::pack::create(repository, tips, input, err, progress, context)
72		− } else {
73		− core::pack::create(repository, tips, input, out, progress, context)
74		− }
	63	+ core::pack::create(repository, tips, input, output_directory, progress, context)
75	64	},
76	65	)
77	66	}

@@ -56,6 +56,10 @@ pub enum Subcommands { · 55 unmodified lines
56	56	/// Possible values are "none" and "tree-traversal". Default is "none".
57	57	expansion: Option<core::pack::create::ObjectExpansion>,
58	58
	59	+ /// The directory into which to write the pack file.
	60	+ #[clap(long, short = 'o')]
	61	+ output_directory: PathBuf,
	62	+
59	63	/// the tips from which to start the commit graph iteration.
60	64	///
61	65	/// If empty, we expect to read objects on stdin and default to 'none' as expansion mode.