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

fix: add a -s option to format a revision and its descendants...

fix: add a -s option to format a revision and its descendants `hg fix -r abc123` will format that commit but not its descendants. That seems expected given the option name (`-r`), but it's very rarely what the user wants to do. The problem is that any descendants of that commit will not be formatted, leaving them as orphans that are hard to evolve. They are hard to evolve because the new parent will have formatting changes that the orphan doesn't have. I talked to Danny Hooper (who wrote most of the fix extension) about the problem and we agreed that deprecating `-r` in favor of a new `-s` argument (mimicing rebase's `-s`) would be a good way of reducing the risk that users end up with these hard-to-evolve orphans. So that's what this patch implements. Differential Revision: https://phab.mercurial-scm.org/D8287

Mathias De Mare - - Load All Authors

File last commit:

r41759:8f0e8b17 stable


                r45064:5205b46b

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
				}