Mercurial Mercurial > pub > hg > evolve / 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-check-commit.t
author Pulkit Goyal <7895pulkit@gmail.com>
Fri, 23 Mar 2018 17:46:46 +0530
changeset 3623 71fbb679e311
parent 2672 a08bd434a19b
permissions -rw-r--r--
evolve: use the new rebased changeset to resolve phase-divergence When there is a parent change in phase-divergence, `hg evolve` first rebases the diveregent changeset on parent of public changeset and then continue the resolution of phase-divergence *but* we used to continue with the old divergent changeset rather than the new rebased one. This patch makes sure we use the new rebased changeset to proceed with the resolution. Tests changes shows that it fixes things which were broken earlier.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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














evolve