Temporarily disable localcommit files and buildscripts. #2853
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,8 @@ import ( | |
| "github.com/ActiveState/cli/internal/primer" | ||
| "github.com/ActiveState/cli/internal/prompt" | ||
| "github.com/ActiveState/cli/internal/runbits" | ||
| "github.com/ActiveState/cli/internal/runbits/commitmediator" | ||
| //"github.com/ActiveState/cli/pkg/localcommit" // re-enable in DX-2307 | ||
| "github.com/ActiveState/cli/pkg/platform/api" | ||
| gqlModel "github.com/ActiveState/cli/pkg/platform/api/graphql/model" | ||
| "github.com/ActiveState/cli/pkg/platform/api/reqsimport" | ||
|
|
@@ -177,7 +178,7 @@ func fetchImportChangeset(cp ChangesetProvider, file string, lang string) (model | |
| } | ||
|
|
||
| func commitChangeset(project *project.Project, msg string, changeset model.Changeset) (strfmt.UUID, error) { | ||
| localCommitID, err := commitmediator.Get(project) | ||
| if err != nil { | ||
| return "", errs.Wrap(err, "Unable to get local commit") | ||
| } | ||
|
|
@@ -188,7 +189,7 @@ func commitChangeset(project *project.Project, msg string, changeset model.Chang | |
| locale.T("commit_failed_pull_tip")) | ||
| } | ||
|
|
||
| if err := commitmediator.Set(project, commitID.String()); err != nil { | ||
| return "", locale.WrapError(err, "err_package_update_commit_id") | ||
| } | ||
| return commitID, nil | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,8 +15,9 @@ import ( | |
| "github.com/ActiveState/cli/internal/prompt" | ||
| "github.com/ActiveState/cli/internal/runbits" | ||
| buildscriptRunbits "github.com/ActiveState/cli/internal/runbits/buildscript" | ||
| "github.com/ActiveState/cli/internal/runbits/commitmediator" | ||
| "github.com/ActiveState/cli/pkg/cmdlets/commit" | ||
| //"github.com/ActiveState/cli/pkg/localcommit" // re-enable in DX-2307 | ||
| "github.com/ActiveState/cli/pkg/platform/api/mono/mono_models" | ||
| "github.com/ActiveState/cli/pkg/platform/authentication" | ||
| "github.com/ActiveState/cli/pkg/platform/model" | ||
|
|
@@ -98,7 +99,7 @@ func (p *Pull) Run(params *PullParams) error { | |
| } | ||
|
|
||
| var localCommit *strfmt.UUID | ||
| localCommitID, err := commitmediator.Get(p.project) | ||
| if err != nil { | ||
| return errs.Wrap(err, "Unable to get local commit") | ||
| } | ||
|
|
@@ -150,13 +151,13 @@ func (p *Pull) Run(params *PullParams) error { | |
| } | ||
| } | ||
|
|
||
| commitID, err := commitmediator.Get(p.project) | ||
| if err != nil { | ||
| return errs.Wrap(err, "Unable to get local commit") | ||
| } | ||
|
|
||
| if commitID != *resultingCommit { | ||
| err := commitmediator.Set(p.project, resultingCommit.String()) | ||
| if err != nil { | ||
| return errs.Wrap(err, "Unable to set local commit") | ||
| } | ||
|
|
@@ -181,17 +182,18 @@ func (p *Pull) Run(params *PullParams) error { | |
| } | ||
|
|
||
| func (p *Pull) performMerge(strategies *mono_models.MergeStrategies, remoteCommit strfmt.UUID, localCommit strfmt.UUID, namespace *project.Namespaced, branchName string) (strfmt.UUID, error) { | ||
| // Re-enable in DX-2307. | ||
| //err := p.mergeBuildScript(strategies, remoteCommit) | ||
| //if err != nil { | ||
| // return "", errs.Wrap(err, "Could not merge local build script with remote changes") | ||
| //} | ||
|
|
||
| p.out.Notice(output.Title(locale.Tl("pull_diverged", "Merging history"))) | ||
| p.out.Notice(locale.Tr( | ||
| "pull_diverged_message", | ||
| namespace.String(), branchName, localCommit.String(), remoteCommit.String())) | ||
|
|
||
| commitID, err := commitmediator.Get(p.project) | ||
| if err != nil { | ||
| return "", errs.Wrap(err, "Unable to get local commit") | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,8 +12,9 @@ import ( | |
| "github.com/ActiveState/cli/internal/primer" | ||
| "github.com/ActiveState/cli/internal/prompt" | ||
| "github.com/ActiveState/cli/internal/rtutils/ptr" | ||
| "github.com/ActiveState/cli/internal/runbits/commitmediator" | ||
| "github.com/ActiveState/cli/internal/runbits/rationalize" | ||
| //"github.com/ActiveState/cli/pkg/localcommit" // re-enable in DX-2307 | ||
| "github.com/ActiveState/cli/pkg/platform/api/mono/mono_models" | ||
| "github.com/ActiveState/cli/pkg/platform/authentication" | ||
| "github.com/ActiveState/cli/pkg/platform/model" | ||
|
|
@@ -87,7 +88,7 @@ func (r *Push) Run(params PushParams) (rerr error) { | |
| } | ||
| r.out.Notice(locale.Tl("operating_message", "", r.project.NamespaceString(), r.project.Dir())) | ||
|
|
||
| commitID, err := commitmediator.Get(r.project) // The commit we want to push | ||
| if err != nil { | ||
| // Note: should not get here, as verifyInput() ensures there is a local commit | ||
| return errs.Wrap(err, "Unable to get local commit") | ||
|
|
@@ -191,7 +192,7 @@ func (r *Push) Run(params PushParams) (rerr error) { | |
| } | ||
|
|
||
| // Update the project's commitID with the create project or push result. | ||
| if err := commitmediator.Set(r.project, commitID.String()); err != nil { | ||
| return errs.Wrap(err, "Unable to create local commit file") | ||
| } | ||
|
|
||
|
|
@@ -297,7 +298,7 @@ func (r *Push) verifyInput() error { | |
| return rationalize.ErrNoProject | ||
| } | ||
|
|
||
| commitID, err := commitmediator.Get(r.project) | ||
| if err != nil { | ||
| return errs.Wrap(err, "Unable to get local commit") | ||
| } | ||
|
|
@@ -335,7 +336,7 @@ func (r *Push) promptNamespace() (*project.Namespaced, error) { | |
| } | ||
|
|
||
| var name string | ||
| commitID, err := commitmediator.Get(r.project) | ||
| if err != nil { | ||
| return nil, errs.Wrap(err, "Unable to get local commit") | ||
| } | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should be okay to let
goimportshandle this kind of stuff. I'm not sure how it will handle import statements with comments in them as we iterate on these files before we re-enable everything.