upstream/mercurial-mirror Files · contrib/packaging/packagelib.sh

amend: don't remove unselected removals from memctx...

amend: don't remove unselected removals from memctx When there are removed files in the working copy and they are not selected to be amended into the parent, the `filectxfn` we create for the `memctx` would still return `None` before this patch. That's clearly incorrect; we should return the `filectx` from the unamended commit. Somehow it seems to not matter much except for the case with copies stored in changesets. Thanks to Kyle Lippincott for doing all the debugging and identifying the fix for this issue. Differential Revision: https://phab.mercurial-scm.org/D12573

Mathias De Mare - - Load All Authors

File last commit:

r46597:97205cf0 default


                r49957:770e1352

stable

Download file

             packagelib.sh
        
                    43 lines
            
             | 1.3 KiB
            
                | application/x-sh
            
             |
                BashLexer
            
             / contrib / packaging / packagelib.sh
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # Extract version number into 4 parts, some of which may be empty:

      #

      # version: the numeric part of the most recent tag. Will always look like 1.3.

      #

      # type: if an rc build, "rc", otherwise empty

      #

      # distance: the distance from the nearest tag, or empty if built from a tag

      #

      # node: the node|short hg was built from, or empty if built from a tag

      gethgversion() {

          if [ -z "${1+x}" ]; then

              python="python"

          else

              python="$1"

          fi

          export HGRCPATH=

          export HGPLAIN=

          make cleanbutpackages PYTHON=$python

          make local PURE=--pure PYTHON=$python

          HG="$PWD/hg"

          $python "$HG" version > /dev/null || { echo 'abort: hg version failed!'; exit 1 ; }

          hgversion=`LANGUAGE=C $python "$HG" version | sed -ne 's/.*(version \(.*\))$/\1/p'`

          if echo $hgversion | grep + > /dev/null 2>&1 ; then

              tmp=`echo $hgversion | cut -d+ -f 2`

              hgversion=`echo $hgversion | cut -d+ -f 1`

              distance=`echo $tmp | cut -d- -f 1`

              node=`echo $tmp | cut -d- -f 2`

          else

              distance=''

              node=''

          fi

          if echo $hgversion | grep -E -- '[0-9]\.[0-9](\.[0-9])?rc' > /dev/null 2>&1; then

              version=`echo $hgversion | cut -d'r' -f1`

              type="rc`echo $hgversion | cut -d'c' -f2-`"

          else

              version=$hgversion

              type=''

          fi

      }

	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

				# Extract version number into 4 parts, some of which may be empty:
				#
				# version: the numeric part of the most recent tag. Will always look like 1.3.
				#
				# type: if an rc build, "rc", otherwise empty
				#
				# distance: the distance from the nearest tag, or empty if built from a tag
				#
				# node: the node\|short hg was built from, or empty if built from a tag
				gethgversion() {
				if [ -z "${1+x}" ]; then
				python="python"
				else
				python="$1"
				fi
				export HGRCPATH=
				export HGPLAIN=

				make cleanbutpackages PYTHON=$python
				make local PURE=--pure PYTHON=$python
				HG="$PWD/hg"

				$python "$HG" version > /dev/null \|\| { echo 'abort: hg version failed!'; exit 1 ; }

				hgversion=`LANGUAGE=C $python "$HG" version \| sed -ne 's/.(version \(.\))$/\1/p'`

				if echo $hgversion \| grep + > /dev/null 2>&1 ; then
				tmp=`echo $hgversion \| cut -d+ -f 2`
				hgversion=`echo $hgversion \| cut -d+ -f 1`
				distance=`echo $tmp \| cut -d- -f 1`
				node=`echo $tmp \| cut -d- -f 2`
				else
				distance=''
				node=''
				fi
				if echo $hgversion \| grep -E -- '[0-9]\.[0-9](\.[0-9])?rc' > /dev/null 2>&1; then
				version=`echo $hgversion \| cut -d'r' -f1`
				type="rc`echo $hgversion \| cut -d'c' -f2-`"
				else
				version=$hgversion
				type=''
				fi
				}