Fixes all branches & branch slicing on timeline

Author: eamodio

src/webviews/apps/plus/timeline/timeline.ts

@@ -345,15 +345,14 @@ export class GlTimelineApp extends GlAppHost<State> {
 	}
 
 	private renderConfigHead() {
-		const {
-			head,
-			config: { showAllBranches },
-		} = this;
+		const { head } = this;
+		const disabled = this.config.showAllBranches && this.sliceBy !== 'branch';
+
 		return html`<section>
-			<label for="head" ?disabled=${showAllBranches}>Branch</label>
+			<label for="head" ?disabled=${disabled}>Branch</label>
 			<gl-ref-button
 				name="head"
-				?disabled=${showAllBranches}
+				?disabled=${disabled}
 				icon
 				tooltip="Change Reference"
 				.ref=${head}
@@ -533,9 +532,18 @@ export class GlTimelineApp extends GlAppHost<State> {
 		}
 		if (result?.ref == null) return;
 
+		if (location === 'config') {
+			this._ipc.sendCommand(UpdateScopeCommand, {
+				scope: this.scope!,
+				changes: { head: result.ref, base: this.config.showAllBranches ? null : undefined },
+			});
+
+			return;
+		}
+
 		this._ipc.sendCommand(UpdateScopeCommand, {
 			scope: this.scope!,
-			changes: { head: result.ref, base: location !== 'config' ? null : undefined },
+			changes: { head: result.ref, base: null },
 		});
 		if (this.config.showAllBranches) {
 			this._ipc.sendCommand(UpdateConfigCommand, { changes: { showAllBranches: false } });

src/webviews/plus/timeline/timelineWebview.ts

@@ -692,17 +692,21 @@ export class TimelineWebviewProvider implements WebviewProvider<State, State, Ti
 			return generateRandomTimelineDataset(scope.type);
 		}
 
-		let ref = scope.head?.ref;
-		if (ref) {
-			if (scope.base?.ref != null && scope.base?.ref !== ref) {
-				ref = createRevisionRange(ref, scope.base?.ref, '..');
+		let ref;
+		if (!config.showAllBranches) {
+			ref = scope.head?.ref;
+			if (ref) {
+				if (scope.base?.ref != null && scope.base?.ref !== ref) {
+					ref = createRevisionRange(ref, scope.base?.ref, '..');
+				}
+			} else {
+				ref = scope.base?.ref;
 			}
-		} else {
-			ref = scope.base?.ref;
 		}
 
 		const [contributorsResult, statusFilesResult, currentUserResult] = await Promise.allSettled([
 			repo.git.contributors().getContributors(ref, {
+				all: config.showAllBranches,
 				pathspec: scope.type === 'repo' ? undefined : scope.uri.fsPath,
 				since: getPeriodDate(config.period)?.toISOString(),
 				stats: true,
@@ -745,7 +749,7 @@ export class TimelineWebviewProvider implements WebviewProvider<State, State, Ti
 			}
 		}
 
-		if (config.showAllBranches && config.sliceBy === 'branch' && scope.type !== 'repo') {
+		if (config.showAllBranches && config.sliceBy === 'branch' && scope.type !== 'repo' && !repo.virtual) {
 			const shas = new Set<string>(
 				await repo.git.commits().getLogShas?.('^HEAD', { all: true, pathOrUri: scope.uri, limit: 0 }),
 			);