Mercurial > evolve
annotate tests/test-check-commit.t @ 3799:037ccbf41c6d
tests: make sure we don't result in commit messages conflict
Upcoming patches will introduce functionality of merging commit messages while
resolving content divergence which can lead to conflicts.
We don't want to test the conflicts scenario here, so let's make sure there are
no conflicts of commit messages in this test.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Tue, 05 Jun 2018 22:02:24 +0530 |
parents | a08bd434a19b |
children | c7abe71d749d |
rev | line source |
---|---|
2335
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
1 #require test-repo |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2 |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
3 Enable obsolescence to avoid the warning issue when obsmarker are found |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
4 |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
5 $ cat << EOF >> $HGRCPATH |
2672
a08bd434a19b
test: avoid 'test-check-commit.t' complaining copied code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2335
diff
changeset
|
6 > [diff] |
a08bd434a19b
test: avoid 'test-check-commit.t' complaining copied code
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
2335
diff
changeset
|
7 > git = yes |
2335
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
8 > [experimental] |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
9 > evolution=all |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
10 > EOF |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
11 |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
12 Go back in the hg repo |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
13 |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
14 $ cd $TESTDIR/.. |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
15 |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
16 $ for node in `hg log --rev 'not public() and ::. and not desc("# no-check-commit")' --template '{node|short}\n'`; do |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
17 > hg export $node | ${RUNTESTDIR}/../contrib/check-commit > ${TESTTMP}/check-commit.out |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
18 > if [ $? -ne 0 ]; then |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
19 > echo "Revision $node does not comply with rules" |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
20 > echo '------------------------------------------------------' |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
21 > cat ${TESTTMP}/check-commit.out |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
22 > echo |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
23 > fi |
f7ce3b9167d6
tests: add the commit style checker from Mercurial
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
24 > done |