Improve naming

Author: fcollonval

src/components/BranchHeader.tsx

@@ -28,7 +28,7 @@ export interface IBranchHeaderProps {
   model: IGitExtension;
   currentBranch: string;
   upstreamBranch: string;
-  stagedFiles: Git.IGitStatusFileResult[];
+  stagedFiles: Git.IStatusFileResult[];
   data: Git.IBranch[];
   refresh: () => Promise<void>;
   disabled: boolean;
@@ -50,12 +50,15 @@ export class BranchHeader extends React.Component<
 
   /** Switch current working branch */
   async switchBranch(branchName: string) {
-    await this.props.model.checkout(true, false, branchName, false, null);
+    await this.props.model.checkout({ branchname: branchName });
     this.toggleSelect();
   }
 
   createNewBranch = async (branchName: string) => {
-    await this.props.model.checkout(true, true, branchName, false, null);
+    await this.props.model.checkout({
+      newBranch: true,
+      branchname: branchName
+    });
     this.toggleNewBranchBox();
   };
 

src/components/FileItem.tsx

@@ -37,7 +37,7 @@ import { openDiffView } from './diff/DiffWidget';
 import { ISpecialRef } from './diff/model';
 
 export interface IFileItemProps {
-  file: Git.IGitStatusFileResult;
+  file: Git.IStatusFileResult;
   stage: string;
   model: GitExtension;
   moveFile: (file: string) => Promise<void>;

src/components/FileList.tsx

@@ -51,9 +51,9 @@ export interface IFileListState {
 }
 
 export interface IFileListProps {
-  stagedFiles: Git.IGitStatusFileResult[];
-  unstagedFiles: Git.IGitStatusFileResult[];
-  untrackedFiles: Git.IGitStatusFileResult[];
+  stagedFiles: Git.IStatusFileResult[];
+  unstagedFiles: Git.IStatusFileResult[];
+  untrackedFiles: Git.IStatusFileResult[];
   model: GitExtension;
   renderMime: IRenderMimeRegistry;
 }
@@ -302,23 +302,23 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
 
   /** Reset all staged files */
   resetAllStagedFiles = async () => {
-    await this.props.model.reset(true, null);
+    await this.props.model.reset();
   };
 
   /** Reset a specific staged file */
   resetStagedFile = async (file: string) => {
-    await this.props.model.reset(false, file);
+    await this.props.model.reset(file);
   };
 
   /** Add all unstaged files */
   addAllUnstagedFiles = async () => {
-    await this.props.model.add(true, null);
+    await this.props.model.add();
   };
 
   /** Discard changes in all unstaged files */
   discardAllUnstagedFiles = async () => {
     try {
-      await this.props.model.checkout(false, false, null, true, null);
+      await this.props.model.checkout();
     } catch (reason) {
       showErrorMessage('Discard all changes failed.', reason, [
         Dialog.warnButton({ label: 'DISMISS' })
@@ -328,13 +328,13 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
 
   /** Add a specific unstaged file */
   addUnstagedFile = async (file: string) => {
-    await this.props.model.add(false, file);
+    await this.props.model.add(file);
   };
 
   /** Discard changes in a specific unstaged file */
   discardUnstagedFile = async (file: string) => {
     try {
-      await this.props.model.checkout(false, false, null, false, file);
+      await this.props.model.checkout({ filename: file });
     } catch (reason) {
       showErrorMessage(`Discard changes for ${file} failed.`, reason, [
         Dialog.warnButton({ label: 'DISMISS' })
@@ -349,7 +349,7 @@ export class FileList extends React.Component<IFileListProps, IFileListState> {
 
   /** Add a specific untracked file */
   addUntrackedFile = async (file: string) => {
-    await this.props.model.add(false, file);
+    await this.props.model.add(file);
   };
 
   disableStagesForDiscardAll = () => {

src/components/GitPanel.tsx

@@ -23,9 +23,9 @@ export interface IGitSessionNodeState {
 
   pastCommits: Git.ISingleCommitInfo[];
 
-  stagedFiles: Git.IGitStatusFileResult[];
-  unstagedFiles: Git.IGitStatusFileResult[];
-  untrackedFiles: Git.IGitStatusFileResult[];
+  stagedFiles: Git.IStatusFileResult[];
+  unstagedFiles: Git.IStatusFileResult[];
+  untrackedFiles: Git.IStatusFileResult[];
   hasChangedFiles: boolean;
 
   isHistoryVisible: boolean;
@@ -124,9 +124,9 @@ export class GitPanel extends React.Component<
   setStatus = () => {
     if (this.props.model.pathRepository !== null) {
       // Get git status for current branch
-      let stagedFiles = new Array<Git.IGitStatusFileResult>();
-      let unstagedFiles = new Array<Git.IGitStatusFileResult>();
-      let untrackedFiles = new Array<Git.IGitStatusFileResult>();
+      let stagedFiles = new Array<Git.IStatusFileResult>();
+      let unstagedFiles = new Array<Git.IStatusFileResult>();
+      let untrackedFiles = new Array<Git.IStatusFileResult>();
       let changedFiles = 0;
       let statusFiles = this.props.model.status;
       if (statusFiles.length > 0) {

src/components/GitStage.tsx

@@ -19,7 +19,7 @@ import { FileItem } from './FileItem';
 
 export interface IGitStageProps {
   heading: string;
-  files: Git.IGitStatusFileResult[];
+  files: Git.IStatusFileResult[];
   model: GitExtension;
   showFiles: boolean;
   displayFiles: () => void;
@@ -143,7 +143,7 @@ export class GitStage extends React.Component<IGitStageProps, IGitStageState> {
         {this.props.showFiles && (
           <ul className={sectionFileContainerStyle}>
             {this.props.files.map(
-              (file: Git.IGitStatusFileResult, fileIndex: number) => {
+              (file: Git.IStatusFileResult, fileIndex: number) => {
                 return (
                   <FileItem
                     key={fileIndex}