upstream/mercurial-mirror Files · contrib/heptapod-ci.yml

filemerge: add support for partial conflict resolution by external tool...

filemerge: add support for partial conflict resolution by external tool A common class of merge conflicts is in imports/#includes/etc. It's relatively easy to write a tool that can resolve these conflicts, perhaps by naively just unioning the statements and leaving any cleanup to other tools to do later [1]. Such specialized tools cannot generally resolve all conflicts in a file, of course. Let's therefore call them "partial merge tools". Note that the internal simplemerge algorithm is such a partial merge tool - one that only resolves trivial "conflicts" where one side is unchanged or both sides change in the same way. One can also imagine having smarter language-aware partial tools that merge the AST. It may be useful for such tools to interactively let the user resolve any conflicts it can't resolve itself. However, having the option of implementing it as a partial merge tool means that the developer doesn't *need* to create a UI for it. Instead, the user can resolve any remaining conflicts with their regular merge tool (e.g. `:merge3` or `meld). We don't currently have a way to let the user define such partial merge tools. That's what this patch addresses. It lets the user configure partial merge tools to run. Each tool can be configured to run only on files matching certain patterns (e.g. "*.py"). The tool takes three inputs (local, base, other) and resolves conflicts by updating these in place. For example, let's say the inputs are these: base: ``` import sys def main(): print('Hello') ``` local: ``` import os import sys def main(): print('Hi') ``` other: ``` import re import sys def main(): print('Howdy') ``` A partial merge tool could now resolve the conflicting imports by replacing the import statements in *all* files by the following snippet, while leaving the remainder of the files unchanged. ``` import os import re import sys ``` As a result, simplemerge and any regular merge tool that runs after the partial merge tool(s) will consider the imports to be non-conflicting and will only present the conflict in `main()` to the user. Differential Revision: https://phab.mercurial-scm.org/D12356

Raphaël Gomès - - Load All Authors

File last commit:

r49835:c80544aa default


                r49838:f3aafd78

default

Download file

             heptapod-ci.yml
        
                    157 lines
            
             | 5.0 KiB
            
                | text/x-yaml
            
             |
                YamlLexer
            
             / contrib / heptapod-ci.yml
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      stages:

        - tests

        - phabricator

      image: registry.heptapod.net/mercurial/ci-images/mercurial-core:$HG_CI_IMAGE_TAG

      variables:

          PYTHON: python

          TEST_HGMODULEPOLICY: "allow"

          HG_CI_IMAGE_TAG: "v1.0"

          TEST_HGTESTS_ALLOW_NETIO: "0"

      .all_template: &all

        when: always

      .runtests_template: &runtests

          <<: *all

          stage: tests

          # The runner made a clone as root.

          # We make a new clone owned by user used to run the step.

          before_script:

            - hg clone . /tmp/mercurial-ci/ --noupdate --config phases.publish=no

            - hg -R /tmp/mercurial-ci/ update `hg log --rev '.' --template '{node}'`

            - cd /tmp/mercurial-ci/

            - ls -1 tests/test-check-*.* > /tmp/check-tests.txt

            - black --version

            - clang-format --version

          script:

              - echo "python used, $PYTHON"

              - echo "$RUNTEST_ARGS"

              - HGTESTS_ALLOW_NETIO="$TEST_HGTESTS_ALLOW_NETIO" HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" tests/run-tests.py --color=always $RUNTEST_ARGS

      checks:

          <<: *runtests

          variables:

              RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt"

              PYTHON: python3

      rust-cargo-test:

          stage: tests

          script:

              - echo "python used, $PYTHON"

              - make rust-tests

          variables:

              PYTHON: python3

      phabricator-refresh:

          stage: phabricator

          rules:

            - if: '"$PHABRICATOR_TOKEN" != "NO-PHAB"'

              when: on_success

            - if: '"$PHABRICATOR_TOKEN" == "NO-PHAB"'

              when: never

          variables:

            DEFAULT_COMMENT: ":white_check_mark: refresh by Heptapod after a successful CI run (:octopus: :green_heart:)"

            STABLE_COMMENT: ":white_check_mark: refresh by Heptapod after a successful CI run (:octopus: :green_heart:)\n⚠ This patch is intended for stable ⚠\n{image https://media.giphy.com/media/nYI8SmmChYXK0/source.gif}"

          script:

            - |

              if [ `hg branch` == "stable" ]; then

                  ./contrib/phab-refresh-stack.sh --comment "$STABLE_COMMENT";

              else

                  ./contrib/phab-refresh-stack.sh --comment "$DEFAULT_COMMENT";

              fi

      test-c:

          <<: *runtests

          variables:

              RUNTEST_ARGS: " --no-rust --blacklist /tmp/check-tests.txt"

              PYTHON: python3

              TEST_HGMODULEPOLICY: "c"

              TEST_HGTESTS_ALLOW_NETIO: "1"

      test-pure:

          <<: *runtests

          variables:

              RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"

              PYTHON: python3

              TEST_HGMODULEPOLICY: "py"

      test-rust:

          <<: *runtests

          variables:

              HGWITHRUSTEXT: cpython

              RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt"

              PYTHON: python3

              TEST_HGMODULEPOLICY: "rust+c"

      test-rhg:

          <<: *runtests

          variables:

              HGWITHRUSTEXT: cpython

              RUNTEST_ARGS: "--rust --rhg --blacklist /tmp/check-tests.txt"

              PYTHON: python3

              TEST_HGMODULEPOLICY: "rust+c"

      test-chg:

          <<: *runtests

          variables:

              PYTHON: python3

              RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg"

              TEST_HGMODULEPOLICY: "c"

      check-pytype:

          extends: .runtests_template

          before_script:

            - hg clone . /tmp/mercurial-ci/ --noupdate --config phases.publish=no

            - hg -R /tmp/mercurial-ci/ update `hg log --rev '.' --template '{node}'`

            - cd /tmp/mercurial-ci/

            - make local PYTHON=$PYTHON

            - $PYTHON -m pip install --user -U pytype==2021.04.15

          variables:

              RUNTEST_ARGS: " --allow-slow-tests tests/test-check-pytype.t"

              HGTEST_SLOWTIMEOUT: "3600"

              PYTHON: python3

              TEST_HGMODULEPOLICY: "c"

      # `sh.exe --login` sets a couple of extra environment variables that are defined

      # in the MinGW shell, but switches CWD to /home/$username.  The previous value

      # is stored in OLDPWD.  Of the added variables, MSYSTEM is crucial to running

      # run-tests.py- it is needed to make run-tests.py generate a `python3` script

      # that satisfies the various shebang lines and delegates to `py -3`.

      .window_runtests_template: &windows_runtests

          <<: *all

          when: manual  # we don't have any Windows runners anymore at the moment

          stage: tests

          before_script:

            - C:/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && ls -1 tests/test-check-*.* > C:/Temp/check-tests.txt'

            # TODO: find/install cvs, bzr, perforce, gpg, sqlite3

          script:

              - echo "Entering script section"

              - echo "python used, $Env:PYTHON"

              - Invoke-Expression "$Env:PYTHON -V"

              - Invoke-Expression "$Env:PYTHON -m black --version"

              - echo "$Env:RUNTEST_ARGS"

              - echo "$Env:TMP"

              - echo "$Env:TEMP"

              - C:/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && HGTESTS_ALLOW_NETIO="$TEST_HGTESTS_ALLOW_NETIO" HGMODULEPOLICY="$TEST_HGMODULEPOLICY" $PYTHON tests/run-tests.py --color=always $RUNTEST_ARGS'

      windows:

          <<: *windows_runtests

          tags:

            - windows

          variables:

              TEST_HGMODULEPOLICY: "c"

              RUNTEST_ARGS: "--blacklist C:/Temp/check-tests.txt"

              PYTHON: py -3

      windows-pyox:

          <<: *windows_runtests

          tags:

            - windows

          variables:

              TEST_HGMODULEPOLICY: "c"

              RUNTEST_ARGS: "--blacklist C:/Temp/check-tests.txt --pyoxidized"

              PYTHON: py -3

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				stages:
				- tests
				- phabricator

				image: registry.heptapod.net/mercurial/ci-images/mercurial-core:$HG_CI_IMAGE_TAG

				variables:
				PYTHON: python
				TEST_HGMODULEPOLICY: "allow"
				HG_CI_IMAGE_TAG: "v1.0"
				TEST_HGTESTS_ALLOW_NETIO: "0"

				.all_template: &all
				when: always

				.runtests_template: &runtests
				<<: *all
				stage: tests
				# The runner made a clone as root.
				# We make a new clone owned by user used to run the step.
				before_script:
				- hg clone . /tmp/mercurial-ci/ --noupdate --config phases.publish=no
				- hg -R /tmp/mercurial-ci/ update `hg log --rev '.' --template '{node}'`
				- cd /tmp/mercurial-ci/
				- ls -1 tests/test-check-. > /tmp/check-tests.txt
				- black --version
				- clang-format --version
				script:
				- echo "python used, $PYTHON"
				- echo "$RUNTEST_ARGS"
				- HGTESTS_ALLOW_NETIO="$TEST_HGTESTS_ALLOW_NETIO" HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" tests/run-tests.py --color=always $RUNTEST_ARGS

				checks:
				<<: *runtests
				variables:
				RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt"
				PYTHON: python3

				rust-cargo-test:
				stage: tests
				script:
				- echo "python used, $PYTHON"
				- make rust-tests
				variables:
				PYTHON: python3

				phabricator-refresh:
				stage: phabricator
				rules:
				- if: '"$PHABRICATOR_TOKEN" != "NO-PHAB"'
				when: on_success
				- if: '"$PHABRICATOR_TOKEN" == "NO-PHAB"'
				when: never
				variables:
				DEFAULT_COMMENT: ":white_check_mark: refresh by Heptapod after a successful CI run (:octopus: :green_heart:)"
				STABLE_COMMENT: ":white_check_mark: refresh by Heptapod after a successful CI run (:octopus: :green_heart:)\n⚠ This patch is intended for stable ⚠\n{image https://media.giphy.com/media/nYI8SmmChYXK0/source.gif}"
				script:
				- \|
				if [ `hg branch` == "stable" ]; then
				./contrib/phab-refresh-stack.sh --comment "$STABLE_COMMENT";
				else
				./contrib/phab-refresh-stack.sh --comment "$DEFAULT_COMMENT";
				fi

				test-c:
				<<: *runtests
				variables:
				RUNTEST_ARGS: " --no-rust --blacklist /tmp/check-tests.txt"
				PYTHON: python3
				TEST_HGMODULEPOLICY: "c"
				TEST_HGTESTS_ALLOW_NETIO: "1"

				test-pure:
				<<: *runtests
				variables:
				RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
				PYTHON: python3
				TEST_HGMODULEPOLICY: "py"

				test-rust:
				<<: *runtests
				variables:
				HGWITHRUSTEXT: cpython
				RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt"
				PYTHON: python3
				TEST_HGMODULEPOLICY: "rust+c"

				test-rhg:
				<<: *runtests
				variables:
				HGWITHRUSTEXT: cpython
				RUNTEST_ARGS: "--rust --rhg --blacklist /tmp/check-tests.txt"
				PYTHON: python3
				TEST_HGMODULEPOLICY: "rust+c"

				test-chg:
				<<: *runtests
				variables:
				PYTHON: python3
				RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg"
				TEST_HGMODULEPOLICY: "c"

				check-pytype:
				extends: .runtests_template
				before_script:
				- hg clone . /tmp/mercurial-ci/ --noupdate --config phases.publish=no
				- hg -R /tmp/mercurial-ci/ update `hg log --rev '.' --template '{node}'`
				- cd /tmp/mercurial-ci/
				- make local PYTHON=$PYTHON
				- $PYTHON -m pip install --user -U pytype==2021.04.15
				variables:
				RUNTEST_ARGS: " --allow-slow-tests tests/test-check-pytype.t"
				HGTEST_SLOWTIMEOUT: "3600"
				PYTHON: python3
				TEST_HGMODULEPOLICY: "c"

				# `sh.exe --login` sets a couple of extra environment variables that are defined
				# in the MinGW shell, but switches CWD to /home/$username. The previous value
				# is stored in OLDPWD. Of the added variables, MSYSTEM is crucial to running
				# run-tests.py- it is needed to make run-tests.py generate a `python3` script
				# that satisfies the various shebang lines and delegates to `py -3`.
				.window_runtests_template: &windows_runtests
				<<: *all
				when: manual # we don't have any Windows runners anymore at the moment
				stage: tests
				before_script:
				- C:/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && ls -1 tests/test-check-. > C:/Temp/check-tests.txt'
				# TODO: find/install cvs, bzr, perforce, gpg, sqlite3

				script:
				- echo "Entering script section"
				- echo "python used, $Env:PYTHON"
				- Invoke-Expression "$Env:PYTHON -V"
				- Invoke-Expression "$Env:PYTHON -m black --version"
				- echo "$Env:RUNTEST_ARGS"
				- echo "$Env:TMP"
				- echo "$Env:TEMP"

				- C:/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && HGTESTS_ALLOW_NETIO="$TEST_HGTESTS_ALLOW_NETIO" HGMODULEPOLICY="$TEST_HGMODULEPOLICY" $PYTHON tests/run-tests.py --color=always $RUNTEST_ARGS'

				windows:
				<<: *windows_runtests
				tags:
				- windows
				variables:
				TEST_HGMODULEPOLICY: "c"
				RUNTEST_ARGS: "--blacklist C:/Temp/check-tests.txt"
				PYTHON: py -3

				windows-pyox:
				<<: *windows_runtests
				tags:
				- windows
				variables:
				TEST_HGMODULEPOLICY: "c"
				RUNTEST_ARGS: "--blacklist C:/Temp/check-tests.txt --pyoxidized"
				PYTHON: py -3