comparison hgext/mq.py @ 15322:c8e2a5ea7062 stable

mq: avoid data loss upon qfold + qmv (issue3058)

When renaming a patch A as B where B was previously qfolded into A and
therefore marked as removed, a versioned MQ would first restore B before
marking it as a copy of A, thus losing A changes. The undelete() call is
probably a left-over, wctx.copy() explicitely handles the case where the
destination is removed.

Also note that status command represents "hg rm b; hg mv a b" as:

  A b
    a
  R a

which explains the first hunk in test-mq-qrename.t.

15321:e174353e8cda

        try:
            if r.dirstate[patch] == 'a':
                r.dirstate.drop(patch)
                r.dirstate.add(name)
            else:
                if r.dirstate[name] == 'r':
                    wctx.undelete([name])
                wctx.copy(patch, name)
                wctx.forget([patch])
        finally:
            wlock.release()

15322:c8e2a5ea7062

        try:
            if r.dirstate[patch] == 'a':
                r.dirstate.drop(patch)
                r.dirstate.add(name)
            else:
                wctx.copy(patch, name)
                wctx.forget([patch])
        finally:
            wlock.release()