Move develop (v1) to master #568
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also doing some miscellaneous cleanup (remove Invoke-NullCoalescing, remove testDebugHarness.ps1 in favor of using the Pester Tests debug configuration, rename CheckVersion.ps1 to CheckRequirements.ps1).
Also add PrereleaseVersion as module private data property. Might come in handy. I'll update the issue template on master and then submit a PR to merge master to develop.
Remove PowerShell v2 support.
Update develop (1.0) from master (0.7.1)
Remove obsolete funtion Enable-GitColors.
Update develop from master
Hat tip to @lzybkr
- Make Set-ConsoleMode a no-op on non-Windows - Suppress a lint warning - Remove unused functions
Semantics are still quite strange... - If -Builder is specified (piped in), it will be returned, but only modified if -AnsiConsole is also specified - If -AnsiConsole is specified, a string with ANSI color escape sequences is returned. - Otherwise, an empty string is returned.
Use ANSI color codes if SupportsVirtualTerminal
24-bit support depends on System.Drawing for parsing HTML color strings.
Update develop from master
ANSI 256-color and 24-bit color support
Update develop from master
Passing just "git" to get-command causes the script to fail if you have an alias called "git". For example, I have hub installed (https://github.com/github/hub), which recommends aliasing git=hub. However, after doing this it breaks this posh-git script because `get-command git` returns the new alias which has no path. Running `get-command git` returns: CommandType Name Version Source ----------- ---- ------- ------ Alias git -> hub.exe But `get-command git.exe` returns: CommandType Name Version Source ----------- ---- ------- ------ Application git.exe 2.13.2.1 C:\Program Files\Git\cmd\git.exe
Fix bug w/setting fg/bg color to 0x0 & add regression test
…ings-display Enhance $GitPromptSettings to display RGB in hex, better spacing
Add $global:PoshGitLastPrompt for ANSI escaped prompt str
…n the develop branch.
Implement $GitPromptSettings.UntrackedFilesMode in the develop branch.
Also modified ANSI tests to be consistent and not flatten $res with string interpolation. Catch more errors this way.
Update to prompt func to allow path/status order swap
Update develop from master
rkeithhill
reviewed
Apr 20, 2018
| [string[]]$RepositoriesInWhichToDisableFileStatus = @() | ||
|
|
||
| [string]$DescribeStyle = '' | ||
| [psobject]$WindowTitle = {param($GitStatus, [bool]$IsAdmin) "$(if ($IsAdmin) {'Administrator: '})$(if ($GitStatus) {"posh~git ~ $($GitStatus.RepoName) [$($GitStatus.Branch)] ~ "})PowerShell $($PSVersionTable.PSVersion) $([IntPtr]::Size * 8)-bit ($PID)"} |
|
I did a dir diff on this branch with develop and there wasn't much except in some of top-level md files and the psd1
|
That's what I would expect. I assume most of what you see aligns with what GitHub shows on 3e4509e? I reverted the version back to 1.0.0.0 as an indicator that a bug report's coming from a clone of posh-git, rather than an official release (which will have 1.0.0). Or did we decide that isn't necessary? |
|
I "think" it's still necessary because module versioning at the PowerShell level (vs PSGallery/PowerShellGet) is still using .NET's System.Version and can't indicate pre-prelease info in the version number. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed (#522 (comment)), v0.x development has moved from
mastertov0. This bring v1 progress ondevelopintomasteras our main line of development.We've already reviewed everything except the last two commits.