Mercurial > public > mercurial-scm > hg-stable
diff hgext/shelve.py @ 25104:d6453f6fbdba
shelve: allow --patch and --stat without --list for a single shelf
It's annoying having to specify --list and --patch/--stat when all you
really want to do is to dump a patch. This creates an explicit
--patch/--stat command that is executed if --list is not specified. It
ensures that 1) there is only one shelf name specified and 2) that the
shelf exists. Then it redirects to the original listcmd code.
| author | Tony Tung <tonytung@fb.com> |
|---|---|
| date | Tue, 14 Apr 2015 16:23:54 -0400 |
| parents | ce00b2e96d09 |
| children | 0ca8410ea345 |
line wrap: on
line diff
--- a/hgext/shelve.py Tue Apr 14 16:23:07 2015 -0400 +++ b/hgext/shelve.py Tue Apr 14 16:23:54 2015 -0400 @@ -361,6 +361,17 @@ finally: fp.close() +def singlepatchcmds(ui, repo, pats, opts, subcommand): + """subcommand that displays a single shelf""" + if len(pats) != 1: + raise util.Abort(_("--%s expects a single shelf") % subcommand) + shelfname = pats[0] + + if not shelvedfile(repo, shelfname, 'patch').exists(): + raise util.Abort(_("cannot find shelf %s") % shelfname) + + listcmd(ui, repo, pats, opts) + def checkparents(repo, state): """check parent while resuming an unshelve""" if state.parents != repo.dirstate.parents(): @@ -699,8 +710,8 @@ ('list', set(['list'])), ('message', set(['create'])), ('name', set(['create'])), - ('patch', set(['list'])), - ('stat', set(['list'])), + ('patch', set(['patch', 'list'])), + ('stat', set(['stat', 'list'])), ] def checkopt(opt): if opts[opt]: @@ -717,11 +728,11 @@ return deletecmd(ui, repo, pats) elif checkopt('list'): return listcmd(ui, repo, pats, opts) + elif checkopt('patch'): + return singlepatchcmds(ui, repo, pats, opts, subcommand='patch') + elif checkopt('stat'): + return singlepatchcmds(ui, repo, pats, opts, subcommand='stat') else: - for i in ('patch', 'stat'): - if opts[i]: - raise util.Abort(_("option '--%s' may not be " - "used when shelving a change") % (i,)) return createcmd(ui, repo, pats, opts) def extsetup(ui):