[pacman-dev] [PATCH] Bazaar VCS support

[Gary van der Merwe]

On Thu 13 Sep 2012 07:52:16 SAST, Allan McRae wrote:
> Please change this (and throughout the patch) to keep protocols in
> alphabetical order.

Ah, I like beening first :-) Done

>> +	local fragment=${netfile##*#}
>
> This has been changed in the other vcs functons on my git branch to
> ${netfile#*#} as that allows the fragment to contain a "#" character.

Done


>> +	local revision="-r-1"
>
> Strings starting with a "-" can lead to issues...  Changes this to:
> revision=('-r-1')
>
>> +				revision="-r${fragment##*=}"
>
> revision=("-r${fragment##*=}")

Done


>> +		if ! bzr branch "$url" "$dir" $revisionspec --no-tree --use-existing-dir; then
>
>> +		if ! bzr pull "$url" $revisionspec --overwrite; then
>
> I guess $revisionspec should be $revision?  And with comment above it
> will be $(revision[@])


Gee. That was a big mistake that I made. Fixed.



Signed-off-by: Gary van der Merwe <garyvdm at gmail.com>
---
 doc/PKGBUILD.5.txt    |  5 +++-
 scripts/makepkg.sh.in | 75 ++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
index 47f9e88..0dca4a2 100644
--- a/doc/PKGBUILD.5.txt
+++ b/doc/PKGBUILD.5.txt
@@ -405,7 +405,7 @@ Using VCS Sources[[VCS]]
 ------------------------
 Building a developmental version of a package using sources from a version control
 system (VCS) is enabled by specifying the source in the form
-`source=('folder::url#fragment')`. Currently makepkg supports the `git`, `hg` and
+`source=('folder::url#fragment')`. Currently makepkg supports the `bzr`, `git`, `hg` and
 `svn` protocols.
 
 The source URL is divided into three components:
@@ -427,6 +427,9 @@ The source URL is divided into three components:
 	have the format `source=(url#revision=123)`. The available fragments depends on
 	the VCS being used:
 
+	*bzr*;;
+		revision (see `bzr help revisionspec` for details)
+
 	*git*;;
 		branch, commit, tag
 
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 6de7b4f..971e2f4 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -200,7 +200,7 @@ get_filepath() {
 	local proto="$(get_protocol "$1")"
 
 	case $proto in
-		git*|hg*|svn*)
+		bzr*|git*|hg*|svn*)
 			if [[ -d "$startdir/$file" ]]; then
 				file="$startdir/$file"
 			elif [[ -d "$SRCDEST/$file" ]]; then
@@ -236,7 +236,7 @@ get_filename() {
 	local proto=$(get_protocol "$netfile")
 
 	case $proto in
-		git*|hg*|svn*)
+		bzr*|git*|hg*|svn*)
 			filename=${netfile%%#*}
 			filename=${filename%/}
 			filename=${filename##*/}
@@ -377,6 +377,72 @@ download_file() {
 	ln -s "$SRCDEST/$filename" "$srcdir/"
 }
 
+download_bzr() {
+	local netfile=$1
+
+	local url=$(get_url "$netfile")
+	url=${url##*bzr+}
+	url=${url%%#*}
+
+	local fragment=${netfile#*#}
+	if [[ $fragment = "$netfile" ]]; then
+		unset fragment
+	fi
+
+	local displaylocation="$url"
+	local revision=('-r-1')
+
+	if [[ -n $fragment ]]; then
+		case ${fragment%%=*} in
+			revision)
+				revision=("-r${fragment##*=}")
+				displaylocation="$url -r ${fragment##*=}"
+				;;
+			*)
+				error "$(gettext "Unrecognized reference: %s")" "${fragment}"
+				plain "$(gettext "Aborting...")"
+				exit 1
+		esac
+	fi
+
+	local dir=$(get_filepath "$netfile")
+	[[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")"
+
+	if [[ ! -d "$dir" ]] || dir_is_empty "$dir" ; then
+		msg2 "$(gettext "Branching %s ...")" "${displaylocation}"
+		if ! bzr branch "$url" "$dir" $revision --no-tree --use-existing-dir; then
+			error "$(gettext "Failure while branching %s")" "${displaylocation}"
+			plain "$(gettext "Aborting...")"
+			exit 1
+		fi
+	elif (( ! HOLDVER )); then
+		# Make sure we are fetching the right repo
+		if [[ "$url" != "$(bzr config parent_location -d $dir)"  ]] ; then
+			error "$(gettext "%s is not a branch of %s")" "$dir" "$url"
+			plain "$(gettext "Aborting...")"
+			exit 1
+		fi
+		msg2 "$(gettext "Pulling %s ...")" "${displaylocation}"
+		cd_safe "$dir"
+		if ! bzr pull "$url" $revision --overwrite; then
+			# only warn on failure to allow offline builds
+			warning "$(gettext "Failure while pulling %s")" "${displaylocation}"
+		fi
+	fi
+
+	msg2 "$(gettext "Creating working copy of %s %s repo...")" "${dir}" "bzr"
+	pushd "$srcdir" &>/dev/null
+	rm -rf "${dir##*/}"
+
+	if ! bzr checkout "$dir" --lightweight; then
+		error "$(gettext "Failure while creating working copy of %s %s repo")" "${dir}" "bzr"
+		plain "$(gettext "Aborting...")"
+		exit 1
+	fi
+
+	popd &>/dev/null
+}
+
 download_git() {
 	local netfile=$1
 
@@ -596,6 +662,9 @@ download_sources() {
 			local)
 				download_local "$netfile"
 				;;
+			bzr*)
+				(( GET_VCS )) && download_bzr "$netfile"
+				;;
 			git*)
 				(( GET_VCS )) && download_git "$netfile"
 				;;
@@ -975,7 +1044,7 @@ generate_checksums() {
 			proto="$(get_protocol "$netfile")"
 
 			case $proto in
-				git*|hg*|svn*)
+				bzr*|git*|hg*|svn*)
 					sum="SKIP"
 					;;
 				*)
-- 
1.7.12