bug: in op convenience function, return the new op to be able to set metadata later

1 files changed, 35 insertions, 35 deletions

diff --git a/bug/bug_actions_test.go b/bug/bug_actions_test.go
index ee9fbd72..e68132fc 100644
--- a/bug/bug_actions_test.go
+++ b/bug/bug_actions_test.go
@@ -70,7 +70,7 @@ func TestPushPull(t *testing.T) {
 	repoA, repoB, remote := setupRepos(t)
 	defer cleanupRepos(repoA, repoB, remote)
 
-	bug1, err := Create(rene, unix, "bug1", "message")
+	bug1, _, err := Create(rene, unix, "bug1", "message")
 	assert.Nil(t, err)
 	err = bug1.Commit(repoA)
 	assert.Nil(t, err)
@@ -89,7 +89,7 @@ func TestPushPull(t *testing.T) {
 	}
 
 	// B --> remote --> A
-	bug2, err := Create(rene, unix, "bug2", "message")
+	bug2, _, err := Create(rene, unix, "bug2", "message")
 	assert.Nil(t, err)
 	err = bug2.Commit(repoB)
 	assert.Nil(t, err)
@@ -132,7 +132,7 @@ func _RebaseTheirs(t testing.TB) {
 	repoA, repoB, remote := setupRepos(t)
 	defer cleanupRepos(repoA, repoB, remote)
 
-	bug1, err := Create(rene, unix, "bug1", "message")
+	bug1, _, err := Create(rene, unix, "bug1", "message")
 	assert.Nil(t, err)
 	err = bug1.Commit(repoA)
 	assert.Nil(t, err)
@@ -148,11 +148,11 @@ func _RebaseTheirs(t testing.TB) {
 	bug2, err := ReadLocalBug(repoB, bug1.Id())
 	assert.Nil(t, err)
 
-	err = AddComment(bug2, rene, unix, "message2")
+	_, err = AddComment(bug2, rene, unix, "message2")
 	assert.Nil(t, err)
-	err = AddComment(bug2, rene, unix, "message3")
+	_, err = AddComment(bug2, rene, unix, "message3")
 	assert.Nil(t, err)
-	err = AddComment(bug2, rene, unix, "message4")
+	_, err = AddComment(bug2, rene, unix, "message4")
 	assert.Nil(t, err)
 	err = bug2.Commit(repoB)
 	assert.Nil(t, err)
@@ -193,7 +193,7 @@ func _RebaseOurs(t testing.TB) {
 	repoA, repoB, remote := setupRepos(t)
 	defer cleanupRepos(repoA, repoB, remote)
 
-	bug1, err := Create(rene, unix, "bug1", "message")
+	bug1, _, err := Create(rene, unix, "bug1", "message")
 	assert.Nil(t, err)
 	err = bug1.Commit(repoA)
 	assert.Nil(t, err)
@@ -206,29 +206,29 @@ func _RebaseOurs(t testing.TB) {
 	err = Pull(repoB, "origin")
 	assert.Nil(t, err)
 
-	err = AddComment(bug1, rene, unix, "message2")
+	_, err = AddComment(bug1, rene, unix, "message2")
 	assert.Nil(t, err)
-	err = AddComment(bug1, rene, unix, "message3")
+	_, err = AddComment(bug1, rene, unix, "message3")
 	assert.Nil(t, err)
-	err = AddComment(bug1, rene, unix, "message4")
+	_, err = AddComment(bug1, rene, unix, "message4")
 	assert.Nil(t, err)
 	err = bug1.Commit(repoA)
 	assert.Nil(t, err)
 
-	err = AddComment(bug1, rene, unix, "message5")
+	_, err = AddComment(bug1, rene, unix, "message5")
 	assert.Nil(t, err)
-	err = AddComment(bug1, rene, unix, "message6")
+	_, err = AddComment(bug1, rene, unix, "message6")
 	assert.Nil(t, err)
-	err = AddComment(bug1, rene, unix, "message7")
+	_, err = AddComment(bug1, rene, unix, "message7")
 	assert.Nil(t, err)
 	err = bug1.Commit(repoA)
 	assert.Nil(t, err)
 
-	err = AddComment(bug1, rene, unix, "message8")
+	_, err = AddComment(bug1, rene, unix, "message8")
 	assert.Nil(t, err)
-	err = AddComment(bug1, rene, unix, "message9")
+	_, err = AddComment(bug1, rene, unix, "message9")
 	assert.Nil(t, err)
-	err = AddComment(bug1, rene, unix, "message10")
+	_, err = AddComment(bug1, rene, unix, "message10")
 	assert.Nil(t, err)
 	err = bug1.Commit(repoA)
 	assert.Nil(t, err)
@@ -274,7 +274,7 @@ func _RebaseConflict(t testing.TB) {
 	repoA, repoB, remote := setupRepos(t)
 	defer cleanupRepos(repoA, repoB, remote)
 
-	bug1, err := Create(rene, unix, "bug1", "message")
+	bug1, _, err := Create(rene, unix, "bug1", "message")
 	assert.Nil(t, err)
 	err = bug1.Commit(repoA)
 	assert.Nil(t, err)
@@ -287,29 +287,29 @@ func _RebaseConflict(t testing.TB) {
 	err = Pull(repoB, "origin")
 	assert.Nil(t, err)
 
-	err = AddComment(bug1, rene, unix, "message2")
+	_, err = AddComment(bug1, rene, unix, "message2")
 	assert.Nil(t, err)
-	err = AddComment(bug1, rene, unix, "message3")
+	_, err = AddComment(bug1, rene, unix, "message3")
 	assert.Nil(t, err)
-	err = AddComment(bug1, rene, unix, "message4")
+	_, err = AddComment(bug1, rene, unix, "message4")
 	assert.Nil(t, err)
 	err = bug1.Commit(repoA)
 	assert.Nil(t, err)
 
-	err = AddComment(bug1, rene, unix, "message5")
+	_, err = AddComment(bug1, rene, unix, "message5")
 	assert.Nil(t, err)
-	err = AddComment(bug1, rene, unix, "message6")
+	_, err = AddComment(bug1, rene, unix, "message6")
 	assert.Nil(t, err)
-	err = AddComment(bug1, rene, unix, "message7")
+	_, err = AddComment(bug1, rene, unix, "message7")
 	assert.Nil(t, err)
 	err = bug1.Commit(repoA)
 	assert.Nil(t, err)
 
-	err = AddComment(bug1, rene, unix, "message8")
+	_, err = AddComment(bug1, rene, unix, "message8")
 	assert.Nil(t, err)
-	err = AddComment(bug1, rene, unix, "message9")
+	_, err = AddComment(bug1, rene, unix, "message9")
 	assert.Nil(t, err)
-	err = AddComment(bug1, rene, unix, "message10")
+	_, err = AddComment(bug1, rene, unix, "message10")
 	assert.Nil(t, err)
 	err = bug1.Commit(repoA)
 	assert.Nil(t, err)
@@ -317,29 +317,29 @@ func _RebaseConflict(t testing.TB) {
 	bug2, err := ReadLocalBug(repoB, bug1.Id())
 	assert.Nil(t, err)
 
-	err = AddComment(bug2, rene, unix, "message11")
+	_, err = AddComment(bug2, rene, unix, "message11")
 	assert.Nil(t, err)
-	err = AddComment(bug2, rene, unix, "message12")
+	_, err = AddComment(bug2, rene, unix, "message12")
 	assert.Nil(t, err)
-	err = AddComment(bug2, rene, unix, "message13")
+	_, err = AddComment(bug2, rene, unix, "message13")
 	assert.Nil(t, err)
 	err = bug2.Commit(repoB)
 	assert.Nil(t, err)
 
-	err = AddComment(bug2, rene, unix, "message14")
+	_, err = AddComment(bug2, rene, unix, "message14")
 	assert.Nil(t, err)
-	err = AddComment(bug2, rene, unix, "message15")
+	_, err = AddComment(bug2, rene, unix, "message15")
 	assert.Nil(t, err)
-	err = AddComment(bug2, rene, unix, "message16")
+	_, err = AddComment(bug2, rene, unix, "message16")
 	assert.Nil(t, err)
 	err = bug2.Commit(repoB)
 	assert.Nil(t, err)
 
-	err = AddComment(bug2, rene, unix, "message17")
+	_, err = AddComment(bug2, rene, unix, "message17")
 	assert.Nil(t, err)
-	err = AddComment(bug2, rene, unix, "message18")
+	_, err = AddComment(bug2, rene, unix, "message18")
 	assert.Nil(t, err)
-	err = AddComment(bug2, rene, unix, "message19")
+	_, err = AddComment(bug2, rene, unix, "message19")
 	assert.Nil(t, err)
 	err = bug2.Commit(repoB)
 	assert.Nil(t, err)