Group local branch tip with its remotes into one bubble

if they are on the same commit. Only if it's safe to do so, i.e. there are no tags or stashes with the same name. Two remotes without the local one also won't be grouped. Grouping can be deactivated by setting `{ "git-log--graph.group-branch-remotes": false }`

README.md

@@ -126,6 +126,11 @@ Please consider opening an issue or PR if you think a certain action or option w
             "As a view in the Source Control side nav section. You will also be able to drag it to any other place in the interface."
         ]
     },
+    "git-log--graph.group-branch-remotes": {
+        "description": "If active, branches and their origins will be merged into a single branch-tip bubble, but only if there is no ambiguity.",
+        "type": "boolean",
+        "default": true
+    },
     "git-log--graph.hide-quick-branch-tips": {
         "description": "If active, the area at the top with the dotted branch lines and git status will not be shown anymore.",
         "type": "boolean",

package.json

@@ -98,6 +98,11 @@
 						"As a view in the Source Control side nav section. You will also be able to drag it to any other place in the interface."
 					]
 				},
+				"git-log--graph.group-branch-remotes": {
+					"description": "If active, branches and their origins will be merged into a single branch-tip bubble, but only if there is no ambiguity.",
+					"type": "boolean",
+					"default": true
+				},
 				"git-log--graph.details-panel-position": {
 					"description": "Decide where the commit details should appear when you click a row in the main view.",
 					"type": "string",

src/global.d.ts

@@ -32,6 +32,8 @@ interface GitRef {
 interface Branch extends GitRef {
 	type: "branch"
 	remote_name?: string
+	/** For display of multiple remotes inside one Ref */
+	remote_names_group?: string[]
 	tracking_remote_name?: string
 	inferred?: boolean
 }

web/src/views/CommitRefTips.vue

@@ -0,0 +1,52 @@
+<template>
+	<div class="commit-ref-tips row align-center">
+		<ref-tip v-for="ref of refs" :key="ref.id" :commit="commit" :git_ref="ref" />
+	</div>
+</template>
+<script setup>
+import { computed } from 'vue'
+import { config } from '../state/store'
+
+let props = defineProps({
+	commit: {
+		required: true,
+		/** @type {Vue.PropType<Commit>} */
+		type: Object,
+	},
+})
+
+function group_same_name_branches_into_one(/** @type {Branch[]} */ branches) {
+	return {
+		...branches[0],
+		remote_name: undefined,
+		id: branches[0].name,
+		remote_names_group: branches
+			.map(ref => ref.remote_name)
+			.filter(is_truthy),
+	}
+}
+
+let refs = computed(() => {
+	if (config.value['group-branch-remotes'] === false)
+		return props.commit.refs
+	return Object.values(props.commit.refs.reduce((/** @type {Record<string, GitRef[]>} */ all, ref) => {
+		all[ref.name] ||= []
+		all[ref.name].push(ref)
+		return all
+	}, {}))
+		.map(name_group => {
+			let as_branches = name_group.filter(is_branch)
+			let is_all_branches = as_branches.length === name_group.length
+			let has_local_branch_tip = as_branches.some(branch => ! branch.remote_name)
+			if (as_branches.length > 1 && is_all_branches && has_local_branch_tip)
+				return group_same_name_branches_into_one(as_branches)
+			return name_group
+		}).flat()
+})
+</script>
+<style scoped>
+.commit-ref-tips {
+	line-height: 1em;
+	z-index: 1;
+}
+</style>

web/src/views/CommitRow.vue

@@ -1,14 +1,12 @@
 <template>
-	<div :class="{merge:commit.merge}" class="commit row">
+	<div :class="{merge:commit.merge}" class="commit-row commit row">
 		<SVGVisualization :commit="commit" :height="calculated_height" :style="vis_style" class="vis" />
 		<div v-if="commit.hash" class="info flex-1 row gap-20">
 			<div class="subject-wrapper flex-1 row align-center">
 				<div :style="commit.branch? {color:commit.branch.color} : undefined" class="vis-ascii-circle vis-resize-handle" @mousedown="vis_resize_handle_mousedown">
 					●&nbsp;
 				</div>
-				<div class="refs row align-center">
-					<ref-tip v-for="ref of commit.refs" :key="ref.id" :commit="commit" :git_ref="ref" />
-				</div>
+				<commit-ref-tips :commit="commit" />
 				<div class="subject">
 					&nbsp;{{ commit.subject }}
 				</div>
@@ -102,10 +100,6 @@ let calculated_height = computed(() =>
 .info > .subject-wrapper > .vis-resize-handle {
 	cursor: col-resize;
 }
-.info > .subject-wrapper > .refs {
-	line-height: 1em;
-	z-index: 1;
-}
 .info > .datetime,
 .info > .author {
 	color: #808080;

web/src/views/RefTip.vue

@@ -1,6 +1,9 @@
 <template>
 	<div v-context-menu="context_menu_provider" v-drag="drag" v-drop="drop" class="ref-tip" v-bind="bind">
 		{{ git_ref.id }}
+		<template v-if="branch?.remote_names_group">
+			<span v-for="remote_name of branch.remote_names_group" :key="remote_name" class="remote-name-group-entry"> + {{ remote_name }}</span>
+		</template>
 	</div>
 </template>
 <script setup>
@@ -116,4 +119,7 @@ let context_menu_provider = computed(() => () => {
 	background: #fff !important;
 	color: #f00 !important;
 }
+.remote-name-group-entry {
+	color: #fff;
+}
 </style>