Display the merge message in index viewer

pvigier · Mar 13, 2019 · 1fd6a36 · 1fd6a36
1 parent 45df59c
commit 1fd6a36
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/src/renderer/components/index-viewer.tsx b/src/renderer/components/index-viewer.tsx
@@ -48,8 +48,21 @@ export class IndexViewer extends React.PureComponent<IndexViewerProps, IndexView
     this.handleSubmit = this.handleSubmit.bind(this);
   }
 
-  componentDidMount() {
+  async componentDidMount() {
     this.getPatches();
+    if (this.props.repoState === RepoState.Merge) {
+      this.setState({
+        summary: await this.props.repo.getMergeMessage()
+      });
+    }
+  }
+
+  async componentDidUpdate(prevProps: IndexViewerProps) {
+    if (prevProps.repoState !== this.props.repoState) {
+      this.setState({
+        summary: this.props.repoState === RepoState.Merge ? await this.props.repo.getMergeMessage() : ''
+      });
+    } 
   }
 
   handleUnstagedPatchSelect(patch: Git.ConvenientPatch) {

diff --git a/src/renderer/helpers/repo-wrapper.ts b/src/renderer/helpers/repo-wrapper.ts
@@ -563,6 +563,18 @@ export class RepoWrapper {
     }
   }
 
+  async getMergeMessage() {
+    return new Promise<string>((resolve, reject) => {
+      fs.readFile(Path.join(this.path, 'MERGE_MSG'), (error, data) => {
+        if (!error) {
+          resolve(data.toString().split('\n')[0]);
+        } else {
+          reject(error);
+        }
+      });
+    });
+  }
+
   async finishMerge(message: string) {
     try {
       const author = this.getSignature();