Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-28 12:33:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

use "Incoming" and "Current" everywhere (#158478)

Browse Source 
fixes https://github.com/microsoft/vscode/issues/156229
This commit is contained in:
Johannes Rieken
2022-08-18 14:21:06 +02:00
committed by GitHub
parent db560ba214
commit c592ef8e18
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/git/src/commands.ts
View File

@@ -422,8 +422,8 @@ export class CommandCenter {
type InputData = { uri: Uri; title?: string; detail?: string; description?: string };
const mergeUris = toMergeUris(uri);
const ours: InputData = { uri: mergeUris.ours, title: localize('Yours', 'Yours') };
const theirs: InputData = { uri: mergeUris.theirs, title: localize('Theirs', 'Theirs') };
const current: InputData = { uri: mergeUris.ours, title: localize('Current', 'Current') };
const incoming: InputData = { uri: mergeUris.theirs, title: localize('Incoming', 'Incoming') };
try {
const [head, rebaseOrMergeHead] = await Promise.all([
@@ -431,12 +431,12 @@ export class CommandCenter {
isRebasing ? repo.getCommit('REBASE_HEAD') : repo.getCommit('MERGE_HEAD')
]);
// ours (current branch and commit)
ours.detail = head.refNames.map(s => s.replace(/^HEAD ->/, '')).join(', ');
ours.description = '$(git-commit) ' + head.hash.substring(0, 7);
current.detail = head.refNames.map(s => s.replace(/^HEAD ->/, '')).join(', ');
current.description = '$(git-commit) ' + head.hash.substring(0, 7);
// theirs
theirs.detail = rebaseOrMergeHead.refNames.join(', ');
theirs.description = '$(git-commit) ' + rebaseOrMergeHead.hash.substring(0, 7);
incoming.detail = rebaseOrMergeHead.refNames.join(', ');
incoming.description = '$(git-commit) ' + rebaseOrMergeHead.hash.substring(0, 7);
} catch (error) {
// not so bad, can continue with just uris
@@ -446,8 +446,8 @@ export class CommandCenter {
const options = {
base: mergeUris.base,
input1: isRebasing ? ours : theirs,
input2: isRebasing ? theirs : ours,
input1: isRebasing ? current : incoming,
input2: isRebasing ? incoming : current,
output: uri
};