Merge with crew-stable

hgext/mq.py

@@ -2038,10 +2038,14 b' def rename(ui, repo, patch, name=None, *'
     if r:
         wlock = r.wlock()
         try:
-            if r.dirstate[name] == 'r':
-                r.undelete([name])
-            r.copy(patch, name)
-            r.remove([patch], False)
+            if r.dirstate[patch] == 'a':
+                r.dirstate.forget(patch)
+                r.dirstate.add(name)
+            else:
+                if r.dirstate[name] == 'r':
+                    r.undelete([name])
+                r.copy(patch, name)
+                r.remove([patch], False)
         finally:
             del wlock
 

tests/test-mq-qrename

@@ -22,4 +22,15 b' ls .hg/patches/bar'
 hg qrename bar/renamed baz
 hg qseries
 ls .hg/patches/baz
+cd ..
 
+echo % test patch being renamed before committed
+hg init b
+cd b
+hg qinit -c
+hg qnew x
+hg qrename y
+hg qcommit -m rename
+cd ..
+
+

tests/test-mq-qrename.out

@@ -5,3 +5,4 b' bar/renamed'
 renamed
 baz
 .hg/patches/baz
+% test patch being renamed before committed