Merge with crew-stable

hgext/mq.py

@@ -1129,7 +1129,7 b' class queue:'
                         f = repo.file(dst)
                         src = f.renamed(man[dst])
                         if src:
-                            copies[src[0]] = copies.get(dst, [])
+                            copies.setdefault(src[0], []).extend(copies.get(dst, []))
                             if dst in a:
                                 copies[src[0]].append(dst)
                         # we can't copy a file created by the patch itself

tests/test-mq-qrefresh

@@ -82,3 +82,28 b' echo % patch file contents'
 cat .hg/patches/mqbase | \
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
+cd ..
+
+
+
+echo "[diff]" >> $HGRCPATH
+echo "git=True" >> $HGRCPATH
+
+# Test qrefresh --git losing copy metadata
+echo % create test repo
+hg init repo
+cd repo
+echo a > a
+hg ci -Am adda
+hg copy a ab
+echo b >> ab
+hg copy a ac
+echo c >> ac
+echo % capture changes
+hg qnew -f p1
+hg qdiff
+echo % refresh and check changes again
+hg qref
+hg qdiff
+cd ..
+

tests/test-mq-qrefresh.out

@@ -159,3 +159,39 b' diff -r b55ecdccb5cf 2/base'
 @@ -1,1 +1,1 @@
 -base
 +patched
+% create test repo
+adding a
+% capture changes
+diff --git a/a b/ab
+copy from a
+copy to ab
+--- a/a
++++ b/ab
+@@ -1,1 +1,2 @@
+ a
++b
+diff --git a/a b/ac
+copy from a
+copy to ac
+--- a/a
++++ b/ac
+@@ -1,1 +1,2 @@
+ a
++c
+% refresh and check changes again
+diff --git a/a b/ab
+copy from a
+copy to ab
+--- a/a
++++ b/ab
+@@ -1,1 +1,2 @@
+ a
++b
+diff --git a/a b/ac
+copy from a
+copy to ac
+--- a/a
++++ b/ac
+@@ -1,1 +1,2 @@
+ a
++c