hannes/git-repo-manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Drop separate variable for repo name

Browse Source
This commit is contained in:
Hannes Körber
2021-11-19 22:16:24 +01:00
parent 4c1a6c6ed7
commit 1efbf6728d
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/lib.rs
View File

@@ -59,32 +59,30 @@ fn sync_trees(config: Config) {
let root_path = expand_path(Path::new(&tree.root)); let root_path = expand_path(Path::new(&tree.root));
for repo in &repos { for repo in &repos {
let name = &repo.name;
let repo_path = root_path.join(&repo.name); let repo_path = root_path.join(&repo.name);
let mut repo_handle = None; let mut repo_handle = None;
if repo_path.exists() { if repo_path.exists() {
repo_handle = Some(open_repo(&repo_path).unwrap_or_else(|error| { repo_handle = Some(open_repo(&repo_path).unwrap_or_else(|error| {
print_repo_error(name, &format!("Opening repository failed: {}", error)); print_repo_error(&repo.name, &format!("Opening repository failed: {}", error));
process::exit(1); process::exit(1);
})); }));
} else { } else {
match &repo.remotes { match &repo.remotes {
None => { None => {
print_repo_action( print_repo_action(
name, &repo.name,
"Repository does not have remotes configured, initializing new", "Repository does not have remotes configured, initializing new",
); );
repo_handle = match init_repo(&repo_path) { repo_handle = match init_repo(&repo_path) {
Ok(r) => { Ok(r) => {
print_repo_success(name, "Repository created"); print_repo_success(&repo.name, "Repository created");
Some(r) Some(r)
} }
Err(e) => { Err(e) => {
print_repo_error( print_repo_error(
name, &repo.name,
&format!("Repository failed during init: {}", e), &format!("Repository failed during init: {}", e),
); );
None None
@@ -101,11 +99,11 @@ fn sync_trees(config: Config) {
match clone_repo(first, &repo_path) { match clone_repo(first, &repo_path) {
Ok(_) => { Ok(_) => {
print_repo_success(name, "Repository successfully cloned"); print_repo_success(&repo.name, "Repository successfully cloned");
} }
Err(e) => { Err(e) => {
print_repo_error( print_repo_error(
name, &repo.name,
&format!("Repository failed during clone: {}", e), &format!("Repository failed during clone: {}", e),
); );
continue; continue;
@@ -122,7 +120,7 @@ fn sync_trees(config: Config) {
Ok(r) => r, Ok(r) => r,
Err(e) => { Err(e) => {
print_repo_error( print_repo_error(
name, &repo.name,
&format!("Repository failed during getting the remotes: {}", e), &format!("Repository failed during getting the remotes: {}", e),
); );
continue; continue;
@@ -136,7 +134,7 @@ fn sync_trees(config: Config) {
for remote in remotes { for remote in remotes {
if !current_remotes.iter().any(|r| *r == remote.name) { if !current_remotes.iter().any(|r| *r == remote.name) {
print_repo_action( print_repo_action(
name, &repo.name,
&format!( &format!(
"Setting up new remote \"{}\" to \"{}\"", "Setting up new remote \"{}\" to \"{}\"",
&remote.name, &remote.url &remote.name, &remote.url
@@ -144,7 +142,7 @@ fn sync_trees(config: Config) {
); );
if let Err(e) = repo_handle.remote(&remote.name, &remote.url) { if let Err(e) = repo_handle.remote(&remote.name, &remote.url) {
print_repo_error( print_repo_error(
name, &repo.name,
&format!("Repository failed during setting the remotes: {}", e), &format!("Repository failed during setting the remotes: {}", e),
); );
continue; continue;
@@ -154,14 +152,17 @@ fn sync_trees(config: Config) {
let current_url = match current_remote.url() { let current_url = match current_remote.url() {
Some(url) => url, Some(url) => url,
None => { None => {
print_repo_error(name, &format!("Repository failed during getting of the remote URL for remote \"{}\". This is most likely caused by a non-utf8 remote name", remote.name)); print_repo_error(&repo.name, &format!("Repository failed during getting of the remote URL for remote \"{}\". This is most likely caused by a non-utf8 remote name", remote.name));
continue; continue;
} }
}; };
if remote.url != current_url { if remote.url != current_url {
print_repo_action(name, &format!("Updating remote {} to \"{}\"", &remote.name, &remote.url)); print_repo_action(
&repo.name,
&format!("Updating remote {} to \"{}\"", &remote.name, &remote.url),
);
if let Err(e) = repo_handle.remote_set_url(&remote.name, &remote.url) { if let Err(e) = repo_handle.remote_set_url(&remote.name, &remote.url) {
print_repo_error(name, &format!("Repository failed during setting of the remote URL for remote \"{}\": {}", &remote.name, e)); print_repo_error(&repo.name, &format!("Repository failed during setting of the remote URL for remote \"{}\": {}", &remote.name, e));
continue; continue;
}; };
} }
@@ -171,12 +172,12 @@ fn sync_trees(config: Config) {
for current_remote in &current_remotes { for current_remote in &current_remotes {
if !remotes.iter().any(|r| &r.name == current_remote) { if !remotes.iter().any(|r| &r.name == current_remote) {
print_repo_action( print_repo_action(
name, &repo.name,
&format!("Deleting remote \"{}\"", &current_remote,), &format!("Deleting remote \"{}\"", &current_remote,),
); );
if let Err(e) = repo_handle.remote_delete(current_remote) { if let Err(e) = repo_handle.remote_delete(current_remote) {
print_repo_error( print_repo_error(
name, &repo.name,
&format!( &format!(
"Repository failed during deleting remote \"{}\": {}", "Repository failed during deleting remote \"{}\": {}",
&current_remote, e &current_remote, e