comparison hgext/mq.py @ 3568:23f7d9621783

Merge with upstream

3567:3bab1fc0ab75

        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)

                    continue
                elif x in mm:
                    del mm[mm.index(x)]
                dd.append(x)

            m = list(util.unique(mm))
            r = list(util.unique(dd))
            a = list(util.unique(aa))
            filelist = filter(matchfn, util.unique(m + r + a))
            if opts.get('git'):
                self.diffopts().git = True
            patch.diff(repo, patchparent, files=filelist, match=matchfn,
                       fp=patchf, changes=(m, a, r, [], u),

        if rev:
            if files:
                raise util.Abort(_('option "-r" not valid when importing '
                                   'files'))
            rev = [int(r) for r in cmdutil.revrange(self.ui, repo, rev)]
            rev.sort(lambda x, y: cmp(y, x))
        if (len(files) > 1 or len(rev) > 1) and patchname:
            raise util.Abort(_('option "-n" not valid when importing multiple '
                               'patches'))
        i = 0

3568:23f7d9621783

        appliedbase = 0
        if opts.get('rev'):
            if not self.applied:
                raise util.Abort(_('no patches applied'))
            revs = 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)

                    continue
                elif x in mm:
                    del mm[mm.index(x)]
                dd.append(x)

            m = util.unique(mm)
            r = util.unique(dd)
            a = util.unique(aa)
            filelist = filter(matchfn, util.unique(m + r + a))
            if opts.get('git'):
                self.diffopts().git = True
            patch.diff(repo, patchparent, files=filelist, match=matchfn,
                       fp=patchf, changes=(m, a, r, [], u),

        if rev:
            if files:
                raise util.Abort(_('option "-r" not valid when importing '
                                   'files'))
            rev = cmdutil.revrange(self.ui, repo, rev)
            rev.sort(lambda x, y: cmp(y, x))
        if (len(files) > 1 or len(rev) > 1) and patchname:
            raise util.Abort(_('option "-n" not valid when importing multiple '
                               'patches'))
        i = 0