Skip to content
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.

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

Update README.md for v1.0.0 release #572

Merged
merged 4 commits into from
May 7, 2018
Merged

Conversation

rkeithhill
Copy link
Collaborator

Replaces PR #529

Copy link
Owner

@dahlbyk dahlbyk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got through the first half. Will resume later.

Great work on these changes — we're close!

README.md Outdated
[![master build coverage](https://coveralls.io/repos/github/dahlbyk/posh-git/badge.svg?branch=master)](https://coveralls.io/github/dahlbyk/posh-git?branch=master)
( [README](https://github.com/dahlbyk/posh-git/blob/master/README.md)
• [CHANGELOG](https://github.com/dahlbyk/posh-git/blob/master/CHANGELOG.md) )
| Windows (AppVeyor) | Linux/macOS (Travis | Code Coverage Status |
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing ) on Travis.

README.md Outdated
| [![v0 build status][av-v0-img]][av-v0-site] | [![v0 build coverage][cc-v0-img]][cc-v0-site] |

[README][v0-readme]
• [CHANGELOG](https://github.com/dahlbyk/posh-git/blob/v0/CHANGELOG.md)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be a link reference (or whatever they're called)?

README.md Outdated
| [![master build status][av-master-img]][av-master-site] | [![master build status][tv-master-img]][tv-master-site] | [![master build coverage][cc-master-img]][cc-master-site] |

[README](https://github.com/dahlbyk/posh-git/blob/master/README.md)
• [CHANGELOG](https://github.com/dahlbyk/posh-git/blob/master/CHANGELOG.md)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These, too. Probably search for (http in the doc to find others.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do but a few I'll leave inline - primarly bug fix links and any that has the link in the displayed text e.g. [https://git-scm.com](https://git-scm.com).

README.md Outdated
Import-PackageProvider NuGet -Force
```
Then retry the `Install-Module` command above.
2. Execute one of the following two commands from an elevated PowerShell prompt depending on your current posh-git installation status:
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

, before depending?

README.md Outdated
```powershell
# If you have never installed posh-git from the PowerShell Gallery
# NOTE: If asked to trust packages from the PowerShell Gallery, answer yes to continue installation of posh-git
PowerShellGet\Install-Module posh-git -Scope CurrentUser -Force
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why -Force here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To force side-by-side:

05-06 11:17:02 46ms 3> install-module posh-git -Scope CurrentUser -AllowPrerelease
WARNING: Version '0.7.1' of module 'posh-git' is already installed at
'C:\Users\Keith\Documents\WindowsPowerShell\Modules\posh-git\0.7.1'. To install version '1.0.0-beta1', run
Install-Module and add the -Force parameter, this command will install version '1.0.0-beta1' in side-by-side with
version '0.7.1'.
C:\Users\Keith
05-06 11:17:27 38ms 4> install-module posh-git -Scope CurrentUser -AllowPrerelease -Force
C:\Users\Keith
05-06 11:17:41 42ms 5>

README.md Outdated

The version of `PSReadLine` (1.2) that ships with PowerShell Core 6.0 has known issues that cause problems with the
prompt function that posh-git uses. Fortunately, there is a beta of PSReadLine 2.0.0 that fixes these problems.
You can check the version of PSReadLine you have by executing: `get-module psreadline`.
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add a warning to posh-git.psm1 if we detect this situation?

And super nitpicky, but maybe capitalize Get-Module PSReadline?

README.md Outdated
You can check the version of PSReadLine you have by executing: `get-module psreadline`.
If it less than 2.0.0, follow this procedure.

1. Start PowerShell Core by running `pwsh`.
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They just checked version in pwsh; they don't need this step 1.

README.md Outdated
If you want posh-git to be available in just the current host, then execute `Add-PoshGitToProfile`.
This will add the same command but to the file `$profile.CurrentUserCurrentHost`.

If you want posh-git to be available for all users on the system, start PowerShell as Administrator or
via sudo (sudo pwsh) on Linux/macOS then execute `Add-PoshGitToProfile -AllUsers -AllHosts`.
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Format sudo as code?

@rkeithhill
Copy link
Collaborator Author

Sure would be nice to get beta2 out next week - if possible. :-)

@dahlbyk
Copy link
Owner

dahlbyk commented May 7, 2018

Trying…

Copy link
Owner

@dahlbyk dahlbyk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revisions look good. Here's my feedback on the rest of the changes.

README.md Outdated
PowerShellGet\Install-Module posh-git -Scope CurrentUser
```
You may be asked if you trust packages coming from the PowerShell Gallery. Answer yes to allow installation of this module to proceed.
posh-git is available on the [PowerShell Gallery][psgallery-beta1] and can be installed using the PowerShellGet module.
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thought I had commented on this before, but I guess not…

Let's name this link psgallery-v1 so we just need to update link once 1.0 final drops.

README.md Outdated
[choco-site]: https://chocolatey.org/packages/poshgit/
[psgallery-beta1]: https://www.powershellgallery.com/packages/posh-git/1.0.0-beta1
[psgallery-img]: https://img.shields.io/powershellgallery/dt/posh-git.svg
[psgallery-site]: https://powershellgallery.com/packages/posh-git
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Canonical links for PS Gallery should include www

README.md Outdated
* `~` = There are uncommitted changes i.e. staged changes in the working tree waiting to be committed (`LocalStagedStatus`)
* None = There are no unstaged or uncommitted changes to the working tree (`LocalDefault`)
* `]` (`AfterText`)
- `[` (`BeforeText`)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is BeforeStatus as of #544.

README.md Outdated
the remote branch (`BranchBehindAndAheadStatus`). NOTE: this status is only available if
`$GitPromptSettings.BranchBehindAndAheadDisplay` is set to `Compact`.
- `×` = The local branch is tracking a branch that is gone from the remote (`BranchGoneStatus`)
- `ABCD` represent the index; `|` (`DelimText`); `EFGH` represent the working directory
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DelimStatus

README.md Outdated
- `!` = There are unstaged changes in the working tree (`LocalWorkingStatus`)
- `~` = There are uncommitted changes i.e. staged changes in the working tree waiting to be committed (`LocalStagedStatus`)
- None = There are no unstaged or uncommitted changes to the working tree (`LocalDefault`)
- `]` (`AfterText`)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AfterStatus

README.md Outdated
- `W` represents the overall status of the working directory
- `!` = There are unstaged changes in the working tree (`LocalWorkingStatus`)
- `~` = There are uncommitted changes i.e. staged changes in the working tree waiting to be committed (`LocalStagedStatus`)
- None = There are no unstaged or uncommitted changes to the working tree (`LocalDefault`)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These three statuses should probably include their Symbol suffix now.

README.md Outdated

![[master ≡] ~\GitHub\posh-git
02-18 14:04:35 38> ][prompt-custom]

If you'd like to make any of these changes permanent i.e. available whenever you start PowerShell, put the corresponding
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comma after permanent?

README.md Outdated
the current dir is in a Git repository.
To simplify the layout, `DP` is being used as an abbreviation for `DefaultPrompt` settings.

Default prompt layout (DP is short for DefaultPrompt):
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does DP need to be explained twice?

@rkeithhill
Copy link
Collaborator Author

Good catches!! Thanks

rkeithhill added 2 commits May 7, 2018 09:42
Add MD024 to markdown linter disable list.  With CHANGELOG we have multiple headers with same name e.g. Added, Changed, Removed, Fixed.
@dahlbyk dahlbyk force-pushed the rkeithhill/update-readme-v1 branch from b12bdf8 to 0ef0a84 Compare May 7, 2018 15:18
@dahlbyk
Copy link
Owner

dahlbyk commented May 7, 2018

@rkeithhill I practiced a bit of git-fu to separate your formatting/structure changes from actual content changes in 5c0170c. I think it's a bit easier to double-check content changes that way.

I verified the only difference before/after my changes was a few MD rules (no-inline-html, no-bare-urls, no-space-in-code):

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5caf064..06cdcdb 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,6 +4,11 @@
     "markdownlint.config": {
         "MD013": false,
         "MD024": false,
-        "MD029": false
+        "MD029": false,
+        "MD033": {
+            "allowed_elements": [ "kbd" ]
+        },
+        "MD034": false,
+        "MD038": false
     }
 }

Beyond that:

  • I put back an "install with Chocolatey" section, with slightly adjusted copy.
  • Fixed an intra-README link.

README.md Outdated
@@ -248,7 +248,7 @@ For example, a status of `[master ≡ +0 ~2 -1 | +1 ~1 -0]` corresponds to the f
## Customization variables

posh-git adds variables to your session to let you customize it, including `$GitPromptSettings`, `$GitTabSettings`, and `$TortoiseGitSettings`.
For an example of how to configure your PowerShell profile script to import the posh-git module and create a custom prompt function that displays git status info, see the [Customizing Your PowerShell Prompt](#step-3-optional-customize-your-powershell-prompt) section below.
For an example of how to configure your PowerShell profile script to import the posh-git module and create a custom prompt function that displays git status info, see the [Customizing Your PowerShell Prompt](#customizing-the-posh-git-prompt) section below.
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch - again!

@rkeithhill
Copy link
Collaborator Author

Looks good. I think the only thing we need to do before a beta.2 is review/update the CHANGELOG. As for a final release, I still want to tackle the path eliding feature. Maybe tab expansion as well. I've been playing around with TabExpansionPlusPlus - but this might take a while.

@dahlbyk
Copy link
Owner

dahlbyk commented May 7, 2018

Looks good. I think the only thing we need to do before a beta.2 is review/update the CHANGELOG.

👍

As for a final release, I still want to tackle the path eliding feature.

👍

Maybe tab expansion as well. I've been playing around with TabExpansionPlusPlus - but this might take a while.

I'm inclined to push this to 2.0.

The two big things yet on my 1.0 list:

  • Move ssh-agent stuff into a separate module.
  • Figure out if the Chocolatey install/uninstall needs to change, perhaps just proxying PowerShellGet?

@dahlbyk dahlbyk force-pushed the rkeithhill/update-readme-v1 branch from 0ef0a84 to 9d0e02d Compare May 7, 2018 18:59
@dahlbyk dahlbyk merged commit 0a29c44 into master May 7, 2018
@dahlbyk dahlbyk deleted the rkeithhill/update-readme-v1 branch May 7, 2018 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants