Merge pull request atom#2246 from atom/aw/is-commit-pushed-stall

smashwilson · web-flow · commit b3fd9f4c80e4 · 2019-08-08T14:19:11.000-04:00
Improve performance of isCommitPushed
diff --git a/lib/git-shell-out-strategy.js b/lib/git-shell-out-strategy.js
@@ -985,6 +985,9 @@ export default class GitShellOutStrategy {
     } else if (option.showRemote) {
       args.splice(1, 0, '--remotes');
     }
+    if (option.pattern) {
+      args.push(option.pattern);
+    }
     return (await this.exec(args)).trim().split(LINE_ENDING_REGEX);
   }
 
diff --git a/lib/models/repository-states/present.js b/lib/models/repository-states/present.js
@@ -770,9 +770,18 @@ export default class Present extends State {
   }
 
   async isCommitPushed(sha) {
-    const remoteBranchesWithCommit = await this.git().getBranchesWithCommit(sha, {showLocal: false, showRemote: true});
-    const currentRemote = (await this.repository.getCurrentBranch()).getUpstream();
-    return remoteBranchesWithCommit.includes(currentRemote.getFullRef());
+    const currentBranch = await this.repository.getCurrentBranch();
+    const upstream = currentBranch.getPush();
+    if (!upstream.isPresent()) {
+      return false;
+    }
+
+    const contained = await this.git().getBranchesWithCommit(sha, {
+      showLocal: false,
+      showRemote: true,
+      pattern: upstream.getShortRef(),
+    });
+    return contained.some(ref => ref.length > 0);
   }
 
   // Author information
diff --git a/test/git-strategies.test.js b/test/git-strategies.test.js
@@ -1080,6 +1080,13 @@ import * as reporterProxy from '../lib/reporter-proxy';
           ['refs/remotes/origin/HEAD', 'refs/remotes/origin/master'],
         );
       });
+
+      it('includes only refs matching a pattern', async function() {
+        assert.sameMembers(
+          await git.getBranchesWithCommit(SHA, {showLocal: true, showRemote: true, pattern: 'origin/master'}),
+          ['refs/remotes/origin/master'],
+        );
+      });
     });
 
     describe('getRemotes()', function() {
diff --git a/test/models/repository.test.js b/test/models/repository.test.js
@@ -882,6 +882,40 @@ describe('Repository', function() {
     });
   });
 
+  describe('isCommitPushed(sha)', function() {
+    it('returns true if SHA is reachable from the upstream ref', async function() {
+      const {localRepoPath} = await setUpLocalAndRemoteRepositories('multiple-commits');
+      const repository = new Repository(localRepoPath);
+      await repository.getLoadPromise();
+
+      const sha = (await repository.getLastCommit()).getSha();
+      assert.isTrue(await repository.isCommitPushed(sha));
+    });
+
+    it('returns false if SHA is not reachable from upstream', async function() {
+      const {localRepoPath} = await setUpLocalAndRemoteRepositories('multiple-commits');
+      const repository = new Repository(localRepoPath);
+      await repository.getLoadPromise();
+
+      await repository.git.commit('unpushed', {allowEmpty: true});
+      repository.refresh();
+
+      const sha = (await repository.getLastCommit()).getSha();
+      assert.isFalse(await repository.isCommitPushed(sha));
+    });
+
+    it('returns false on a detached HEAD', async function() {
+      const workdir = await cloneRepository('multiple-commits');
+      const repository = new Repository(workdir);
+      await repository.getLoadPromise();
+
+      await repository.checkout('HEAD~2');
+
+      const sha = (await repository.getLastCommit()).getSha();
+      assert.isFalse(await repository.isCommitPushed(sha));
+    });
+  });
+
   describe('undoLastCommit()', function() {
     it('performs a soft reset', async function() {
       const workingDirPath = await cloneRepository('multiple-commits');

Original file line number	Diff line number	Diff line change
`@@ -985,6 +985,9 @@ export default class GitShellOutStrategy {`
`985`	`985`	`} else if (option.showRemote) {`
`986`	`986`	`args.splice(1, 0, '--remotes');`
`987`	`987`	`}`
	`988`	`+ if (option.pattern) {`
	`989`	`+ args.push(option.pattern);`
	`990`	`+ }`
`988`	`991`	`return (await this.exec(args)).trim().split(LINE_ENDING_REGEX);`
`989`	`992`	`}`
`990`	`993`