From 097e20723774957f21ac6d1808fcd0a91e8c7630 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Wed, 19 Mar 2025 17:48:14 -0700 Subject: [PATCH] [git-map-branches] Fix coloring of root branch I use `upstream/main` as my default upstream and not `origin/main`. Change-Id: I614b88b2991a915c4477302e5064eaefd3a04ef0 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6372748 Reviewed-by: Gavin Mak Commit-Queue: Sam Clegg --- git_map_branches.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git_map_branches.py b/git_map_branches.py index c310dde738..9ba583322e 100755 --- a/git_map_branches.py +++ b/git_map_branches.py @@ -34,6 +34,7 @@ from git_common import get_git_version, MIN_UPSTREAM_TRACK_GIT_VERSION, hash_one from git_common import get_config, run import gclient_utils +import git_common import setup_color from third_party.colorama import Fore, Style @@ -124,9 +125,11 @@ class BranchMapper(object): self.__current_branch = None self.__current_hash = None self.__tag_set = None + self.__root = None self.__status_info = {} def start(self): + self.__root = git_common.root() self.__branches_info = get_branches_info( include_tracking_status=self.verbosity >= 1) if (self.verbosity >= 2): @@ -199,7 +202,7 @@ class BranchMapper(object): return not parent or parent in self.__gone_branches def __color_for_branch(self, branch, branch_hash): - if branch.startswith('origin/'): + if branch == self.__root or branch.startswith('origin/'): color = Fore.RED elif branch.startswith('branch-heads'): color = Fore.BLUE