fix build (#301)

Sebastian Thiel committed 4 years ago

Commit cb56f121 parent 61ea4c44 files · +66 −12Browse files

Unified · Split

4 files

git-repository/src/types.rs +1 −0
gitoxide-core/src/repository/exclude.rs +2 −2
src/plumbing/main.rs +18 −9
src/shared.rs +45 −1

@@ -8,6 +8,7 @@ use crate::head; · 7 unmodified lines
8	pub struct Worktree<'repo> {	8	pub struct Worktree<'repo> {
9	pub(crate) parent: &'repo Repository,	9	pub(crate) parent: &'repo Repository,
10	/// The root path of the checkout.	10	/// The root path of the checkout.
		11	#[allow(dead_code)]
11	pub(crate) path: &'repo std::path::Path,	12	pub(crate) path: &'repo std::path::Path,
12	}	13	}
13		14

gitoxide-core/src/repository/exclude.rs+2−2

@@ -16,8 +16,8 @@ pub mod query { · 15 unmodified lines
16		16
17	pub fn query(	17	pub fn query(
18	repo: git::Repository,	18	repo: git::Repository,
19	out: impl io::Write,	19	_out: impl io::Write,
20	query::Options { format, pathspecs }: query::Options,	20	query::Options { format, pathspecs: _ }: query::Options,
21	) -> anyhow::Result<()> {	21	) -> anyhow::Result<()> {
22	if format != OutputFormat::Human {	22	if format != OutputFormat::Human {
23	bail!("JSON output isn't implemented yet");	23	bail!("JSON output isn't implemented yet");

src/plumbing/main.rs+18−9

         },
         Subcommands::Repository(repo::Platform { repository, cmd }) => {
             use git_repository as git;
-            let repository = git::open(repository)?.apply_environment();
+            let repository = git::ThreadSafeRepository::open(repository)?;
             match cmd {
                 repo::Subcommands::Commit { cmd } => match cmd {
                     repo::commit::Subcommands::Describe {
                         None,
                         move |_progress, out, err| {
                             core::repository::commit::describe(
-                                repository,
+                                repository.into(),
                                 rev_spec.as_deref(),
                                 out,
                                 err,
                         None,
                         move |_progress, out, _err| {
                             core::repository::exclude::query(
-                                repository,
+                                repository.into(),
                                 out,
                                 core::repository::exclude::query::Options { format, pathspecs },
                             )
                         progress,
                         progress_keep_open,
                         None,
-                        move |_progress, out, err| core::repository::mailmap::entries(repository, format, out, err),
+                        move |_progress, out, err| {
+                            core::repository::mailmap::entries(repository.into(), format, out, err)
+                        },
                     ),
                 },
                 repo::Subcommands::Odb { cmd } => match cmd {
                         progress,
                         progress_keep_open,
                         None,
-                        move |_progress, out, _err| core::repository::odb::entries(repository, format, out),
+                        move |_progress, out, _err| core::repository::odb::entries(repository.into(), format, out),
                     ),
                     repo::odb::Subcommands::Info => prepare_and_run(
                         "repository-odb-info",
                         progress,
                         progress_keep_open,
                         None,
-                        move |_progress, out, err| core::repository::odb::info(repository, format, out, err),
+                        move |_progress, out, err| core::repository::odb::info(repository.into(), format, out, err),
                     ),
                 },
                 repo::Subcommands::Tree { cmd } => match cmd {
                         None,
                         move |_progress, out, _err| {
                             core::repository::tree::entries(
-                                repository,
+                                repository.into(),
                                 treeish.as_deref(),
                                 recursive,
                                 extended,
                         progress_keep_open,
                         None,
                         move |_progress, out, err| {
-                            core::repository::tree::info(repository, treeish.as_deref(), extended, format, out, err)
+                            core::repository::tree::info(
+                                repository.into(),
+                                treeish.as_deref(),
+                                extended,
+                                format,
+                                out,
+                                err,
+                            )
                         },
                     ),
                 },
                     core::repository::verify::PROGRESS_RANGE,
                     move |progress, out, _err| {
                         core::repository::verify::integrity(
-                            repository,
+                            repository.into(),
                             out,
                             progress,
                             &should_interrupt,

src/shared.rs+45−1

@@ -52,12 +52,56 @@ pub mod pretty { · 51 unmodified lines
52		52
53	use crate::shared::ProgressRange;	53	use crate::shared::ProgressRange;
54		54
		55	#[cfg(feature = "small")]
		56	pub fn prepare_and_run<T>(
		57	name: &str,
		58	verbose: bool,
		59	progress: bool,
		60	#[cfg_attr(not(feature = "prodash-render-tui"), allow(unused_variables))] progress_keep_open: bool,
		61	range: impl Into<Option<ProgressRange>>,
		62	run: impl FnOnce(
		63	progress::DoOrDiscard<prodash::tree::Item>,
		64	&mut dyn std::io::Write,
		65	&mut dyn std::io::Write,
		66	) -> Result<T>,
		67	) -> Result<T> {
		68	crate::shared::init_env_logger();
		69
		70	match (verbose, progress) {
		71	(false, false) => {
		72	let stdout = stdout();
		73	let mut stdout_lock = stdout.lock();
		74	let stderr = stderr();
		75	let mut stderr_lock = stderr.lock();
		76	run(progress::DoOrDiscard::from(None), &mut stdout_lock, &mut stderr_lock)
		77	}
		78	(true, false) => {
		79	let progress = crate::shared::progress_tree();
		80	let sub_progress = progress.add_child(name);
		81
		82	use crate::shared::{self, STANDARD_RANGE};
		83	let handle = shared::setup_line_renderer_range(&progress, range.into().unwrap_or(STANDARD_RANGE));
		84
		85	let mut out = Vec::<u8>::new();
		86	let res = run(progress::DoOrDiscard::from(Some(sub_progress)), &mut out, &mut stderr());
		87	handle.shutdown_and_wait();
		88	std::io::Write::write_all(&mut stdout(), &out)?;
		89	res
		90	}
		91	#[cfg(not(feature = "prodash-render-tui"))]
		92	(true, true) \| (false, true) => {
		93	unreachable!("BUG: This branch can't be run without a TUI built-in")
		94	}
		95	}
		96	}
		97
		98	#[cfg(not(feature = "small"))]
55	pub fn prepare_and_run<T: Send + 'static>(	99	pub fn prepare_and_run<T: Send + 'static>(
56	name: &str,	100	name: &str,
57	verbose: bool,	101	verbose: bool,
58	progress: bool,	102	progress: bool,
59	#[cfg_attr(not(feature = "prodash-render-tui"), allow(unused_variables))] progress_keep_open: bool,	103	#[cfg_attr(not(feature = "prodash-render-tui"), allow(unused_variables))] progress_keep_open: bool,
60	#[cfg_attr(not(feature = "prodash-render-line"), allow(unused_variables))] range: impl Into<Option<ProgressRange>>,	104	range: impl Into<Option<ProgressRange>>,
61	run: impl FnOnce(	105	run: impl FnOnce(
62	progress::DoOrDiscard<prodash::tree::Item>,	106	progress::DoOrDiscard<prodash::tree::Item>,
63	&mut dyn std::io::Write,	107	&mut dyn std::io::Write,

fix build (#301)

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code