comparison hgext/mq.py @ 15934:9d4b5c3cb853

qimport: back out 2eec74d7ce95

This patch presumed mq csets must always be secret, which isn't yet
established.

15933:b8696a6676be

                se = statusentry(n, patchname)
                self.applied.insert(0, se)

                self.added.append(patchname)
                patchname = None
            if rev:
                # if we added anything with rev, we must move the secret root
                phases.retractboundary(repo, phases.secret, [n])
            self.parseseries()
            self.applieddirty = True
            self.seriesdirty = True

        for i, filename in enumerate(files):

      hg qimport -e existing-patch -n new-name

    Returns 0 if import succeeded.
    """
    lock = repo.lock() # cause this may move phase
    try:
        q = repo.mq
        try:
            q.qimport(repo, filename, patchname=opts.get('name'),
                  existing=opts.get('existing'), force=opts.get('force'),
                  rev=opts.get('rev'), git=opts.get('git'))
        finally:
            q.savedirty()


        if opts.get('push') and not opts.get('rev'):
            return q.push(repo, None)
    finally:
        lock.release()
    return 0

def qinit(ui, repo, create):
    """initialize a new queue repository

15934:9d4b5c3cb853

                se = statusentry(n, patchname)
                self.applied.insert(0, se)

                self.added.append(patchname)
                patchname = None
            self.parseseries()
            self.applieddirty = True
            self.seriesdirty = True

        for i, filename in enumerate(files):

      hg qimport -e existing-patch -n new-name

    Returns 0 if import succeeded.
    """
    q = repo.mq
    try:
        q.qimport(repo, filename, patchname=opts.get('name'),
              existing=opts.get('existing'), force=opts.get('force'),
              rev=opts.get('rev'), git=opts.get('git'))
    finally:
        q.savedirty()

    if opts.get('push') and not opts.get('rev'):
        return q.push(repo, None)
    return 0

def qinit(ui, repo, create):
    """initialize a new queue repository