add showCommitID configuraiton

commit-id:6807a2de

Author: ejoffe

config/config.go

@@ -55,6 +55,7 @@ type UserConfig struct {
 	NoRebase             bool `default:"false" yaml:"noRebase"`
 	DeleteMergedBranches bool `default:"false" yaml:"deleteMergedBranches"`
 	ShortPRLink          bool `default:"false" yaml:"shortPRLink"`
+	ShowCommitID         bool `default:"false" yaml:"showCommitID"`
 }
 
 type InternalState struct {

github/pullrequest.go

@@ -185,6 +185,12 @@ func (pr *PullRequest) String(config *config.Config) string {
 		prInfo = prURL
 	}
 
+	if config.User.ShowCommitID && len(pr.Commit.CommitHash) >= 8 {
+		prInfo = pr.Commit.CommitHash[:8] + " " + prInfo
+	} else if config.User.ShowCommitID && len(pr.Commit.CommitHash) > 0 {
+		prInfo = pr.Commit.CommitHash + " " + prInfo
+	}
+
 	var mq string
 	if len(pr.Commits) > 1 {
 		mq = statusBitIcons(config)["warning"]

github/pullrequest_test.go

@@ -198,6 +198,27 @@ func TestString(t *testing.T) {
 		},
 	}
 
+	cfgWithCommitID := &config.Config{
+		Repo: &config.RepoConfig{
+			RequireChecks:   true,
+			RequireApproval: true,
+		},
+		User: &config.UserConfig{
+			StatusBitsEmojis: false,
+			ShowCommitID:     true,
+		},
+	}
+
+	prWithHash := func(inQueue bool, commits int, hash string) *PullRequest {
+		return &PullRequest{
+			InQueue: inQueue,
+			Commits: make([]git.Commit, commits),
+			Title:   "Title",
+			Commit:  git.Commit{CommitHash: hash},
+			MergeStatus: PullRequestMergeStatus{},
+		}
+	}
+
 	tests := []testcase{
 		{expect: "[?xxx] .   0 : Title", pr: pr(true, 1), cfg: cfg},
 		{expect: "[?xxx] .   0 : Title", pr: pr(true, 2), cfg: cfg},
@@ -206,6 +227,12 @@ func TestString(t *testing.T) {
 		{expect: "[?xxx] . https://github.com/testowner/testrepo/pull/0 : Title", pr: pr(true, 1), cfg: cfgWithShowPRLink},
 		// ShortPRLink: clickable short link via OSC 8
 		{expect: "[?xxx] . \033]8;;https://github.com/testowner/testrepo/pull/0\033\\PR-0\033]8;;\033\\ : Title", pr: pr(true, 1), cfg: cfgWithShortPRLink},
+		// ShowCommitID: first 8 chars of commit hash shown
+		{expect: "[?xxx] . abcd1234   0 : Title", pr: prWithHash(true, 1, "abcd1234ef567890"), cfg: cfgWithCommitID},
+		// ShowCommitID with short hash (< 8 chars): full hash shown
+		{expect: "[?xxx] . abcd   0 : Title", pr: prWithHash(true, 1, "abcd"), cfg: cfgWithCommitID},
+		// ShowCommitID with empty hash: no hash shown
+		{expect: "[?xxx] .   0 : Title", pr: prWithHash(true, 1, ""), cfg: cfgWithCommitID},
 	}
 	for i, test := range tests {
 		assert.Equal(t, test.expect, test.pr.String(test.cfg), fmt.Sprintf("case %d failed", i))

readme.md

@@ -198,6 +198,7 @@ User specific configuration is saved to .spr.yml in the user home directory.
 | noRebase             | bool | false   | when true spr update will not rebase on top of origin |
 | deleteMergedBranches | bool | false   | delete branches after prs are merged |
 | shortPRLink          | bool | false   | show pull request links as clickable PR-<number> instead of full URL |
+| showCommitID         | bool | false   | show first 8 characters of commit hash for each pull request |
 
 Happy Coding!
 -------------