This is an archive of the discontinued Mercurial Phabricator instance.

Differential D183

githelp: don't crash when user does githelp -- git
ClosedPublic

Authored by simonfar on Jul 26 2017, 11:18 AM.
Tags
None
Subscribers
None

Details

Reviewers
ikostia
Group Reviewers
Restricted Project
Commits
rFBHGX93252c90e7d7: githelp: don't crash when user does githelp -- git
Summary

We didn't check for sanity when the user asked for hg githelp -- git -
oops. Fix the args test to catch you if you ask for help for git, as opposed to
(say) git commit.

Test Plan

Ran the new test cases.

Diff Detail

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

Event Timeline

simonfar created this revision.Jul 26 2017, 11:18 AM
ikostia accepted this revision.Jul 26 2017, 11:23 AM
This revision is now accepted and ready to land.Jul 26 2017, 11:23 AM
Closed by commit rFBHGX93252c90e7d7: githelp: don't crash when user does githelp -- git (authored by simonfar). · Explain WhyJul 28 2017, 9:29 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/githelp.py (2 lines)
Mtests/test-githelp.t (10 lines)

Diff 437

hgext3rd/githelp.py

@command('^githelp|git', [ @command('^githelp|git', [
], _('hg githelp')) ], _('hg githelp'))
def githelp(ui, repo, *args, **kwargs): def githelp(ui, repo, *args, **kwargs):
'''suggests the Mercurial equivalent of the given git command '''suggests the Mercurial equivalent of the given git command
Usage: hg githelp -- <git command> Usage: hg githelp -- <git command>
''' '''
if len(args) == 0: if len(args) == 0 or (len(args) == 1 and args[0] =='git'):
raise error.Abort(_('missing git command - ' raise error.Abort(_('missing git command - '
'usage: hg githelp -- <git command>')) 'usage: hg githelp -- <git command>'))
if args[0] == 'git': if args[0] == 'git':
args = args[1:] args = args[1:]
cmd = args[0] cmd = args[0]
if not cmd in gitcommands: if not cmd in gitcommands:

tests/test-githelp.t

$ touch both $ touch both
$ touch untracked_file $ touch untracked_file
$ hg remove removed_file $ hg remove removed_file
$ rm deleted_file $ rm deleted_file
githelp on a single command should succeed githelp on a single command should succeed
$ hg githelp -- commit $ hg githelp -- commit
hg commit hg commit
$ hg githelp -- git commit
hg commit
githelp should fail nicely if we don't give it arguments
$ hg githelp
abort: missing git command - usage: hg githelp -- <git command>
[255]
$ hg githelp -- git
abort: missing git command - usage: hg githelp -- <git command>
[255]
githelp on a command with options should succeed githelp on a command with options should succeed
$ hg githelp -- commit -pm "abc" $ hg githelp -- commit -pm "abc"
hg record -m 'abc' hg record -m 'abc'
githelp on a command with standalone unrecognized option should succeed with warning githelp on a command with standalone unrecognized option should succeed with warning
$ hg githelp -- commit -p -v $ hg githelp -- commit -p -v
ignoring unknown option -v ignoring unknown option -v