46     phases,

    46     phases,

    47     pycompat,

    47     pycompat,

    48     registrar,

    48     registrar,

    49     repair,

    49     repair,

    50     scmutil,

    50     scmutil,

    51     templatefilters,

    52     templatefilters,

    52     util,

    53     util,

    53     vfs as vfsmod,

    54     vfs as vfsmod,

    54 )

    55 )

    55 

    56 

  1137         return patchcmds(ui, repo, pats, opts)

  1138         return patchcmds(ui, repo, pats, opts)

  1138     else:

  1139     else:

  1139         return createcmd(ui, repo, pats, opts)

  1140         return createcmd(ui, repo, pats, opts)

  1140 

  1141 

  1141 def extsetup(ui):

  1142 def extsetup(ui):

  1143         [shelvedstate._filename, False, False,

  1144         [shelvedstate._filename, False, False,

  1144          _('unshelve already in progress'),

  1145          _('unshelve already in progress'),

  1145          _("use 'hg unshelve --continue' or 'hg unshelve --abort'")])

  1146          _("use 'hg unshelve --continue' or 'hg unshelve --abort'")])

  1146     cmdutil.afterresolvedstates.append(

  1147     cmdutil.afterresolvedstates.append(

  1147         [shelvedstate._filename, _('hg unshelve --continue')])

  1148         [shelvedstate._filename, _('hg unshelve --continue')])