diff options
Diffstat (limited to 'bridge')
| -rw-r--r-- | bridge/github/import.go | 22 | ||||
| -rw-r--r-- | bridge/gitlab/config.go | 3 |
2 files changed, 11 insertions, 14 deletions
diff --git a/bridge/github/import.go b/bridge/github/import.go index a41083d2..1db67469 100644 --- a/bridge/github/import.go +++ b/bridge/github/import.go @@ -184,7 +184,7 @@ func (gi *githubImporter) ensureIssue(ctx context.Context, repo *cache.RepoCache // resolve bug b, err := repo.ResolveBugMatcher(func(excerpt *cache.BugExcerpt) bool { - return excerpt.CreateMetadata[core.MetaKeyOrigin] == target && + return excerpt.CreateMetadata[metaKeyGithubUrl] == issue.Url.String() && excerpt.CreateMetadata[metaKeyGithubId] == parseId(issue.Id) }) if err == nil { @@ -195,12 +195,11 @@ func (gi *githubImporter) ensureIssue(ctx context.Context, repo *cache.RepoCache } // At Github there exist issues with seemingly empty titles. An example is - // https://github.com/NixOS/nixpkgs/issues/72730 . - // The title provided by the GraphQL API actually consists of a space followed by a - // zero width space (U+200B). This title would cause the NewBugRaw() function to - // return an error: empty title. - title := string(issue.Title) - if title == " \u200b" { // U+200B == zero width space + // https://github.com/NixOS/nixpkgs/issues/72730 (here the title is actually + // a zero width space U+200B). + // Set title to some non-empty string, since git-bug does not accept empty titles. + title := text.CleanupOneLine(string(issue.Title)) + if text.Empty(title) { title = EmptyTitlePlaceholder } @@ -375,12 +374,11 @@ func (gi *githubImporter) ensureTimelineItem(ctx context.Context, repo *cache.Re } // At Github there exist issues with seemingly empty titles. An example is - // https://github.com/NixOS/nixpkgs/issues/72730 . - // The title provided by the GraphQL API actually consists of a space followed - // by a zero width space (U+200B). This title would cause the NewBugRaw() - // function to return an error: empty title. + // https://github.com/NixOS/nixpkgs/issues/72730 (here the title is actually + // a zero width space U+200B). + // Set title to some non-empty string, since git-bug does not accept empty titles. title := text.CleanupOneLine(string(item.RenamedTitleEvent.CurrentTitle)) - if title == " \u200b" { // U+200B == zero width space + if text.Empty(title) { title = EmptyTitlePlaceholder } diff --git a/bridge/gitlab/config.go b/bridge/gitlab/config.go index 3496b4a3..4a714d09 100644 --- a/bridge/gitlab/config.go +++ b/bridge/gitlab/config.go @@ -3,7 +3,6 @@ package gitlab import ( "fmt" "net/url" - "path" "regexp" "strconv" "strings" @@ -195,7 +194,7 @@ func promptTokenOptions(repo repository.RepoKeyring, login, baseUrl string) (aut } func promptToken(baseUrl string) (*auth.Token, error) { - fmt.Printf("You can generate a new token by visiting %s.\n", path.Join(baseUrl, "profile/personal_access_tokens")) + fmt.Printf("You can generate a new token by visiting %s.\n", strings.TrimSuffix(baseUrl, "/")+"/-/profile/personal_access_tokens") fmt.Println("Choose 'Create personal access token' and set the necessary access scope for your repository.") fmt.Println() fmt.Println("'api' access scope: to be able to make api calls") |