Merge lp:~wallyworld/goetveld/rietveld-no-bzr-diff-alias into lp:goetveld

[Ian Booth]

Add --no-alias to the bzr diff command used to get the branch changes to push to codereview.

Make bzr diff command work with aliases

I have bzr diff aliased to bzr cdiff so I can get nice coloured output. Sadly, this confuses the ability to parse the diff output to push patches to codereview.

This simple fix adds "--no-alias" to the bzr diff command to make everything work nicely.

[John A Meinel (jameinel)]

LGTM

review: Approve

[Ian Booth (wallyworld)]

*** Submitted:

Make bzr diff command work with aliases

I have bzr diff aliased to bzr cdiff so I can get nice coloured output. Sadly, this confuses the ability to parse the diff output to push patches to codereview.

This simple fix adds "--no-alias" to the bzr diff command to make everything work nicely.

=== modified file 'bazaar.go'
--- bazaar.go	2012-03-15 02:02:17 +0000
+++ bazaar.go	2012-11-22 05:50:22 +0000
@@ -73,7 +73,7 @@
 
 func (b *bzrBranches) Patch() (patch []*FileDiff, err error) {
 	revisions := fmt.Sprint("revid:", b.oldRevision, "..revid:", b.newRevision, "")
-	output, status, err := run("bzr", "diff", "-r", revisions, b.newPath)
+	output, status, err := run("bzr", "--no-aliases", "diff", "-r", revisions, b.newPath)
 	// Status 1 just means there are changes.
 	if err != nil && status != 1 {
 		return nil, err