Use branch operand as source/target for whole branch rather than just branch reference

Author: OliverJAsh

apps/lite/ui/src/operations/operation.ts

@@ -482,12 +482,23 @@ export const moveOperation = ({
 
 	if (branchMoveOperation) return branchMoveOperation;
 
-	const relativeTo: RelativeTo | null = Match.value(target).pipe(
+	const relativeTo: RelativeTo | null = Match.value({ target, side }).pipe(
 		Match.withReturnType<RelativeTo | null>(),
-		Match.tags({
-			Commit: ({ commitId }) => ({ type: "commit", subject: commitId }),
-			Branch: ({ branchRef }) => ({ type: "referenceBytes", subject: branchRef }),
-		}),
+		Match.when({ target: { _tag: "Commit" } }, ({ target }) => ({
+			type: "commit",
+			subject: target.commitId,
+		})),
+		Match.when(
+			{
+				target: { _tag: "Branch" },
+				// We use the branch operand as the source/target for the branch
+				// contents. However, `RelativeTo` is interpreted to mean just the
+				// branch reference rather than the whole branch (reference + contents),
+				// meaning `side: "below"` won't work as expected.
+				side: "above",
+			},
+			({ target }) => ({ type: "referenceBytes", subject: target.branchRef }),
+		),
 		Match.orElse(() => null),
 	);
 

apps/lite/ui/src/routes/project/$id/workspace/OutlinePanel.tsx

@@ -1488,18 +1488,13 @@ const BranchSegment: FC<{
 			aria-label={refName.displayName}
 			expanded
 			className={classes(workspaceItemRowStyles.section, styles.segment)}
+			render={<OperandC projectId={projectId} operand={operand} />}
 		>
-			<OperandC
+			<BranchRow
 				projectId={projectId}
-				operand={operand}
-				render={
-					<BranchRow
-						projectId={projectId}
-						branchName={refName.displayName}
-						branchRef={refName.fullNameBytes}
-						stackId={stackId}
-					/>
-				}
+				branchName={refName.displayName}
+				branchRef={refName.fullNameBytes}
+				stackId={stackId}
 			/>
 
 			{segment.commits.length === 0 ? (