ScmAmendComponent fixes

Signed-off-by: Nigel Westbury <nigelipse@miegel.org>
eclipse-theia · May 21, 2019 · 3bed733 · 3bed733
1 parent 3b29323
commit 3bed733
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/packages/git/src/browser/git-contribution.ts b/packages/git/src/browser/git-contribution.ts
@@ -976,12 +976,11 @@ export class GitAmendSupport implements ScmAmendSupport {
 
     constructor(protected readonly repository: Repository, protected readonly git: Git) { }
 
-    public async getIntialAmendingCommits(storedState: string, lastHead: string): Promise<ScmCommit[]> {
-        const { amendingHeadCommitSha } = JSON.parse(storedState);
+    public async getInitialAmendingCommits(amendingHeadCommitSha: string, latestCommitSha: string): Promise<ScmCommit[]> {
         const commits = await this.git.log(
             this.repository,
             {
-                range: { toRevision: amendingHeadCommitSha, fromRevision: lastHead },
+                range: { toRevision: amendingHeadCommitSha, fromRevision: latestCommitSha },
                 maxCount: 50
             }
         );
@@ -998,7 +997,7 @@ export class GitAmendSupport implements ScmAmendSupport {
     }
 
     public async getLastCommit(): Promise<ScmCommit | undefined> {
-        const commits = await this.git.log(this.repository, { maxCount: 1, shortSha: true });
+        const commits = await this.git.log(this.repository, { maxCount: 1 });
         if (commits.length > 0) {
             return this.createScmCommit(commits[0]);
         }

diff --git a/packages/scm/src/browser/scm-amend-component.tsx b/packages/scm/src/browser/scm-amend-component.tsx
@@ -128,24 +128,23 @@ export class ScmAmendComponent extends React.Component<ScmAmendComponentProps, S
             if (this.state.lastCommit && nextCommit) {
                 const direction: 'up' | 'down' = this.transitionHint === 'amend' ? 'up' : 'down';
                 const transitionData = { direction, previousLastCommit: this.state.lastCommit };
-                const amendingCommits = this.state.amendingCommits.concat([]);
+                const amendingCommits = this.state.amendingCommits.concat([]); // copy the array
                 switch (this.transitionHint) {
                     case 'amend':
                         if (this.state.lastCommit) {
                             amendingCommits.push(this.state.lastCommit);
-                            if (this.state.amendingCommits.length === 1) {
-                                const storageKey = this.getStorageKey();
-                                const serializedState = JSON.stringify({
-                                    amendingHeadCommitSha: this.state.amendingCommits[0].commit.id,
-                                    latestCommitSha: nextCommit.commit.id
-                                });
-                                this.props.storageService.setData<string | undefined>(storageKey, serializedState);
-                            }
+
+                            const storageKey = this.getStorageKey();
+                            const serializedState = JSON.stringify({
+                                amendingHeadCommitSha: amendingCommits[0].commit.id,
+                                latestCommitSha: nextCommit.commit.id
+                            });
+                            this.props.storageService.setData<string | undefined>(storageKey, serializedState);
                         }
                         break;
                     case 'unamend':
                         amendingCommits.pop();
-                        if (this.state.amendingCommits.length === 0) {
+                        if (amendingCommits.length === 0) {
                             const storageKey = this.getStorageKey();
                             this.props.storageService.setData<string | undefined>(storageKey, undefined);
                         }
@@ -190,7 +189,7 @@ export class ScmAmendComponent extends React.Component<ScmAmendComponentProps, S
                 // head commit after the last 'amend'.
                 return [];
             }
-            const commits = await this.props.scmAmendSupport.getIntialAmendingCommits(amendingHeadCommitSha, lastCommit.id);
+            const commits = await this.props.scmAmendSupport.getInitialAmendingCommits(amendingHeadCommitSha, lastCommit.id);
 
             const amendingCommitPromises = commits.map(async commit => {
                 const avatar = await this.props.avatarService.getAvatar(commit.authorEmail);

diff --git a/packages/scm/src/browser/scm-service.ts b/packages/scm/src/browser/scm-service.ts
@@ -99,7 +99,7 @@ export interface ScmCommit {
 }
 
 export interface ScmAmendSupport {
-    getIntialAmendingCommits(storedState: string, lastHead: string): Promise<ScmCommit[]>
+    getInitialAmendingCommits(amendingHeadCommitSha: string, latestCommitSha: string): Promise<ScmCommit[]>
     getMessage(commit: string): Promise<string>;
     reset(commit: string): Promise<void>;
     getLastCommit(): Promise<ScmCommit | undefined>;