av6 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6461 AFFECTED FILES hgext/githelp.py tests/test-githelp.t CHANGE DETAILS diff --git a/tests/test-githelp.t b/tests/test-githelp.t --- a/tests/test-githelp.t +++ b/tests/test-githelp.t @@ -219,6 +219,22 @@ $ hg githelp -- git stash drop xyz hg shelve -d xyz +githelp for stash list with patch + $ hg githelp -- git stash list -p + hg shelve -l -p + +githelp for stash show + $ hg githelp -- git stash show + hg shelve --stat + +githelp for stash show with patch and name + $ hg githelp -- git stash show -p mystash + hg shelve -p mystash + +githelp for stash clear + $ hg githelp -- git stash clear + hg shelve --cleanup + githelp for whatchanged should show deprecated message $ hg githelp -- whatchanged -p this command has been deprecated in the git project, thus isn't supported by this tool diff --git a/hgext/githelp.py b/hgext/githelp.py --- a/hgext/githelp.py +++ b/hgext/githelp.py @@ -923,14 +923,26 @@ def stash(ui, repo, *args, **kwargs): cmdoptions = [ + ('p', 'patch', None, ''), ] args, opts = parseoptions(ui, cmdoptions, args) cmd = Command('shelve') action = args[0] if len(args) > 0 else None if action == 'list': cmd['-l'] = None + if opts.get('patch'): + cmd['-p'] = None + elif action == 'show': + if opts.get('patch'): + cmd['-p'] = None + else: + cmd['--stat'] = None + if len(args) > 1: + cmd.append(args[1]) + elif action == 'clear': + cmd['--cleanup'] = None elif action == 'drop': cmd['-d'] = None if len(args) > 1: @@ -943,10 +955,9 @@ cmd.append(args[1]) if action == 'apply': cmd['--keep'] = None - elif (action == 'branch' or action == 'show' or action == 'clear' - or action == 'create'): + elif action == 'branch' or action == 'create': ui.status(_("note: Mercurial doesn't have equivalents to the " - "git stash branch, show, clear, or create actions\n\n")) + "git stash branch or create actions\n\n")) return else: if len(args) > 0: To: av6, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
