diff options
Diffstat (limited to 'bridge')
38 files changed, 212 insertions, 181 deletions
diff --git a/bridge/bridges.go b/bridge/bridges.go index d74a58fa..5fe0c395 100644 --- a/bridge/bridges.go +++ b/bridge/bridges.go @@ -2,13 +2,13 @@ package bridge import ( - "github.com/MichaelMure/git-bug/bridge/core" - "github.com/MichaelMure/git-bug/bridge/github" - "github.com/MichaelMure/git-bug/bridge/gitlab" - "github.com/MichaelMure/git-bug/bridge/jira" - "github.com/MichaelMure/git-bug/bridge/launchpad" - "github.com/MichaelMure/git-bug/cache" - "github.com/MichaelMure/git-bug/repository" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/github" + "github.com/git-bug/git-bug/bridge/gitlab" + "github.com/git-bug/git-bug/bridge/jira" + "github.com/git-bug/git-bug/bridge/launchpad" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/repository" ) func init() { diff --git a/bridge/core/auth/credential.go b/bridge/core/auth/credential.go index 20343c9c..cb8e2baf 100644 --- a/bridge/core/auth/credential.go +++ b/bridge/core/auth/credential.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" - "github.com/MichaelMure/git-bug/entity" - "github.com/MichaelMure/git-bug/repository" + "github.com/git-bug/git-bug/entity" + "github.com/git-bug/git-bug/repository" ) const ( diff --git a/bridge/core/auth/credential_base.go b/bridge/core/auth/credential_base.go index f9d1bf67..9b6c1828 100644 --- a/bridge/core/auth/credential_base.go +++ b/bridge/core/auth/credential_base.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/MichaelMure/git-bug/bridge/core" - "github.com/MichaelMure/git-bug/repository" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/repository" ) type credentialBase struct { diff --git a/bridge/core/auth/credential_test.go b/bridge/core/auth/credential_test.go index 8bb25835..b35576d0 100644 --- a/bridge/core/auth/credential_test.go +++ b/bridge/core/auth/credential_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/MichaelMure/git-bug/entity" - "github.com/MichaelMure/git-bug/repository" + "github.com/git-bug/git-bug/entity" + "github.com/git-bug/git-bug/repository" ) func TestCredential(t *testing.T) { diff --git a/bridge/core/auth/login.go b/bridge/core/auth/login.go index 496f2412..91114463 100644 --- a/bridge/core/auth/login.go +++ b/bridge/core/auth/login.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "fmt" - "github.com/MichaelMure/git-bug/entity" + "github.com/git-bug/git-bug/entity" ) const ( diff --git a/bridge/core/auth/login_password.go b/bridge/core/auth/login_password.go index 166e37fb..fd5d730b 100644 --- a/bridge/core/auth/login_password.go +++ b/bridge/core/auth/login_password.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "fmt" - "github.com/MichaelMure/git-bug/entity" + "github.com/git-bug/git-bug/entity" ) const ( diff --git a/bridge/core/auth/token.go b/bridge/core/auth/token.go index 84d6ac13..0b28326c 100644 --- a/bridge/core/auth/token.go +++ b/bridge/core/auth/token.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "fmt" - "github.com/MichaelMure/git-bug/entity" + "github.com/git-bug/git-bug/entity" ) const ( diff --git a/bridge/core/bridge.go b/bridge/core/bridge.go index 1fc631f0..63f5d44a 100644 --- a/bridge/core/bridge.go +++ b/bridge/core/bridge.go @@ -13,8 +13,8 @@ import ( "github.com/pkg/errors" - "github.com/MichaelMure/git-bug/cache" - "github.com/MichaelMure/git-bug/repository" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/repository" ) var ErrImportNotSupported = errors.New("import is not supported") diff --git a/bridge/core/config.go b/bridge/core/config.go index ed079eb8..4fc9501d 100644 --- a/bridge/core/config.go +++ b/bridge/core/config.go @@ -3,9 +3,9 @@ package core import ( "fmt" - "github.com/MichaelMure/git-bug/cache" - "github.com/MichaelMure/git-bug/entities/identity" - "github.com/MichaelMure/git-bug/entity" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/entities/identity" + "github.com/git-bug/git-bug/entity" ) func FinishConfig(repo *cache.RepoCache, metaKey string, login string) error { diff --git a/bridge/core/export.go b/bridge/core/export.go index 9a248739..11f90353 100644 --- a/bridge/core/export.go +++ b/bridge/core/export.go @@ -3,7 +3,7 @@ package core import ( "fmt" - "github.com/MichaelMure/git-bug/entity" + "github.com/git-bug/git-bug/entity" ) type ExportEvent int diff --git a/bridge/core/import.go b/bridge/core/import.go index 8fab476e..a072d24a 100644 --- a/bridge/core/import.go +++ b/bridge/core/import.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/MichaelMure/git-bug/entity" + "github.com/git-bug/git-bug/entity" ) type ImportEvent int diff --git a/bridge/core/interfaces.go b/bridge/core/interfaces.go index 3d212f29..00b7a70e 100644 --- a/bridge/core/interfaces.go +++ b/bridge/core/interfaces.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/MichaelMure/git-bug/cache" + "github.com/git-bug/git-bug/cache" ) type Configuration map[string]string diff --git a/bridge/github/client.go b/bridge/github/client.go index e33b28d4..1072d7cb 100644 --- a/bridge/github/client.go +++ b/bridge/github/client.go @@ -9,7 +9,7 @@ import ( "github.com/shurcooL/githubv4" - "github.com/MichaelMure/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/core" ) var _ Client = &githubv4.Client{} diff --git a/bridge/github/config.go b/bridge/github/config.go index 9ae1d187..401149a8 100644 --- a/bridge/github/config.go +++ b/bridge/github/config.go @@ -15,11 +15,11 @@ import ( "github.com/pkg/errors" - "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/commands/input" - "github.com/MichaelMure/git-bug/repository" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/core/auth" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/commands/input" + "github.com/git-bug/git-bug/repository" ) const githubClientID = "ce3600aa56c2e69f18a5" // git-bug org diff --git a/bridge/github/config_test.go b/bridge/github/config_test.go index 01907435..a2043404 100644 --- a/bridge/github/config_test.go +++ b/bridge/github/config_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/MichaelMure/git-bug/bridge/core/auth" + "github.com/git-bug/git-bug/bridge/core/auth" ) func TestSplitURL(t *testing.T) { @@ -26,10 +26,10 @@ func TestSplitURL(t *testing.T) { { name: "default url", args: args{ - url: "https://github.com/MichaelMure/git-bug", + url: "https://github.com/git-bug/git-bug", }, want: want{ - owner: "MichaelMure", + owner: "git-bug", project: "git-bug", err: nil, }, @@ -37,10 +37,10 @@ func TestSplitURL(t *testing.T) { { name: "default issues url", args: args{ - url: "https://github.com/MichaelMure/git-bug/issues", + url: "https://github.com/git-bug/git-bug/issues", }, want: want{ - owner: "MichaelMure", + owner: "git-bug", project: "git-bug", err: nil, }, @@ -48,10 +48,10 @@ func TestSplitURL(t *testing.T) { { name: "default url with git extension", args: args{ - url: "https://github.com/MichaelMure/git-bug.git", + url: "https://github.com/git-bug/git-bug.git", }, want: want{ - owner: "MichaelMure", + owner: "git-bug", project: "git-bug", err: nil, }, @@ -59,10 +59,10 @@ func TestSplitURL(t *testing.T) { { name: "url with git protocol", args: args{ - url: "git://github.com/MichaelMure/git-bug.git", + url: "git://github.com/git-bug/git-bug.git", }, want: want{ - owner: "MichaelMure", + owner: "git-bug", project: "git-bug", err: nil, }, @@ -70,10 +70,10 @@ func TestSplitURL(t *testing.T) { { name: "ssh url", args: args{ - url: "git@github.com:MichaelMure/git-bug.git", + url: "git@github.com:git-bug/git-bug.git", }, want: want{ - owner: "MichaelMure", + owner: "git-bug", project: "git-bug", err: nil, }, @@ -81,7 +81,7 @@ func TestSplitURL(t *testing.T) { { name: "bad url", args: args{ - url: "https://githb.com/MichaelMure/git-bug.git", + url: "https://githb.com/git-bug/git-bug.git", }, want: want{ err: ErrBadProjectURL, @@ -115,26 +115,26 @@ func TestValidateUsername(t *testing.T) { }{ { name: "existing username", - input: "MichaelMure", - fixed: "MichaelMure", + input: "git-bug", + fixed: "git-bug", ok: true, }, { name: "existing username with bad case", - input: "MicHaelmurE", - fixed: "MichaelMure", + input: "GiT-bUg", + fixed: "git-bug", ok: true, }, { name: "existing organisation", - input: "ipfs", - fixed: "ipfs", + input: "git-bug", + fixed: "git-bug", ok: true, }, { name: "existing organisation with bad case", - input: "iPfS", - fixed: "ipfs", + input: "gIt-BuG", + fixed: "git-bug", ok: true, }, { @@ -183,7 +183,7 @@ func TestValidateProject(t *testing.T) { name: "public repository and token with scope 'public_repo'", args: args{ project: "git-bug", - owner: "MichaelMure", + owner: "git-bug", token: tokenPublic, }, want: true, @@ -192,7 +192,7 @@ func TestValidateProject(t *testing.T) { name: "private repository and token with scope 'repo'", args: args{ project: "git-bug-test-github-bridge", - owner: "MichaelMure", + owner: "git-bug", token: tokenPrivate, }, want: true, @@ -201,7 +201,7 @@ func TestValidateProject(t *testing.T) { name: "private repository and token with scope 'public_repo'", args: args{ project: "git-bug-test-github-bridge", - owner: "MichaelMure", + owner: "git-bug", token: tokenPublic, }, want: false, diff --git a/bridge/github/export.go b/bridge/github/export.go index 30e064c0..6f882637 100644 --- a/bridge/github/export.go +++ b/bridge/github/export.go @@ -15,13 +15,13 @@ import ( "github.com/shurcooL/githubv4" "golang.org/x/sync/errgroup" - "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/entities/bug" - "github.com/MichaelMure/git-bug/entities/common" - "github.com/MichaelMure/git-bug/entity" - "github.com/MichaelMure/git-bug/entity/dag" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/core/auth" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/entities/bug" + "github.com/git-bug/git-bug/entities/common" + "github.com/git-bug/git-bug/entity" + "github.com/git-bug/git-bug/entity/dag" ) var ( diff --git a/bridge/github/export_test.go b/bridge/github/export_test.go index e06457d4..9b10020d 100644 --- a/bridge/github/export_test.go +++ b/bridge/github/export_test.go @@ -13,13 +13,13 @@ import ( "github.com/stretchr/testify/require" - "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/entity" - "github.com/MichaelMure/git-bug/entity/dag" - "github.com/MichaelMure/git-bug/repository" - "github.com/MichaelMure/git-bug/util/interrupt" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/core/auth" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/entity" + "github.com/git-bug/git-bug/entity/dag" + "github.com/git-bug/git-bug/repository" + "github.com/git-bug/git-bug/util/interrupt" ) const ( diff --git a/bridge/github/github.go b/bridge/github/github.go index cbeb03eb..09a352a8 100644 --- a/bridge/github/github.go +++ b/bridge/github/github.go @@ -7,8 +7,8 @@ import ( "golang.org/x/oauth2" - "github.com/MichaelMure/git-bug/bridge/core" - "github.com/MichaelMure/git-bug/bridge/core/auth" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/core/auth" ) const ( diff --git a/bridge/github/import.go b/bridge/github/import.go index 4a51d117..2268d9e7 100644 --- a/bridge/github/import.go +++ b/bridge/github/import.go @@ -7,11 +7,11 @@ import ( "github.com/shurcooL/githubv4" - "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/entity" - "github.com/MichaelMure/git-bug/util/text" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/core/auth" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/entity" + "github.com/git-bug/git-bug/util/text" ) const EmptyTitlePlaceholder = "<empty string>" diff --git a/bridge/github/import_integration_test.go b/bridge/github/import_integration_test.go index 8c411d8d..a642d374 100644 --- a/bridge/github/import_integration_test.go +++ b/bridge/github/import_integration_test.go @@ -11,11 +11,11 @@ import ( m "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/MichaelMure/git-bug/bridge/github/mocks" - "github.com/MichaelMure/git-bug/cache" - "github.com/MichaelMure/git-bug/entities/bug" - "github.com/MichaelMure/git-bug/repository" - "github.com/MichaelMure/git-bug/util/interrupt" + "github.com/git-bug/git-bug/bridge/github/mocks" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/entities/bug" + "github.com/git-bug/git-bug/repository" + "github.com/git-bug/git-bug/util/interrupt" ) // using testify/mock and mockery diff --git a/bridge/github/import_test.go b/bridge/github/import_test.go index b0ff2f99..80be5116 100644 --- a/bridge/github/import_test.go +++ b/bridge/github/import_test.go @@ -4,20 +4,21 @@ import ( "context" "fmt" "os" + "strings" "testing" "time" "github.com/stretchr/testify/require" - "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/entities/bug" - "github.com/MichaelMure/git-bug/entities/common" - "github.com/MichaelMure/git-bug/entities/identity" - "github.com/MichaelMure/git-bug/entity/dag" - "github.com/MichaelMure/git-bug/repository" - "github.com/MichaelMure/git-bug/util/interrupt" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/core/auth" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/entities/bug" + "github.com/git-bug/git-bug/entities/common" + "github.com/git-bug/git-bug/entities/identity" + "github.com/git-bug/git-bug/entity/dag" + "github.com/git-bug/git-bug/repository" + "github.com/git-bug/git-bug/util/interrupt" ) func TestGithubImporter(t *testing.T) { @@ -34,7 +35,10 @@ func TestGithubImporter(t *testing.T) { defer backend.Close() interrupt.RegisterCleaner(backend.Close) - author, err := identity.NewIdentity(repo, "Michael Muré", "batolettre@gmail.com") + author, err := identity.NewIdentity(repo, "Michael Muré", "no-reply@git-bug.test") + require.NoError(t, err) + + complexIssueEditAuthor, err := identity.NewIdentity(repo, "sudoforge", "no-reply@git-bug.test") require.NoError(t, err) tests := []struct { @@ -44,7 +48,7 @@ func TestGithubImporter(t *testing.T) { }{ { name: "simple issue", - url: "https://github.com/MichaelMure/git-bug-test-github-bridge/issues/1", + url: "https://github.com/git-bug/git-bug-test-github-bridge/issues/1", bug: &bug.Snapshot{ Operations: []dag.Operation{ bug.NewCreateOp(author, 0, "simple issue", "initial comment", nil), @@ -55,7 +59,7 @@ func TestGithubImporter(t *testing.T) { }, { name: "empty issue", - url: "https://github.com/MichaelMure/git-bug-test-github-bridge/issues/2", + url: "https://github.com/git-bug/git-bug-test-github-bridge/issues/2", bug: &bug.Snapshot{ Operations: []dag.Operation{ bug.NewCreateOp(author, 0, "empty issue", "", nil), @@ -64,14 +68,41 @@ func TestGithubImporter(t *testing.T) { }, { name: "complex issue", - url: "https://github.com/MichaelMure/git-bug-test-github-bridge/issues/3", + url: "https://github.com/git-bug/git-bug-test-github-bridge/issues/3", bug: &bug.Snapshot{ Operations: []dag.Operation{ bug.NewCreateOp(author, 0, "complex issue", "initial comment", nil), bug.NewLabelChangeOperation(author, 0, []bug.Label{"bug"}, []bug.Label{}), bug.NewLabelChangeOperation(author, 0, []bug.Label{"duplicate"}, []bug.Label{}), bug.NewLabelChangeOperation(author, 0, []bug.Label{}, []bug.Label{"duplicate"}), - bug.NewAddCommentOp(author, 0, "### header\n\n**bold**\n\n_italic_\n\n> with quote\n\n`inline code`\n\n```\nmultiline code\n```\n\n- bulleted\n- list\n\n1. numbered\n1. list\n\n- [ ] task\n- [x] list\n\n@MichaelMure mention\n\n#2 reference issue\n#3 auto-reference issue\n\n", nil), + bug.NewAddCommentOp(author, 0, strings.Join([]string{ + "### header", + "**bold**", + "_italic_", + "> with quote", + "`inline code`", + "```\nmultiline code\n```", + "- bulleted\n- list", + "1. numbered\n1. list", + "- [ ] task\n- [x] list", + "@MichaelMure mention", + "#2 reference issue\n#3 auto-reference issue", + "", + }, "\n\n"), nil), + bug.NewEditCommentOp(complexIssueEditAuthor, 0, "", strings.Join([]string{ + "### header", + "**bold**", + "_italic_", + "> with quote", + "`inline code`", + "```\nmultiline code\n```", + "- bulleted\n- list", + "1. numbered\n1. list", + "- [ ] task\n- [x] list", + "@git-bug/maintainers mention", + "#2 reference issue\n#3 auto-reference issue", + "", + }, "\n\n"), nil), bug.NewSetTitleOp(author, 0, "complex issue edited", "complex issue"), bug.NewSetTitleOp(author, 0, "complex issue", "complex issue edited"), bug.NewSetStatusOp(author, 0, common.ClosedStatus), @@ -81,7 +112,7 @@ func TestGithubImporter(t *testing.T) { }, { name: "editions", - url: "https://github.com/MichaelMure/git-bug-test-github-bridge/issues/4", + url: "https://github.com/git-bug/git-bug-test-github-bridge/issues/4", bug: &bug.Snapshot{ Operations: []dag.Operation{ bug.NewCreateOp(author, 0, "editions", "initial comment edited", nil), @@ -93,7 +124,7 @@ func TestGithubImporter(t *testing.T) { }, { name: "comment deletion", - url: "https://github.com/MichaelMure/git-bug-test-github-bridge/issues/5", + url: "https://github.com/git-bug/git-bug-test-github-bridge/issues/5", bug: &bug.Snapshot{ Operations: []dag.Operation{ bug.NewCreateOp(author, 0, "comment deletion", "", nil), @@ -102,7 +133,7 @@ func TestGithubImporter(t *testing.T) { }, { name: "edition deletion", - url: "https://github.com/MichaelMure/git-bug-test-github-bridge/issues/6", + url: "https://github.com/git-bug/git-bug-test-github-bridge/issues/6", bug: &bug.Snapshot{ Operations: []dag.Operation{ bug.NewCreateOp(author, 0, "edition deletion", "initial comment", nil), @@ -114,7 +145,7 @@ func TestGithubImporter(t *testing.T) { }, { name: "hidden comment", - url: "https://github.com/MichaelMure/git-bug-test-github-bridge/issues/7", + url: "https://github.com/git-bug/git-bug-test-github-bridge/issues/7", bug: &bug.Snapshot{ Operations: []dag.Operation{ bug.NewCreateOp(author, 0, "hidden comment", "initial comment", nil), @@ -124,7 +155,7 @@ func TestGithubImporter(t *testing.T) { }, { name: "transferred issue", - url: "https://github.com/MichaelMure/git-bug-test-github-bridge/issues/8", + url: "https://github.com/git-bug/git-bug-test-github-bridge/issues/8", bug: &bug.Snapshot{ Operations: []dag.Operation{ bug.NewCreateOp(author, 0, "transfered issue", "", nil), @@ -133,7 +164,7 @@ func TestGithubImporter(t *testing.T) { }, { name: "unicode control characters", - url: "https://github.com/MichaelMure/git-bug-test-github-bridge/issues/10", + url: "https://github.com/git-bug/git-bug-test-github-bridge/issues/10", bug: &bug.Snapshot{ Operations: []dag.Operation{ bug.NewCreateOp(author, 0, "unicode control characters", "u0000: \nu0001: \nu0002: \nu0003: \nu0004: \nu0005: \nu0006: \nu0007: \nu0008: \nu0009: \t\nu0010: \nu0011: \nu0012: \nu0013: \nu0014: \nu0015: \nu0016: \nu0017: \nu0018: \nu0019:", nil), @@ -154,7 +185,7 @@ func TestGithubImporter(t *testing.T) { importer := &githubImporter{} err = importer.Init(ctx, backend, core.Configuration{ - confKeyOwner: "MichaelMure", + confKeyOwner: "git-bug", confKeyProject: "git-bug-test-github-bridge", confKeyDefaultLogin: login, }) diff --git a/bridge/gitlab/config.go b/bridge/gitlab/config.go index 9411ba2e..13864771 100644 --- a/bridge/gitlab/config.go +++ b/bridge/gitlab/config.go @@ -10,11 +10,11 @@ import ( "github.com/pkg/errors" "github.com/xanzy/go-gitlab" - "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/commands/input" - "github.com/MichaelMure/git-bug/repository" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/core/auth" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/commands/input" + "github.com/git-bug/git-bug/repository" ) var ( diff --git a/bridge/gitlab/config_test.go b/bridge/gitlab/config_test.go index 43ed649a..2814b482 100644 --- a/bridge/gitlab/config_test.go +++ b/bridge/gitlab/config_test.go @@ -22,57 +22,57 @@ func TestProjectPath(t *testing.T) { { name: "default url", args: args{ - url: "https://gitlab.com/MichaelMure/git-bug", + url: "https://gitlab.com/git-bug/git-bug", }, want: want{ - path: "MichaelMure/git-bug", + path: "git-bug/git-bug", err: nil, }, }, { name: "multiple sub groups", args: args{ - url: "https://gitlab.com/MichaelMure/group/subgroup/git-bug", + url: "https://gitlab.com/git-bug/group/subgroup/git-bug", }, want: want{ - path: "MichaelMure/group/subgroup/git-bug", + path: "git-bug/group/subgroup/git-bug", err: nil, }, }, { name: "default url with git extension", args: args{ - url: "https://gitlab.com/MichaelMure/git-bug.git", + url: "https://gitlab.com/git-bug/git-bug.git", }, want: want{ - path: "MichaelMure/git-bug", + path: "git-bug/git-bug", err: nil, }, }, { name: "url with git protocol", args: args{ - url: "git://gitlab.com/MichaelMure/git-bug.git", + url: "git://gitlab.com/git-bug/git-bug.git", }, want: want{ - path: "MichaelMure/git-bug", + path: "git-bug/git-bug", err: nil, }, }, { name: "ssh url", args: args{ - url: "git@gitlab.com/MichaelMure/git-bug.git", + url: "git@gitlab.com/git-bug/git-bug.git", }, want: want{ - path: "MichaelMure/git-bug", + path: "git-bug/git-bug", err: nil, }, }, { name: "bad url", args: args{ - url: "---,%gitlab.com/MichaelMure/git-bug.git", + url: "---,%gitlab.com/git-bug/git-bug.git", }, want: want{ err: ErrBadProjectURL, diff --git a/bridge/gitlab/event.go b/bridge/gitlab/event.go index 0653269d..92592e4d 100644 --- a/bridge/gitlab/event.go +++ b/bridge/gitlab/event.go @@ -7,7 +7,7 @@ import ( "github.com/xanzy/go-gitlab" - "github.com/MichaelMure/git-bug/util/text" + "github.com/git-bug/git-bug/util/text" ) // Event represents a unified GitLab event (note, label or state event). diff --git a/bridge/gitlab/export.go b/bridge/gitlab/export.go index 8cf8decf..040ace41 100644 --- a/bridge/gitlab/export.go +++ b/bridge/gitlab/export.go @@ -10,13 +10,13 @@ import ( "github.com/pkg/errors" "github.com/xanzy/go-gitlab" - "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/entities/bug" - "github.com/MichaelMure/git-bug/entities/common" - "github.com/MichaelMure/git-bug/entity" - "github.com/MichaelMure/git-bug/entity/dag" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/core/auth" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/entities/bug" + "github.com/git-bug/git-bug/entities/common" + "github.com/git-bug/git-bug/entity" + "github.com/git-bug/git-bug/entity/dag" ) var ( diff --git a/bridge/gitlab/export_test.go b/bridge/gitlab/export_test.go index 7c826822..bbc2b11c 100644 --- a/bridge/gitlab/export_test.go +++ b/bridge/gitlab/export_test.go @@ -11,16 +11,16 @@ import ( "github.com/xanzy/go-gitlab" - "github.com/MichaelMure/git-bug/entity" - "github.com/MichaelMure/git-bug/entity/dag" + "github.com/git-bug/git-bug/entity" + "github.com/git-bug/git-bug/entity/dag" "github.com/stretchr/testify/require" - "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/repository" - "github.com/MichaelMure/git-bug/util/interrupt" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/core/auth" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/repository" + "github.com/git-bug/git-bug/util/interrupt" ) const ( diff --git a/bridge/gitlab/gitlab.go b/bridge/gitlab/gitlab.go index 3625a9bb..864d60c9 100644 --- a/bridge/gitlab/gitlab.go +++ b/bridge/gitlab/gitlab.go @@ -5,8 +5,8 @@ import ( "github.com/xanzy/go-gitlab" - "github.com/MichaelMure/git-bug/bridge/core" - "github.com/MichaelMure/git-bug/bridge/core/auth" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/core/auth" ) const ( diff --git a/bridge/gitlab/gitlab_api.go b/bridge/gitlab/gitlab_api.go index c00baf9d..79d2bfef 100644 --- a/bridge/gitlab/gitlab_api.go +++ b/bridge/gitlab/gitlab_api.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/MichaelMure/git-bug/util/text" + "github.com/git-bug/git-bug/util/text" "github.com/xanzy/go-gitlab" ) diff --git a/bridge/gitlab/import.go b/bridge/gitlab/import.go index e4330b4c..43289e0d 100644 --- a/bridge/gitlab/import.go +++ b/bridge/gitlab/import.go @@ -8,11 +8,11 @@ import ( "github.com/xanzy/go-gitlab" - "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/entity" - "github.com/MichaelMure/git-bug/util/text" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/core/auth" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/entity" + "github.com/git-bug/git-bug/util/text" ) // gitlabImporter implement the Importer interface diff --git a/bridge/gitlab/import_test.go b/bridge/gitlab/import_test.go index bed93a80..2190369b 100644 --- a/bridge/gitlab/import_test.go +++ b/bridge/gitlab/import_test.go @@ -9,15 +9,15 @@ import ( "github.com/stretchr/testify/require" - "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/entities/bug" - "github.com/MichaelMure/git-bug/entities/common" - "github.com/MichaelMure/git-bug/entities/identity" - "github.com/MichaelMure/git-bug/entity/dag" - "github.com/MichaelMure/git-bug/repository" - "github.com/MichaelMure/git-bug/util/interrupt" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/core/auth" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/entities/bug" + "github.com/git-bug/git-bug/entities/common" + "github.com/git-bug/git-bug/entities/identity" + "github.com/git-bug/git-bug/entity/dag" + "github.com/git-bug/git-bug/repository" + "github.com/git-bug/git-bug/util/interrupt" ) func TestGitlabImport(t *testing.T) { @@ -73,7 +73,7 @@ func TestGitlabImport(t *testing.T) { bug: &bug.Snapshot{ Operations: []dag.Operation{ bug.NewCreateOp(author, 0, "complex issue", "initial comment", nil), - bug.NewAddCommentOp(author, 0, "### header\n\n**bold**\n\n_italic_\n\n> with quote\n\n`inline code`\n\n```\nmultiline code\n```\n\n- bulleted\n- list\n\n1. numbered\n1. list\n\n- [ ] task\n- [x] list\n\n@MichaelMure mention\n\n#2 reference issue\n#3 auto-reference issue", nil), + bug.NewAddCommentOp(author, 0, "### header\n\n**bold**\n\n_italic_\n\n> with quote\n\n`inline code`\n\n```\nmultiline code\n```\n\n- bulleted\n- list\n\n1. numbered\n1. list\n\n- [ ] task\n- [x] list\n\n@git-bug mention\n\n#2 reference issue\n#3 auto-reference issue", nil), bug.NewSetTitleOp(author, 0, "complex issue edited", "complex issue"), bug.NewSetTitleOp(author, 0, "complex issue", "complex issue edited"), bug.NewSetStatusOp(author, 0, common.ClosedStatus), diff --git a/bridge/jira/client.go b/bridge/jira/client.go index 3ceffff2..53dfad6e 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/entities/bug" + "github.com/git-bug/git-bug/entities/bug" ) var errDone = errors.New("Iteration Done") diff --git a/bridge/jira/config.go b/bridge/jira/config.go index 4fb267db..22ce1dca 100644 --- a/bridge/jira/config.go +++ b/bridge/jira/config.go @@ -4,18 +4,18 @@ import ( "context" "fmt" - "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/commands/input" - "github.com/MichaelMure/git-bug/repository" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/core/auth" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/commands/input" + "github.com/git-bug/git-bug/repository" ) const moreConfigText = ` NOTE: There are a few optional configuration values that you can additionally set in your git configuration to influence the behavior of the bridge. Please see the notes at: -https://github.com/MichaelMure/git-bug/blob/master/doc/jira_bridge.md +https://github.com/git-bug/git-bug/blob/master/doc/jira_bridge.md ` const credTypeText = ` diff --git a/bridge/jira/export.go b/bridge/jira/export.go index 95f9e28c..2ea34196 100644 --- a/bridge/jira/export.go +++ b/bridge/jira/export.go @@ -10,12 +10,12 @@ import ( "github.com/pkg/errors" - "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/entities/bug" - "github.com/MichaelMure/git-bug/entity" - "github.com/MichaelMure/git-bug/entity/dag" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/core/auth" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/entities/bug" + "github.com/git-bug/git-bug/entity" + "github.com/git-bug/git-bug/entity/dag" ) var ( diff --git a/bridge/jira/import.go b/bridge/jira/import.go index d8a5f8dd..0d7d1f1e 100644 --- a/bridge/jira/import.go +++ b/bridge/jira/import.go @@ -9,14 +9,14 @@ import ( "strings" "time" - "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/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" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/core/auth" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/entities/bug" + "github.com/git-bug/git-bug/entities/common" + "github.com/git-bug/git-bug/entity" + "github.com/git-bug/git-bug/entity/dag" + "github.com/git-bug/git-bug/util/text" ) const ( diff --git a/bridge/jira/jira.go b/bridge/jira/jira.go index 024bf9a2..eaf42065 100644 --- a/bridge/jira/jira.go +++ b/bridge/jira/jira.go @@ -7,9 +7,9 @@ import ( "sort" "time" - "github.com/MichaelMure/git-bug/bridge/core" - "github.com/MichaelMure/git-bug/bridge/core/auth" - "github.com/MichaelMure/git-bug/commands/input" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/core/auth" + "github.com/git-bug/git-bug/commands/input" ) const ( diff --git a/bridge/launchpad/config.go b/bridge/launchpad/config.go index 669d36bf..835c0d07 100644 --- a/bridge/launchpad/config.go +++ b/bridge/launchpad/config.go @@ -6,9 +6,9 @@ import ( "net/http" "regexp" - "github.com/MichaelMure/git-bug/bridge/core" - "github.com/MichaelMure/git-bug/cache" - "github.com/MichaelMure/git-bug/commands/input" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/commands/input" ) var ErrBadProjectURL = errors.New("bad Launchpad project URL") diff --git a/bridge/launchpad/import.go b/bridge/launchpad/import.go index 6a20217c..67c67b55 100644 --- a/bridge/launchpad/import.go +++ b/bridge/launchpad/import.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/MichaelMure/git-bug/bridge/core" - "github.com/MichaelMure/git-bug/cache" - "github.com/MichaelMure/git-bug/entity" - "github.com/MichaelMure/git-bug/util/text" + "github.com/git-bug/git-bug/bridge/core" + "github.com/git-bug/git-bug/cache" + "github.com/git-bug/git-bug/entity" + "github.com/git-bug/git-bug/util/text" ) type launchpadImporter struct { diff --git a/bridge/launchpad/launchpad.go b/bridge/launchpad/launchpad.go index 51ee79d2..6538aaee 100644 --- a/bridge/launchpad/launchpad.go +++ b/bridge/launchpad/launchpad.go @@ -4,7 +4,7 @@ package launchpad import ( "time" - "github.com/MichaelMure/git-bug/bridge/core" + "github.com/git-bug/git-bug/bridge/core" ) const ( |