comparison hgext/mq.py @ 3373:9851f46d6ecc

mq: change qdel --forget to --rev; accept any revision symbol

3370:b7fe334ff4fb

        tr.close()
        return (err, n)

    def delete(self, repo, patches, opts):
        realpatches = []
        appliedbase = 0
        forget = opts.get('forget')
        for patch in patches:
            patch = self.lookup(patch, strict=True)
            info = self.isapplied(patch)
            if info and not forget:
                raise util.Abort(_("cannot delete applied patch %s") % patch)
            if patch not in self.series:
                raise util.Abort(_("patch %s not in series file") % patch)
            if forget:
                if not info:
                    raise util.Abort(_("cannot forget unapplied patch %s") % patch)
                if info[0] != appliedbase:
                    raise util.Abort(_("patch %s not at base") % patch)
                appliedbase += 1
            realpatches.append(patch)

        if not opts.get('keep'):
            r = self.qrepo()
            if r:
                r.remove(realpatches, True)
            else:
                os.unlink(self.join(patch))

        if forget:
            del self.applied[:appliedbase]
            self.applied_dirty = 1
        indices = [self.find_series(p) for p in realpatches]
        indices.sort()
        for i in indices[-1::-1]:

        self.series_dirty = 1
        qrepo = self.qrepo()
        if qrepo:
            qrepo.add(added)

def delete(ui, repo, patch, *patches, **opts):
    """remove patches from queue

    With --forget, mq will stop managing the named patches. The
    patches must be applied and at the base of the stack. This option
    is useful when the patches have been applied upstream.

    Otherwise, the patches must not be applied.

    With --keep, the patch files are preserved in the patch directory."""
    q = repo.mq
    q.delete(repo, (patch,) + patches, opts)
    q.save_dirty()
    return 0

def applied(ui, repo, patch=None, **opts):
    """print the patches already applied"""

               [('I', 'include', [], _('include names matching the given patterns')),
                ('X', 'exclude', [], _('exclude names matching the given patterns'))],
               'hg qdiff [-I] [-X] [FILE]...'),
    "qdelete|qremove|qrm":
        (delete,
         [('f', 'forget', None, _('stop managing an applied patch')),
          ('k', 'keep', None, _('keep patch file'))],
          'hg qdelete [-f] [-k] PATCH'),
    'qfold':
        (fold,
         [('e', 'edit', None, _('edit patch header')),
          ('k', 'keep', None, _('keep folded patch files')),
          ('m', 'message', '', _('set patch header to <text>')),

3373:9851f46d6ecc

        tr.close()
        return (err, n)

    def delete(self, repo, patches, opts):
        realpatches = []
        for patch in patches:
            patch = self.lookup(patch, strict=True)
            info = self.isapplied(patch)
            if info:
                raise util.Abort(_("cannot delete applied patch %s") % patch)
            if patch not in self.series:
                raise util.Abort(_("patch %s not in series file") % patch)
            realpatches.append(patch)

        appliedbase = 0
        if opts.get('rev'):
            if not self.applied:
                raise util.Abort(_('no patches applied'))
            revs = [int(r) for r in cmdutil.revrange(ui, repo, opts['rev'])]
            if len(revs) > 1 and revs[0] > revs[1]:
                revs.reverse()
            for rev in revs:
                if appliedbase >= len(self.applied):
                    raise util.Abort(_("revision %d is not managed") % rev)

                base = revlog.bin(self.applied[appliedbase].rev)
                node = repo.changelog.node(rev)
                if node != base:
                    raise util.Abort(_("cannot delete revision %d above "
                                       "applied patches") % rev)
                realpatches.append(self.applied[appliedbase].name)
                appliedbase += 1

        if not opts.get('keep'):
            r = self.qrepo()
            if r:
                r.remove(realpatches, True)
            else:
                os.unlink(self.join(patch))

        if appliedbase:
            del self.applied[:appliedbase]
            self.applied_dirty = 1
        indices = [self.find_series(p) for p in realpatches]
        indices.sort()
        for i in indices[-1::-1]:

        self.series_dirty = 1
        qrepo = self.qrepo()
        if qrepo:
            qrepo.add(added)

def delete(ui, repo, *patches, **opts):
    """remove patches from queue

    With --rev, mq will stop managing the named revisions. The
    patches must be applied and at the base of the stack. This option
    is useful when the patches have been applied upstream.

    Otherwise, the patches must not be applied.

    With --keep, the patch files are preserved in the patch directory."""
    q = repo.mq
    q.delete(repo, patches, opts)
    q.save_dirty()
    return 0

def applied(ui, repo, patch=None, **opts):
    """print the patches already applied"""

               [('I', 'include', [], _('include names matching the given patterns')),
                ('X', 'exclude', [], _('exclude names matching the given patterns'))],
               'hg qdiff [-I] [-X] [FILE]...'),
    "qdelete|qremove|qrm":
        (delete,
         [('k', 'keep', None, _('keep patch file')),
          ('r', 'rev', [], _('stop managing a revision'))],
          'hg qdelete [-k] [-r REV]... PATCH...'),
    'qfold':
        (fold,
         [('e', 'edit', None, _('edit patch header')),
          ('k', 'keep', None, _('keep folded patch files')),
          ('m', 'message', '', _('set patch header to <text>')),