Skip to content

Allow opening lines from other branches than main branch #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oren0e merged 1 commit into from
Jul 12, 2022
Merged

Allow opening lines from other branches than main branch #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 10 additions & 43 deletions src/match_logic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,25 +73,21 @@ pub fn parse_path_and_line_arg(arg: &str, split_char: char) -> AnyhowResult<File
)))
}

fn get_main_branch_name(output: &str) -> AnyhowResult<String> {
let re = Regex::new(r"(?s:.)*HEAD branch: (\w+)")?;
let captured = re
.captures(output)
.ok_or_else(|| anyhow!("Main branch not found"))?;
Ok(captured[1].to_owned())
}

pub fn get_line_number_link(repo_url: &str, path: &str, line_number: &str) -> AnyhowResult<String> {
let git_remote = Command::new("git")
.args(&["remote", "show", "origin"])
fn get_current_branch_name() -> AnyhowResult<String> {
let git_branch = Command::new("git")
.args(&["symbolic-ref", "--short", "HEAD"])
.stdout(Stdio::piped())
.output()?;
let stdout = String::from_utf8(git_branch.stdout)?.trim_end().to_string();

Ok(stdout)
}

let stdout = String::from_utf8(git_remote.stdout)?;
let main_branch = get_main_branch_name(&stdout)?;
pub fn get_line_number_link(repo_url: &str, path: &str, line_number: &str) -> AnyhowResult<String> {
let current_branch = get_current_branch_name()?;
Ok(format!(
"{}/blob/{}/{}#L{}",
repo_url, main_branch, path, line_number,
repo_url, current_branch, path, line_number,
))
}

Expand Down Expand Up @@ -132,35 +128,6 @@ mod tests {
);
}

#[test]
fn test_get_main_branch_name() {
let output = r#"
* remote origin
Fetch URL: git@github.com:oren0e/gitopen.git
Push URL: git@github.com:oren0e/gitopen.git
HEAD branch: main
Remote branches:
main tracked
refs/remotes/origin/Bump_regex_crate_version stale (use 'git remote prune' to remove)
refs/remotes/origin/Feature/open_commit stale (use 'git remote prune' to remove)
refs/remotes/origin/Feature/push_and_open_pr stale (use 'git remote prune' to remove)
refs/remotes/origin/Fix/work_with_gitlab stale (use 'git remote prune' to remove)
refs/remotes/origin/Refactor/str_instead_of_string stale (use 'git remote prune' to remove)
refs/remotes/origin/test/push-pr stale (use 'git remote prune' to remove)
Local branches configured for 'git pull':
Bump_regex_crate_version merges with remote Bump_regex_crate_version
Feature/open_commit merges with remote Feature/open_commit
Feature/push_and_open_pr merges with remote Feature/push_and_open_pr
Fix/work_with_gitlab merges with remote Fix/work_with_gitlab
Refactor/str_instead_of_string merges with remote Refactor/str_instead_of_string
main merges with remote main
Local ref configured for 'git push':
main pushes to main (up to date)
"#;
let main_branch = get_main_branch_name(output).unwrap();
assert_eq!(main_branch, "main".to_owned());
}

#[test]
fn test_parse_path_and_line_arg_success() {
let happy_case = "my-proj/src/var/main.rs:90";
Expand Down