##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

mq: add parent node IDs to MQ patches on qrefresh/qnew...
mq: add parent node IDs to MQ patches on qrefresh/qnew The goal of this patch is to add the IDs of the parents of applied MQ patches into the patch file headers whenever qnew or qrefresh are run. This will serve as a reminder of when the patches last applied cleanly and will let us do more intelligent things in the future, such as: * Resolve conflicts found when qpushing to a new location by merging instead of simply showing rejects. * Display better diffs of versioned MQ patches because we can tell how the patched files have changed in the meantime. Here are the new rules this patch introduces. They are checked in this order: * If a patch currently has old, plain-style patch headers ("From:" and "Date:") do not change the style or add any new headers. * If the 'mq.plain' configuration setting is true, only plain-style headers will be used for all MQ patches. * qnew will initialize new patches with HG-style headers and fill in the "# Parent" header with the appropriate parent node. * qrefresh will refresh the "# Parent" header with the current parent of the current patch.
Steve Losh - - Load All Authors

File last commit:

r10397:8cb81d75 default
r10397:8cb81d75 default
Show More
test-mq-header-from
150 lines | 2.3 KiB | text/plain | TextLexer
/ tests / test-mq-header-from
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH
echo "[diff]" >> $HGRCPATH
echo "nodates=true" >> $HGRCPATH
catlog() {
cat .hg/patches/$1.patch | sed -e "s/^diff \-r [0-9a-f]* /diff -r ... /" \
-e "s/^\(# Parent \).*/\1/"
hg log --template "{rev}: {desc} - {author}\n"
}
runtest() {
echo ==== init
hg init a
cd a
hg qinit
echo ==== qnew -U
hg qnew -U 1.patch
catlog 1
echo ==== qref
echo "1" >1
hg add
hg qref
catlog 1
echo ==== qref -u
hg qref -u mary
catlog 1
echo ==== qnew
hg qnew 2.patch
echo "2" >2
hg add
hg qref
catlog 2
echo ==== qref -u
hg qref -u jane
catlog 2
echo ==== qnew -U -m
hg qnew -U -m "Three" 3.patch
catlog 3
echo ==== qref
echo "3" >3
hg add
hg qref
catlog 3
echo ==== qref -m
hg qref -m "Drei"
catlog 3
echo ==== qref -u
hg qref -u mary
catlog 3
echo ==== qref -u -m
hg qref -u maria -m "Three (again)"
catlog 3
echo ==== qnew -m
hg qnew -m "Four" 4.patch
echo "4" >4of t
hg add
hg qref
catlog 4
echo ==== qref -u
hg qref -u jane
catlog 4
echo ==== qnew with HG header
hg qnew --config 'mq.plain=true' 5.patch
hg qpop
echo "# HG changeset patch" >>.hg/patches/5.patch
echo "# User johndoe" >>.hg/patches/5.patch
hg qpush 2>&1 | grep 'now at'
catlog 5
echo ==== hg qref
echo "5" >5
hg add
hg qref
catlog 5
echo ==== hg qref -U
hg qref -U
catlog 5
echo ==== hg qref -u
hg qref -u johndeere
catlog 5
echo ==== qnew with plain header
hg qnew --config 'mq.plain=true' -U 6.patch
hg qpop
hg qpush 2>&1 | grep 'now at'
catlog 6
echo ==== hg qref
echo "6" >6
hg add
hg qref
catlog 6
echo ==== hg qref -U
hg qref -U
catlog 6
echo ==== hg qref -u
hg qref -u johndeere
catlog 6
echo ==== "qpop -a / qpush -a"
hg qpop -a
hg qpush -a
hg log --template "{rev}: {desc} - {author}\n"
}
echo ======= plain headers
echo "[mq]" >> $HGRCPATH
echo "plain=true" >> $HGRCPATH
mkdir sandbox
(cd sandbox ; runtest)
rm -r sandbox
echo ======= hg headers
echo "plain=false" >> $HGRCPATH
mkdir sandbox
(cd sandbox ; runtest)
rm -r sandbox
runtest