Summary

Git repositories in rb-gateway can now pull from an upstream remote.

Review Request #9347 — Created Nov. 4, 2017 and updated Dec. 11, 2017, 8:15 p.m.

Information

Owner

hmarceau

Repository

rb-gateway

Branch

master

Bugs

Depends On

Commit

88a011a...

Reviewers

Groups

rb-gateway, students

People

Description

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.

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.

Issues

Description	From	Last Updated
pull should be a method on the Repository interface because we will want this support for both GitRepository and, in …	brennie	Nov. 10, 2017, 1:43 p.m.
Comments should end in a period. Likewise below.	brennie	Nov. 10, 2017, 2:20 p.m.
Can we keep this alphabetical?	david	Dec. 10, 2017, 8:52 a.m.
Can we put a blank line between each "operation" in here?	david	Dec. 10, 2017, 8:54 a.m.
Should be "Set up". "Right now only" should also be a separate sentence.	david	Dec. 10, 2017, 8:55 a.m.
Do we not want to return here?	david	Dec. 10, 2017, 8:56 a.m.
To match the other comments, this should be "Set up and perform."	david	Dec. 10, 2017, 8:56 a.m.
Because Repository is an abstract interface, the comment shouldn't refer to git.	david	Dec. 10, 2017, 8:57 a.m.
I'm not sure that we should hard-code master here, since that's git specific. Strictly speaking, we don't actually need to …	david	Nov. 25, 2017, 11:36 a.m.

flake8 passed.

JSHint passed.

pull.go (Diff revision 1)

The issue has been resolved. Show all issues

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).

pull.go (Diff revision 1)
The issue has been resolved. Show all issues
```
Comments should end in a period. Likewise below.
```

Summary:

-	[WIP] RB-Gateway can now pull from a remote
+	RB-Gateway can now pull from a remote

Description:

~		I added the file `pull.go` , it contains a pull function which behaves
~		like a typical git-pull. Testing is still required.
	~	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.

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.

Commit:

-	7a8047eca329fefbe6f0604278cac91c6e1202c4
+	44ffb947805b9f7d484c22ef3ee7b54cb50aab65

Diff:

Revision 2 (+231 -8)

Show changes

	auth.go
	git_repository.go
	repository.go
	routes.go
	util.go

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

Commit:

-	44ffb947805b9f7d484c22ef3ee7b54cb50aab65
+	3d040c445e1350e0b0aa3827c76040f7ea9575fa

Diff:

Revision 3 (+140)

Show changes

	git_repository.go
	repository.go
	util.go

Checks run (2 succeeded)

flake8 passed.

JSHint passed.

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.

Summary:

-	RB-Gateway can now pull from a remote
+	Git repositories in rb-gateway can now pull from upstream remotes.

Summary:

-	Git repositories in rb-gateway can now pull from upstream remotes.
+	Git repositories in rb-gateway can now pull from an upstream remote.

Fix it!

git_repository.go (Diff revision 3)
The issue has been resolved. Show all issues
```
Can we keep this alphabetical?
```
git_repository.go (Diff revision 3)
The issue has been resolved. Show all issues
```
Can we put a blank line between each "operation" in here?
```

git_repository.go (Diff revision 3)

The issue has been resolved. Show all issues

Should be "Set up". "Right now only" should also be a separate sentence.

git_repository.go (Diff revision 3)
The issue has been resolved. Show all issues
```
Do we not want to return here?
```
git_repository.go (Diff revision 3)
The issue has been resolved. Show all issues
```
To match the other comments, this should be "Set up and perform."
```

repository.go (Diff revision 3)

The issue has been resolved. Show all issues

Because Repository is an abstract interface, the comment shouldn't refer to git.

util.go (Diff revision 3)

An issue was opened. Show all issues

I'm not sure that we should hard-code master here, since that's git specific.

Strictly speaking, we don't actually need to pull, we just need to do a git fetch --all

hmarceau Dec. 10, 2017, 6:10 p.m.

I'd like to address this issue in a future commit. I plan on reconciling both
of my projects and getting rid of hard coded git specifics will be a significant
part of that effort. Also, since git repos are currently the only repository supported
by RB-Gateway hardcoding "master" doesn't break anything.

Commit:

-	3d040c445e1350e0b0aa3827c76040f7ea9575fa
+	88a011a87bde0fe8fdad693a581f085c738e533a

Diff:

Revision 4 (+149 -2)

Show changes

	auth.go
	git_repository.go
	repository.go
	util.go

Checks run (2 succeeded)

flake8 passed.

JSHint passed.