upstream/mercurial-mirror Files · contrib/packaging/build-linux-wheels.sh

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Gregory Szorc - - Load All Authors

File last commit:

r38031:6f5b4cee default


                r38817:bb54db4a

@96 default

Download file

             build-linux-wheels.sh
        
                    34 lines
            
             | 1.1 KiB
            
                | application/x-sh
            
             |
                BashLexer
            
             / contrib / packaging / build-linux-wheels.sh
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/bin/bash

      # This file is directly inspired by

      # https://github.com/pypa/python-manylinux-demo/blob/master/travis/build-wheels.sh

      set -e -x

      PYTHON_TARGETS=$(ls -d /opt/python/cp27*/bin)

      # Create an user for the tests

      useradd hgbuilder

      # Bypass uid/gid problems

      cp -R /src /io && chown -R hgbuilder:hgbuilder /io

      # Compile wheels for Python 2.X

      for PYBIN in $PYTHON_TARGETS; do

          "${PYBIN}/pip" wheel /io/ -w wheelhouse/

      done

      # Bundle external shared libraries into the wheels with

      # auditwheel (https://github.com/pypa/auditwheel) repair.

      # It also fix the ABI tag on the wheel making it pip installable.

      for whl in wheelhouse/*.whl; do

          auditwheel repair "$whl" -w /src/wheelhouse/

      done

      # Install packages and run the tests for all Python versions

      cd /io/tests/

      for PYBIN in $PYTHON_TARGETS; do

          # Install mercurial wheel as root

          "${PYBIN}/pip" install mercurial --no-index -f /src/wheelhouse

          # But run tests as hgbuilder user (non-root)

          su hgbuilder -c "\"${PYBIN}/python\" /io/tests/run-tests.py --with-hg=\"${PYBIN}/hg\" --blacklist=/io/contrib/packaging/linux-wheel-centos5-blacklist"

      done

	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

				#!/bin/bash
				# This file is directly inspired by
				# https://github.com/pypa/python-manylinux-demo/blob/master/travis/build-wheels.sh
				set -e -x

				PYTHON_TARGETS=$(ls -d /opt/python/cp27*/bin)

				# Create an user for the tests
				useradd hgbuilder

				# Bypass uid/gid problems
				cp -R /src /io && chown -R hgbuilder:hgbuilder /io

				# Compile wheels for Python 2.X
				for PYBIN in $PYTHON_TARGETS; do
				"${PYBIN}/pip" wheel /io/ -w wheelhouse/
				done

				# Bundle external shared libraries into the wheels with
				# auditwheel (https://github.com/pypa/auditwheel) repair.
				# It also fix the ABI tag on the wheel making it pip installable.
				for whl in wheelhouse/*.whl; do
				auditwheel repair "$whl" -w /src/wheelhouse/
				done

				# Install packages and run the tests for all Python versions
				cd /io/tests/

				for PYBIN in $PYTHON_TARGETS; do
				# Install mercurial wheel as root
				"${PYBIN}/pip" install mercurial --no-index -f /src/wheelhouse
				# But run tests as hgbuilder user (non-root)
				su hgbuilder -c "\"${PYBIN}/python\" /io/tests/run-tests.py --with-hg=\"${PYBIN}/hg\" --blacklist=/io/contrib/packaging/linux-wheel-centos5-blacklist"
				done