Mercurial > hg
view tests/test-mq-qrefresh-replace-log-message @ 7177:09ed32b79656
mq: Fix --qrefresh --short to work with --exclude and --include
pmezard expects
hg qref -s -X b
to apply the -X to the list of files in the patch, and thus remove b from the
patch.
That's how it worked before f7fc5f5ecd62. That change seemed sensible, but it
wasn't...
mpm says
(17:22:30) pmezard_: kiilerix1: do you mean that -X should be forbidden with -s ?
(17:22:54) pmezard_: kiilerix1: and --include too
(17:23:03) mpm: No because you should be able to say hg qref -s foo* -X foo-bar
so mpm expects
hg qref -s -X b *
to apply the -X to the list of files in the working directory, and thus don't
include b in the patch
This patch tries to make both usecases work by creating a matchfn which uses
the include/excludes but not the filelist.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Sun, 19 Oct 2008 16:31:24 +0200 |
parents | 448eb46d4d84 |
children |
line wrap: on
line source
#!/bin/sh # Environement setup for MQ echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH #Repo init hg init hg qinit echo ======================= echo "Should fail if no patches applied" hg qrefresh hg qrefresh -e hg qnew -m "First commit message" first-patch echo aaaa > file hg add file hg qrefresh echo ======================= echo "Should display 'First commit message'" hg log -l1 -v | sed -n '/description/,$p' echo # Testing changing message with -m echo bbbb > file hg qrefresh -m "Second commit message" echo ======================= echo "Should display 'Second commit message'" hg log -l1 -v | sed -n '/description/,$p' echo # Testing changing message with -l echo "Third commit message" > logfile echo " This is the 3rd log message" >> logfile echo bbbb > file hg qrefresh -l logfile echo ======================= printf "Should display 'Third commit message\\\n This is the 3rd log message'\n" hg log -l1 -v | sed -n '/description/,$p' echo # Testing changing message with -l- hg qnew -m "First commit message" second-patch echo aaaa > file2 hg add file2 echo bbbb > file2 (echo "Fifth commit message" echo " This is the 5th log message" >> logfile) |\ hg qrefresh -l- echo ======================= printf "Should display 'Fifth commit message\\\n This is the 5th log message'\n" hg log -l1 -v | sed -n '/description/,$p' echo