Fetch/push/pull

interfaces/nodegit.js.flow

@@ -113,6 +113,48 @@ declare module 'nodegit' {
     static default(repo: Repository): Signature;
   }
 
+  declare class Remote {
+    name(): string;
+    url(): string;
+
+    getPushRefspecs(): Promise<Array<string>>;
+    push(refspecs: ?Array<string>, options: Object): Promise<void>;
+
+    fetch(refspecs: ?Array<string>, options: Object, message: string): Promise<void>;
+
+    disconnect(): Promise<void>;
+    stop(): void;
+  }
+
+  declare class FetchOptions {
+
+  }
+
+  declare class Cred {
+    static userpassPlaintextNew(username: string, password: string): Cred;
+    static sshKeyFromAgent(username: string): Cred;
+    static defaultNew(): Cred;
+  }
+
+  declare class Reference {
+    name(): string;
+    shorthand(): string;
+  }
+
+  declare class Branch {
+    static upstream(branch: Reference): Promise<?Reference>;
+  }
+
+  declare class Config {
+    getStringBuf(name: string): ?string;
+    setString(name: string, value: string): Promise<void>;
+  }
+
+  declare class TransferProgress {
+    totalObjects(): number;
+    receivedObjects(): number;
+  }
+
   declare class Repository {
     static open(path: string): Promise<Repository>;
 
@@ -129,5 +171,18 @@ declare module 'nodegit' {
     createCommit(updateRef: string, author: Signature, committer: Signature, message: string, oid: Oid, parents: ?Array<Commit>): Promise<Oid>;
 
     getStatusExt(): Promise<Array<StatusFile>>;
+
+    getRemotes(): Array<string>;
+    getRemote(name: string): Promise<?Remote>;
+
+    getReference(name: string): Promise<?Reference>;
+    getCurrentBranch(): Promise<Reference>;
+
+    fetch(remote: string | Remote, options: Object | FetchOptions): Promise<void>;
+
+    configSnapshot(): Promise<Config>;
+    config(): Promise<Config>;
+
+    mergeBranches(to: string | Reference, from: string | Reference, signature?: Signature): Promise<Oid>;
   }
 }

lib/file-list-component.js

@@ -5,9 +5,10 @@ import etch from 'etch'
 import {CompositeDisposable} from 'atom'
 // $FlowFixMe: Yes, we know this isn't a React component :\
 import CommitBoxComponent from './commit-box-component'
-import CommitBoxViewModel from './commit-box-view-model'
 // $FlowFixMe: Yes, we know this isn't a React component :\
 import FileSummaryComponent from './file-summary-component'
+// $FlowFixMe: Yes, we know this isn't a React component :\
+import PushPullComponent from './push-pull-component'
 
 import type FileListViewModel from './file-list-view-model'
 
@@ -16,7 +17,6 @@ type FileListComponentProps = {fileListViewModel: FileListViewModel}
 export default class FileListComponent {
   viewModel: FileListViewModel;
   element: HTMLElement;
-  commitBoxViewModel: CommitBoxViewModel;
   subscriptions: CompositeDisposable;
 
   constructor (props: FileListComponentProps) {
@@ -32,8 +32,6 @@ export default class FileListComponent {
   acceptProps ({fileListViewModel}: FileListComponentProps): Promise<void> {
     this.viewModel = fileListViewModel
 
-    this.commitBoxViewModel = fileListViewModel.commitBoxViewModel
-
     let updatePromise = Promise.resolve()
     if (this.element) {
       updatePromise = etch.update(this)
@@ -79,6 +77,7 @@ export default class FileListComponent {
   render () {
     return (
       <div className='git-Panel' tabIndex='-1'>
+        <PushPullComponent viewModel={this.viewModel.pushPullViewModel}/>
         <header className='git-Panel-item is-header'>Changes</header>
         <div className='git-Panel-item is-flexible git-FileList'>{
           this.viewModel.getFileDiffViewModels().map((viewModel, index) =>
@@ -91,7 +90,7 @@ export default class FileListComponent {
               toggleAction={c => this.onToggleFileSummary(c)}/>
           )
         }</div>
-        <CommitBoxComponent viewModel={this.commitBoxViewModel}/>
+        <CommitBoxComponent viewModel={this.viewModel.commitBoxViewModel}/>
       </div>
     )
   }

lib/file-list-view-model.js

@@ -3,6 +3,7 @@
 import {Emitter, CompositeDisposable} from 'atom'
 import FileDiffViewModel from './file-diff-view-model'
 import CommitBoxViewModel from './commit-box-view-model'
+import PushPullViewModel from './push-pull-view-model'
 
 import type {Disposable} from 'atom'
 import type GitStore from './git-store'
@@ -13,6 +14,7 @@ export default class FileListViewModel {
   selectedIndex: number;
   emitter: Emitter;
   commitBoxViewModel: CommitBoxViewModel;
+  pushPullViewModel: PushPullViewModel;
   subscriptions: CompositeDisposable;
 
   constructor (gitStore: GitStore) {
@@ -21,6 +23,7 @@ export default class FileListViewModel {
     this.emitter = new Emitter()
     this.subscriptions = new CompositeDisposable()
     this.commitBoxViewModel = new CommitBoxViewModel(gitStore)
+    this.pushPullViewModel = new PushPullViewModel(gitStore)
 
     this.gitStore.onDidUpdate(() => this.emitUpdateEvent())
   }
@@ -100,4 +103,12 @@ export default class FileListViewModel {
   getFileDiffViewModels (): Array<FileDiffViewModel> {
     return this.gitStore.getFiles().map(fileDiff => new FileDiffViewModel(fileDiff))
   }
+
+  setToken (t: string) {
+    this.pushPullViewModel.setToken(t)
+  }
+
+  push (): Promise<void> {
+    return this.pushPullViewModel.push()
+  }
 }

lib/git-package.js

@@ -14,13 +14,16 @@ import type {ChangeType} from './git-store'
 
 type GitState = {panelVisible: boolean}
 
+type GitPushFunction = () => Promise<void>
+
 export default class GitPackage {
   subscriptions: CompositeDisposable;
   state: GitState;
   changesPanel: ?Panel<FileListViewModel>;
   statusBarTile: ?Tile<StatusBarViewModel>;
-  fileListViewModel: FileListViewModel;
+  fileListViewModel: ?FileListViewModel;
   gitStore: GitStore;
+  token: ?string;
 
   constructor () {
     this.subscriptions = new CompositeDisposable()
@@ -199,6 +202,20 @@ export default class GitPackage {
     this.statusBarTile = tile
   }
 
+  consumeGitHubToken (token: string) {
+    this.token = token
+
+    if (!this.hasRepository()) return
+
+    this.getFileListViewModel().setToken(token)
+  }
+
+  provideGitPush (): ?GitPushFunction {
+    if (!this.hasRepository()) return null
+
+    return () => this.getFileListViewModel().push()
+  }
+
   createDiffPaneItem ({uri, pending}: {uri: string, pending: boolean}): DiffViewModel {
     const pathName = uri.replace(DiffURI, '')
     const gitStore = this.getGitStore()

lib/git-service.js

@@ -540,4 +540,198 @@ export default class GitService {
         }
       })
   }
+
+  getRemotes (): Promise<Array<string>> {
+    return Git.Repository
+      .open(this.repoPath)
+      .then(repo => repo.getRemotes())
+  }
+
+  createNetworkOptions (remote: Git.Remote, {username, password}: {username: string, password: string}, progress: (progress: number) => void): Object {
+    let authAttempts = 0
+    const credentialsCallback = (url, user) => {
+      if (authAttempts > 2) {
+        remote.stop()
+        remote.disconnect()
+        return Git.Cred.defaultNew()
+      }
+
+      authAttempts++
+      return Git.Cred.userpassPlaintextNew(username, password)
+    }
+    return {
+      callbacks: {
+        transferProgress: (transferProgress: Git.TransferProgress) => {
+          progress(transferProgress.receivedObjects() / transferProgress.totalObjects())
+        },
+        credentials: credentialsCallback
+      }
+    }
+  }
+
+  static NoRemoteErrorName (): string {
+    return 'GitService.noRemote'
+  }
+
+  static NoBranchErrorName (): string {
+    return 'GitService.noBranch'
+  }
+
+  fetch (remote: string, creds: {username: string, password: string}, progress: (progress: number) => void): Promise<void> {
+    return Git.Repository
+      .open(this.repoPath)
+      .then(repo => repo.getRemote(remote))
+      .then(remote_ => {
+        if (!remote_) {
+          const error = new Error()
+          error.name = GitService.NoRemoteErrorName()
+          return Promise.reject(error)
+        }
+
+        const remote = remote_
+        return remote.fetch(null, this.createNetworkOptions(remote, creds, progress), `Fetch from ${remote}`)
+      })
+  }
+
+  async pull (branchName: string, creds: {username: string, password: string}, progress: (progress: number) => void): Promise<void> {
+    // const upstream = await Git.Branch.upstream(branch)
+
+    const remote = await this.getBranchRemote(branchName)
+    if (!remote) {
+      const error = new Error()
+      error.name = GitService.NoRemoteErrorName()
+      return Promise.reject(error)
+    }
+
+    await this.fetch(remote, creds, progress)
+
+    const repo = await Git.Repository.open(this.repoPath)
+
+    const branch = await repo.getReference(branchName)
+    if (!branch) {
+      const error = new Error()
+      error.name = GitService.NoBranchErrorName()
+      return Promise.reject(error)
+    }
+
+    const upstream = await Git.Branch.upstream(branch)
+    if (!upstream) {
+      const error = new Error()
+      error.name = GitService.NoBranchErrorName()
+      return Promise.reject(error)
+    }
+
+    await repo.mergeBranches(branchName, upstream.name())
+  }
+
+  static NoRemotesErrorName (): string {
+    return 'GitService.noRemotes'
+  }
+
+  static TooManyRemotesErrorName (): string {
+    return 'GitService.tooManyRemotes'
+  }
+
+  async pushNewBranch (branch: string, creds: {username: string, password: string}, progress: (progress: number) => void): Promise<void> {
+    const remotes = await this.getRemotes()
+    if (!remotes.length) {
+      const error = new Error()
+      error.name = GitService.NoRemotesErrorName()
+      return Promise.reject(error)
+    }
+
+    // TODO: At some point we can let the user choose a remote, but for now
+    // let's just solve the easy case.
+    if (remotes.length > 1) {
+      const error = new Error()
+      error.name = GitService.TooManyRemotesErrorName()
+      return Promise.reject(error)
+    }
+
+    const remoteName = remotes[0]
+
+    const repo = await Git.Repository.open(this.repoPath)
+    const remote = await repo.getRemote(remoteName)
+    if (!remote) {
+      const error = new Error()
+      error.name = GitService.NoRemoteErrorName()
+      return Promise.reject(error)
+    }
+
+    const refspec = `refs/heads/${branch}`
+    const refspecs = [`${refspec}:${refspec}`]
+    await remote.push(refspecs, this.createNetworkOptions(remote, creds, progress))
+
+    const config = await repo.config()
+    await config.setString(`branch.${branch}.remote`, remoteName)
+    await config.setString(`branch.${branch}.merge`, refspec)
+  }
+
+  async push (branch: string, creds: {username: string, password: string}, progress: (progress: number) => void): Promise<void> {
+    const remoteName = await this.getBranchRemote(branch)
+    if (!remoteName) {
+      return this.pushNewBranch(branch, creds, progress)
+    }
+
+    const repo = await Git.Repository.open(this.repoPath)
+    const remote = await repo.getRemote(remoteName)
+    if (!remote) {
+      const error = new Error()
+      error.name = GitService.NoRemoteErrorName()
+      return Promise.reject(error)
+    }
+
+    const refspecs = await this.getPushRefspecs(branch)
+    return remote.push(refspecs, this.createNetworkOptions(remote, creds, progress))
+  }
+
+  async getPushRefspecs (branchName: string): Promise<Array<string>> {
+    const remoteName = await this.getBranchRemote(branchName)
+    if (!remoteName) {
+      const error = new Error()
+      error.name = GitService.NoRemoteErrorName()
+      return Promise.reject(error)
+    }
+
+    const repo = await Git.Repository.open(this.repoPath)
+    const remote = await repo.getRemote(remoteName)
+    if (!remote) {
+      const error = new Error()
+      error.name = GitService.NoRemoteErrorName()
+      return Promise.reject(error)
+    }
+
+    const refspecs = await remote.getPushRefspecs()
+    // If we don't have any refspecs configured, then try to construct a
+    // reasonable default. Ideally libgit2 would do this for us.
+    if (refspecs.length > 0) return refspecs
+
+    const branch = await repo.getReference(branchName)
+    if (!branch) {
+      const error = new Error()
+      error.name = GitService.NoBranchErrorName()
+      return Promise.reject(error)
+    }
+
+    const upstream = await Git.Branch.upstream(branch)
+    if (!upstream) {
+      const error = new Error()
+      error.name = GitService.NoBranchErrorName()
+      return Promise.reject(error)
+    }
+
+    // The upstream branch's name takes the form of:
+    //   refs/remotes/REMOTE_NAME/BRANCH_NAME
+    // We just want the last part of that.
+    const upstreamBranchName = upstream.name().replace(`refs/remotes/${remoteName}/`, '')
+    return [`refs/heads/${branchName}:refs/heads/${upstreamBranchName}`]
+  }
+
+  getBranchRemote (name: string): Promise<?string> {
+    return Git.Repository
+      .open(this.repoPath)
+      .then(repo => repo.configSnapshot())
+      .then(config => config.getStringBuf(`branch.${name}.remote`))
+      .catch(e => null)
+  }
 }