Skip to content

Add -fromCurrent param to git-new #3

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 2 commits into from
Nov 8, 2024
Merged

Add -fromCurrent param to git-new #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecbb6f7
Add `-fromCurrent` param to git-new
mdekrey Nov 8, 2024
07912f7
Ensure `Get-CurrentBranch` is in scope
mdekrey Nov 8, 2024
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
7 changes: 7 additions & 0 deletions docs/new.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ _Aliases: -d, -dependency, -dependencies_
A comma-delimited list of branches (without the remote, if applicable). If not
specified, assumes the default service line (see [tool-config][tool-config].)

### `-fromCurrent` (Optional)

_Aliases: -c_

If specified and on a current branch, include the current branch in the
dependency branches.

### `-dryRun` (Optional)

If specified, only test merging, do not push the updates.
Expand Down
9 changes: 8 additions & 1 deletion git-new.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,21 @@ Param(
[Parameter(Mandatory)][String] $branchName,
[Parameter()][Alias('m')][Alias('message')][ValidateLength(1,25)][String] $comment,
[Parameter()][Alias('d')][Alias('dependency')][Alias('dependencies')][String[]] $dependencyBranches,
[switch][Alias('c')][Alias('fromCurrent')] $fromCurrentBranch,
[switch] $dryRun
)

Import-Module -Scope Local "$PSScriptRoot/utils/input.psm1"
Import-Module -Scope Local "$PSScriptRoot/utils/scripting.psm1"
Import-Module -Scope Local "$PSScriptRoot/utils/query-state.psm1"

[string[]] $dependencyBranches = Expand-StringArray $dependencyBranches
if ($fromCurrentBranch) {
[string[]] $dependencyBranches = @($dependencyBranches; Get-CurrentBranch)
}

Invoke-JsonScript -scriptPath "$PSScriptRoot/git-new.json" -params @{
branchName = $branchName;
dependencyBranches = Expand-StringArray $dependencyBranches;
dependencyBranches = $dependencyBranches;
comment = $comment ?? '';
} -dryRun:$dryRun
71 changes: 69 additions & 2 deletions git-new.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ Describe 'git-new' {
$fw.assertDiagnosticOutput | Should -BeNullOrEmpty
}

It 'creates a remote branch with simplified dependency dependencies' {
It 'creates a remote branch with simplified dependencies' {
Initialize-AssertValidBranchName 'feature/PS-100-some-work'
Initialize-AssertValidBranchName 'infra/foo'
Initialize-AssertValidBranchName 'main'
Expand Down Expand Up @@ -226,7 +226,7 @@ Describe 'git-new' {
)
}

It 'creates a remote branch with simplified dependency dependencies but still multiple' {
It 'creates a remote branch with simplified dependencies but still multiple' {
Initialize-AssertValidBranchName 'feature/PS-100-some-work'
Initialize-AssertValidBranchName 'infra/foo'
Initialize-AssertValidBranchName 'main'
Expand Down Expand Up @@ -258,6 +258,73 @@ Describe 'git-new' {
)
}

It 'creates a remote branch with simplified dependencies but still multiple and the current branch' {
Initialize-AssertValidBranchName 'feature/PS-100-some-work'
Initialize-AssertValidBranchName 'infra/foo'
Initialize-AssertValidBranchName 'main'
Initialize-AssertValidBranchName 'feature/homepage-redesign'
Initialize-AssertValidBranchName 'infra/update-dependencies'
Initialize-AssertValidBranchName 'something-else'
Initialize-CurrentBranch 'something-else'

$mocks = @(
Initialize-LocalActionAssertExistence -branches @('feature/PS-100-some-work') -shouldExist $false
Initialize-LocalActionAssertExistence -branches @('infra/foo', 'main', 'feature/homepage-redesign', 'infra/update-dependencies', 'something-else') -shouldExist $true
Initialize-LocalActionSetDependency @{
'feature/PS-100-some-work' = @('feature/homepage-redesign', 'infra/update-dependencies', 'something-else')
} -commitish 'new-commit'
Initialize-LocalActionMergeBranchesSuccess `
@('feature/homepage-redesign', 'infra/update-dependencies', 'something-else') 'merge-result' `
-mergeMessageTemplate "Merge '{}' for creation of feature/PS-100-some-work"
Initialize-FinalizeActionSetBranches @{
'$dependencies' = 'new-commit'
'feature/PS-100-some-work' = 'merge-result'
} -track @('feature/PS-100-some-work')
Initialize-FinalizeActionCheckout 'feature/PS-100-some-work'
Initialize-FinalizeActionTrackSuccess @('feature/PS-100-some-work') -untracked @('feature/PS-100-some-work')
)

& $PSScriptRoot/git-new.ps1 feature/PS-100-some-work -d 'infra/foo,main,feature/homepage-redesign,infra/update-dependencies' -m 'some work' -c
Invoke-VerifyMock $mocks -Times 1
$fw.assertDiagnosticOutput | Should -Be @(
"WARN: Removing 'infra/foo' from branches; it is redundant via the following: feature/homepage-redesign"
"WARN: Removing 'main' from branches; it is redundant via the following: feature/homepage-redesign"
)
}

It 'creates a remote branch with simplified dependencies but still multiple when trying to include the current branch but there is none' {
Initialize-AssertValidBranchName 'feature/PS-100-some-work'
Initialize-AssertValidBranchName 'infra/foo'
Initialize-AssertValidBranchName 'main'
Initialize-AssertValidBranchName 'feature/homepage-redesign'
Initialize-AssertValidBranchName 'infra/update-dependencies'
Initialize-NoCurrentBranch

$mocks = @(
Initialize-LocalActionAssertExistence -branches @('feature/PS-100-some-work') -shouldExist $false
Initialize-LocalActionAssertExistence -branches @('infra/foo', 'main', 'feature/homepage-redesign', 'infra/update-dependencies') -shouldExist $true
Initialize-LocalActionSetDependency @{
'feature/PS-100-some-work' = @('feature/homepage-redesign', 'infra/update-dependencies')
} -commitish 'new-commit'
Initialize-LocalActionMergeBranchesSuccess `
@('feature/homepage-redesign', 'infra/update-dependencies') 'merge-result' `
-mergeMessageTemplate "Merge '{}' for creation of feature/PS-100-some-work"
Initialize-FinalizeActionSetBranches @{
'$dependencies' = 'new-commit'
'feature/PS-100-some-work' = 'merge-result'
} -track @('feature/PS-100-some-work')
Initialize-FinalizeActionCheckout 'feature/PS-100-some-work'
Initialize-FinalizeActionTrackSuccess @('feature/PS-100-some-work') -untracked @('feature/PS-100-some-work')
)

& $PSScriptRoot/git-new.ps1 feature/PS-100-some-work -d 'infra/foo,main,feature/homepage-redesign,infra/update-dependencies' -m 'some work' -c
Invoke-VerifyMock $mocks -Times 1
$fw.assertDiagnosticOutput | Should -Be @(
"WARN: Removing 'infra/foo' from branches; it is redundant via the following: feature/homepage-redesign"
"WARN: Removing 'main' from branches; it is redundant via the following: feature/homepage-redesign"
)
}

It 'reports failed merges and does not push if all fail' {
Initialize-AssertValidBranchName 'feature/PS-100-some-work'
Initialize-AssertValidBranchName 'feature/homepage-redesign'
Expand Down