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.
.gitlab-ci.yml
author Anton Shestakov <av6@dwimlabs.net>
Mon, 11 Nov 2019 02:42:37 +0700
branchstable
changeset 4935 3874bc10d4a7
parent 4926 0fad1d376814
child 4958 8ced373682c4
permissions -rw-r--r--
docs: add two more amend commits to simulate temporary amend commits sharing.rst made reference to temporary amend commits and used them to demonstrate that hidden commits are not exchanged. Nowadays, evolve doesn't create such commits, but it still makes sense to show how they are handled during the exchange process. So let's add two more amend commits, one for each repo. This way the guide doesn't have to be updated too much, but doesn't lose this important detail of working with evolve. Unfortunately, this means that tons of hashes change, but it's better than to have figure 4 demonstrate absolutely nothing. Temporary amend commits were removed from test-sharing.t in 06844693bb21, but sharing.rst continued using them for demonstration purposes. It might've been better to replace at least some of the temporary amend commits by extra amends back then, but oh well.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4873
91116cec0a67 gitlab-ci: basic test with flake8
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset 
     1
 
flake8:
4923
d18908c5642a heptapod-ci: point to our own docker images
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4874
diff changeset 
     2
 
    image: octobus/ci-py2-hgext3rd
4873
91116cec0a67 gitlab-ci: basic test with flake8
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff changeset 
     3
 
    script:
4923
d18908c5642a heptapod-ci: point to our own docker images
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4874
diff changeset 
     4
 
        - hg files -0 'set:(**.py or grep("^#!.*python")) - removed()' -X hgext3rd/evolve/thirdparty | xargs -0 flake8
4926
0fad1d376814 heptapod-ci: test with python3 too
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 4925
diff changeset 
     5
 







4925






dbeb04ee6679
heptapod-ci: add a --pure variant for the CI



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4924

diff
changeset




     6


tests-py2-cext:







4923






d18908c5642a
heptapod-ci: point to our own docker images



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4874

diff
changeset




     7


    image: octobus/ci-py2-hgext3rd







4874






ab0d09c93532
gitlab-ci: be bold and try to run the full test in them



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4873

diff
changeset




     8


    script:












ab0d09c93532
gitlab-ci: be bold and try to run the full test in them



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4873

diff
changeset




     9


        - echo $PWD












ab0d09c93532
gitlab-ci: be bold and try to run the full test in them



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4873

diff
changeset




    10


        - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`












ab0d09c93532
gitlab-ci: be bold and try to run the full test in them



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4873

diff
changeset




    11


        - hg clone https://mirror.octobus.net/hg/ /tmp/mercurial-clone-`hg log -r . -T "{node}"` --config share.pool=/tmp/












ab0d09c93532
gitlab-ci: be bold and try to run the full test in them



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4873

diff
changeset




    12


        - hg -R /tmp/mercurial-clone-`hg log -r . -T "{node}"` update `hg log -r . -T '{branch}'`







4924






cf1c67449fa7
heptapod-ci: let the number of CPU to be picked automatically



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4923

diff
changeset




    13


        - (cd tests; /tmp/mercurial-clone-`hg log -r . -T "{node}"`/tests/run-tests.py)







4874






ab0d09c93532
gitlab-ci: be bold and try to run the full test in them



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4873

diff
changeset




    14


        - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`







4925






dbeb04ee6679
heptapod-ci: add a --pure variant for the CI



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4924

diff
changeset




    15














dbeb04ee6679
heptapod-ci: add a --pure variant for the CI



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4924

diff
changeset




    16


tests-py2-pure:












dbeb04ee6679
heptapod-ci: add a --pure variant for the CI



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4924

diff
changeset




    17


    image: octobus/ci-py2-hgext3rd












dbeb04ee6679
heptapod-ci: add a --pure variant for the CI



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4924

diff
changeset




    18


    script:












dbeb04ee6679
heptapod-ci: add a --pure variant for the CI



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4924

diff
changeset




    19


        - echo $PWD












dbeb04ee6679
heptapod-ci: add a --pure variant for the CI



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4924

diff
changeset




    20


        - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`












dbeb04ee6679
heptapod-ci: add a --pure variant for the CI



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4924

diff
changeset




    21


        - hg clone https://mirror.octobus.net/hg/ /tmp/mercurial-clone-`hg log -r . -T "{node}"` --config share.pool=/tmp/












dbeb04ee6679
heptapod-ci: add a --pure variant for the CI



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4924

diff
changeset




    22


        - hg -R /tmp/mercurial-clone-`hg log -r . -T "{node}"` update `hg log -r . -T '{branch}'`












dbeb04ee6679
heptapod-ci: add a --pure variant for the CI



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4924

diff
changeset




    23


        - (cd tests; /tmp/mercurial-clone-`hg log -r . -T "{node}"`/tests/run-tests.py --pure)












dbeb04ee6679
heptapod-ci: add a --pure variant for the CI



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4924

diff
changeset




    24


        - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`







4926






0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    25














0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    26


tests-py3-cext:












0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    27


    image: octobus/ci-py3-hgext3rd












0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    28


    script:












0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    29


        - echo $PWD












0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    30


        - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`












0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    31


        - hg clone https://mirror.octobus.net/hg/ /tmp/mercurial-clone-`hg log -r . -T "{node}"` --config share.pool=/tmp/












0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    32


        - hg -R /tmp/mercurial-clone-`hg log -r . -T "{node}"` update `hg log -r . -T '{branch}'`












0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    33


        - (cd tests; python3 /tmp/mercurial-clone-`hg log -r . -T "{node}"`/tests/run-tests.py)












0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    34


        - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`












0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    35














0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    36


tests-py3-pure:












0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    37


    image: octobus/ci-py3-hgext3rd












0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    38


    script:












0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    39


        - echo $PWD












0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    40


        - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`












0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    41


        - hg clone https://mirror.octobus.net/hg/ /tmp/mercurial-clone-`hg log -r . -T "{node}"` --config share.pool=/tmp/












0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    42


        - hg -R /tmp/mercurial-clone-`hg log -r . -T "{node}"` update `hg log -r . -T '{branch}'`












0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    43


        - (cd tests; python3 /tmp/mercurial-clone-`hg log -r . -T "{node}"`/tests/run-tests.py --pure)












0fad1d376814
heptapod-ci: test with python3 too



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
4925

diff
changeset




    44


        - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`














evolve