diff options
Diffstat (limited to 'bridge/jira')
| -rw-r--r-- | bridge/jira/client.go | 2 | ||||
| -rw-r--r-- | bridge/jira/config.go | 2 | ||||
| -rw-r--r-- | bridge/jira/export.go | 4 | ||||
| -rw-r--r-- | bridge/jira/import.go | 16 | ||||
| -rw-r--r-- | bridge/jira/jira.go | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/bridge/jira/client.go b/bridge/jira/client.go index 5e1db26f..c5fd1776 100644 --- a/bridge/jira/client.go +++ b/bridge/jira/client.go @@ -16,7 +16,7 @@ import ( "github.com/pkg/errors" - "github.com/MichaelMure/git-bug/bug" + "github.com/MichaelMure/git-bug/entities/bug" ) var errDone = errors.New("Iteration Done") diff --git a/bridge/jira/config.go b/bridge/jira/config.go index 3ce6ad9a..4fb267db 100644 --- a/bridge/jira/config.go +++ b/bridge/jira/config.go @@ -7,7 +7,7 @@ import ( "github.com/MichaelMure/git-bug/bridge/core" "github.com/MichaelMure/git-bug/bridge/core/auth" "github.com/MichaelMure/git-bug/cache" - "github.com/MichaelMure/git-bug/input" + "github.com/MichaelMure/git-bug/commands/input" "github.com/MichaelMure/git-bug/repository" ) diff --git a/bridge/jira/export.go b/bridge/jira/export.go index 0cadf754..763d6a1c 100644 --- a/bridge/jira/export.go +++ b/bridge/jira/export.go @@ -12,11 +12,11 @@ import ( "github.com/MichaelMure/git-bug/bridge/core" "github.com/MichaelMure/git-bug/bridge/core/auth" - "github.com/MichaelMure/git-bug/bug" "github.com/MichaelMure/git-bug/cache" + "github.com/MichaelMure/git-bug/entities/bug" + "github.com/MichaelMure/git-bug/entities/identity" "github.com/MichaelMure/git-bug/entity" "github.com/MichaelMure/git-bug/entity/dag" - "github.com/MichaelMure/git-bug/identity" ) var ( diff --git a/bridge/jira/import.go b/bridge/jira/import.go index 572c393e..8043acf4 100644 --- a/bridge/jira/import.go +++ b/bridge/jira/import.go @@ -11,8 +11,9 @@ import ( "github.com/MichaelMure/git-bug/bridge/core" "github.com/MichaelMure/git-bug/bridge/core/auth" - "github.com/MichaelMure/git-bug/bug" "github.com/MichaelMure/git-bug/cache" + "github.com/MichaelMure/git-bug/entities/bug" + "github.com/MichaelMure/git-bug/entities/common" "github.com/MichaelMure/git-bug/entity" "github.com/MichaelMure/git-bug/entity/dag" "github.com/MichaelMure/git-bug/util/text" @@ -269,8 +270,7 @@ func (ji *jiraImporter) ensureComment(repo *cache.RepoCache, b *cache.BugCache, return err } - targetOpID, err := b.ResolveOperationWithMetadata( - metaKeyJiraId, item.ID) + targetOpID, err := b.ResolveOperationWithMetadata(metaKeyJiraId, item.ID) if err != nil && err != cache.ErrNoMatchingOp { return err } @@ -333,7 +333,7 @@ func (ji *jiraImporter) ensureComment(repo *cache.RepoCache, b *cache.BugCache, op, err := b.EditCommentRaw( editor, item.Updated.Unix(), - targetOpID, + entity.CombineIds(b.Id(), targetOpID), text.Cleanup(item.Body), map[string]string{ metaKeyJiraId: derivedID, @@ -516,7 +516,7 @@ func (ji *jiraImporter) ensureChange(repo *cache.RepoCache, b *cache.BugCache, e statusStr, hasMap := statusMap[item.To] if hasMap { switch statusStr { - case bug.OpenStatus.String(): + case common.OpenStatus.String(): op, err := b.OpenRaw( author, entry.Created.Unix(), @@ -530,7 +530,7 @@ func (ji *jiraImporter) ensureChange(repo *cache.RepoCache, b *cache.BugCache, e } ji.out <- core.NewImportStatusChange(op.Id()) - case bug.ClosedStatus.String(): + case common.ClosedStatus.String(): op, err := b.CloseRaw( author, entry.Created.Unix(), @@ -608,8 +608,8 @@ func getStatusMap(conf core.Configuration) (map[string]string, error) { mapStr, hasConf := conf[confKeyIDMap] if !hasConf { return map[string]string{ - bug.OpenStatus.String(): "1", - bug.ClosedStatus.String(): "6", + common.OpenStatus.String(): "1", + common.ClosedStatus.String(): "6", }, nil } diff --git a/bridge/jira/jira.go b/bridge/jira/jira.go index 6423843c..024bf9a2 100644 --- a/bridge/jira/jira.go +++ b/bridge/jira/jira.go @@ -9,7 +9,7 @@ import ( "github.com/MichaelMure/git-bug/bridge/core" "github.com/MichaelMure/git-bug/bridge/core/auth" - "github.com/MichaelMure/git-bug/input" + "github.com/MichaelMure/git-bug/commands/input" ) const ( |