| pulkit |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/shelve.py (15 lines) | |||
| M | tests/test-shelve.t (27 lines) |
| difflines = fp.readlines() | difflines = fp.readlines() | ||||
| if opts['patch']: | if opts['patch']: | ||||
| for chunk, label in patch.difflabel(iter, difflines): | for chunk, label in patch.difflabel(iter, difflines): | ||||
| ui.write(chunk, label=label) | ui.write(chunk, label=label) | ||||
| if opts['stat']: | if opts['stat']: | ||||
| for chunk, label in patch.diffstatui(difflines, width=width): | for chunk, label in patch.diffstatui(difflines, width=width): | ||||
| ui.write(chunk, label=label) | ui.write(chunk, label=label) | ||||
| def patchcmds(ui, repo, pats, opts, subcommand): | def patchcmds(ui, repo, pats, opts): | ||||
| """subcommand that displays shelves""" | """subcommand that displays shelves""" | ||||
| if len(pats) == 0: | if len(pats) == 0: | ||||
| raise error.Abort(_("--%s expects at least one shelf") % subcommand) | shelves = listshelves(repo) | ||||
| if not shelves: | |||||
| raise error.Abort(_("there are no shelves to show")) | |||||
| mtime, name = shelves[0] | |||||
| sname = util.split(name)[1] | |||||
| pats = [sname] | |||||
| for shelfname in pats: | for shelfname in pats: | ||||
| if not shelvedfile(repo, shelfname, patchextension).exists(): | if not shelvedfile(repo, shelfname, patchextension).exists(): | ||||
| raise error.Abort(_("cannot find shelf %s") % shelfname) | raise error.Abort(_("cannot find shelf %s") % shelfname) | ||||
| listcmd(ui, repo, pats, opts) | listcmd(ui, repo, pats, opts) | ||||
| def checkparents(repo, state): | def checkparents(repo, state): | ||||
| if checkopt('cleanup'): | if checkopt('cleanup'): | ||||
| if pats: | if pats: | ||||
| raise error.Abort(_("cannot specify names when using '--cleanup'")) | raise error.Abort(_("cannot specify names when using '--cleanup'")) | ||||
| return cleanupcmd(ui, repo) | return cleanupcmd(ui, repo) | ||||
| elif checkopt('delete'): | elif checkopt('delete'): | ||||
| return deletecmd(ui, repo, pats) | return deletecmd(ui, repo, pats) | ||||
| elif checkopt('list'): | elif checkopt('list'): | ||||
| return listcmd(ui, repo, pats, opts) | return listcmd(ui, repo, pats, opts) | ||||
| elif checkopt('patch'): | elif checkopt('patch') or checkopt('stat'): | ||||
| return patchcmds(ui, repo, pats, opts, subcommand='patch') | return patchcmds(ui, repo, pats, opts) | ||||
| elif checkopt('stat'): | |||||
| return patchcmds(ui, repo, pats, opts, subcommand='stat') | |||||
| else: | else: | ||||
| return createcmd(ui, repo, pats, opts) | return createcmd(ui, repo, pats, opts) | ||||
| def extsetup(ui): | def extsetup(ui): | ||||
| cmdutil.unfinishedstates.append( | cmdutil.unfinishedstates.append( | ||||
| [shelvedstate._filename, False, False, | [shelvedstate._filename, False, False, | ||||
| _('unshelve already in progress'), | _('unshelve already in progress'), | ||||
| _("use 'hg unshelve --continue' or 'hg unshelve --abort'")]) | _("use 'hg unshelve --continue' or 'hg unshelve --abort'")]) | ||||
| cmdutil.afterresolvedstates.append( | cmdutil.afterresolvedstates.append( | ||||
| [shelvedstate._filename, _('hg unshelve --continue')]) | [shelvedstate._filename, _('hg unshelve --continue')]) | ||||
| abort: cannot find shelf nonexistentshelf | abort: cannot find shelf nonexistentshelf | ||||
| [255] | [255] | ||||
| $ hg shelve --stat nonexistentshelf | $ hg shelve --stat nonexistentshelf | ||||
| abort: cannot find shelf nonexistentshelf | abort: cannot find shelf nonexistentshelf | ||||
| [255] | [255] | ||||
| $ hg shelve --patch default nonexistentshelf | $ hg shelve --patch default nonexistentshelf | ||||
| abort: cannot find shelf nonexistentshelf | abort: cannot find shelf nonexistentshelf | ||||
| [255] | [255] | ||||
| when the user asks for a patch, we assume they want the most recent shelve if | |||||
| they don't provide a shelve name | |||||
| $ hg shelve --patch | $ hg shelve --patch | ||||
| abort: --patch expects at least one shelf | default-01 (*)* changes to: create conflict (glob) | ||||
| diff --git a/shelf-patch-b b/shelf-patch-b | |||||
| new file mode 100644 | |||||
| --- /dev/null | |||||
| +++ b/shelf-patch-b | |||||
| @@ -0,0 +1,1 @@ | |||||
| +patch b | |||||
| $ cd .. | |||||
| you shouldn't be able to ask for the patch/stats of the most recent shelve if | |||||
| there are no shelves | |||||
| $ hg init noshelves | |||||
| $ cd noshelves | |||||
| $ hg shelve --patch | |||||
| abort: there are no shelves to show | |||||
| [255] | |||||
| $ hg shelve --stat | |||||
| abort: there are no shelves to show | |||||
| [255] | [255] | ||||
| $ cd .. | $ cd .. | ||||
| Shelve from general delta repo uses bundle2 on disk | Shelve from general delta repo uses bundle2 on disk | ||||
| -------------------------------------------------- | -------------------------------------------------- | ||||
| no general delta | no general delta | ||||