From 1fd6a3679335fb32f6cb0e9e66353cee76417c68 Mon Sep 17 00:00:00 2001
From: Pierre Vigier <pierre.vigier@ymail.com>
Date: Wed, 13 Mar 2019 14:36:53 +0100
Subject: [PATCH] Display the merge message in index viewer

---
 src/renderer/components/index-viewer.tsx | 15 ++++++++++++++-
 src/renderer/helpers/repo-wrapper.ts     | 12 ++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/index-viewer.tsx b/src/renderer/components/index-viewer.tsx
index 5a60922..2797e30 100644
--- 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
index 7e0988b..322fae0 100644
--- 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();