Merge branch version/0-44-0-RC1 to adopt changes from PR #3008

ActiveState · Jan 10, 2024 · 4ab48ec · 4ab48ec
2 parents 38b4833 + ad9ccbd
commit 4ab48ec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/internal/runbits/commit/commit.go b/internal/runbits/commit/commit.go
@@ -20,6 +20,7 @@ type commitOutput struct {
 	Hash              string               `locale:"hash,[HEADING]Commit[/RESET]" json:"hash"`
 	Author            string               `locale:"author,[HEADING]Author[/RESET]" json:"author"`
 	Date              string               `locale:"date,[HEADING]Date[/RESET]" json:"date"`
+	Revision          string               `locale:"revision,[HEADING]Revision[/RESET]" json:"revision"`
 	Message           string               `locale:"message,[HEADING]Message[/RESET]" json:"message"`
 	PlainChanges      []string             `locale:"changes,[HEADING]Changes[/RESET]" json:"-"`
 	StructuredChanges []*requirementChange `opts:"hidePlain" json:"changes"`
@@ -80,6 +81,12 @@ func newCommitOutput(commit *mono_models.Commit, orgs []gmodel.Organization, isL
 	}
 	commitOutput.Date = dt.Format(time.RFC822)
 
+	dt, err = time.Parse(time.RFC3339, commit.AtTime.String())
+	if err != nil {
+		multilog.Error("Could not parse revision time: %v", err)
+	}
+	commitOutput.Revision = dt.Format(time.RFC822)
+
 	commitOutput.Message = locale.Tl("print_commit_no_message", "[DISABLED]Not provided.[/RESET]")
 	if commit.Message != "" {
 		commitOutput.Message = commit.Message

diff --git a/test/integration/history_int_test.go b/test/integration/history_int_test.go
@@ -35,6 +35,7 @@ func (suite *HistoryIntegrationTestSuite) TestHistory_History() {
 	cp.Expect("Commit")
 	cp.Expect("Author")
 	cp.Expect("Date")
+	cp.Expect("Revision")
 	cp.Expect("Message")
 	cp.Expect("• requests (2.26.0 → 2.7.0)")
 	cp.Expect("• autopip (1.6.0 → Auto)")