mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
c8f0bb9bb7
Copy information was saved in a common loop, then refined in a git-only block. The problem was the latter did filter out renames occuring in the current patch and irrelevant to commit. In the non-git case, copy records still existed in the dirstate, referencing removed files, making the commit to fail. Git and non-git copy handling paths are now separated for simplicity. Reported by Gary Bernhardt
169 lines
4.0 KiB
Bash
Executable File
169 lines
4.0 KiB
Bash
Executable File
#!/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 % 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 .. |