Manage the repository state correctly

Author: pvigier

src/renderer/components/commit-list.tsx

@@ -3,13 +3,14 @@ import * as Git from 'nodegit';
 import { CommitItem } from './commit-item';
 import { IndexItem } from './index-item';
 import { InputDialogHandler } from './input-dialog';
-import { RepoWrapper } from '../helpers/repo-wrapper';
+import { RepoWrapper, RepoState } from '../helpers/repo-wrapper';
 import { getBranchColor } from '../helpers/commit-graph';
 
 const ITEM_HEIGHT = 28;
 
 export interface CommitListProps { 
   repo: RepoWrapper;
+  repoState: RepoState;
   selectedCommit: Git.Commit | null;
   onCommitSelect: (commit: Git.Commit) => void;
   onIndexSelect: () => void;
@@ -140,7 +141,7 @@ export class CommitList extends React.PureComponent<CommitListProps, CommitListS
     // Select visible commits and add index if necessary
     const items: JSX.Element[] = [];
     if (this.state.start === -1) {
-      items.push(<IndexItem state={this.props.repo.repo.state()} selected={this.props.selectedCommit === null}
+      items.push(<IndexItem repoState={this.props.repoState} selected={this.props.selectedCommit === null}
         onIndexSelect={this.props.onIndexSelect} 
         key='index' />);
     }

src/renderer/components/graph-viewer.tsx

@@ -5,10 +5,11 @@ import { CommitList } from './commit-list';
 import { Splitter } from './splitter';
 import { ReferenceExplorer } from './reference-explorer'
 import { InputDialogHandler } from './input-dialog';
-import { RepoWrapper } from "../helpers/repo-wrapper";
+import { RepoWrapper, RepoState } from "../helpers/repo-wrapper";
 
 export interface GraphViewerProps { 
   repo: RepoWrapper;
+  repoState: RepoState;
   selectedCommit: Git.Commit | null;
   onCommitSelect: (commit: Git.Commit) => void;
   onIndexSelect: () => void;

src/renderer/components/index-item.tsx

@@ -1,8 +1,9 @@
 import * as React from 'react';
 import * as Git from 'nodegit';
+import { RepoState } from '../helpers/repo-wrapper';
 
 export interface IndexItemProps { 
-  state: number;
+  repoState: RepoState;
   selected: boolean;
   onIndexSelect: () => void;
 }
@@ -20,19 +21,17 @@ export class IndexItem extends React.PureComponent<IndexItemProps, {}> {
   render() {
     //console.log(this.props.state);
     let suffix = ''
-    switch (this.props.state) {
-      case Git.Repository.STATE.CHERRYPICK:
+    switch (this.props.repoState) {
+      case RepoState.Cherrypick:
         suffix = 'cherrypicking'
         break;
-      case Git.Repository.STATE.MERGE:
+      case RepoState.Merge:
         suffix = 'merging';
         break;
-      case Git.Repository.STATE.REBASE:
-      case Git.Repository.STATE.REBASE_INTERACTIVE:
-      case Git.Repository.STATE.REBASE_MERGE:
+      case RepoState.Rebase:
         suffix = 'rebasing';
         break;
-      case Git.Repository.STATE.REVERT:
+      case RepoState.Revert:
         suffix = 'reverting';
         break;
     }

src/renderer/components/index-viewer.tsx

@@ -1,10 +1,11 @@
 import * as React from 'react';
 import * as Git from 'nodegit';
 import { PatchList } from './patch-list';
-import { RepoWrapper, PatchType } from '../helpers/repo-wrapper';
+import { RepoWrapper, PatchType, RepoState } from '../helpers/repo-wrapper';
 
 export interface IndexViewerProps { 
   repo: RepoWrapper;
+  repoState: RepoState;
   selectedPatch: Git.ConvenientPatch | null;
   onPatchSelect: (patch: Git.ConvenientPatch | null, type: PatchType) => void;
 }
@@ -215,7 +216,7 @@ export class IndexViewer extends React.PureComponent<IndexViewerProps, IndexView
   }
 
   getSubmitButton() {
-    if (this.props.repo.repo.isMerging()) {
+    if (this.props.repoState === RepoState.Merge) {
       return (
         <>
           <button className='green-button'
@@ -279,7 +280,7 @@ export class IndexViewer extends React.PureComponent<IndexViewerProps, IndexView
           onSelectedPatchesChange={this.handleSelectedStagedPatchesChange} />
         <div className='section-header'>
           <p>Commit message</p>
-          {this.props.repo.headCommit && !this.props.repo.repo.isMerging() ?
+          {this.props.repo.headCommit && this.props.repoState !== RepoState.Merge ?
           <div className='amend-container'>
             <input type='checkbox' id='amend' name='amend' checked={this.state.amend} onChange={this.handleAmendChange} />
             <label htmlFor='amend'>Amend</label> 

src/renderer/components/repo-dashboard.tsx

@@ -12,7 +12,7 @@ import { Splitter } from './splitter';
 import { Toolbar } from './toolbar';
 import { LoadingScreen, LoadingState } from './loading-screen';
 import { InputDialogHandler } from './input-dialog';
-import { RepoWrapper, PatchType } from '../helpers/repo-wrapper';
+import { RepoWrapper, PatchType, RepoState } from '../helpers/repo-wrapper';
 import { CancellablePromise, makeCancellable } from '../helpers/make-cancellable';
 
 export interface RepoDashboardProps { 
@@ -25,6 +25,7 @@ export interface RepoDashboardProps {
 }
 
 export interface RepoDashboardState { 
+  repoState: RepoState;
   loadingState: LoadingState;
   selectedCommit: Git.Commit | null;
   selectedPatch: Git.ConvenientPatch | null;
@@ -57,6 +58,7 @@ export class RepoDashboard extends React.PureComponent<RepoDashboardProps, RepoD
     this.exitPatchViewer = this.exitPatchViewer.bind(this);
     this.handleRightPanelResize = this.handleRightPanelResize.bind(this);
     this.state = {
+      repoState: this.props.repo.getState(),
       loadingState: LoadingState.NotLoading,
       selectedCommit: null,
       selectedPatch: null,
@@ -188,6 +190,9 @@ export class RepoDashboard extends React.PureComponent<RepoDashboardProps, RepoD
 
   async refreshIndex() {
     if (!this.state.selectedCommit && this.rightViewer.current) {
+      this.setState({
+        repoState: this.props.repo.getState()
+      });
       const indexViewer = this.rightViewer.current as IndexViewer;
       await indexViewer.refresh();
       if (this.state.selectedPatch && this.state.patchType !== PatchType.Committed) {
@@ -233,6 +238,7 @@ export class RepoDashboard extends React.PureComponent<RepoDashboardProps, RepoD
         leftViewer = <LoadingScreen state={this.state.loadingState} />
       } else {
         leftViewer = <GraphViewer repo={this.props.repo} 
+          repoState={this.state.repoState}
           selectedCommit={this.state.selectedCommit} 
           onCommitSelect={this.handleCommitSelect}
           onIndexSelect={this.handleIndexSelect} 
@@ -251,6 +257,7 @@ export class RepoDashboard extends React.PureComponent<RepoDashboardProps, RepoD
         ref={this.rightViewer as React.RefObject<CommitViewer>} />
     } else {
       rightViewer = <IndexViewer repo={this.props.repo} 
+        repoState={this.state.repoState}
         selectedPatch={this.state.selectedPatch} 
         onPatchSelect={this.handlePatchSelect} 
         ref={this.rightViewer as React.RefObject<IndexViewer>} />

src/renderer/helpers/repo-wrapper.ts

@@ -33,6 +33,14 @@ export enum PatchType {
   Committed
 }
 
+export enum RepoState {
+  Cherrypick,
+  Commit,
+  Merge,
+  Rebase,
+  Revert
+}
+
 export class Stash {
   index: number;
   commit: Git.Commit;
@@ -305,6 +313,25 @@ export class RepoWrapper {
     return await Git.Repository.open(path);
   }
 
+  // State
+
+  getState() {
+    switch (this.repo.state()) {
+      case Git.Repository.STATE.CHERRYPICK:
+        return RepoState.Cherrypick;
+      case Git.Repository.STATE.MERGE:
+        return RepoState.Merge;
+      case Git.Repository.STATE.REBASE:
+      case Git.Repository.STATE.REBASE_INTERACTIVE:
+      case Git.Repository.STATE.REBASE_MERGE:
+        return RepoState.Rebase;
+      case Git.Repository.STATE.REVERT:
+        return RepoState.Revert;
+      default:
+        return RepoState.Commit;
+    }
+  }
+
   // Head operations
 
   async checkoutReference(reference: Git.Reference) {