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

changegroup: cg3 has two empty groups *after* manifests...

changegroup: cg3 has two empty groups *after* manifests changegroup.getchunks() determines the end of the stream by looking for an empty chunk group (two consecutive empty chunks). It ignores empty groups in the first two groups. Changegroup 3 introduced an empty chunk between the manifests and the files, which confuses getchunks(). Since it comes after the first two, getchunks() will stop there. Fix by rewriting getchunks so it first counts two groups (empty or not) and then keeps antostarts counting empty groups. With this counting, changegroup 1 and 2 have exactly one empty group after the first two groups, while changegroup 3 has two (one for directories and one for files). It's a little hard to test this at this point, but I have verified that this patch fixes narrowhg (which was broken before this patch). Also, future patches will fix "hg strip" with treemanifests, and once that's done, getchunks() will be tested through tests of "hg strip".

Augie Fackler - - Load All Authors

File last commit:

r26833:6474b640 stable


                r27920:da5f2336

stable

Download file

             packagelib.sh
        
                    35 lines
            
             | 1.1 KiB
            
                | application/x-sh
            
             |
                BashLexer
            
             / contrib / 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() {

          make clean

          make local || make local PURE=--pure

          HG="$PWD/hg"

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

          hgversion=`$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() {
				make clean
				make local \|\| make local PURE=--pure
				HG="$PWD/hg"

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

				hgversion=`$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
				}