MichaelMure/git-bug
1
1
Fork 0
mirror of https://github.com/MichaelMure/git-bug.git synced 2024-12-15 10:12:06 +03:00
Code Issues Projects Releases Wiki Activity

jira: tag bugs with the base URL, tighten the matching

Browse Source
This commit is contained in:
Michael Muré 2020-03-28 17:07:57 +01:00
parent 8389df0711
commit 4397766800
No known key found for this signature in database
GPG Key ID: A4457C029293126F
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bridge/jira/import.go
View File

@ -216,7 +216,16 @@ func (ji *jiraImporter) ensureIssue(repo *cache.RepoCache, issue Issue) (*cache.
return nil, err return nil, err
} }
b, err := repo.ResolveBugCreateMetadata(metaKeyJiraId, issue.ID) b, err := repo.ResolveBugMatcher(func(excerpt *cache.BugExcerpt) bool {
if _, ok := excerpt.CreateMetadata[metaKeyJiraBaseUrl]; ok &&
excerpt.CreateMetadata[metaKeyJiraBaseUrl] != ji.conf[confKeyBaseUrl] {
return false
}
return excerpt.CreateMetadata[core.MetaKeyOrigin] == target &&
excerpt.CreateMetadata[metaKeyJiraId] == issue.ID &&
excerpt.CreateMetadata[metaKeyJiraProject] == ji.conf[confKeyProject]
})
if err != nil && err != bug.ErrBugNotExist { if err != nil && err != bug.ErrBugNotExist {
return nil, err return nil, err
} }
@ -241,6 +250,7 @@ func (ji *jiraImporter) ensureIssue(repo *cache.RepoCache, issue Issue) (*cache.
metaKeyJiraId: issue.ID, metaKeyJiraId: issue.ID,
metaKeyJiraKey: issue.Key, metaKeyJiraKey: issue.Key,
metaKeyJiraProject: ji.conf[confKeyProject], metaKeyJiraProject: ji.conf[confKeyProject],
metaKeyJiraBaseUrl: ji.conf[confKeyBaseUrl],
}) })
if err != nil { if err != nil {
return nil, err return nil, err

1
bridge/jira/jira.go
View File

@ -20,6 +20,7 @@ const (
metaKeyJiraKey = "jira-key" metaKeyJiraKey = "jira-key"
metaKeyJiraUser = "jira-user" metaKeyJiraUser = "jira-user"
metaKeyJiraProject = "jira-project" metaKeyJiraProject = "jira-project"
metaKeyJiraBaseUrl = "jira-base-url"
metaKeyJiraExportTime = "jira-export-time" metaKeyJiraExportTime = "jira-export-time"
metaKeyJiraLogin = "jira-login" metaKeyJiraLogin = "jira-login"