BuzzbeeSCD/openchamber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: make branch updates use latest remote refs

Browse Source 
Fetch remote targets before merge or rebase
Prefer remote branch targets over stale local branches
Fix Update copy and branch search input
This commit is contained in:
Bohdan Triapitsyn
2026-05-06 00:32:55 +03:00
parent 8540f51395
commit 32929d592e
7 changed files with 108 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/ui/src/components/views/GitView.tsx
+52 -30
View File
@@ -1396,6 +1396,12 @@ export const GitView: React.FC = () => {
return 'main';
}, [effectiveRemotes, localBranches, rootBranchHint, worktreeMetadata?.createdFromBranch]);
const updateTargetBranch = React.useMemo(() => {
const remoteNames = effectiveRemotes.map((remote) => remote.name);
const remoteCandidates = remoteNames.map((remote) => `${remote}/${baseBranch}`);
return remoteCandidates.find((candidate) => remoteBranches.includes(candidate)) ?? baseBranch;
}, [baseBranch, effectiveRemotes, remoteBranches]);
const availableIdentities = React.useMemo(() => {
const unique = new Map<string, GitIdentityProfile>();
if (globalIdentity) {
@@ -1762,6 +1768,29 @@ export const GitView: React.FC = () => {
setBranchOperation(null);
}, []);
const resolveIntegrationTarget = React.useCallback((branch: string) => {
const trimmed = branch.trim();
const knownRemoteNames = new Set(effectiveRemotes.map((remote) => remote.name));
const slashIndex = trimmed.indexOf('/');
if (slashIndex > 0) {
const remote = trimmed.slice(0, slashIndex);
const remoteBranch = trimmed.slice(slashIndex + 1);
if (knownRemoteNames.has(remote) && remoteBranch) {
return { branch: trimmed, remote, remoteBranch };
}
}
for (const remote of effectiveRemotes) {
const remoteCandidate = `${remote.name}/${trimmed}`;
if (remoteBranches.includes(remoteCandidate)) {
return { branch: remoteCandidate, remote: remote.name, remoteBranch: trimmed };
}
}
return { branch: trimmed, remote: null, remoteBranch: null };
}, [effectiveRemotes, remoteBranches]);
const handleMerge = React.useCallback(
async (branch: string) => {
if (!currentDirectory) return;
@@ -1770,21 +1799,17 @@ export const GitView: React.FC = () => {
const currentBranch = status?.current;
const knownRemoteNames = new Set(effectiveRemotes.map((r) => r.name));
const target = resolveIntegrationTarget(branch);
try {
// If it's a remote-tracking branch (prefix matches a known remote), fetch latest first
const slashIndex = branch.indexOf('/');
if (slashIndex > 0 && knownRemoteNames.has(branch.substring(0, slashIndex))) {
const remote = branch.substring(0, slashIndex);
const remoteBranch = branch.substring(slashIndex + 1);
addOperationLog(`Fetching ${remote}/${remoteBranch}...`, 'running');
await git.gitFetch(currentDirectory, { remote, branch: remoteBranch });
updateLastLog('done', `Fetched ${remote}/${remoteBranch}`);
if (target.remote && target.remoteBranch) {
addOperationLog(`Fetching ${target.remote}/${target.remoteBranch}...`, 'running');
await git.gitFetch(currentDirectory, { remote: target.remote, branch: target.remoteBranch });
updateLastLog('done', `Fetched ${target.remote}/${target.remoteBranch}`);
}
addOperationLog(`Merging ${branch} into ${currentBranch}...`, 'running');
const result = await git.merge(currentDirectory, { branch });
addOperationLog(`Merging ${target.branch} into ${currentBranch}...`, 'running');
const result = await git.merge(currentDirectory, { branch: target.branch });
if (result.conflict) {
updateLastLog('error', `Merge conflicts detected`);
@@ -1793,7 +1818,7 @@ export const GitView: React.FC = () => {
setConflictDialogOpen(true);
persistConflictState(currentDirectory, result.conflictFiles ?? [], 'merge');
} else {
updateLastLog('done', `Merged ${branch} into ${currentBranch}`);
updateLastLog('done', `Merged ${target.branch} into ${currentBranch}`);
clearConflictState();
addOperationLog('Refreshing repository status...', 'running');
await refreshStatusAndBranches();
@@ -1804,16 +1829,16 @@ export const GitView: React.FC = () => {
if (isUncommittedChangesError(err)) {
updateLastLog('error', 'Uncommitted changes detected');
setStashDialogOperation('merge');
setStashDialogBranch(branch);
setStashDialogBranch(target.branch);
setStashDialogOpen(true);
} else {
const message = err instanceof Error ? err.message : `Failed to merge ${branch}`;
const message = err instanceof Error ? err.message : `Failed to merge ${target.branch}`;
updateLastLog('error', message);
}
}
// Note: branchOperation is cleared when dialog closes via handleOperationComplete
},
[currentDirectory, git, status, effectiveRemotes, refreshStatusAndBranches, refreshLog, isUncommittedChangesError, persistConflictState, clearConflictState, addOperationLog, updateLastLog, resetOperationLogs]
[currentDirectory, git, status, resolveIntegrationTarget, refreshStatusAndBranches, refreshLog, isUncommittedChangesError, persistConflictState, clearConflictState, addOperationLog, updateLastLog, resetOperationLogs]
);
const handleRebase = React.useCallback(
@@ -1824,21 +1849,17 @@ export const GitView: React.FC = () => {
const currentBranch = status?.current;
const knownRemoteNames = new Set(effectiveRemotes.map((r) => r.name));
const target = resolveIntegrationTarget(branch);
try {
// If it's a remote-tracking branch (prefix matches a known remote), fetch latest first
const slashIndex = branch.indexOf('/');
if (slashIndex > 0 && knownRemoteNames.has(branch.substring(0, slashIndex))) {
const remote = branch.substring(0, slashIndex);
const remoteBranch = branch.substring(slashIndex + 1);
addOperationLog(`Fetching ${remote}/${remoteBranch}...`, 'running');
await git.gitFetch(currentDirectory, { remote, branch: remoteBranch });
updateLastLog('done', `Fetched ${remote}/${remoteBranch}`);
if (target.remote && target.remoteBranch) {
addOperationLog(`Fetching ${target.remote}/${target.remoteBranch}...`, 'running');
await git.gitFetch(currentDirectory, { remote: target.remote, branch: target.remoteBranch });
updateLastLog('done', `Fetched ${target.remote}/${target.remoteBranch}`);
}
addOperationLog(`Rebasing ${currentBranch} onto ${branch}...`, 'running');
const result = await git.rebase(currentDirectory, { onto: branch });
addOperationLog(`Rebasing ${currentBranch} onto ${target.branch}...`, 'running');
const result = await git.rebase(currentDirectory, { onto: target.branch });
if (result.conflict) {
updateLastLog('error', `Rebase conflicts detected`);
@@ -1847,7 +1868,7 @@ export const GitView: React.FC = () => {
setConflictDialogOpen(true);
persistConflictState(currentDirectory, result.conflictFiles ?? [], 'rebase');
} else {
updateLastLog('done', `Rebased ${currentBranch} onto ${branch}`);
updateLastLog('done', `Rebased ${currentBranch} onto ${target.branch}`);
clearConflictState();
addOperationLog('Refreshing repository status...', 'running');
await refreshStatusAndBranches();
@@ -1858,16 +1879,16 @@ export const GitView: React.FC = () => {
if (isUncommittedChangesError(err)) {
updateLastLog('error', 'Uncommitted changes detected');
setStashDialogOperation('rebase');
setStashDialogBranch(branch);
setStashDialogBranch(target.branch);
setStashDialogOpen(true);
} else {
const message = err instanceof Error ? err.message : `Failed to rebase onto ${branch}`;
const message = err instanceof Error ? err.message : `Failed to rebase onto ${target.branch}`;
updateLastLog('error', message);
}
}
// Note: branchOperation is cleared when dialog closes via handleOperationComplete
},
[currentDirectory, git, status, effectiveRemotes, refreshStatusAndBranches, refreshLog, isUncommittedChangesError, persistConflictState, clearConflictState, addOperationLog, updateLastLog, resetOperationLogs]
[currentDirectory, git, status, resolveIntegrationTarget, refreshStatusAndBranches, refreshLog, isUncommittedChangesError, persistConflictState, clearConflictState, addOperationLog, updateLastLog, resetOperationLogs]
);
const handleAbortConflict = React.useCallback(async () => {
@@ -2249,6 +2270,7 @@ export const GitView: React.FC = () => {
currentBranch={status?.current}
localBranches={localBranches}
remoteBranches={remoteBranches}
defaultTargetBranch={updateTargetBranch}
onMerge={handleMerge}
onRebase={handleRebase}
disabled={isBusy}
packages/ui/src/components/views/git/BranchIntegrationSection.tsx
+23 -3
View File
@@ -53,6 +53,7 @@ interface BranchIntegrationSectionProps {
operationLogs?: OperationLogEntry[];
onOperationComplete?: () => void;
mode?: 'dialog' | 'inline';
defaultTargetBranch?: string;
}
export const BranchIntegrationSection: React.FC<BranchIntegrationSectionProps> = ({
@@ -66,6 +67,7 @@ export const BranchIntegrationSection: React.FC<BranchIntegrationSectionProps> =
operationLogs = [],
onOperationComplete,
mode = 'dialog',
defaultTargetBranch,
}) => {
const { t } = useI18n();
const [dialogOpen, setDialogOpen] = React.useState(false);
@@ -94,10 +96,15 @@ export const BranchIntegrationSection: React.FC<BranchIntegrationSectionProps> =
// Filter branches based on search
const filteredLocal = React.useMemo(() => {
const term = branchSearch.toLowerCase();
const filtered = localBranches.filter((b) => b !== currentBranch);
const remoteBranchNames = new Set(
remoteBranches
.map((branch) => branch.slice(branch.indexOf('/') + 1))
.filter(Boolean)
);
const filtered = localBranches.filter((branch) => branch !== currentBranch && !remoteBranchNames.has(branch));
if (!term) return filtered;
return filtered.filter((b) => b.toLowerCase().includes(term));
}, [branchSearch, localBranches, currentBranch]);
}, [branchSearch, localBranches, currentBranch, remoteBranches]);
const filteredRemote = React.useMemo(() => {
const term = branchSearch.toLowerCase();
@@ -105,9 +112,16 @@ export const BranchIntegrationSection: React.FC<BranchIntegrationSectionProps> =
return remoteBranches.filter((b) => b.toLowerCase().includes(term));
}, [branchSearch, remoteBranches]);
const resolveDefaultBranch = React.useCallback(() => {
if (!defaultTargetBranch) return null;
if (remoteBranches.includes(defaultTargetBranch)) return defaultTargetBranch;
if (localBranches.includes(defaultTargetBranch)) return defaultTargetBranch;
return null;
}, [defaultTargetBranch, localBranches, remoteBranches]);
const handleOpenDialog = () => {
setDialogOpen(true);
setSelectedBranch(null);
setSelectedBranch(resolveDefaultBranch());
setOperation('merge');
setBranchSearch('');
};
@@ -158,6 +172,11 @@ export const BranchIntegrationSection: React.FC<BranchIntegrationSectionProps> =
}
}, [branchDropdownOpen]);
React.useEffect(() => {
if (mode !== 'inline' || selectedBranch) return;
setSelectedBranch(resolveDefaultBranch());
}, [mode, resolveDefaultBranch, selectedBranch]);
const renderOperating = () => (
<div className="space-y-3">
<div
@@ -306,6 +325,7 @@ export const BranchIntegrationSection: React.FC<BranchIntegrationSectionProps> =
placeholder={t('gitView.branch.searchPlaceholder')}
value={branchSearch}
onValueChange={setBranchSearch}
onKeyDown={(event) => event.stopPropagation()}
/>
<CommandList className="h-full min-h-0" disableHorizontal>
<CommandEmpty>{t('gitView.branch.empty')}</CommandEmpty>