RB-Gateway can now pull from a remote

Review Request #9347 - Created Nov. 4, 2017 and updated

Henri-Philippe Marceau
rb-gateway
master
3d040c4...
rb-gateway, students

A Pull method was added to repository.go and git_repository.go.
This method is intended to behave like git-pull meaning it starts with
a git-fetch and then a git-merge. Fetching is made rather
straightforward thanks to git2go. However, the merge section of Pull
required a few more steps. First, a merge analysis is performed, then the
merge and lastly a commit is created.

I setup a remote repository on github, cloned it on my machine, pushed
a few changes and pulled those changes into my local copy using only
RB-Gateway's Pull method.

  • 0
  • 0
  • 2
  • 0
  • 2
Description From Last Updated
Barret Rennie
  1. 
      
  2. pull.go (Diff revision 1)
     
     

    pull should be a method on the Repository interface because we will want this support for both GitRepository and, in the future, HgRepository (when support for mercurial is added).

  3. pull.go (Diff revision 1)
     
     

    Comments should end in a period. Likewise below.

  4. 
      
Henri-Philippe Marceau
Henri-Philippe Marceau
Henri-Philippe Marceau
Review request changed

Testing Done:

   

I setup a remote repository on github, cloned it on my machine, pushed

    a few changes and pulled those changes into my local copy using only
~   RB-Gateway's Pull method. More testing needs to be done.

  ~ RB-Gateway's Pull method.

Loading...