Merge pull request #42 from zaquestion/issue20

[#20] (mrCreate) default to forked-from branch and check for branch pushed

README.md

@@ -16,7 +16,7 @@ lab will look for hub and uses that as your git binary when available so you don
 $ lab version
 git version 2.11.0
 hub version 2.3.0-pre9
-lab version 0.5.1
+lab version 0.5.2
 ```
 
 # Inspiration
@@ -43,7 +43,7 @@ $ go get -u github.com/zaquestion/lab
 
 $ lab version
 git version 2.11.0
-lab version 0.5.1
+lab version 0.5.2
 ```
 
 # Configuration

cmd/mrCreate.go

@@ -24,7 +24,7 @@ const (
 )
 
 var (
-	// Will be updated to upstream in init() if user if remote exists
+	// Will be updated to upstream in init() if upstream remote exists
 	targetRemote = "origin"
 )
 
@@ -51,15 +51,16 @@ func runMRCreate(cmd *cobra.Command, args []string) {
 		log.Fatal(err)
 	}
 
-	sourceRemote, err := gitconfig.Local("branch." + branch + ".remote")
-	if err != nil {
-		sourceRemote = "origin"
-	}
+	sourceRemote := determineSourceRemote(branch)
 	sourceProjectName, err := git.PathWithNameSpace(sourceRemote)
 	if err != nil {
 		log.Fatal(err)
 	}
 
+	if !lab.BranchPushed(sourceProjectName, branch) {
+		log.Fatal("aborting MR, branch not present on remote: ", sourceRemote)
+	}
+
 	targetProjectName, err := git.PathWithNameSpace(targetRemote)
 	if err != nil {
 		log.Fatal(err)
@@ -97,6 +98,23 @@ func runMRCreate(cmd *cobra.Command, args []string) {
 	fmt.Println(mrURL + "/diffs")
 }
 
+func determineSourceRemote(branch string) string {
+	// Check if the branch is being tracked
+	r, err := gitconfig.Local("branch." + branch + ".remote")
+	if err == nil {
+		return r
+	}
+
+	// If not, check if the fork is named after the user
+	_, err = gitconfig.Local("remote." + lab.User + ".url")
+	if err == nil {
+		return lab.User
+	}
+
+	// If not, default to origin
+	return "origin"
+}
+
 func mrMsg(base, head, sourceRemote, targetRemote string) (string, error) {
 	lastCommitMsg, err := git.LastCommitMessage()
 	if err != nil {

cmd/version.go

@@ -17,7 +17,7 @@ var versionCmd = &cobra.Command{
 		git.Stdout = nil
 		git.Stderr = nil
 		version, _ := git.Output()
-		fmt.Printf("%s%s\n", string(version), "lab version 0.5.1")
+		fmt.Printf("%s%s\n", string(version), "lab version 0.5.2")
 	},
 }
 

internal/gitlab/gitlab.go

@@ -289,3 +289,17 @@ func IssueList(project string, opts *gitlab.ListProjectIssuesOptions) ([]*gitlab
 	}
 	return list, nil
 }
+
+// BranchPushed checks if a branch exists on a specified GitLab Project
+func BranchPushed(project, branch string) bool {
+	p, err := FindProject(project)
+	if err != nil {
+		return false
+	}
+
+	b, _, err := lab.Branches.GetBranch(p.ID, branch)
+	if err != nil {
+		return false
+	}
+	return b != nil
+}