Implement Repository#pull with shelling out rather than Nodegit

kuychaco · kuychaco · commit e731e7d47585 · 2016-08-13T12:34:10.000-07:00
diff --git a/lib/models/repository.js b/lib/models/repository.js
@@ -307,9 +307,8 @@ export default class Repository {
 
   async pull (branchName) {
     await this.fetch(branchName)
-    const branchRef = await this.rawRepository.getReference(branchName)
-    const upstreamRef = await Git.Branch.upstream(branchRef)
-    await this.rawRepository.mergeBranches(branchRef, upstreamRef)
+    // TODO: get remote from config
+    return this.git.merge(`origin/${branchName}`)
   }
 
   async getAheadBehindCount (branchName) {
diff --git a/test/models/repository.test.js b/test/models/repository.test.js
@@ -333,18 +333,21 @@ describe('Repository', function () {
     })
   })
 
-  xdescribe('pull()', () => {
-    it('brings commits from the remote', async () => {
-      const {localRepoPath, remoteRepoPath} = await createLocalAndRemoteRepositories()
+  describe('pull()', () => {
+    it('updates the remote branch and merges into local branch', async () => {
+      const {localRepoPath} = await createLocalAndRemoteRepositories()
       const localRepo = await buildRepository(localRepoPath)
-      const remoteRepo = await Git.Repository.open(remoteRepoPath)
-
-      await createEmptyCommit(remoteRepoPath, 'new remote commit')
-
-      assert.notEqual((await remoteRepo.getMasterCommit()).message(), (await localRepo.getLastCommit()).message)
+      let remoteHead, localHead
+      remoteHead = await localRepo.git.getCommit('origin/master')
+      localHead = await localRepo.git.getCommit('master')
+      assert.equal(remoteHead.message, 'second commit')
+      assert.equal(localHead.message, 'second commit')
 
       await localRepo.pull('master')
-      assert.equal((await remoteRepo.getMasterCommit()).message(), (await localRepo.getLastCommit()).message)
+      remoteHead = await localRepo.git.getCommit('origin/master')
+      localHead = await localRepo.git.getCommit('master')
+      assert.equal(remoteHead.message, 'third commit')
+      assert.equal(localHead.message, 'third commit')
     })
   })
 
