comparison hgext/mq.py @ 16653:73b8c2554be8

mq: introduce qpop --check

qpop --check let you qpop with uncommitted files if they do not
intersect with files touched by the popped patches.

16648:1388cc711ea7

        finally:
            wlock.release()

    def pop(self, repo, patch=None, force=False, update=True, all=False,
            nobackup=False):
        wlock = repo.wlock()
        try:
            if patch:
                # index, rev, patch
                info = self.isapplied(patch)

                        break
                update = needupdate

            tobackup = set()
            if update:
                m, a, r, d = self.checklocalchanges(repo, force=force)
                if not nobackup and force:
                    tobackup.update(m + a)

            self.applieddirty = True
            end = len(self.applied)
            rev = self.applied[start].node
            if update:

                ctx = repo[qp]
                m, a, r, d = repo.status(qp, top)[:4]
                if d:
                    raise util.Abort(_("deletions found between repo revs"))

                # backup local changes in --force case
                self.backup(repo, set(a + m + r) & tobackup)

                for f in a:
                    try:
                        util.unlinkpath(repo.wjoin(f))
                    except OSError, e:

@command("^qpop",
         [('a', 'all', None, _('pop all patches')),
          ('n', 'name', '',
           _('queue name to pop (DEPRECATED)'), _('NAME')),
          ('f', 'force', None, _('forget any local changes to patched files')),
          ('', 'no-backup', None, _('do not save backup copies of files'))],
         _('hg qpop [-a] [-f] [PATCH | INDEX]'))
def pop(ui, repo, patch=None, **opts):
    """pop the current patch off the stack

    By default, pops off the top of the patch stack. If given a patch
    name, keeps popping off patches until the named patch is at the
    top of the stack.

    Return 0 on success.
    """
    localupdate = True
    if opts.get('name'):

        ui.warn(_('using patch queue: %s\n') % q.path)
        localupdate = False
    else:
        q = repo.mq
    ret = q.pop(repo, patch, force=opts.get('force'), update=localupdate,
                all=opts.get('all'), nobackup=opts.get('no_backup'))
    q.savedirty()
    return ret

@command("qrename|qmv", [], _('hg qrename PATCH1 [PATCH2]'))
def rename(ui, repo, patch, name=None, **opts):

16653:73b8c2554be8

        finally:
            wlock.release()

    def pop(self, repo, patch=None, force=False, update=True, all=False,
            nobackup=False, check=False):
        if force and check:
            raise util.Abort(_('cannot use both --force and --check'))
        wlock = repo.wlock()
        try:
            if patch:
                # index, rev, patch
                info = self.isapplied(patch)

                        break
                update = needupdate

            tobackup = set()
            if update:
                m, a, r, d = self.checklocalchanges(repo, force=force or check)
                if force:
                    if not nobackup:
                        tobackup.update(m + a)
                elif check:
                    tobackup.update(m + a + r + d)

            self.applieddirty = True
            end = len(self.applied)
            rev = self.applied[start].node
            if update:

                ctx = repo[qp]
                m, a, r, d = repo.status(qp, top)[:4]
                if d:
                    raise util.Abort(_("deletions found between repo revs"))

                tobackup = set(a + m + r) & tobackup
                if check and tobackup:
                    self.localchangesfound()
                self.backup(repo, tobackup)

                for f in a:
                    try:
                        util.unlinkpath(repo.wjoin(f))
                    except OSError, e:

@command("^qpop",
         [('a', 'all', None, _('pop all patches')),
          ('n', 'name', '',
           _('queue name to pop (DEPRECATED)'), _('NAME')),
          ('c', 'check', None, _('tolerate non-conflicting local changes')),
          ('f', 'force', None, _('forget any local changes to patched files')),
          ('', 'no-backup', None, _('do not save backup copies of files'))],
         _('hg qpop [-a] [-f] [PATCH | INDEX]'))
def pop(ui, repo, patch=None, **opts):
    """pop the current patch off the stack

    Without argument, pops off the top of the patch stack. If given a
    patch name, keeps popping off patches until the named patch is at
    the top of the stack.

    By default, abort if the working directory contains uncommitted
    changes. With -c/--check, abort only if the uncommitted files
    overlap with patched files. With -f/--force, backup and discard
    changes made to such files.

    Return 0 on success.
    """
    localupdate = True
    if opts.get('name'):

        ui.warn(_('using patch queue: %s\n') % q.path)
        localupdate = False
    else:
        q = repo.mq
    ret = q.pop(repo, patch, force=opts.get('force'), update=localupdate,
                all=opts.get('all'), nobackup=opts.get('no_backup'),
                check=opts.get('check'))
    q.savedirty()
    return ret

@command("qrename|qmv", [], _('hg qrename PATCH1 [PATCH2]'))
def rename(ui, repo, patch, name=None, **opts):