diff options
| author | Michael Muré <batolettre@gmail.com> | 2022-08-23 15:01:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-23 15:01:36 +0200 |
| commit | 5a70e8b3a2e0fe3d1a1dcd4c24bb6bf64633cb7f (patch) | |
| tree | e5382a09a45098672b6d60397eac201617fdd6ec /commands | |
| parent | 81fd7a5d8b6443e65c861f00a7387c0a3c926c66 (diff) | |
| parent | 6ed4b8b7a1185ad278eb2e40b32e859f828233d9 (diff) | |
| download | git-bug-5a70e8b3a2e0fe3d1a1dcd4c24bb6bf64633cb7f.tar.gz | |
Merge pull request #664 from MichaelMure/combined-id-rework
bug: have a type for combined ids, fix #653
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/comment.go | 2 | ||||
| -rw-r--r-- | commands/show.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/commands/comment.go b/commands/comment.go index b4b4628b..7cab447c 100644 --- a/commands/comment.go +++ b/commands/comment.go @@ -41,7 +41,7 @@ func runComment(env *Env, args []string) error { } env.out.Printf("Author: %s\n", colors.Magenta(comment.Author.DisplayName())) - env.out.Printf("Id: %s\n", colors.Cyan(comment.Id().Human())) + env.out.Printf("Id: %s\n", colors.Cyan(comment.CombinedId().Human())) env.out.Printf("Date: %s\n\n", comment.FormatTime()) env.out.Println(text.LeftPadLines(comment.Message, 4)) } diff --git a/commands/show.go b/commands/show.go index d145ffe7..1491372e 100644 --- a/commands/show.go +++ b/commands/show.go @@ -163,7 +163,7 @@ func showDefaultFormatter(env *Env, snapshot *bug.Snapshot) error { var message string env.out.Printf("%s%s #%d %s <%s>\n\n", indent, - comment.Id().Human(), + comment.CombinedId().Human(), i, comment.Author.DisplayName(), comment.Author.Email(), @@ -207,8 +207,8 @@ type JSONComment struct { func NewJSONComment(comment bug.Comment) JSONComment { return JSONComment{ - Id: comment.Id().String(), - HumanId: comment.Id().Human(), + Id: comment.CombinedId().String(), + HumanId: comment.CombinedId().Human(), Author: NewJSONIdentity(comment.Author), Message: comment.Message, } |