Replace localcommit with new primed checkoutinfo package.

internal/captain/rationalize.go

@@ -7,11 +7,11 @@ import (
 	"github.com/ActiveState/cli/internal/locale"
 	"github.com/ActiveState/cli/internal/runbits/rationalize"
 	"github.com/ActiveState/cli/pkg/buildscript"
-	"github.com/ActiveState/cli/pkg/localcommit"
+	"github.com/ActiveState/cli/pkg/checkoutinfo"
 )
 
 func rationalizeError(err *error) {
-	var errInvalidCommitID *localcommit.ErrInvalidCommitID
+	var errInvalidCommitID *checkoutinfo.ErrInvalidCommitID
 
 	switch {
 	case err == nil:

internal/events/cmdcall/cmdcall.go

@@ -21,6 +21,7 @@ type primeable interface {
 	primer.Configurer
 	primer.Analyticer
 	primer.SvcModeler
+	primer.CheckoutInfoer
 }
 
 // CmdCall manages dependencies for the handling of events triggered by command

internal/migrator/migrator.go

@@ -9,6 +9,7 @@ import (
 	"github.com/ActiveState/cli/internal/locale"
 	"github.com/ActiveState/cli/internal/logging"
 	"github.com/ActiveState/cli/internal/runbits/buildscript"
+	"github.com/ActiveState/cli/pkg/checkoutinfo"
 	"github.com/ActiveState/cli/pkg/platform/authentication"
 	"github.com/ActiveState/cli/pkg/platform/model"
 	"github.com/ActiveState/cli/pkg/projectfile"
@@ -29,7 +30,8 @@ func NewMigrator(auth *authentication.Auth, cfg *config.Instance, svcm *model.Sv
 			case 0:
 				if cfg.GetBool(constants.OptinBuildscriptsConfig) {
 					logging.Debug("Creating buildscript")
-					if err := buildscript_runbit.Initialize(filepath.Dir(project.Path()), auth, svcm); err != nil {
+					info := checkoutinfo.New(project)
+					if err := buildscript_runbit.Initialize(filepath.Dir(project.Path()), auth, svcm, info); err != nil {
 						return v, errs.Wrap(err, "Failed to initialize buildscript")
 					}
 				}

internal/primer/primer.go

@@ -12,24 +12,26 @@ import (
 	"github.com/ActiveState/cli/internal/prompt"
 	"github.com/ActiveState/cli/internal/subshell"
 	"github.com/ActiveState/cli/internal/svcctl"
+	"github.com/ActiveState/cli/pkg/checkoutinfo"
 	"github.com/ActiveState/cli/pkg/platform/authentication"
 	"github.com/ActiveState/cli/pkg/platform/model"
 	"github.com/ActiveState/cli/pkg/project"
 	"github.com/ActiveState/cli/pkg/projectfile"
 )
 
 type Values struct {
-	project     *project.Project
-	projectfile *projectfile.Project
-	output      output.Outputer
-	auth        *authentication.Auth
-	prompt      prompt.Prompter
-	subshell    subshell.SubShell
-	conditional *constraints.Conditional
-	config      *config.Instance
-	ipComm      svcctl.IPCommunicator
-	svcModel    *model.SvcModel
-	analytics   analytics.Dispatcher
+	project      *project.Project
+	projectfile  *projectfile.Project
+	output       output.Outputer
+	auth         *authentication.Auth
+	prompt       prompt.Prompter
+	subshell     subshell.SubShell
+	conditional  *constraints.Conditional
+	config       *config.Instance
+	ipComm       svcctl.IPCommunicator
+	svcModel     *model.SvcModel
+	analytics    analytics.Dispatcher
+	checkoutinfo *checkoutinfo.CheckoutInfo
 }
 
 func New(values ...any) *Values {
@@ -65,12 +67,14 @@ func New(values ...any) *Values {
 			}
 		}
 	}
+	result.checkoutinfo = checkoutinfo.New(result.projectfile)
 	return result
 }
 
 func (v *Values) SetProject(p *project.Project) {
 	v.project = p
 	v.projectfile = p.Source()
+	v.checkoutinfo = checkoutinfo.New(v.projectfile)
 }
 
 type Projecter interface {
@@ -118,6 +122,10 @@ type Conditioner interface {
 	Conditional() *constraints.Conditional
 }
 
+type CheckoutInfoer interface {
+	CheckoutInfo() *checkoutinfo.CheckoutInfo
+}
+
 func (v *Values) Project() *project.Project {
 	return v.project
 }
@@ -161,3 +169,7 @@ func (v *Values) Config() *config.Instance {
 func (v *Values) Analytics() analytics.Dispatcher {
 	return v.analytics
 }
+
+func (v *Values) CheckoutInfo() *checkoutinfo.CheckoutInfo {
+	return v.checkoutinfo
+}

internal/runbits/buildplanner/buildplanner.go

@@ -9,7 +9,6 @@ import (
 	"github.com/ActiveState/cli/internal/rtutils/ptr"
 	"github.com/ActiveState/cli/internal/runbits/rationalize"
 	"github.com/ActiveState/cli/pkg/buildplan"
-	"github.com/ActiveState/cli/pkg/localcommit"
 	"github.com/ActiveState/cli/pkg/platform/api/buildplanner/request"
 	"github.com/ActiveState/cli/pkg/platform/model"
 	bpModel "github.com/ActiveState/cli/pkg/platform/model/buildplanner"
@@ -39,6 +38,7 @@ type primeable interface {
 	primer.Auther
 	primer.Outputer
 	primer.SvcModeler
+	primer.CheckoutInfoer
 }
 
 // GetCommit returns a commit from the given arguments. By default, the local commit for the
@@ -54,6 +54,7 @@ func GetCommit(
 	out := prime.Output()
 	auth := prime.Auth()
 	svcm := prime.SvcModel()
+	info := prime.CheckoutInfo()
 
 	if pj == nil && !namespace.IsValid() {
 		return nil, rationalize.ErrNoProject
@@ -87,9 +88,9 @@ func GetCommit(
 	switch {
 	// Return the buildplan from this runtime.
 	case !namespaceProvided && !commitIdProvided:
-		localCommitID, err := localcommit.Get(pj.Path())
+		localCommitID, err := info.CommitID()
 		if err != nil {
-			return nil, errs.Wrap(err, "Could not get local commit")
+			return nil, errs.Wrap(err, "Could not get commit ID")
 		}
 
 		bp := bpModel.NewBuildPlannerModel(auth, svcm)
@@ -154,9 +155,9 @@ func GetCommit(
 		owner = pj.Owner()
 		name = pj.Name()
 		nsString = pj.NamespaceString()
-		commitID, err := localcommit.Get(pj.Path())
+		commitID, err := info.CommitID()
 		if err != nil {
-			return nil, errs.Wrap(err, "Could not get local commit")
+			return nil, errs.Wrap(err, "Could not get commit ID")
 		}
 		localCommitID = &commitID
 	}

internal/runbits/buildscript/file.go

@@ -9,9 +9,8 @@ import (
 	"github.com/ActiveState/cli/internal/errs"
 	"github.com/ActiveState/cli/internal/fileutils"
 	"github.com/ActiveState/cli/internal/logging"
-	"github.com/ActiveState/cli/internal/primer"
 	"github.com/ActiveState/cli/pkg/buildscript"
-	"github.com/ActiveState/cli/pkg/localcommit"
+	"github.com/ActiveState/cli/pkg/checkoutinfo"
 	"github.com/ActiveState/cli/pkg/platform/authentication"
 	"github.com/ActiveState/cli/pkg/platform/model"
 	"github.com/ActiveState/cli/pkg/platform/model/buildplanner"
@@ -42,12 +41,7 @@ func ScriptFromFile(path string) (*buildscript.BuildScript, error) {
 	return buildscript.Unmarshal(data)
 }
 
-type primeable interface {
-	primer.Auther
-	primer.SvcModeler
-}
-
-func Initialize(path string, auth *authentication.Auth, svcm *model.SvcModel) error {
+func Initialize(path string, auth *authentication.Auth, svcm *model.SvcModel, info *checkoutinfo.CheckoutInfo) error {
 	scriptPath := filepath.Join(path, constants.BuildScriptFileName)
 	script, err := ScriptFromFile(scriptPath)
 	if err == nil {
@@ -58,7 +52,7 @@ func Initialize(path string, auth *authentication.Auth, svcm *model.SvcModel) er
 	}
 
 	logging.Debug("Build script does not exist. Creating one.")
-	commitId, err := localcommit.Get(path)
+	commitId, err := info.CommitID()
 	if err != nil {
 		return errs.Wrap(err, "Unable to get the local commit ID")
 	}

internal/runbits/checker/checker.go

@@ -8,16 +8,16 @@ import (
 	"github.com/ActiveState/cli/internal/locale"
 	"github.com/ActiveState/cli/internal/logging"
 	"github.com/ActiveState/cli/internal/output"
-	"github.com/ActiveState/cli/pkg/localcommit"
+	"github.com/ActiveState/cli/pkg/checkoutinfo"
 	"github.com/ActiveState/cli/pkg/platform/authentication"
 	"github.com/ActiveState/cli/pkg/platform/model"
 	"github.com/ActiveState/cli/pkg/project"
 )
 
 // RunCommitsBehindNotifier checks for the commits behind count based on the
 // provided project and displays the results to the user in a helpful manner.
-func RunCommitsBehindNotifier(p *project.Project, out output.Outputer, auth *authentication.Auth) {
-	count, err := CommitsBehind(p, auth)
+func RunCommitsBehindNotifier(p *project.Project, out output.Outputer, auth *authentication.Auth, info *checkoutinfo.CheckoutInfo) {
+	count, err := CommitsBehind(p, auth, info)
 	if err != nil {
 		if errors.Is(err, model.ErrCommitCountUnknowable) {
 			out.Notice(output.Title(locale.Tr("runtime_update_notice_unknown_count")))
@@ -35,7 +35,7 @@ func RunCommitsBehindNotifier(p *project.Project, out output.Outputer, auth *aut
 	}
 }
 
-func CommitsBehind(p *project.Project, auth *authentication.Auth) (int, error) {
+func CommitsBehind(p *project.Project, auth *authentication.Auth, info *checkoutinfo.CheckoutInfo) (int, error) {
 	if p.IsHeadless() {
 		return 0, nil
 	}
@@ -49,9 +49,9 @@ func CommitsBehind(p *project.Project, auth *authentication.Auth) (int, error) {
 		return 0, locale.NewError("err_latest_commit", "Latest commit ID is nil")
 	}
 
-	commitID, err := localcommit.Get(p.Dir())
+	commitID, err := info.CommitID()
 	if err != nil {
-		return 0, errs.Wrap(err, "Unable to get local commit")
+		return 0, errs.Wrap(err, "Unable to get commit ID")
 	}
 
 	return model.CommitsBehind(*latestCommitID, commitID, auth)

internal/runbits/checkout/checkout.go

@@ -14,7 +14,6 @@ import (
 	"github.com/ActiveState/cli/internal/language"
 	"github.com/ActiveState/cli/internal/osutils"
 	"github.com/ActiveState/cli/internal/runbits/git"
-	"github.com/ActiveState/cli/pkg/localcommit"
 	"github.com/ActiveState/cli/pkg/platform/api/mono/mono_models"
 	"github.com/ActiveState/cli/pkg/platform/authentication"
 	"github.com/ActiveState/cli/pkg/platform/model"
@@ -28,6 +27,7 @@ type primeable interface {
 	primer.Configurer
 	primer.Auther
 	primer.SvcModeler
+	primer.CheckoutInfoer
 }
 
 // Checkout will checkout the given platform project at the given path
@@ -99,7 +99,7 @@ func (r *Checkout) Run(ns *project.Namespaced, branchName, cachePath, targetPath
 	}
 
 	if r.prime.Config().GetBool(constants.OptinBuildscriptsConfig) {
-		if err := buildscript_runbit.Initialize(path, r.prime.Auth(), r.prime.SvcModel()); err != nil {
+		if err := buildscript_runbit.Initialize(path, r.prime.Auth(), r.prime.SvcModel(), r.prime.CheckoutInfo()); err != nil {
 			return "", errs.Wrap(err, "Unable to initialize buildscript")
 		}
 	}
@@ -184,6 +184,7 @@ func CreateProjectFiles(checkoutPath, cachePath, owner, name, branch, commitID,
 			Owner:      owner,
 			Project:    name, // match case on the Platform
 			BranchName: branch,
+			CommitID:   commitID,
 			Directory:  checkoutPath,
 			Language:   language,
 			Cache:      cachePath,
@@ -196,10 +197,6 @@ func CreateProjectFiles(checkoutPath, cachePath, owner, name, branch, commitID,
 		}
 	}
 
-	if err := localcommit.Set(checkoutPath, commitID); err != nil {
-		return errs.Wrap(err, "Could not create local commit file")
-	}
-
 	return nil
 }
 

internal/runbits/commits_runbit/time.go

@@ -6,7 +6,7 @@ import (
 	"github.com/ActiveState/cli/internal/captain"
 	"github.com/ActiveState/cli/internal/errs"
 	"github.com/ActiveState/cli/pkg/buildscript"
-	"github.com/ActiveState/cli/pkg/localcommit"
+	"github.com/ActiveState/cli/pkg/checkoutinfo"
 	"github.com/ActiveState/cli/pkg/platform/authentication"
 	"github.com/ActiveState/cli/pkg/platform/model"
 	"github.com/ActiveState/cli/pkg/project"
@@ -40,14 +40,14 @@ func ExpandTime(ts *captain.TimeValue, auth *authentication.Auth) (time.Time, er
 
 // ExpandTimeForProject is the same as ExpandTime except that it ensures the returned time is either the same or
 // later than that of the most recent commit.
-func ExpandTimeForProject(ts *captain.TimeValue, auth *authentication.Auth, proj *project.Project) (time.Time, error) {
+func ExpandTimeForProject(ts *captain.TimeValue, auth *authentication.Auth, proj *project.Project, info *checkoutinfo.CheckoutInfo) (time.Time, error) {
 	timestamp, err := ExpandTime(ts, auth)
 	if err != nil {
 		return time.Time{}, errs.Wrap(err, "Unable to expand time")
 	}
 
 	if proj != nil {
-		commitID, err := localcommit.Get(proj.Dir())
+		commitID, err := info.CommitID()
 		if err != nil {
 			return time.Time{}, errs.Wrap(err, "Unable to get commit ID")
 		}

internal/runbits/reqop_runbit/update.go

@@ -33,6 +33,7 @@ type primeable interface {
 	primer.Configurer
 	primer.Analyticer
 	primer.SvcModeler
+	primer.CheckoutInfoer
 }
 
 type requirements []*Requirement

internal/runbits/runtime/runtime.go

@@ -23,7 +23,6 @@ import (
 	"github.com/ActiveState/cli/internal/runbits/runtime/progress"
 	"github.com/ActiveState/cli/internal/runbits/runtime/trigger"
 	"github.com/ActiveState/cli/pkg/buildplan"
-	"github.com/ActiveState/cli/pkg/localcommit"
 	"github.com/ActiveState/cli/pkg/platform/model"
 	bpModel "github.com/ActiveState/cli/pkg/platform/model/buildplanner"
 	"github.com/ActiveState/cli/pkg/project"
@@ -105,6 +104,7 @@ type primeable interface {
 	primer.Configurer
 	primer.SvcModeler
 	primer.Analyticer
+	primer.CheckoutInfoer
 }
 
 func Update(
@@ -147,7 +147,7 @@ func Update(
 		commitID = opts.Commit.CommitID
 	}
 	if commitID == "" {
-		commitID, err = localcommit.Get(proj.Dir())
+		commitID, err = prime.CheckoutInfo().CommitID()
 		if err != nil {
 			return nil, errs.Wrap(err, "Failed to get local commit")
 		}
@@ -169,7 +169,7 @@ func Update(
 		}
 	}()
 
-	rtHash, err := runtime_helpers.Hash(proj, &commitID)
+	rtHash, err := runtime_helpers.Hash(prime, &commitID)
 	if err != nil {
 		ah.fire(anaConsts.CatRuntimeDebug, anaConsts.ActRuntimeCache, nil)
 		return nil, errs.Wrap(err, "Failed to get runtime hash")

internal/runners/activate/activate.go

@@ -28,7 +28,6 @@ import (
 	"github.com/ActiveState/cli/internal/runbits/runtime/trigger"
 	"github.com/ActiveState/cli/internal/subshell"
 	"github.com/ActiveState/cli/internal/virtualenvironment"
-	"github.com/ActiveState/cli/pkg/localcommit"
 	"github.com/ActiveState/cli/pkg/platform/authentication"
 	"github.com/ActiveState/cli/pkg/platform/model"
 	"github.com/ActiveState/cli/pkg/project"
@@ -66,6 +65,7 @@ type primeable interface {
 	primer.Configurer
 	primer.SvcModeler
 	primer.Analyticer
+	primer.CheckoutInfoer
 }
 
 func NewActivate(prime primeable) *Activate {
@@ -146,9 +146,9 @@ func (r *Activate) Run(params *ActivateParams) (rerr error) {
 	}
 
 	if proj != nil {
-		commitID, err := localcommit.Get(proj.Dir())
+		commitID, err := r.prime.CheckoutInfo().CommitID()
 		if err != nil {
-			return errs.Wrap(err, "Unable to get local commit")
+			return errs.Wrap(err, "Unable to get commit ID")
 		}
 		if cid := params.Namespace.CommitID; cid != nil && *cid != commitID {
 			return locale.NewInputError("err_activate_commit_id_mismatch")
@@ -196,9 +196,9 @@ func (r *Activate) Run(params *ActivateParams) (rerr error) {
 		}
 	}
 
-	commitID, err := localcommit.Get(proj.Dir())
+	commitID, err := r.prime.CheckoutInfo().CommitID()
 	if err != nil {
-		return errs.Wrap(err, "Unable to get local commit")
+		return errs.Wrap(err, "Unable to get commit ID")
 	}
 	if commitID == "" {
 		err := locale.NewInputError("err_project_no_commit", "Your project does not have a commit ID. Please run [ACTIONIABLE]'state push'[/RESET] first.", model.ProjectURL(proj.Owner(), proj.Name(), ""))

internal/runners/artifacts/artifacts.go

@@ -31,6 +31,7 @@ type primeable interface {
 	primer.SvcModeler
 	primer.Configurer
 	primer.Analyticer
+	primer.CheckoutInfoer
 }
 
 type Params struct {