Use native git api to get local branches (Also fixes #572 and #601) (#600)

* execute git show with config "core.quotePath=false" for file listings (#572)
* Use native "getBranches" from gite RepositoryState
* Wrap long commit message #601
* hide the Git View (chooser) command from command palette

Author: ole

browser/src/components/LogView/Commit/index.tsx

@@ -110,40 +110,44 @@ class Commit extends React.Component<CommitProps, CommitState> {
             >
                 <div id="detail-view">
                     <div className="authorAndCommitInfoContainer">
-                        <Avatar result={this.props.selectedEntry.author}></Avatar>
-                        <h1 className="commit-subject">
-                            {gitmojify(this.props.selectedEntry.subject)}
-                            &nbsp;
-                            <CopyToClipboard
-                                text={this.props.selectedEntry.subject + '\n' + this.props.selectedEntry.body}
-                            >
-                                <span
-                                    className="btnx clipboard hint--right hint--rounded hint--bounce"
-                                    aria-label="Copy commit text"
+                        <div style={{ minWidth: '80px' }}>
+                            <Avatar result={this.props.selectedEntry.author}></Avatar>
+                        </div>
+                        <div style={{ flexGrow: 1 }}>
+                            <h1 className="commit-subject">
+                                {gitmojify(this.props.selectedEntry.subject)}
+                                &nbsp;
+                                <CopyToClipboard
+                                    text={this.props.selectedEntry.subject + '\n' + this.props.selectedEntry.body}
                                 >
-                                    <GoClippy></GoClippy>
-                                </span>
-                            </CopyToClipboard>
-                        </h1>
-                        <Author result={this.props.selectedEntry.author}></Author>
-                        <div className="commit-body">{gitmojify(this.props.selectedEntry.body)}</div>
-                        <div className="commit-notes">{gitmojify(this.props.selectedEntry.notes)}</div>
-                    </div>
-                    <div className="actions">
-                        <input
-                            ref={x => {
-                                this.ref = x;
-                            }}
-                            className={'textInput'}
-                            type="text"
-                            value={this.state.searchText}
-                            placeholder="Find file"
-                            onKeyDown={this.handleKeyDown}
-                            onChange={this.handleSearchChange}
-                        />
-                        <a role="button" className="action-btn close-btn" onClick={this.onClose}>
-                            <GoX></GoX>
-                        </a>
+                                    <span
+                                        className="btnx clipboard hint--right hint--rounded hint--bounce"
+                                        aria-label="Copy commit text"
+                                    >
+                                        <GoClippy></GoClippy>
+                                    </span>
+                                </CopyToClipboard>
+                            </h1>
+                            <Author result={this.props.selectedEntry.author}></Author>
+                            <div className="commit-body">{gitmojify(this.props.selectedEntry.body)}</div>
+                            <div className="commit-notes">{gitmojify(this.props.selectedEntry.notes)}</div>
+                        </div>
+                        <div className="actions">
+                            <input
+                                ref={x => {
+                                    this.ref = x;
+                                }}
+                                className={'textInput'}
+                                type="text"
+                                value={this.state.searchText}
+                                placeholder="Find file"
+                                onKeyDown={this.handleKeyDown}
+                                onChange={this.handleSearchChange}
+                            />
+                            <a role="button" className="action-btn close-btn" onClick={this.onClose}>
+                                <GoX></GoX>
+                            </a>
+                        </div>
                     </div>
                     <div className="comitted-files">{this.renderFileEntries()}</div>
                 </div>

browser/src/main.css

@@ -416,7 +416,7 @@ div.details-view-cnt .commit-subject {
 div.details-view-cnt .commit-body,
 div.details-view-cnt .commit-notes {
 	margin: 1em 0;
-	white-space: pre;
+	/*white-space: pre;*/
 }
 
 div.details-view-cnt .commit-body:empty,
@@ -433,7 +433,9 @@ div.details-view-cnt .commit-notes:empty {
 }
 
 #detail-view .authorAndCommitInfoContainer {
-    flex: 1 1;
+	flex: 1 1;
+	display: flex;
+	justify-content: space-between;
 }
 #detail-view .authorAndCommitInfoContainer img.avatar {
     height:80px;
@@ -457,12 +459,7 @@ div.details-view-cnt .commit-notes:empty {
 }
 
 #detail-view div.actions {
-	position: sticky;
-	top: 0px;
-	align-self: flex-start;
 	white-space: nowrap;
-	flex: 0 1;
-	text-align: right;
 }
 
 #detail-view .comitted-files {

package.json

@@ -194,6 +194,10 @@
                 {
                     "command": "git.commit.compare.view.show",
                     "when": "!git.commit.compare.view.show"
+                },
+                {
+                    "command": "git.viewChooser",
+                    "when": "false"
                 }
             ],
             "editor/title": [

src/adapter/repository/git.d.ts

@@ -3,7 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken, Event, SourceControlInputBox, Uri } from 'vscode';
+import { Uri, Event, Disposable, ProviderResult } from 'vscode';
+export { ProviderResult } from 'vscode';
 
 export interface Git {
     readonly path: string;
@@ -41,7 +42,10 @@ export interface Commit {
     readonly hash: string;
     readonly message: string;
     readonly parents: string[];
-    readonly authorEmail?: string | undefined;
+    readonly authorDate?: Date;
+    readonly authorName?: string;
+    readonly authorEmail?: string;
+    readonly commitDate?: Date;
 }
 
 export interface Submodule {
@@ -110,9 +114,29 @@ export interface RepositoryUIState {
     readonly onDidChange: Event<void>;
 }
 
+/**
+ * Log options.
+ */
 export interface LogOptions {
-    // Max number of log entries to retrieve. If not specified, the default is 32.
+    /** Max number of log entries to retrieve. If not specified, the default is 32. */
     readonly maxEntries?: number;
+    readonly path?: string;
+}
+
+export interface CommitOptions {
+    all?: boolean | 'tracked';
+    amend?: boolean;
+    signoff?: boolean;
+    signCommit?: boolean;
+    empty?: boolean;
+    noVerify?: boolean;
+}
+
+export interface BranchQuery {
+    readonly remote?: boolean;
+    readonly pattern?: string;
+    readonly count?: number;
+    readonly contains?: string;
 }
 
 export interface Repository {
@@ -153,6 +177,7 @@ export interface Repository {
     createBranch(name: string, checkout: boolean, ref?: string): Promise<void>;
     deleteBranch(name: string, force?: boolean): Promise<void>;
     getBranch(name: string): Promise<Branch>;
+    getBranches(query: BranchQuery): Promise<Ref[]>;
     setBranchUpstream(name: string, upstream: string): Promise<void>;
 
     getMergeBase(ref1: string, ref2: string): Promise<string>;
@@ -162,13 +187,48 @@ export interface Repository {
 
     addRemote(name: string, url: string): Promise<void>;
     removeRemote(name: string): Promise<void>;
+    renameRemote(name: string, newName: string): Promise<void>;
 
     fetch(remote?: string, ref?: string, depth?: number): Promise<void>;
     pull(unshallow?: boolean): Promise<void>;
     push(remoteName?: string, branchName?: string, setUpstream?: boolean): Promise<void>;
 
     blame(path: string): Promise<string>;
     log(options?: LogOptions): Promise<Commit[]>;
+
+    commit(message: string, opts?: CommitOptions): Promise<void>;
+}
+
+export interface RemoteSource {
+    readonly name: string;
+    readonly description?: string;
+    readonly url: string | string[];
+}
+
+export interface RemoteSourceProvider {
+    readonly name: string;
+    readonly icon?: string; // codicon name
+    readonly supportsQuery?: boolean;
+    getRemoteSources(query?: string): ProviderResult<RemoteSource[]>;
+    publishRepository?(repository: Repository): Promise<void>;
+}
+
+export interface Credentials {
+    readonly username: string;
+    readonly password: string;
+}
+
+export interface CredentialsProvider {
+    getCredentials(host: Uri): ProviderResult<Credentials>;
+}
+
+export interface PushErrorHandler {
+    handlePushError(
+        repository: Repository,
+        remote: Remote,
+        refspec: string,
+        error: Error & { gitErrorCode: GitErrorCodes },
+    ): Promise<boolean>;
 }
 
 export type APIState = 'uninitialized' | 'initialized';
@@ -180,6 +240,14 @@ export interface API {
     readonly repositories: Repository[];
     readonly onDidOpenRepository: Event<Repository>;
     readonly onDidCloseRepository: Event<Repository>;
+
+    toGitUri(uri: Uri, ref: string): Uri;
+    getRepository(uri: Uri): Repository | null;
+    init(root: Uri): Promise<Repository | null>;
+
+    registerRemoteSourceProvider(provider: RemoteSourceProvider): Disposable;
+    registerCredentialsProvider(provider: CredentialsProvider): Disposable;
+    registerPushErrorHandler(handler: PushErrorHandler): Disposable;
 }
 
 export interface GitExtension {
@@ -216,6 +284,7 @@ export const enum GitErrorCodes {
     CantOpenResource = 'CantOpenResource',
     GitNotFound = 'GitNotFound',
     CantCreatePipe = 'CantCreatePipe',
+    PermissionDenied = 'PermissionDenied',
     CantAccessRemote = 'CantAccessRemote',
     RepositoryNotFound = 'RepositoryNotFound',
     RepositoryIsLocked = 'RepositoryIsLocked',

src/adapter/repository/git.ts

@@ -13,14 +13,12 @@ import { ITEM_ENTRY_SEPARATOR, LOG_ENTRY_SEPARATOR, LOG_FORMAT_ARGS } from './co
 import { Repository, RefType } from './git.d';
 import { GitOriginType } from './index';
 import { IGitArgsService } from './types';
-import { GitBranchesService } from './gitBranchService';
 import { GitRemoteService } from './gitRemoteService';
 import { captureTelemetry } from '../../common/telemetry';
 
 @injectable()
 export class Git implements IGitService {
     private refHashesMap: Map<string, string> = new Map<string, string>();
-    private readonly branchesService: GitBranchesService;
     private readonly remotesService: GitRemoteService;
     constructor(
         private repo: Repository,
@@ -30,7 +28,6 @@ export class Git implements IGitService {
         @inject(IGitArgsService) private gitArgsService: IGitArgsService,
     ) {
         this.remotesService = new GitRemoteService(repo, this.gitCmdExecutor);
-        this.branchesService = new GitBranchesService(repo, this.remotesService);
     }
 
     /**
@@ -63,9 +60,36 @@ export class Git implements IGitService {
     }
 
     @captureTelemetry()
-    public async getBranches(): Promise<Branch[]> {
-        return this.branchesService.getBranches();
+    public async getBranches(withRemote = false): Promise<Branch[]> {
+        const gitRoot = this.getGitRoot();
+
+        // get only the local branches
+        const branches = await this.repo.getBranches({ remote: withRemote });
+
+        return Promise.all(
+            branches.map(async r => {
+                let remoteUrl: string | undefined = undefined;
+
+                // fetch the remote from local branch using upstreamRef (received only with getBranch)
+                const remoteName = (await this.repo.getBranch(r.name || 'master')).upstream?.remote;
+
+                if (remoteName) {
+                    remoteUrl = this.repo.state.remotes.find(x => x.name === remoteName)?.fetchUrl;
+                }
+
+                const originType = await this.remotesService.getOriginType(remoteUrl);
+
+                return {
+                    gitRoot: gitRoot,
+                    name: r.name,
+                    remote: remoteUrl,
+                    remoteType: originType,
+                    current: this.getCurrentBranch() === r.name,
+                } as Branch;
+            }),
+        );
     }
+
     public getCurrentBranch(): string {
         return this.repo.state.HEAD!.name || '';
     }

src/adapter/repository/gitArgsService.ts

@@ -16,13 +16,13 @@ export class GitArgsService implements IGitArgsService {
         return ['show', '--numstat', '--format=', '-M', hash];
     }
     public getCommitNameStatusArgs(hash: string): string[] {
-        return ['show', '--name-status', '--format=', '-M', hash];
+        return ['-c', 'core.quotePath=false', 'show', '--name-status', '--format=', '-M', hash];
     }
     public getCommitWithNumStatArgsForMerge(hash: string) {
-        return ['show', '--numstat', '--format=', '-M', '--first-parent', hash];
+        return ['-c', 'core.quotePath=false', 'show', '--numstat', '--format=', '-M', '--first-parent', hash];
     }
     public getCommitNameStatusArgsForMerge(hash: string): string[] {
-        return ['show', '--name-status', '--format=', '-M', '--first-parent', hash];
+        return ['-c', 'core.quotePath=false', 'show', '--name-status', '--format=', '-M', '--first-parent', hash];
     }
     public getObjectHashArgs(object: string): string[] {
         return ['show', `--format=${Helpers.GetCommitInfoFormatCode(CommitInfo.FullHash)}`, '--shortstat', object];