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

copies: handle a case when both merging csets are not descendant of merge base...

copies: handle a case when both merging csets are not descendant of merge base This patch fix the behaviour of fullcopytracing algorithm in the case when both the merging csets are not the descendant of merge base. Although it seems to be the rare case when both the csets are not descendant of merge base. But it can be seen in most of cases of content-divergence in evolve extension, where merge base is the common predecessor. Previous patch added a test where this algorithm can fail to continue because of an assumption that only one of the two csets can be dirty. This patch fix that error. For refrence I suggest you to look into the previous discussion held on a patch sent by Pulkit: https://phab.mercurial-scm.org/D3896 Differential Revision: https://phab.mercurial-scm.org/D5963

Mathias De Mare - - Load All Authors

File last commit:

r41759:8f0e8b17 stable


                r42098:7694b685

default

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 -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() {
				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 -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
				}