##// END OF EJS Templates
rebase: move actual rebase into a single transaction...
rebase: move actual rebase into a single transaction Previously, rebasing would open several transaction over the course of rebasing several commits. Opening a transaction can have notable overhead (like copying the dirstate) which can add up when rebasing many commits. This patch adds a single large transaction around the actual commit rebase operation, with a catch for intervention which serializes the current state if we need to drop back to the terminal for user intervention. Amazingly, almost all the tests seem to pass. On large repos with large working copies, this can speed up rebasing 7 commits by 25%. I'd expect the percentage to be a bit larger for rebasing even more commits. There are minor test changes because we're rolling back the entire transaction during unexpected exceptions instead of just stopping mid-rebase, so there's no more backup bundle. It also leave an unknown file in the working copy, since our clean up 'hg update' doesn't delete unknown files.

File last commit:

r29641:13f90dde stable
r31226:cf8ad0e6 default
Show More
packagelib.sh
35 lines | 1.1 KiB | application/x-sh | BashLexer
Augie Fackler
packaging: rework version detection and declaration (issue4912)...
r26833 # 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
Augie Fackler
packaging: extract packagelib for common code from builddeb and buildrpm
r24972 gethgversion() {
Pierre-Yves David
packagelib: do not remove packages directory in hggetversion (issue5262)...
r29641 make cleanbutpackages
Augie Fackler
packaging: extract packagelib for common code from builddeb and buildrpm
r24972 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'`
Augie Fackler
packaging: rework version detection and declaration (issue4912)...
r26833 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
Augie Fackler
packaging: extract packagelib for common code from builddeb and buildrpm
r24972 if echo $hgversion | grep -- '-' > /dev/null 2>&1; then
version=`echo $hgversion | cut -d- -f1`
Augie Fackler
packaging: rework version detection and declaration (issue4912)...
r26833 type=`echo $hgversion | cut -d- -f2`
Augie Fackler
packaging: extract packagelib for common code from builddeb and buildrpm
r24972 else
Augie Fackler
packaging: rework version detection and declaration (issue4912)...
r26833 version=$hgversion
type=''
Augie Fackler
packaging: extract packagelib for common code from builddeb and buildrpm
r24972 fi
}