mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +03:00
552c248fa5
'hg qrefresh --short file.txt' now adds changes made to file.txt to current patch. This builds on a patch for implementing --amend by Kirill Smelkov as discussed in issue933. FIXME: Why do mq refresh have two matchers if we only need one?
133 lines
2.9 KiB
Bash
Executable File
133 lines
2.9 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 % qrefresh --short
|
|
echo 'orphan' > orphanchild
|
|
hg add orphanchild
|
|
hg qrefresh nonexistingfilename
|
|
hg qrefresh --short 1/base
|
|
hg qrefresh --short 2/base
|
|
|
|
echo % qdiff
|
|
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 % diff shows orphan ...
|
|
hg st
|
|
hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
|
|
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" \
|
|
-e "s/^\(diff\).*/\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 ..
|
|
|