소스 검색

Uses compare with vs compare to

main
Eric Amodio 6 년 전
부모
커밋
2d583c83d1
4개의 변경된 파일9개의 추가작업 그리고 9개의 파일을 삭제
  1. +3
    -3
      src/commands/diffBranchWithBranch.ts
  2. +1
    -1
      src/commands/diffDirectory.ts
  3. +2
    -2
      src/views/nodes/compareNode.ts
  4. +3
    -3
      src/views/nodes/comparePickerNode.ts

+ 3
- 3
src/commands/diffBranchWithBranch.ts 파일 보기

@ -56,13 +56,13 @@ export class DiffBranchWithBranchCommand extends ActiveEditorCommand {
let placeHolder;
switch (args.ref2) {
case '':
placeHolder = `Compare Working Tree to${GlyphChars.Ellipsis}`;
placeHolder = `Compare Working Tree with${GlyphChars.Ellipsis}`;
break;
case 'HEAD':
placeHolder = `Compare HEAD to${GlyphChars.Ellipsis}`;
placeHolder = `Compare HEAD with${GlyphChars.Ellipsis}`;
break;
default:
placeHolder = `Compare ${args.ref2} to${GlyphChars.Ellipsis}`;
placeHolder = `Compare ${args.ref2} with${GlyphChars.Ellipsis}`;
break;
}

+ 1
- 1
src/commands/diffDirectory.ts 파일 보기

@ -62,7 +62,7 @@ export class DiffDirectoryCommand extends ActiveEditorCommand {
args = { ...args };
const pick = await new BranchesAndTagsQuickPick(repoPath).show(
`Compare Working Tree to${GlyphChars.Ellipsis}`
`Compare Working Tree with${GlyphChars.Ellipsis}`
);
if (pick === undefined) return undefined;

+ 2
- 2
src/views/nodes/compareNode.ts 파일 보기

@ -124,7 +124,7 @@ export class CompareNode extends ViewNode {
if (ref === undefined) {
const pick = await new BranchesAndTagsQuickPick(repoPath).show(
`Compare ${this.getRefName(this._selectedRef.ref)} to${GlyphChars.Ellipsis}`
`Compare ${this.getRefName(this._selectedRef.ref)} with${GlyphChars.Ellipsis}`
);
if (pick === undefined || pick instanceof CommandQuickPickItem) return;
@ -143,7 +143,7 @@ export class CompareNode extends ViewNode {
if (repoPath === undefined) {
repoPath = await getRepoPathOrPrompt(
undefined,
`Select branch or tag in which repository${GlyphChars.Ellipsis}`
`Select branch or tag for compare in which repository${GlyphChars.Ellipsis}`
);
}
if (repoPath === undefined) return;

+ 3
- 3
src/views/nodes/comparePickerNode.ts 파일 보기

@ -34,7 +34,7 @@ export class ComparePickerNode extends ViewNode {
let item;
if (selectedRef === undefined) {
item = new TreeItem(
`Compare <branch, tag, or ref> to <branch, tag, or ref>${repository}`,
`Compare <branch, tag, or ref> with <branch, tag, or ref>${repository}`,
TreeItemCollapsibleState.None
);
item.contextValue = ResourceType.ComparePicker;
@ -46,11 +46,11 @@ export class ComparePickerNode extends ViewNode {
}
else {
item = new TreeItem(
`Compare ${selectedRef.label} to <branch, tag, or ref>${repository}`,
`Compare ${selectedRef.label} with <branch, tag, or ref>${repository}`,
TreeItemCollapsibleState.None
);
item.contextValue = ResourceType.ComparePickerWithRef;
item.tooltip = `Click to compare ${selectedRef.label} to${GlyphChars.Ellipsis}`;
item.tooltip = `Click to compare ${selectedRef.label} with${GlyphChars.Ellipsis}`;
item.command = {
title: `Compare ${selectedRef.label} with${GlyphChars.Ellipsis}`,
command: this.view.getQualifiedCommand('compareWithSelected')

불러오는 중...
취소
저장