Adding an additional git prompt symbol for a branch's tracking state

[paulmarsy]

@dahlbyk pull request for issues:
#172
#190

As per the discussion in #190

• The symbol showing the state of the working tree has been added back in
• The remote tracking state is always shown as it is now decoupled from the working tree symbol

I also added a space between the branch name and symbol for clarity.

Should the DelimText character be used to segment the different parts of the prompt?

In sync with no local changes

In sync with unstaged local changes

In sync with staged local changes

Ahead of the remote branch

Behind the remote branch

Both ahead & behind the remote branch

The three unicode characters used (0x2261, 0x2191 & 0x2193) render correctly in:

• ConEmu with Consolas font
• Windows PowerShell console with the default Lucida Console font (Windows 10)
• Windows PowerShell console with the default 'Raster Fonts' (Windows 8.1 & Windows Server 2012 R2)
• Windows PowerShell ISE with the default Lucida Console font (Windows 10 & 8.1) both script pane and console pane
• Command Prompt / cmd.exe (Windows 10, 8.1 & Windows Server 2012 R2)
• 'Git Bash' - mintty
• 'Git Bash' - msysgit

RE: @bazzilic & #190 (comment) I'm unsure where to find and test those fonts.

[bazzilic]

Why not the ↕ symbol for both ahead and behind?

As for the fonts,
Lucida Console and Consolas are preinstalled with Windows.
Ubuntu Font Family: http://font.ubuntu.com/
Monaco: http://www.fontpalace.com/font-details/Monaco/
Droid Sans Mono: http://www.fontsquirrel.com/fonts/droid-sans-mono
Source Code Pro: http://www.1001fonts.com/source-code-pro-font.html
Menlo: https://github.com/hbin/top-programming-fonts/blob/master/Menlo-Regular.ttf?raw=true

[paulmarsy]

Testing in ConEmu/PowerShell under Windows 7 all four symbols render correctly in the below fonts using:
"$([char]0x2191)$([char]0x2193)$([char]0x2261)$([char]0x2195)"
↑↓≡↕

• Lucida Console ✔️
• Consolas ✔️
• Menlo-Regular ✔️
• Monaco ✔️
• Ubuntu ✔️
• UbuntuCondensed ✔️
• UbuntuLight ✔️
• UbuntuMono ✔️
• SourceCodePro-Black ✔️
• SourceCodePro-ExtraLight ✔️
• SourceCodePro-Light ✔️
• SourceCodePro-Regular ✔️
• SourceCodePro-Semibold ✔️
• DroidSansMono ✔️

I'll update the ahead & behind symbol to use ↕ as it is more appropriate.

[paulmarsy]

Is there any further feedback on this? Are there any changes to the implementation that should be made or is it suitable?
I realise there are a large number of changes to the prompt file which requires careful consideration to avoid introducing any bugs in such a critical function. Are there any additional scenarios which should be tested?

Here is an example workflow with the current proposed PR:

For the user experience the only thing I am unsure of is whether to keep the space between the branch name and it's symbol. I am leaning towards removing the space to keep things more compact.

[dahlbyk]

Sorry for the delayed response - your implementation and testing seems quite thorough, I just haven't had an opportunity to dig in for a final review due to recent travel. Soon, I hope!

[paulmarsy]

No problem, just wanted to make sure there was nothing currently outstanding for me to do 😄

[paulmarsy]

An example workflow of the change without the space is below.
I am undecided and have no preference one way or the other.. the difference is minor.

[bazzilic]

Looks great to me. As for the space, I prefer the first one, with the space between the arrow and the branch name.

[codewithtyler]

I also prefer the first one. The additional space makes it easier to read.

[dahlbyk]

I should have just merged this months ago. Great work, @paulmarsy!