Add git info to check/push #205
Conversation
JakeDawkins
requested review from
EverlastingBugstopper and
lrlna
as code owners
JakeDawkins
added
feature 🎉
src/cli.rs
Outdated
|
|
||
| // constructing GitContext with a set of overrides from env vars | ||
| let git_context = GitContext::new(branch, committer, commit, remote_url); | ||
| tracing::debug!("Git Context: {:?}", git_context); |
There was a problem hiding this comment.
| tracing::debug!("Git Context: {:?}", git_context); | |
| tracing::debug!("Git Context", ?git_context); |
There was a problem hiding this comment.
This doesn't work for me, I get an error saying
error: expected expression, found `?`
--> src/cli.rs:97:40
|
97 | tracing::debug!("Git Context", ?git_context);
| ^ expected expression
src/git.rs
Outdated
| ) -> Self { | ||
| let git = git_info::get(); | ||
|
|
||
| let branch = if override_branch.is_none() { |
There was a problem hiding this comment.
these could all be one liners
let branch = override_branch.unwrap_or_else(|| git.current_branch);There was a problem hiding this comment.
This doesn't quite work, because git.current_branch is an Option<String>, so the return types clash of it either being a string from the unwrapping of override_branch or an Option<String> from git.
There was a problem hiding this comment.
you're looking for or()! So:
let branch = override_branch.or(git.current_branch);
src/git.rs
Outdated
| if user.is_empty() && email.is_empty() { | ||
| None | ||
| } else { | ||
| Some(format!("{} {}", user, email)) |
There was a problem hiding this comment.
this gets a bit murky if user is empty and email is not - wonder if that's a common case
There was a problem hiding this comment.
definitely a common case i've seen a whole bunch
src/git.rs
Outdated
| let remote_url = if let Some(remote) = remote_url { | ||
| GitContext::sanitize_remote_url(&remote) | ||
| } else { | ||
| None | ||
| }; |
There was a problem hiding this comment.
let remote_url = remote_url.map(|url| GitContext::sanitize_remote_url(&url));There was a problem hiding this comment.
The result of this would also be the wrong type, it'd be Option<Option<String>> instead of Option<String>
- creates GitContext::new() that takes no arguments - creates GitContext::with_env() that uses RoverEnv store to create git object - separates out GitContext::committer() and GitContext::remote() into their own logic methods
Adds the ability to pass git info to all check/push commands for use in Apollo Studio
gitmodule to the crate