test-mq-qrefresh: test qrefresh when tip != qtip

tests/test-mq-qrefresh

@@ -1,169 +1,194
 #!/bin/sh
 
 echo "[extensions]" >> $HGRCPATH
 echo "mq=" >> $HGRCPATH
 
 echo % init
 hg init a
 cd a
 
 echo % commit
 mkdir 1 2
 echo 'base' > 1/base
 echo 'base' > 2/base
 hg ci -Ambase -d '1 0'
 
 echo % qnew mqbase
 hg qnew -mmqbase mqbase
 
 echo % qrefresh
 echo 'patched' > 1/base
 echo 'patched' > 2/base
 hg qrefresh
 
 echo % qdiff
 hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
                -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 
 echo % qdiff dirname
 hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
                  -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 
 echo % patch file contents
 cat .hg/patches/mqbase | \
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 
 echo % qrefresh 1
 echo 'patched again' > base
 hg qrefresh 1
 
 echo % qdiff
 hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
                -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 
 echo % qdiff dirname
 hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
                  -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 
 echo % patch file contents
 cat .hg/patches/mqbase | \
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 
 echo % qrefresh . in subdir
 ( cd 1 ; hg qrefresh . )
 
 echo % qdiff
 hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
                -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 
 echo % qdiff dirname
 hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
                  -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 
 echo % patch file contents
 cat .hg/patches/mqbase | \
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 
 echo % qrefresh in hg-root again
 hg qrefresh
 
 echo % qdiff
 hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
                -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 
 echo % qdiff dirname
 hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
                  -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 
 echo % patch file contents
 cat .hg/patches/mqbase | \
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 
 echo
 echo % qrefresh --short tests:
 echo 'orphan' > orphanchild
 hg add orphanchild
 
 echo % - add 1/base and 2/base one by one
 hg qrefresh nonexistingfilename # clear patch
 hg qrefresh --short 1/base
 hg qrefresh --short 2/base
 
 echo % -- qdiff output
 hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
                -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 
 echo % -- patch file content
 cat .hg/patches/mqbase | \
 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
 hg st
 
 echo % -- diff shows what is not in patch
 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
               -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" \
               -e "s/^\(diff\).*/\1/"
 echo % - before starting exclusive tests
 sed -n '/^diff/s/diff -r [^ ]* //p' .hg/patches/mqbase
 echo % - exclude 2/base
 hg qref -s -X 2/base
 sed -n '/^diff/s/diff -r [^ ]* //p' .hg/patches/mqbase
 echo % -- status shows 2/base as dirty
 hg st
 echo % - remove 1/base and add 2/base again but not orphanchild
 hg qref -s -X orphanchild -X 1/base 2/base orphanchild
 sed -n '/^diff/s/diff -r [^ ]* //p' .hg/patches/mqbase
 echo % - add 1/base with include filter - and thus remove 2/base from patch
 hg qref -s -I 1/ o* */*
 sed -n '/^diff/s/diff -r [^ ]* //p' .hg/patches/mqbase
 echo
 cd ..
 
 # Test qrefresh --git losing copy metadata
 echo % create test repo
 hg init repo
 cd repo
 echo "[diff]" >> .hg/hgrc
 echo "git=True" >> .hg/hgrc
 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 ..
 
 # Test issue 1441: qrefresh confused after hg rename
 echo % issue1441 without git patches
 hg init repo-1441
 cd repo-1441
 echo a > a
 hg add a
 hg qnew -f p
 hg mv a b
 hg qrefresh
 hg qdiff --nodates
 cd ..
 
+echo '% issue2025: qrefresh does not honor filtering options when tip != qtip'
+hg init repo-2025
+cd repo-2025
+echo a > a
+echo b > b
+hg ci -qAm addab
+echo a >> a
+echo b >> b
+hg qnew -f patch
+hg up -qC 0
+echo c > c
+hg ci -qAm addc
+hg up -qC 1
+echo '% refresh with tip != qtip'
+hg --config diff.nodates=1 qrefresh -I b 2>&1 \
+    | sed 's/saving bundle.*/saving bundle.../g'
+echo '% status after refresh'
+hg st
+echo '% b after refresh'
+cat b
+echo '% patch file after refresh'
+cat .hg/patches/patch
+cd ..
+
+
 echo % issue1441 with git patches
 hg init repo-1441-git
 cd repo-1441-git
 echo "[diff]" >> .hg/hgrc
 echo "git=True" >> .hg/hgrc
 echo a > a
 hg add a
 hg qnew -f p
 hg mv a b
 hg qrefresh
 hg qdiff --nodates
 cd ..
  No newline at end of file

tests/test-mq-qrefresh.out

@@ -1,268 +1,288
 % init
 % commit
 adding 1/base
 adding 2/base
 % qnew mqbase
 % qrefresh
 % qdiff
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % qdiff dirname
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % patch file contents
 mqbase
 
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % qrefresh 1
 % qdiff
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % qdiff dirname
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % patch file contents
 mqbase
 
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % qrefresh . in subdir
 % qdiff
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % qdiff dirname
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % patch file contents
 mqbase
 
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % qrefresh in hg-root again
 % qdiff
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % qdiff dirname
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 % patch file contents
 mqbase
 
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 
 % qrefresh --short tests:
 % - add 1/base and 2/base one by one
 % -- qdiff output
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf orphanchild
 --- /dev/null
 +++ b/orphanchild
 @@ -0,0 +1,1 @@
 +orphan
 % -- patch file content
 mqbase
 
 diff -r b55ecdccb5cf 1/base
 --- a/1/base
 +++ b/1/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 diff -r b55ecdccb5cf 2/base
 --- a/2/base
 +++ b/2/base
 @@ -1,1 +1,1 @@
 -base
 +patched
 A orphanchild
 ? base
 % -- diff shows what is not in patch
 diff
 --- /dev/null
 +++ b/orphanchild
 @@ -0,0 +1,1 @@
 +orphan
 % - before starting exclusive tests
 1/base
 2/base
 % - exclude 2/base
 1/base
 % -- status shows 2/base as dirty
 M 2/base
 A orphanchild
 ? base
 % - remove 1/base and add 2/base again but not orphanchild
 2/base
 % - add 1/base with include filter - and thus remove 2/base from patch
 1/base
 
 % 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
 % issue1441 without git patches
 diff -r 000000000000 b
 --- /dev/null
 +++ b/b
 @@ -0,0 +1,1 @@
 +a
+% issue2025: qrefresh does not honor filtering options when tip != qtip
+% refresh with tip != qtip
+saving bundle...
+adding branch
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
+% status after refresh
+M a
+% b after refresh
+b
+b
+% patch file after refresh
+diff -r 1a60229be7ac b
+--- a/b
++++ b/b
+@@ -1,1 +1,2 @@
+ b
++b
 % issue1441 with git patches
 diff --git a/b b/b
 new file mode 100644
 --- /dev/null
 +++ b/b
 @@ -0,0 +1,1 @@
 +a