Reviewers: mp+132060_code.launchpad.net,
Message: Please take a look.
Description: Handle some edge cases with 'bzr log'
You can alias 'bzr log' to set default arguments. Because of this, the output doesn't conform to what rietveld expects. This just forces specific flags so that the output will match expectations.
https://code.launchpad.net/~jameinel/goetveld/fix-log/+merge/132060
(do not edit description out of merge proposal)
Please review this at https://codereview.appspot.com/6822053/
Affected files: A [revision details] M bazaar.go
Index: [revision details] === added file '[revision details]' --- [revision details] 2012-01-01 00:00:00 +0000 +++ [revision details] 2012-01-01 00:00:00 +0000 @@ -0,0 +1,2 @@ +Old revision: <email address hidden> +New revision: <email address hidden>
Index: bazaar.go === modified file 'bazaar.go' --- bazaar.go 2012-03-15 02:02:17 +0000 +++ bazaar.go 2012-10-30 11:06:00 +0000 @@ -28,11 +28,11 @@ // BazaarDiffBranches returns a Delta between the bazaar branch at // oldPath and the one at newPath. func BazaarDiffBranches(oldPath, newPath string) (Delta, error) { - output1, _, err := run("bzr", "log", "-l1", "--show-ids", "-r", "ancestor:"+oldPath, newPath) + output1, _, err := run("bzr", "log", "--long", "-l1", "--show-ids", "-r", "ancestor:"+oldPath, newPath) if err != nil { return nil, err } - output2, _, err := run("bzr", "log", "-l1", "--show-ids", newPath) + output2, _, err := run("bzr", "log", "--long", "-l1", "--show-ids", "-r", "-1", newPath) if err != nil { return nil, err }
« Back to merge proposal
Reviewers: mp+132060_ code.launchpad. net,
Message:
Please take a look.
Description:
Handle some edge cases with 'bzr log'
You can alias 'bzr log' to set default arguments. Because of this, the
output
doesn't conform to what rietveld expects. This just forces specific
flags so
that the output will match expectations.
https:/ /code.launchpad .net/~jameinel/ goetveld/ fix-log/ +merge/ 132060
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/6822053/
Affected files:
A [revision details]
M bazaar.go
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>
Index: bazaar.go hes(oldPath, newPath string) (Delta, error) { "+oldPath, newPath) "+oldPath,
=== modified file 'bazaar.go'
--- bazaar.go 2012-03-15 02:02:17 +0000
+++ bazaar.go 2012-10-30 11:06:00 +0000
@@ -28,11 +28,11 @@
// BazaarDiffBranches returns a Delta between the bazaar branch at
// oldPath and the one at newPath.
func BazaarDiffBranc
- output1, _, err :=
run("bzr", "log", "-l1", "--show-ids", "-r", "ancestor:
+ output1, _, err :=
run("bzr", "log", "--long", "-l1", "--show-ids", "-r", "ancestor:
newPath)
if err != nil {
return nil, err
}
- output2, _, err := run("bzr", "log", "-l1", "--show-ids", newPath)
+ output2, _, err :=
run("bzr", "log", "--long", "-l1", "--show-ids", "-r", "-1", newPath)
if err != nil {
return nil, err
}