git: add constant for pseudo remote name "git"

martinvonz · Aug 29, 2023 · 0e26ef7 · 0e26ef7
1 parent f47da04
commit 0e26ef7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/cli/src/commands/branch.rs b/cli/src/commands/branch.rs
@@ -407,7 +407,10 @@ fn cmd_branch_list(
 
     for (name, branch_target) in all_branches {
         let found_non_git_remote = {
-            let pseudo_remote_count = branch_target.remote_targets.contains_key("git") as usize;
+            let pseudo_remote_count = branch_target
+                .remote_targets
+                .contains_key(git::REMOTE_NAME_FOR_LOCAL_GIT_REPO)
+                as usize;
             branch_target.remote_targets.len() - pseudo_remote_count > 0
         };
 

diff --git a/lib/src/git.rs b/lib/src/git.rs
@@ -33,6 +33,9 @@ use crate::revset;
 use crate::settings::GitSettings;
 use crate::view::{RefName, View};
 
+/// Reserved remote name for the backing Git repo.
+pub const REMOTE_NAME_FOR_LOCAL_GIT_REPO: &str = "git";
+
 #[derive(Error, Debug)]
 pub enum GitImportError {
     #[error("Failed to read Git HEAD target commit {id}: {err}", id=id.hex())]
@@ -136,15 +139,19 @@ pub fn build_unified_branches_map(view: &View) -> (BTreeMap<String, BranchTarget
     let mut bad_branch_names = Vec::new();
     for (branch_name, git_tracking_target) in local_branch_git_tracking_refs(view) {
         let branch_target = all_branches.entry(branch_name.to_owned()).or_default();
-        if branch_target.remote_targets.contains_key("git") {
+        if branch_target
+            .remote_targets
+            .contains_key(REMOTE_NAME_FOR_LOCAL_GIT_REPO)
+        {
             // TODO(#1690): There should be a mechanism to prevent importing a
             // remote named "git" in `jj git import`.
             bad_branch_names.push(branch_name.to_owned());
         } else {
             // TODO: `BTreeMap::try_insert` could be used here once that's stabilized.
-            branch_target
-                .remote_targets
-                .insert("git".to_owned(), git_tracking_target.clone());
+            branch_target.remote_targets.insert(
+                REMOTE_NAME_FOR_LOCAL_GIT_REPO.to_owned(),
+                git_tracking_target.clone(),
+            );
         }
     }
     (all_branches, bad_branch_names)

diff --git a/lib/src/revset.rs b/lib/src/revset.rs
@@ -1890,7 +1890,7 @@ fn resolve_remote_branch(repo: &dyn Repo, name: &str, remote: &str) -> Option<Ve
         return Some(target.added_ids().cloned().collect());
     }
     // A remote with name "git" will shadow local-git tracking branches
-    if remote == "git" {
+    if remote == git::REMOTE_NAME_FOR_LOCAL_GIT_REPO {
         let target = match name {
             "HEAD" => view.git_head(),
             _ => get_local_git_tracking_branch(view, name),