Added [directory] argument to init.

- git init supports providing an optional directory in which to initialize a new repo - the semantics is otherwise the same

Daniel Levin committed 5 years ago

Commit 62f8dc61 parent f6060754 files · +27 −9Browse files

Unified · Split

4 files

@@ -91,11 +91,18 @@ fn write_file(data: &[u8], path: &Path) -> Result<(), Error> { · 90 unmodified lines
91	}	91	}
92		92
93	fn create_dir(p: &Path) -> Result<(), Error> {	93	fn create_dir(p: &Path) -> Result<(), Error> {
94	fs::create_dir(p).map_err(\|e\| Error::CreateDirectory(e, p.to_owned()))	94	fs::create_dir_all(p).map_err(\|e\| Error::CreateDirectory(e, p.to_owned()))
95	}	95	}
96		96
97	pub fn repository() -> Result<(), Error> {	97	pub fn repository(directory: Option<PathBuf>) -> Result<(), Error> {
98	let mut cursor = PathBuf::from(GIT_DIR_NAME);	98
		99	let mut cursor = match directory {
		100	Some(dir) => PathBuf::from(dir),
		101	None => PathBuf::from("."),
		102	};
		103
		104	cursor.push(GIT_DIR_NAME);
		105
99	if cursor.is_dir() {	106	if cursor.is_dir() {
100	return Err(Error::DirectoryExists(cursor));	107	return Err(Error::DirectoryExists(cursor));
101	}	108	}

@@ -1,5 +1,6 @@
1	use anyhow::{Context as AnyhowContext, Result};	1	use anyhow::{Context as AnyhowContext, Result};
		2	use std::path::PathBuf;
2		3
3	pub fn init() -> Result<()> {	4	pub fn init(directory: Option<PathBuf>) -> Result<()> {
4	git_repository::init::repository().with_context(\|\| "Repository initialization failed")	5	git_repository::init::repository(directory).with_context(\|\| "Repository initialization failed")
5	}	6	}

     /// Initialize the repository in the current directory.
     #[derive(FromArgs, PartialEq, Debug)]
     #[argh(subcommand, name = "init")]
-    pub struct Init {}
+    pub struct Init {
+        #[argh(option)]
+        pub directory: Option<PathBuf>,
+    }
     /// find all repositories in a given directory.
     #[derive(FromArgs, PartialEq, Debug)]
     git_features::interrupt::init_handler(std::io::stderr());
     match cli.subcommand {
-        SubCommands::Init(_) => core::repository::init(),
+        SubCommands::Init(Init {
+            directory
+        }) => core::repository::init(),
         #[cfg(feature = "gitoxide-core-organize")]
         SubCommands::Find(Find { root }) => {
             use crate::shared::lean::prepare;

         #[clap(alias = "initialize")]
         #[clap(setting = AppSettings::ColoredHelp)]
         #[clap(setting = AppSettings::DisableVersion)]
-        Init,
+        Init {
+            /// The directory in which to initialize a new git repository.
+            ///
+            /// Defaults to the current working directory.
+            directory: Option<PathBuf>,
+        },
         /// Find all repositories in a given directory.
         #[clap(setting = AppSettings::ColoredHelp)]
         #[clap(setting = AppSettings::DisableVersion)]
     let verbose = true;
     match args.cmd {
-        Subcommands::Init => core::repository::init(),
+        Subcommands::Init { directory } => core::repository::init(directory),
         Subcommands::Find { root } => {
             use gitoxide_core::organize;
             // force verbose only, being the line renderer.