standardize commit hash commit sha (jesseduffield#3398)

Standardise on use of 'commit hash' rather than 'commit SHA' Close: jesseduffield#3208
eldios · Apr 12, 2024 · 145fb61 · 145fb61
2 parents 06624e8 + 7e14d88
commit 145fb61
Show file tree

Hide file tree

Showing 75 changed files with 1,101 additions and 1,018 deletions.
diff --git a/docs/Custom_Command_Keybindings.md b/docs/Custom_Command_Keybindings.md
@@ -6,7 +6,7 @@ You can add custom command keybindings in your config.yml (accessible by pressin
 customCommands:
  - key: '<c-r>'
  context: 'commits'
- command: 'hub browse -- "commit/{{.SelectedLocalCommit.Sha}}"'
+ command: 'hub browse -- "commit/{{.SelectedLocalCommit.Hash}}"'
  - key: 'a'
  context: 'files'
  command: "git {{if .SelectedFile.HasUnstagedChanges}} add {{else}} reset {{end}} {{.SelectedFile.Name | quote}}"
@@ -305,7 +305,7 @@ SelectedWorktree
 CheckedOutBranch
 ```
 
-To see what fields are available on e.g. the `SelectedFile`, see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/commands/models/file.go) (all the modelling lives in the same directory). Note that the custom commands feature does not guarantee backwards compatibility (until we hit Lazygit version 1.0 of course) which means a field you're accessing on an object may no longer be available from one release to the next. Typically however, all you'll need is `{{.SelectedFile.Name}}`, `{{.SelectedLocalCommit.Sha}}` and `{{.SelectedLocalBranch.Name}}`. In the future we will likely introduce a tighter interface that exposes a limited set of fields for each model.
+To see what fields are available on e.g. the `SelectedFile`, see [here](https://github.com/jesseduffield/lazygit/blob/master/pkg/commands/models/file.go) (all the modelling lives in the same directory). Note that the custom commands feature does not guarantee backwards compatibility (until we hit Lazygit version 1.0 of course) which means a field you're accessing on an object may no longer be available from one release to the next. Typically however, all you'll need is `{{.SelectedFile.Name}}`, `{{.SelectedLocalCommit.Hash}}` and `{{.SelectedLocalBranch.Name}}`. In the future we will likely introduce a tighter interface that exposes a limited set of fields for each model.
 
 ## Keybinding collisions
 

diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md
@@ -76,7 +76,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | Copy commit SHA to clipboard | |
+| `` <c-o> `` | Copy commit hash to clipboard | |
 | `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
 | `` b `` | View bisect options | |
 | `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
@@ -245,7 +245,7 @@ If you would instead like to start an interactive rebase from the selected commi
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | Copy commit SHA to clipboard | |
+| `` <c-o> `` | Copy commit hash to clipboard | |
 | `` <space> `` | Checkout | Checkout the selected commit as a detached HEAD. |
 | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | Open commit in browser | |
@@ -313,7 +313,7 @@ If you would instead like to start an interactive rebase from the selected commi
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | Copy commit SHA to clipboard | |
+| `` <c-o> `` | Copy commit hash to clipboard | |
 | `` <space> `` | Checkout | Checkout the selected commit as a detached HEAD. |
 | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | Open commit in browser | |

diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md
@@ -66,7 +66,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | コミットのSHAをクリップボードにコピー | |
+| `` <c-o> `` | コミットのhashをクリップボードにコピー | |
 | `` <space> `` | チェックアウト | Checkout the selected commit as a detached HEAD. |
 | `` y `` | コミットの情報をコピー | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | ブラウザでコミットを開く | |
@@ -93,7 +93,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | コミットのSHAをクリップボードにコピー | |
+| `` <c-o> `` | コミットのhashをクリップボードにコピー | |
 | `` <c-r> `` | Reset copied (cherry-picked) commits selection | |
 | `` b `` | View bisect options | |
 | `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
@@ -343,7 +343,7 @@ If you would instead like to start an interactive rebase from the selected commi
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | コミットのSHAをクリップボードにコピー | |
+| `` <c-o> `` | コミットのhashをクリップボードにコピー | |
 | `` <space> `` | チェックアウト | Checkout the selected commit as a detached HEAD. |
 | `` y `` | コミットの情報をコピー | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | ブラウザでコミットを開く | |

diff --git a/docs/keybindings/Keybindings_ko.md b/docs/keybindings/Keybindings_ko.md
@@ -53,7 +53,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | 커밋 SHA를 클립보드에 복사 | |
+| `` <c-o> `` | 커밋 해시를 클립보드에 복사 | |
 | `` <space> `` | 체크아웃 | Checkout the selected commit as a detached HEAD. |
 | `` y `` | 커밋 attribute 복사 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | 브라우저에서 커밋 열기 | |
@@ -83,7 +83,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | 커밋 SHA를 클립보드에 복사 | |
+| `` <c-o> `` | 커밋 해시를 클립보드에 복사 | |
 | `` <space> `` | 체크아웃 | Checkout the selected commit as a detached HEAD. |
 | `` y `` | 커밋 attribute 복사 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | 브라우저에서 커밋 열기 | |
@@ -256,7 +256,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | 커밋 SHA를 클립보드에 복사 | |
+| `` <c-o> `` | 커밋 해시를 클립보드에 복사 | |
 | `` <c-r> `` | Reset cherry-picked (copied) commits selection | |
 | `` b `` | Bisect 옵션 보기 | |
 | `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |

diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md
@@ -139,7 +139,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | Kopieer commit SHA naar klembord | |
+| `` <c-o> `` | Kopieer commit hash naar klembord | |
 | `` <c-r> `` | Reset cherry-picked (gekopieerde) commits selectie | |
 | `` b `` | View bisect options | |
 | `` s `` | Squash | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
@@ -223,7 +223,7 @@ If you would instead like to start an interactive rebase from the selected commi
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | Kopieer commit SHA naar klembord | |
+| `` <c-o> `` | Kopieer commit hash naar klembord | |
 | `` <space> `` | Uitchecken | Checkout the selected commit as a detached HEAD. |
 | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | Open commit in browser | |
@@ -313,7 +313,7 @@ If you would instead like to start an interactive rebase from the selected commi
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | Kopieer commit SHA naar klembord | |
+| `` <c-o> `` | Kopieer commit hash naar klembord | |
 | `` <space> `` | Uitchecken | Checkout the selected commit as a detached HEAD. |
 | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | Open commit in browser | |

diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md
@@ -53,7 +53,7 @@ _Legenda: `<c-b>` oznacza ctrl+b, `<a-b>` oznacza alt+b, `B` oznacza shift+b_
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | Kopiuj SHA commita do schowka | |
+| `` <c-o> `` | Kopiuj hash commita do schowka | |
 | `` <c-r> `` | Resetuj wybrane (cherry-picked) commity | |
 | `` b `` | Zobacz opcje bisect | |
 | `` s `` | Scal | Scal wybrany commit z commitami poniżej. Wiadomość wybranego commita zostanie dołączona do commita poniżej. |
@@ -255,7 +255,7 @@ Jeśli chcesz zamiast tego rozpocząć interaktywny rebase od wybranego commita,
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | Kopiuj SHA commita do schowka | |
+| `` <c-o> `` | Kopiuj hash commita do schowka | |
 | `` <space> `` | Przełącz | Przełącz wybrany commit jako odłączoną HEAD. |
 | `` y `` | Kopiuj atrybut commita do schowka | Kopiuj atrybut commita do schowka (np. hash, URL, różnice, wiadomość, autor). |
 | `` o `` | Otwórz commit w przeglądarce | |
@@ -295,7 +295,7 @@ Jeśli chcesz zamiast tego rozpocząć interaktywny rebase od wybranego commita,
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | Kopiuj SHA commita do schowka | |
+| `` <c-o> `` | Kopiuj hash commita do schowka | |
 | `` <space> `` | Przełącz | Przełącz wybrany commit jako odłączoną HEAD. |
 | `` y `` | Kopiuj atrybut commita do schowka | Kopiuj atrybut commita do schowka (np. hash, URL, różnice, wiadomość, autor). |
 | `` o `` | Otwórz commit w przeglądarce | |

diff --git a/docs/keybindings/Keybindings_ru.md b/docs/keybindings/Keybindings_ru.md
@@ -123,7 +123,7 @@ _Связки клавиш_
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | Скопировать SHA коммита в буфер обмена | |
+| `` <c-o> `` | Скопировать hash коммита в буфер обмена | |
 | `` <space> `` | Переключить | Checkout the selected commit as a detached HEAD. |
 | `` y `` | Скопировать атрибут коммита | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | Открыть коммит в браузере | |
@@ -140,7 +140,7 @@ _Связки клавиш_
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | Скопировать SHA коммита в буфер обмена | |
+| `` <c-o> `` | Скопировать hash коммита в буфер обмена | |
 | `` <c-r> `` | Сбросить отобранную (скопированную | cherry-picked) выборку коммитов | |
 | `` b `` | Просмотреть параметры бинарного поиска | |
 | `` s `` | Объединить коммиты (Squash) | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
@@ -219,7 +219,7 @@ If you would instead like to start an interactive rebase from the selected commi
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | Скопировать SHA коммита в буфер обмена | |
+| `` <c-o> `` | Скопировать hash коммита в буфер обмена | |
 | `` <space> `` | Переключить | Checkout the selected commit as a detached HEAD. |
 | `` y `` | Скопировать атрибут коммита | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | Открыть коммит в браузере | |

diff --git a/docs/keybindings/Keybindings_zh-CN.md b/docs/keybindings/Keybindings_zh-CN.md
@@ -53,7 +53,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | 将提交的 SHA 复制到剪贴板 | |
+| `` <c-o> `` | 将提交的 hash 复制到剪贴板 | |
 | `` <space> `` | 检出 | Checkout the selected commit as a detached HEAD. |
 | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | 在浏览器中打开提交 | |
@@ -106,7 +106,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | 将提交的 SHA 复制到剪贴板 | |
+| `` <c-o> `` | 将提交的 hash 复制到剪贴板 | |
 | `` <space> `` | 检出 | Checkout the selected commit as a detached HEAD. |
 | `` y `` | Copy commit attribute to clipboard | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | 在浏览器中打开提交 | |
@@ -137,7 +137,7 @@ _Legend: `<c-b>` means ctrl+b, `<a-b>` means alt+b, `B` means shift+b_
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | 将提交的 SHA 复制到剪贴板 | |
+| `` <c-o> `` | 将提交的 hash 复制到剪贴板 | |
 | `` <c-r> `` | 重置已拣选（复制）的提交 | |
 | `` b `` | 查看二分查找选项 | |
 | `` s `` | 压缩 | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |

diff --git a/docs/keybindings/Keybindings_zh-TW.md b/docs/keybindings/Keybindings_zh-TW.md
@@ -121,7 +121,7 @@ _說明：`<c-b>` 表示 Ctrl＋B、`<a-b>` 表示 Alt＋B，`B`表示 Shift＋B
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | 複製提交 SHA 到剪貼簿 | |
+| `` <c-o> `` | 複製提交 hash 到剪貼簿 | |
 | `` <space> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
 | `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | 在瀏覽器中開啟提交 | |
@@ -162,7 +162,7 @@ _說明：`<c-b>` 表示 Ctrl＋B、`<a-b>` 表示 Alt＋B，`B`表示 Shift＋B
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | 複製提交 SHA 到剪貼簿 | |
+| `` <c-o> `` | 複製提交 hash 到剪貼簿 | |
 | `` <c-r> `` | 重設選定的揀選 (複製) 提交 | |
 | `` b `` | 查看二分選項 | |
 | `` s `` | 壓縮 (Squash) | Squash the selected commit into the commit below it. The selected commit's message will be appended to the commit below it. |
@@ -236,7 +236,7 @@ If you would instead like to start an interactive rebase from the selected commi
 
 | Key | Action | Info |
 |-----|--------|-------------|
-| `` <c-o> `` | 複製提交 SHA 到剪貼簿 | |
+| `` <c-o> `` | 複製提交 hash 到剪貼簿 | |
 | `` <space> `` | 檢出 | Checkout the selected commit as a detached HEAD. |
 | `` y `` | 複製提交屬性 | Copy commit attribute to clipboard (e.g. hash, URL, diff, message, author). |
 | `` o `` | 在瀏覽器中開啟提交 | |

diff --git a/pkg/app/daemon/daemon.go b/pkg/app/daemon/daemon.go
@@ -212,7 +212,7 @@ func (self *ChangeTodoActionsInstruction) run(common *common.Common) error {
  return handleInteractiveRebase(common, func(path string) error {
  changes := lo.Map(self.Changes, func(c ChangeTodoAction, _ int) utils.TodoChange {
  return utils.TodoChange{
- Sha:  c.Sha,
+ Hash: c.Hash,
  OldAction: todo.Pick,
  NewAction: c.NewAction,
  }
@@ -222,18 +222,18 @@ func (self *ChangeTodoActionsInstruction) run(common *common.Common) error {
  })
 }
 
-// Takes the sha of some commit, and the sha of a fixup commit that was created
+// Takes the hash of some commit, and the hash of a fixup commit that was created
 // at the end of the branch, then moves the fixup commit down to right after the
 // original commit, changing its type to "fixup"
 type MoveFixupCommitDownInstruction struct {
- OriginalSha string
- FixupSha string
+ OriginalHash string
+ FixupHash string
 }
 
-func NewMoveFixupCommitDownInstruction(originalSha string, fixupSha string) Instruction {
+func NewMoveFixupCommitDownInstruction(originalHash string, fixupHash string) Instruction {
  return &MoveFixupCommitDownInstruction{
- OriginalSha: originalSha,
- FixupSha: fixupSha,
+ OriginalHash: originalHash,
+ FixupHash: fixupHash,
  }
 }
 
@@ -247,17 +247,17 @@ func (self *MoveFixupCommitDownInstruction) SerializedInstructions() string {
 
 func (self *MoveFixupCommitDownInstruction) run(common *common.Common) error {
  return handleInteractiveRebase(common, func(path string) error {
- return utils.MoveFixupCommitDown(path, self.OriginalSha, self.FixupSha, getCommentChar())
+ return utils.MoveFixupCommitDown(path, self.OriginalHash, self.FixupHash, getCommentChar())
  })
 }
 
 type MoveTodosUpInstruction struct {
- Shas []string
+ Hashes []string
 }
 
-func NewMoveTodosUpInstruction(shas []string) Instruction {
+func NewMoveTodosUpInstruction(hashes []string) Instruction {
  return &MoveTodosUpInstruction{
- Shas: shas,
+ Hashes: hashes,
  }
 }
 
@@ -270,9 +270,9 @@ func (self *MoveTodosUpInstruction) SerializedInstructions() string {
 }
 
 func (self *MoveTodosUpInstruction) run(common *common.Common) error {
- todosToMove := lo.Map(self.Shas, func(sha string, _ int) utils.Todo {
+ todosToMove := lo.Map(self.Hashes, func(hash string, _ int) utils.Todo {
  return utils.Todo{
- Sha:  sha,
+ Hash: hash,
  Action: todo.Pick,
  }
  })
@@ -283,12 +283,12 @@ func (self *MoveTodosUpInstruction) run(common *common.Common) error {
 }
 
 type MoveTodosDownInstruction struct {
- Shas []string
+ Hashes []string
 }
 
-func NewMoveTodosDownInstruction(shas []string) Instruction {
+func NewMoveTodosDownInstruction(hashes []string) Instruction {
  return &MoveTodosDownInstruction{
- Shas: shas,
+ Hashes: hashes,
  }
 }
 
@@ -301,9 +301,9 @@ func (self *MoveTodosDownInstruction) SerializedInstructions() string {
 }
 
 func (self *MoveTodosDownInstruction) run(common *common.Common) error {
- todosToMove := lo.Map(self.Shas, func(sha string, _ int) utils.Todo {
+ todosToMove := lo.Map(self.Hashes, func(hash string, _ int) utils.Todo {
  return utils.Todo{
- Sha:  sha,
+ Hash: hash,
  Action: todo.Pick,
  }
  })

diff --git a/pkg/app/daemon/rebase.go b/pkg/app/daemon/rebase.go
@@ -21,7 +21,7 @@ func (self *TodoLine) ToString() string {
  if self.Action == "break" {
  return self.Action + "\n"
  } else {
- return self.Action + " " + self.Commit.Sha + " " + self.Commit.Name + "\n"
+ return self.Action + " " + self.Commit.Hash + " " + self.Commit.Name + "\n"
  }
 }
 
@@ -34,7 +34,7 @@ func TodoLinesToString(todoLines []TodoLine) string {
 }
 
 type ChangeTodoAction struct {
- Sha  string
+ Hash string
  NewAction todo.TodoCommand
 }
 

diff --git a/pkg/app/entry_point.go b/pkg/app/entry_point.go
@@ -263,7 +263,7 @@ func mergeBuildInfo(buildInfo *BuildInfo) {
  buildInfo.Commit = revision.Value
  // if lazygit was built from source we'll show the version as the
  // abbreviated commit hash
- buildInfo.Version = utils.ShortSha(revision.Value)
+ buildInfo.Version = utils.ShortHash(revision.Value)
  }
 
  // if version hasn't been set we assume that neither has the date