Skip to content

feat: ignore the type of branch's name when choosing #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 25, 2022
Merged

feat: ignore the type of branch's name when choosing #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b910ed
🆕 feat(ggck): support checkout the origin branch
capdiem Jun 25, 2022
c1ac41d
🆕 feat(ggdc): add Invoke-GitDiffCached
capdiem Jun 25, 2022
e6e1793
feat(ggckb)(ggckb): ignore the type name of branch in ggckb
capdiem Jun 25, 2022
994a727
chore: 1.11.0
capdiem Jun 25, 2022
a15f2be
fix(ggcm)(ggcm): !EmojiFirst not work
capdiem Jun 25, 2022
573ab92
🔀 chore: merge from master and resovle conflicts
capdiem Jun 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions PSGitUtils/PSGitUtils.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
RootModule = 'PSGitUtils.psm1'

# Version number of this module.
ModuleVersion = '1.11.1'
ModuleVersion = '1.12.0'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down Expand Up @@ -82,6 +82,7 @@
'Invoke-GitPush',
'Invoke-GitReset',
'Invoke-GitDiff',
'Invoke-GitDiffCached',
'Remove-LocalBranchesThatNoLongerExistOnRemote'
)

Expand All @@ -94,7 +95,7 @@
)

# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
AliasesToExport = 'ggc', 'ggl', 'emojify', 'gga', 'ggb', 'ggbd', 'ggs', 'ggck', 'ggckb', 'ggpl', 'ggps', 'ggrst', 'ggd', 'ggbs'
AliasesToExport = 'ggc', 'ggl', 'emojify', 'gga', 'ggb', 'ggbd', 'ggs', 'ggck', 'ggckb', 'ggpl', 'ggps', 'ggrst', 'ggd', 'ggdc', 'ggbs'

# DSC resources to export from this module
# DscResourcesToExport = @()
Expand Down
93 changes: 75 additions & 18 deletions PSGitUtils/PSGitUtils.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,13 +249,62 @@ function Get-OptionsForChoosingLocalBranch {
return $localBranches[$choice]
}

function Get-OptionsForChoosingLocalOrOriginBranch {
param (
[string]$title = 'Choose branch',
[string]$message = 'Please choose a branch'
)
[System.Management.Automation.Host.ChoiceDescription[]]$branchOptions = @()
[string[]]$localBranches = Get-GitLocalBranches
[string[]]$originBranches = Get-GitOriginBranches -onlyName
[string[]]$branches = $localBranches + $originBranches | Select-Object -Unique
[char[]]$existChars = @('q')

for ($i = 0; $i -lt $branches.Count; $i++) {
$branch = $branches[$i]

[int]$branchCharIndex = -1

[string[]]$types = "feature","bugfix","hotfix","experimental","build","release","merge"

$type = $types.Where({$branch.StartsWith($_)})[0]
$typeLength = 0
if ($type) {
$typeLength = $type.Length + 1
}

[char[]]$branchChars = $branch.Substring($typeLength).ToCharArray()
for ($j = 0; $j -lt $branchChars.Count; $j++) {
$char = $branchChars[$j]

if (!$existChars.Contains($char)) {
$branchCharIndex = $j
$existChars += $char
break
}
}

if ($branchCharIndex -ne -1) {
$branch = $branch.Insert(($branchCharIndex + $typeLength), '&')
}

$branchOptions += $branch
}

$branchOptions += "&quit"

$choice = $host.UI.PromptForChoice($title, $message, $branchOptions, $branchOptions.Count - 1)

return $branches[$choice]
}

## git checkout [$args]
function Invoke-GitCheckout {
if ($args.Count -eq 0) {
$localBranch = Get-OptionsForChoosingLocalBranch "Switch branch" "Please choose a branch to switch"
$branch = Get-OptionsForChoosingLocalOrOriginBranch "Switch branch" "Please choose a branch to switch"

if ($localBranch) {
git checkout $localBranch
if ($branch) {
git checkout $branch
}
}
else {
Expand Down Expand Up @@ -310,15 +359,10 @@ function Invoke-GitCheckoutNewBranch {

$typeIndex = (Get-Host).UI.PromptForChoice("Creating a new branch and checkout to...", "${step}. Please choose a type for the new branch", $branchTypeOptions, 7)

switch ($typeIndex) {
0 { $branch = "feature/$branch" }
1 { $branch = "bugfix/$branch" }
2 { $branch = "hotfix/$branch" }
3 { $branch = "experimental/$branch" }
4 { $branch = "build/$branch" }
5 { $branch = "release/$branch" }
6 { $branch = "merge/$branch" }
Default {}
[string[]]$types = "feature","bugfix","hotfix","experimental","build","release","merge"
[string]$type = $types[$typeIndex]
if ($type) {
$branch = $type + "/" + $branch
}

Write-Host
Expand All @@ -327,11 +371,19 @@ function Invoke-GitCheckoutNewBranch {
[System.Management.Automation.Host.ChoiceDescription[]]$originBranchOptions = @()
[string[]]$originBranches = Get-GitOriginBranches -onlyName
[char[]]$existChars = @('n')

for ($i = 0; $i -lt $originBranches.Count; $i++) {
$originBranch = $originBranches[$i]

[int]$originBranchCharIndex = -1
[char[]]$originBranchChars = $originBranch.ToCharArray()

$type = $types.Where({$originBranch.StartsWith($_)})[0]
$typeLength = 0
if ($type) {
$typeLength = $type.Length + 1
}

[char[]]$originBranchChars = $originBranch.Substring($typeLength).ToCharArray()
for ($j = 0; $j -lt $originBranchChars.Count; $j++) {
$char = $originBranchChars[$j]

Expand All @@ -343,7 +395,8 @@ function Invoke-GitCheckoutNewBranch {
}

if ($originBranchCharIndex -ne -1) {
$originBranch = $originBranch.Insert($originBranchCharIndex, '&')
Write-Host $originBranchCharIndex $typeLength $originBranch
$originBranch = $originBranch.Insert(($originBranchCharIndex + $typeLength), '&')
}

$item = 'origin/' + $originBranch
Expand Down Expand Up @@ -372,6 +425,9 @@ function Invoke-GitReset { git reset $args }
## git diff
function Invoke-GitDiff { git diff $args }

## git diff
function Invoke-GitDiffCached { git diff --cached }

<#
.SYNOPSIS
Try to delete the local branches that no longer exist on the remote
Expand Down Expand Up @@ -530,8 +586,8 @@ function Format-GitCommitMessage {
$newMessage += $type
}

if ($config.Scope -and ![string]::IsNullOrEmpty($scope)) {
$newMessage += "(" + $scope + ")"
if ($config.Emoji -and ![string]::IsNullOrEmpty($emoji)) {
$newMessage += $emoji + " "
}
}

Expand Down Expand Up @@ -652,10 +708,11 @@ Set-Alias ggpl Invoke-GitPull
Set-Alias ggps Invoke-GitPush
Set-Alias ggrst Invoke-GitReset
Set-Alias ggd Invoke-GitDiff
Set-Alias ggdc Invoke-GitDiffCached
Set-Alias ggl Invoke-GitHistory
Set-Alias emojify Invoke-Emojify
Set-Alias ggbs Remove-LocalBranchesThatNoLongerExistOnRemote

Export-ModuleMember -Function Invoke-GitCommit, Format-GitCommitMessage, Invoke-GitHistory, Invoke-Emojify, Invoke-GitAdd, Invoke-GitBranch, Invoke-GitBranchDelete, Invoke-GitStatus, Invoke-GitCheckout, Get-GitOriginBranches, Invoke-GitCheckoutNewBranch, Invoke-GitPull, Invoke-GitPush, Invoke-GitReset, Invoke-GitDiff, Remove-LocalBranchesThatNoLongerExistOnRemote
Export-ModuleMember -Alias ggc, ggl, emojify, gga, ggb, ggbd, ggs, ggck, ggckb, ggpl, ggps, ggrst, ggd, ggbs
Export-ModuleMember -Function Invoke-GitCommit, Format-GitCommitMessage, Invoke-GitHistory, Invoke-Emojify, Invoke-GitAdd, Invoke-GitBranch, Invoke-GitBranchDelete, Invoke-GitStatus, Invoke-GitCheckout, Get-GitOriginBranches, Invoke-GitCheckoutNewBranch, Invoke-GitPull, Invoke-GitPush, Invoke-GitReset, Invoke-GitDiff, Invoke-GitDiffCached, Remove-LocalBranchesThatNoLongerExistOnRemote
Export-ModuleMember -Alias ggc, ggl, emojify, gga, ggb, ggbd, ggs, ggck, ggckb, ggpl, ggps, ggrst, ggd, ggdc, ggbs
Export-ModuleMember -Variable $global:GitUtilsConfig