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

merge: do the trivial resolution after updating sparse checkout...

merge: do the trivial resolution after updating sparse checkout In merge, we do trivial resolution for files which were deleted on one side and changed on other. When sparse extension in involved that file might not be present in wdir and trivial resolution can lead to file not found error. This patch make sure we updates the sparse checkout before doing the trivial resolution. This fixes the test failure demonstrated in previous patch. Differential Revision: https://phab.mercurial-scm.org/D3984

Gregory Szorc - - Load All Authors

File last commit:

r38025:ea70512b default


                r39017:d49e490a

@94 stable

Download file

             packagelib.sh
        
                    38 lines
            
             | 1.1 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() {

          export HGRCPATH=

          export HGPLAIN=

          make cleanbutpackages

          make local PURE=--pure

          HG="$PWD/hg"

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

          hgversion=`LANGUAGE=C "$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 -- '-' > /dev/null 2>&1; then

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

              type=`echo $hgversion | cut -d- -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() {
				export HGRCPATH=
				export HGPLAIN=

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

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

				hgversion=`LANGUAGE=C "$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 -- '-' > /dev/null 2>&1; then
				version=`echo $hgversion \| cut -d- -f1`
				type=`echo $hgversion \| cut -d- -f2`
				else
				version=$hgversion
				type=''
				fi
				}