Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-mq-qrefresh-replace-log-message
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 04 Oct 2007 23:21:37 -0300
changeset 5378 8a2915f57dfc
parent 5334 448eb46d4d84
permissions -rwxr-xr-x
convert: add a mode where mercurial_sink skips empty revisions. The getchanges function of some converter_source classes can return some false positives. I.e. they sometimes claim that a file "foo" was changed in some revision, even though its contents are still the same. convert_svn is particularly bad, but I think this can also happen with convert_cvs and, at least in theory, with mercurial_source. For regular conversions this is not really a problem - as long as getfile returns the right contents, we'll get a converted revision with the right contents. But when we use --filemap, this could lead to superfluous revisions being converted. Instead of fixing every converter_source, I decided to change mercurial_sink to work around this problem. When --filemap is used, we're interested only in revisions that touch some specific files. If a revision doesn't change any of these files, then we're not interested in it (at least for revisions with a single parent; merges are special). For mercurial_sink, we abuse this property and rollback a commit if the manifest text hasn't changed. This avoids duplicating the logic from localrepo.filecommit to detect unchanged files.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2694
0fb28dbf0dc7 MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
diff changeset 
     1
 
#!/bin/sh
0fb28dbf0dc7 MQ: uniformise message and logfile option.
"Mathieu Clabaut <mathieu.clabaut@gmail.com>"
parents:
diff changeset 
     2
 












0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




     3


# Environement setup for MQ








2976






61fcd9fac434
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
2831

diff
changeset




     4


echo "[extensions]" >> $HGRCPATH













61fcd9fac434
Make tests append settings to $HGRCPATH instead of $HGTMP/.hgrc



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
2831

diff
changeset




     5


echo "mq=" >> $HGRCPATH








2694






0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




     6














0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




     7


#Repo init













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




     8


hg init













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




     9


hg qinit













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    10









5334






448eb46d4d84
mq: fix qrefresh -e with no patches applied



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
4659

diff
changeset




    11


echo =======================













448eb46d4d84
mq: fix qrefresh -e with no patches applied



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
4659

diff
changeset




    12


echo "Should fail if no patches applied"













448eb46d4d84
mq: fix qrefresh -e with no patches applied



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
4659

diff
changeset




    13


hg qrefresh













448eb46d4d84
mq: fix qrefresh -e with no patches applied



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
4659

diff
changeset




    14


hg qrefresh -e













448eb46d4d84
mq: fix qrefresh -e with no patches applied



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
4659

diff
changeset




    15









2694






0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    16


hg qnew -m "First commit message" first-patch













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    17


echo aaaa > file













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    18


hg add file













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    19


hg qrefresh













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    20


echo =======================













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    21


echo "Should display 'First commit message'"













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    22


hg log -l1 -v | sed -n '/description/,$p'













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    23


echo













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    24














0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    25


# Testing changing message with -m













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    26


echo bbbb > file








4659






7a7d4937272b
Kill trailing spaces



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
2976

diff
changeset




    27


hg qrefresh -m "Second commit message"








2694






0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    28


echo =======================













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    29


echo "Should display 'Second commit message'"













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    30


hg log -l1 -v | sed -n '/description/,$p'













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    31


echo













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    32














0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    33














0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    34


# Testing changing message with -l













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    35


echo "Third commit message" > logfile













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    36


echo " This is the 3rd log message" >> logfile













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    37


echo bbbb > file













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    38


hg qrefresh -l logfile













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    39


echo =======================








2831






0b9ac7dfcf56
Fix some tests for portability.



Danek Duvall <danek.duvall@sun.com>


parents: 
2715

diff
changeset




    40


printf "Should display 'Third commit message\\\n This is the 3rd log message'\n"








2694






0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    41


hg log -l1 -v | sed -n '/description/,$p'













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    42


echo













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    43














0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    44


# Testing changing message with -l-













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    45


hg qnew -m "First commit message" second-patch













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    46


echo aaaa > file2













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    47


hg add file2













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    48


echo bbbb > file2








4659






7a7d4937272b
Kill trailing spaces



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
2976

diff
changeset




    49


(echo "Fifth commit message"








2694






0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    50


echo " This is the 5th log message" >> logfile) |\













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    51


hg qrefresh -l-













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    52


echo =======================








2831






0b9ac7dfcf56
Fix some tests for portability.



Danek Duvall <danek.duvall@sun.com>


parents: 
2715

diff
changeset




    53


printf "Should display 'Fifth commit message\\\n This is the 5th log message'\n"








2694






0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    54


hg log -l1 -v | sed -n '/description/,$p'













0fb28dbf0dc7
MQ: uniformise message and logfile option.



"Mathieu Clabaut <mathieu.clabaut@gmail.com>"


parents: 

diff
changeset




    55


echo















mercurial-crew-with-dirclash