This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1728

githelp: improve help for "reset"
ClosedPublic

Authored by indygreg on Dec 19 2017, 12:36 AM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb3cf58487731: githelp: improve help for "reset"
Summary

The previous help referenced a hg reset, which is a Facebook-ism.
We convert that to hg update. We also recognize --soft.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Dec 19 2017, 12:36 AM
durin42 accepted this revision.Dec 20 2017, 8:41 PM
This revision is now accepted and ready to land.Dec 20 2017, 8:41 PM
indygreg updated this revision to Diff 4596.Dec 22 2017, 8:39 PM
pulkit accepted this revision.Dec 28 2017, 4:01 PM
durin42 accepted this revision.Jan 18 2018, 2:34 PM
Closed by commit rHGb3cf58487731: githelp: improve help for "reset" (authored by indygreg). · Explain WhyJan 18 2018, 2:58 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/githelp.py (8 lines)
Mtests/test-githelp.t (17 lines)

Diff 4923

hgext/githelp.py

('', 'mixed', None, ''), ('', 'mixed', None, ''),
] ]
args, opts = parseoptions(ui, cmdoptions, args) args, opts = parseoptions(ui, cmdoptions, args)
commit = convert(args[0] if len(args) > 0 else '.') commit = convert(args[0] if len(args) > 0 else '.')
hard = opts.get('hard') hard = opts.get('hard')
if opts.get('mixed'): 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')) 'staging area\n\n'))
cmd = Command('reset') cmd = Command('update')
if hard: if hard:
cmd.append('--clean') cmd.append('--clean')
cmd.append(commit) cmd.append(commit)
ui.status((str(cmd)), "\n") ui.status((str(cmd)), "\n")
def revert(ui, repo, *args, **kwargs): def revert(ui, repo, *args, **kwargs):
cmdoptions = [ cmdoptions = [
] ]
args, opts = parseoptions(ui, cmdoptions, args) args, opts = parseoptions(ui, cmdoptions, args)

tests/test-githelp.t

hg revert --all hg revert --all
githelp for grep with pattern and path githelp for grep with pattern and path
$ hg githelp -- grep shrubbery flib/intern/ $ hg githelp -- grep shrubbery flib/intern/
hg grep shrubbery flib/intern/ hg grep shrubbery flib/intern/
githelp for reset, checking ~ in git becomes ~1 in mercurial githelp for reset, checking ~ in git becomes ~1 in mercurial
$ hg githelp -- reset HEAD~ $ hg githelp -- reset HEAD~
hg reset .~1 hg update .~1
$ hg githelp -- reset "HEAD^" $ hg githelp -- reset "HEAD^"
hg reset .^ hg update .^
$ hg githelp -- reset HEAD~3 $ 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 githelp for git show --name-status
$ hg githelp -- git show --name-status $ hg githelp -- git show --name-status
hg log --style status -r tip hg log --style status -r tip
githelp for git show --pretty=format: --name-status githelp for git show --pretty=format: --name-status
$ hg githelp -- git show --pretty=format: --name-status $ hg githelp -- git show --pretty=format: --name-status
hg stat --change tip hg stat --change tip