Mercurial > hg-stable
changeset 35720:b3cf58487731
githelp: improve help for "reset"
The previous help referenced a `hg reset`, which is a Facebook-ism.
We convert that to `hg update`. We also recognize --soft.
Differential Revision: https://phab.mercurial-scm.org/D1728
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Mon, 18 Dec 2017 21:09:08 -0800 |
| parents | a4cd8f527a7f |
| children | f50067fbeead |
| files | hgext/githelp.py tests/test-githelp.t |
| diffstat | 2 files changed, 20 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/githelp.py Mon Dec 18 21:02:49 2017 -0800 +++ b/hgext/githelp.py Mon Dec 18 21:09:08 2017 -0800 @@ -807,12 +807,16 @@ hard = opts.get('hard') if opts.get('mixed'): - ui.status(_('NOTE: --mixed has no meaning since mercurial has no ' + + ui.status(_('NOTE: --mixed has no meaning since Mercurial has no ' + 'staging area\n\n')) + if opts.get('soft'): + ui.status(_('NOTE: --soft has no meaning since Mercurial has no ' 'staging area\n\n')) - cmd = Command('reset') + cmd = Command('update') if hard: cmd.append('--clean') + cmd.append(commit) ui.status((str(cmd)), "\n")
--- a/tests/test-githelp.t Mon Dec 18 21:02:49 2017 -0800 +++ b/tests/test-githelp.t Mon Dec 18 21:09:08 2017 -0800 @@ -158,11 +158,22 @@ githelp for reset, checking ~ in git becomes ~1 in mercurial $ hg githelp -- reset HEAD~ - hg reset .~1 + hg update .~1 $ hg githelp -- reset "HEAD^" - hg reset .^ + hg update .^ $ hg githelp -- reset HEAD~3 - hg reset .~3 + hg update .~3 + + $ hg githelp -- reset --mixed HEAD + NOTE: --mixed has no meaning since Mercurial has no staging area + + hg update . + $ hg githelp -- reset --soft HEAD + NOTE: --soft has no meaning since Mercurial has no staging area + + hg update . + $ hg githelp -- reset --hard HEAD + hg update --clean . githelp for git show --name-status $ hg githelp -- git show --name-status