[patch] suggested patch

mercurial.eclass.patch (text/plain), 1.98 KB, created by Denis Kaganovich on 2010-03-03 15:15:14 UTC

--- /usr/portage/eclass/mercurial.eclass	2010-01-17 14:05:39.000000000 +0200
+++ mercurial.eclass	2010-03-03 16:53:18.000000000 +0200
@@ -14,6 +14,8 @@
 
 inherit eutils
 
+IUSE="release-branch release-tag"
+
 EXPORT_FUNCTIONS src_unpack
 
 DEPEND="dev-util/mercurial"
@@ -28,7 +30,7 @@
 #
 # EHG_REVISION is passed as a value for --rev parameter, so it can be more than
 # just a revision, please consult `hg help revisions' for more details.
-[[ -z "${EHG_REVISION}" ]] && EHG_REVISION="tip"
+#[[ -z "${EHG_REVISION}" ]] && EHG_REVISION="tip"
 
 # @ECLASS-VARIABLE: EHG_PROJECT
 # @DESCRIPTION:
@@ -110,13 +112,35 @@
 		${EHG_PULL_CMD} || die "update failed"
 	fi
 
+	local EHG_REVISION
+	# if release-branch|release-tag useflag given - use first named revision before tip or default
+	if [[ -z "${EHG_REVISION}" ]]; then
+		if use release-branch; then
+			for EHG_REVISION in `hg branches -c -R "${hg_src_dir}/${EHG_PROJECT}/${module}" | sed -e 's: .*$::g'` ; do
+				[[ "${EHG_REVISION}" == "default" ]] || break
+			done
+		fi
+		if use release-tag &&
+		    ( ! use release-branch ||
+			[[ "${EHG_REVISION}" == "default" ]] ||
+			[[ -z "${EHG_REVISION}" ]] ); then
+			for EHG_REVISION in `hg tags -R "${hg_src_dir}/${EHG_PROJECT}/${module}" | sed -e 's: .*$::g'` ; do
+				[[ "${EHG_REVISION}" == "tip" ]] || break
+			done
+		fi
+		[[ -z "${EHG_REVISION}" ]] && EHG_REVISION="tip"
+	fi
+
 	# Checkout working copy:
 	einfo "Creating working directory in ${WORKDIR}/${module} (revision: ${EHG_REVISION})"
-	hg clone \
+	mkdir "${WORKDIR}/${module}"
+	ln -s "${hg_src_dir}/${EHG_PROJECT}/${module}"/.hg "${WORKDIR}/${module}"/.hg || die
+	hg update \
 		${EHG_QUIET_CMD_OPT} \
-		--rev="${EHG_REVISION}" \
-		"${hg_src_dir}/${EHG_PROJECT}/${module}" \
-		"${WORKDIR}/${module}" || die "hg clone failed"
+		-r "${EHG_REVISION}" -C \
+		-R "${WORKDIR}/${module}" ${EHG_EXTRA_OPT} || die "hg update failed"
+	# commented for compatibility with clone
+#	rm "${WORKDIR}/${module}"/.hg
 }
 
 # @FUNCTION: mercurial_src_unpack