From 4e5f377d75824e31a058313cad2d2e478f348c28 Mon Sep 17 00:00:00 2001 From: vince Date: Fri, 24 Jul 2020 11:25:38 +0800 Subject: Remove need to specify remote This commit makes the removeBug command use the listRefs repo command to search for the bug, eliminating the need to input the remote the bug came from. --- bug/bug.go | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'bug') diff --git a/bug/bug.go b/bug/bug.go index 95c4325f..148e49bf 100644 --- a/bug/bug.go +++ b/bug/bug.go @@ -243,15 +243,18 @@ func readBug(repo repository.ClockedRepo, ref string) (*Bug, error) { } // RemoveLocalBug will remove a local bug from its hash -func RemoveLocalBug(repo repository.ClockedRepo, id entity.Id) error { - ref := bugsRefPattern + id.String() - return repo.RemoveRef(ref) -} - -// RemoveRemoteBug will remove a remote bug locally from its hash -func RemoveRemoteBug(repo repository.ClockedRepo, remote string, id entity.Id) error { - ref := fmt.Sprintf(bugsRemoteRefPattern, remote) + id.String() - return repo.RemoveRef(ref) +func RemoveBug(repo repository.ClockedRepo, id entity.Id) error { + refs, err := repo.ListRefs(id.String()) + if err != nil { + return err + } + for _, ref := range refs { + err = repo.RemoveRef(ref) + if err != nil { + return err + } + } + return nil } type StreamedBug struct { -- cgit