Merge lp:~niemeyer/lbox/diff-post-prereq-merge into lp:lbox

[Gustavo Niemeyer]

propose: fix diffing post prereq merge

[Gustavo Niemeyer (niemeyer)]

Please take a look.

[Gustavo Niemeyer (niemeyer)]

*** Submitted:

propose: fix diffing post prereq merge

=== modified file 'launchpad.go'
--- launchpad.go	2012-03-14 18:15:53 +0000
+++ launchpad.go	2012-06-19 21:07:20 +0000
@@ -253,6 +253,28 @@
 	return mp, nil
 }
 
+func isMerged(source *lpad.Branch) (merged bool, mp *lpad.MergeProposal, err error) {
+	mps, err := source.LandingTargets()
+	if failed(err) {
+		return
+	}
+	found := errors.New("marker")
+	err = mps.For(func(proposal *lpad.MergeProposal) error {
+		if proposal.Status() == lpad.StMerged {
+			mp = proposal
+			return found
+		}
+		return nil
+	})
+	switch err {
+	case nil:
+		return false, mp, nil
+	case found:
+		return true, mp, nil
+	}
+	return false, nil, err
+}
+
 func setProposalLog(mp *lpad.MergeProposal, log *Log) error {
 	logf("Updating merge proposal log...")
 	desc := fmt.Sprintf("%s\n\n%s", log.Summary, log.Description)

=== modified file 'propose.go'
--- propose.go	2012-06-19 20:04:41 +0000
+++ propose.go	2012-06-19 21:07:20 +0000
@@ -253,11 +253,15 @@
 
 	gotBug := make(chan bool, 1)
 
-	var diffBaseInfo *BranchInfo
+	diffBaseInfo := targetInfo
 	if prereq != nil {
-		diffBaseInfo = &BranchInfo{URL: prereq.Id()}
-	} else {
-		diffBaseInfo = targetInfo
+		merged, _, err := isMerged(prereq)
+		if failed(err) {
+			return
+		}
+		if !merged {
+			diffBaseInfo = &BranchInfo{URL: prereq.Id()}
+		}
 	}
 
 	wg.Add(1)

=== modified file 'submit.go'
--- submit.go	2012-06-19 20:05:44 +0000
+++ submit.go	2012-06-19 21:07:20 +0000
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"errors"
 	"flag"
 	"fmt"
 	"launchpad.net/goetveld/rietveld"
@@ -65,26 +64,15 @@
 	var mpreq *lpad.MergeProposal
 	if prereq != nil {
 		// Can only submit if pre-req is already merged.
-		mps, err := prereq.LandingTargets()
+		var merged bool
+		merged, mpreq, err = isMerged(prereq)
 		if failed(err) {
 			return
 		}
-		found := errors.New("marker")
-		err = mps.For(func(mp *lpad.MergeProposal) error {
-			if mp.Status() == lpad.StMerged {
-				mpreq = mp
-				return found
-			}
-			return nil
-		})
-		if err == nil {
+		if !merged {
 			failed(fmt.Errorf("Pre-requisite %s not yet merged.", prereq.Id()))
 			return
 		}
-		if err != found {
-			failed(err)
-			return
-		}
 	}
 
 	// --- Edit change log ---