* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mercurial.eclass
@ 2012-02-05 19:14 Mike Gilbert (floppym)
0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert (floppym) @ 2012-02-05 19:14 UTC (permalink / raw
To: gentoo-commits
floppym 12/02/05 19:14:16
Modified: ChangeLog mercurial.eclass
Log:
Don't die if hg pull exits with status 1.
Revision Changes Path
1.115 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.115&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.115&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.114&r2=1.115
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- ChangeLog 4 Feb 2012 18:28:32 -0000 1.114
+++ ChangeLog 5 Feb 2012 19:14:16 -0000 1.115
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.114 2012/02/04 18:28:32 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.115 2012/02/05 19:14:16 floppym Exp $
+
+ 05 Feb 2012; Mike Gilbert <floppym@gentoo.org> mercurial.eclass:
+ Don't die if hg pull exits with status 1.
04 Feb 2012; Nirbheek Chauhan <nirbheek@gentoo.org> +mozlinguas.eclass:
Add mozlinguas.eclass to handle language packs for mozilla products
1.18 eclass/mercurial.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mercurial.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mercurial.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mercurial.eclass?r1=1.17&r2=1.18
Index: mercurial.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mercurial.eclass 27 Dec 2011 17:55:12 -0000 1.17
+++ mercurial.eclass 5 Feb 2012 19:14:16 -0000 1.18
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.17 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.18 2012/02/05 19:14:16 floppym Exp $
# @ECLASS: mercurial.eclass
# @MAINTAINER:
@@ -113,7 +113,9 @@
elif [[ -z "${EHG_OFFLINE}" ]]; then
einfo "Updating ${EHG_STORE_DIR}/${EHG_PROJECT}/${module} from ${EHG_REPO_URI}"
cd "${module}" || die "failed to cd to ${module}"
- ${EHG_PULL_CMD} || die "update failed"
+ ${EHG_PULL_CMD}
+ # mercurial-2.1: hg pull returns 1 if there are no incoming changesets
+ [[ $? -eq 0 || $? -eq 1 ]] || die "update failed"
fi
# Checkout working copy:
^ permalink raw reply [flat|nested] 5+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mercurial.eclass
@ 2012-04-03 19:16 Krzysztof Pawlik (nelchael)
0 siblings, 0 replies; 5+ messages in thread
From: Krzysztof Pawlik (nelchael) @ 2012-04-03 19:16 UTC (permalink / raw
To: gentoo-commits
nelchael 12/04/03 19:16:29
Modified: ChangeLog mercurial.eclass
Log:
Rename ESCM_OFFLINE to EVCS_OFFLINE, see bug #410469.
Revision Changes Path
1.201 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.201&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.201&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.200&r2=1.201
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- ChangeLog 3 Apr 2012 19:12:46 -0000 1.200
+++ ChangeLog 3 Apr 2012 19:16:29 -0000 1.201
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.200 2012/04/03 19:12:46 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.201 2012/04/03 19:16:29 nelchael Exp $
+
+ 03 Apr 2012; Krzysztof Pawlik <nelchael@gentoo.org> mercurial.eclass:
+ Rename ESCM_OFFLINE to EVCS_OFFLINE, see bug #410469.
03 Apr 2012; Krzysztof Pawlik <nelchael@gentoo.org>
python-distutils-ng.eclass:
1.19 eclass/mercurial.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mercurial.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mercurial.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mercurial.eclass?r1=1.18&r2=1.19
Index: mercurial.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mercurial.eclass 5 Feb 2012 19:14:16 -0000 1.18
+++ mercurial.eclass 3 Apr 2012 19:16:29 -0000 1.19
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.18 2012/02/05 19:14:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.19 2012/04/03 19:16:29 nelchael Exp $
# @ECLASS: mercurial.eclass
# @MAINTAINER:
@@ -65,7 +65,7 @@
# Set this variable to a non-empty value to disable the automatic updating of
# a mercurial source tree. This is intended to be set outside the ebuild by
# users.
-EHG_OFFLINE="${EHG_OFFLINE:-${ESCM_OFFLINE}}"
+EHG_OFFLINE="${EHG_OFFLINE:-${EVCS_OFFLINE}}"
# @FUNCTION: mercurial_fetch
# @USAGE: [repository_uri] [module] [sourcedir]
^ permalink raw reply [flat|nested] 5+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mercurial.eclass
@ 2012-12-26 23:08 Christoph Junghans (ottxor)
0 siblings, 0 replies; 5+ messages in thread
From: Christoph Junghans (ottxor) @ 2012-12-26 23:08 UTC (permalink / raw
To: gentoo-commits
ottxor 12/12/26 23:08:53
Modified: ChangeLog mercurial.eclass
Log:
added EHG_BOOTSTRAP (bug #340153), EHG_REVISION defaults to 'defaults (bug #380947), set web.cacerts (bug #431220), use auth when pulling (bug #432364)
Revision Changes Path
1.576 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.576&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.576&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.575&r2=1.576
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.575
retrieving revision 1.576
diff -u -r1.575 -r1.576
--- ChangeLog 24 Dec 2012 02:51:25 -0000 1.575
+++ ChangeLog 26 Dec 2012 23:08:53 -0000 1.576
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.575 2012/12/24 02:51:25 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.576 2012/12/26 23:08:53 ottxor Exp $
+
+ 26 Dec 2012; Christoph Junghans <ottxor@gentoo.org> mercurial.eclass:
+ added EHG_BOOTSTRAP (bug #340153), EHG_REVISION defaults to 'defaults (bug
+ #380947), set web.cacerts (bug #431220), use auth when pulling (bug #432364)
24 Dec 2012; Zac Medico <zmedico@gentoo.org> python-any-r1.eclass:
Fix python-any-r1_pkg_setup fallback logic.
1.20 eclass/mercurial.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mercurial.eclass?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mercurial.eclass?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mercurial.eclass?r1=1.19&r2=1.20
Index: mercurial.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- mercurial.eclass 3 Apr 2012 19:16:29 -0000 1.19
+++ mercurial.eclass 26 Dec 2012 23:08:53 -0000 1.20
@@ -1,11 +1,14 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.19 2012/04/03 19:16:29 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.20 2012/12/26 23:08:53 ottxor Exp $
# @ECLASS: mercurial.eclass
# @MAINTAINER:
-# Krzysztof Pawlik <nelchael@gentoo.org>
+# Christoph Junghans <ottxor@gentoo.org>
# Dirkjan Ochtman <djc@gentoo.org>
+# @AUTHOR:
+# Next gen author: Krzysztof Pawlik <nelchael@gentoo.org>
+# Original author: Aron Griffis <agriffis@gentoo.org>
# @BLURB: This eclass provides generic mercurial fetching functions
# @DESCRIPTION:
# This eclass provides generic mercurial fetching functions. To fetch sources
@@ -29,7 +32,7 @@
#
# EHG_REVISION is passed as a value for --updaterev parameter, so it can be more
# than just a revision, please consult `hg help revisions' for more details.
-[[ -z "${EHG_REVISION}" ]] && EHG_REVISION="tip"
+: ${EHG_REVISION:="default"}
# @ECLASS-VARIABLE: EHG_STORE_DIR
# @DESCRIPTION:
@@ -74,12 +77,18 @@
#
# If repository URI is not passed it defaults to EHG_REPO_URI, if module is
# empty it defaults to basename of EHG_REPO_URI, sourcedir defaults to S.
-function mercurial_fetch {
- debug-print-function ${FUNCNAME} ${*}
+mercurial_fetch() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
EHG_REPO_URI=${1-${EHG_REPO_URI}}
[[ -z "${EHG_REPO_URI}" ]] && die "EHG_REPO_URI is empty"
+ local cert_opt=
+ [[ -f ${EPREFIX}/etc/ssl/certs/ca-certificates.crt ]] && \
+ cert_opt=( --config "web.cacerts=${EPREFIX}/etc/ssl/certs/ca-certificates.crt" )
+
local module="${2-$(basename "${EHG_REPO_URI}")}"
local sourcedir="${3-${S}}"
@@ -105,7 +114,7 @@
# Clone/update repository:
if [[ ! -d "${module}" ]]; then
einfo "Cloning ${EHG_REPO_URI} to ${EHG_STORE_DIR}/${EHG_PROJECT}/${module}"
- ${EHG_CLONE_CMD} "${EHG_REPO_URI}" "${module}" || {
+ ${EHG_CLONE_CMD} "${cert_opt[@]}" "${EHG_REPO_URI}" "${module}" || {
rm -rf "${module}"
die "failed to clone ${EHG_REPO_URI}"
}
@@ -113,9 +122,7 @@
elif [[ -z "${EHG_OFFLINE}" ]]; then
einfo "Updating ${EHG_STORE_DIR}/${EHG_PROJECT}/${module} from ${EHG_REPO_URI}"
cd "${module}" || die "failed to cd to ${module}"
- ${EHG_PULL_CMD}
- # mercurial-2.1: hg pull returns 1 if there are no incoming changesets
- [[ $? -eq 0 || $? -eq 1 ]] || die "update failed"
+ ${EHG_PULL_CMD} "${cert_opt[@]}" "${EHG_REPO_URI}" || die "update failed"
fi
# Checkout working copy:
@@ -131,12 +138,55 @@
local HG_REVDATA=($(hg identify -b -i "${sourcedir}"))
export HG_REV_ID=${HG_REVDATA[0]}
local HG_REV_BRANCH=${HG_REVDATA[1]}
- einfo "Work directory: ${sourcedir} global id: ${HG_REV_ID} branch: ${HG_REV_BRANCH}"
+ einfo "Work directory: ${sourcedir} global id: ${HG_REV_ID} (was ${EHG_REVISION} branch: ${HG_REV_BRANCH}"
+}
+
+# @FUNCTION: mercurial_bootstrap
+# @INTERNAL
+# @DESCRIPTION:
+# Internal function that runs bootstrap command on unpacked source.
+mercurial_bootstrap() {
+ debug-print-function ${FUNCNAME} "$@"
+
+ # @ECLASS-VARIABLE: EHG_BOOTSTRAP
+ # @DESCRIPTION:
+ # Command to be executed after checkout and clone of the specified
+ # repository.
+ if [[ ${EHG_BOOTSTRAP} ]]; then
+ pushd "${S}" > /dev/null
+ einfo "Starting bootstrap"
+
+ if [[ -f ${EHG_BOOTSTRAP} ]]; then
+ # we have file in the repo which we should execute
+ debug-print "${FUNCNAME}: bootstraping with file \"${EHG_BOOTSTRAP}\""
+
+ if [[ -x ${EHG_BOOTSTRAP} ]]; then
+ eval "./${EHG_BOOTSTRAP}" \
+ || die "${FUNCNAME}: bootstrap script failed"
+ else
+ eerror "\"${EHG_BOOTSTRAP}\" is not executable."
+ eerror "Report upstream, or bug ebuild maintainer to remove bootstrap command."
+ die "\"${EHG_BOOTSTRAP}\" is not executable"
+ fi
+ else
+ # we execute some system command
+ debug-print "${FUNCNAME}: bootstraping with commands \"${EHG_BOOTSTRAP}\""
+
+ eval "${EHG_BOOTSTRAP}" \
+ || die "${FUNCNAME}: bootstrap commands failed"
+ fi
+
+ einfo "Bootstrap finished"
+ popd > /dev/null
+ fi
}
# @FUNCTION: mercurial_src_unpack
# @DESCRIPTION:
# The mercurial src_unpack function, which will be exported.
function mercurial_src_unpack {
+ debug-print-function ${FUNCNAME} "$@"
+
mercurial_fetch
+ mercurial_bootstrap
}
^ permalink raw reply [flat|nested] 5+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mercurial.eclass
@ 2013-11-04 22:05 Mike Gilbert (floppym)
0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert (floppym) @ 2013-11-04 22:05 UTC (permalink / raw
To: gentoo-commits
floppym 13/11/04 22:05:31
Modified: ChangeLog mercurial.eclass
Log:
Initialize cert_opt to an empty array instead of an empty string. Reported by Kristian Fiskerstrand.
Revision Changes Path
1.1047 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1047&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1047&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1046&r2=1.1047
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1046
retrieving revision 1.1047
diff -u -r1.1046 -r1.1047
--- ChangeLog 4 Nov 2013 21:36:36 -0000 1.1046
+++ ChangeLog 4 Nov 2013 22:05:31 -0000 1.1047
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1046 2013/11/04 21:36:36 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1047 2013/11/04 22:05:31 floppym Exp $
+
+ 04 Nov 2013; Mike Gilbert <floppym@gentoo.org> mercurial.eclass:
+ Initialize cert_opt to an empty array instead of an empty string. Reported by
+ Kristian Fiskerstrand.
04 Nov 2013; Ulrich Müller <ulm@gentoo.org> elisp-common.eclass:
Don't create site-gentoo.el in postrm phase.
1.23 eclass/mercurial.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mercurial.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mercurial.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mercurial.eclass?r1=1.22&r2=1.23
Index: mercurial.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mercurial.eclass 28 Apr 2013 16:15:33 -0000 1.22
+++ mercurial.eclass 4 Nov 2013 22:05:31 -0000 1.23
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.22 2013/04/28 16:15:33 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.23 2013/11/04 22:05:31 floppym Exp $
# @ECLASS: mercurial.eclass
# @MAINTAINER:
@@ -85,7 +85,7 @@
EHG_REPO_URI=${1-${EHG_REPO_URI}}
[[ -z "${EHG_REPO_URI}" ]] && die "EHG_REPO_URI is empty"
- local cert_opt=
+ local cert_opt=()
[[ -f ${EPREFIX}/etc/ssl/certs/ca-certificates.crt ]] && \
cert_opt=( --config "web.cacerts=${EPREFIX}/etc/ssl/certs/ca-certificates.crt" )
^ permalink raw reply [flat|nested] 5+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mercurial.eclass
@ 2014-07-25 23:18 Christoph Junghans (ottxor)
0 siblings, 0 replies; 5+ messages in thread
From: Christoph Junghans (ottxor) @ 2014-07-25 23:18 UTC (permalink / raw
To: gentoo-commits
ottxor 14/07/25 23:18:34
Modified: ChangeLog mercurial.eclass
Log:
Added EHG_CHECKOUT_DIR to override checkout destination
Revision Changes Path
1.1325 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1325&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1325&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1324&r2=1.1325
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1324
retrieving revision 1.1325
diff -u -r1.1324 -r1.1325
--- ChangeLog 22 Jul 2014 06:38:56 -0000 1.1324
+++ ChangeLog 25 Jul 2014 23:18:34 -0000 1.1325
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1324 2014/07/22 06:38:56 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1325 2014/07/25 23:18:34 ottxor Exp $
+
+ 25 Jul 2014; Christoph Junghans <ottxor@gentoo.org> mercurial.eclass:
+ Added EHG_CHECKOUT_DIR to override checkout destination
22 Jul 2014; Michael Haubenwallner <haubi@gentoo.org> java-vm-2.eclass:
Respect EPREFIX in pkg_postinst, bug#517236.
1.24 eclass/mercurial.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mercurial.eclass?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mercurial.eclass?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mercurial.eclass?r1=1.23&r2=1.24
Index: mercurial.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mercurial.eclass 4 Nov 2013 22:05:31 -0000 1.23
+++ mercurial.eclass 25 Jul 2014 23:18:34 -0000 1.24
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.23 2013/11/04 22:05:31 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mercurial.eclass,v 1.24 2014/07/25 23:18:34 ottxor Exp $
# @ECLASS: mercurial.eclass
# @MAINTAINER:
@@ -28,7 +28,7 @@
# @ECLASS-VARIABLE: EHG_REVISION
# @DESCRIPTION:
-# Create working directory for specified revision, defaults to tip.
+# Create working directory for specified revision, defaults to default.
#
# EHG_REVISION is passed as a value for --updaterev parameter, so it can be more
# than just a revision, please consult `hg help revisions' for more details.
@@ -47,6 +47,12 @@
# between several ebuilds.
[[ -z "${EHG_PROJECT}" ]] && EHG_PROJECT="${PN}"
+# @ECLASS-VARIABLE: EGIT_CHECKOUT_DIR
+# @DESCRIPTION:
+# The directory to check the hg sources out to.
+#
+# EHG_CHECKOUT_DIR=${S}
+
# @ECLASS-VARIABLE: EHG_QUIET
# @DESCRIPTION:
# Suppress some extra noise from mercurial, set it to 'ON' to be quiet.
@@ -76,7 +82,9 @@
# Clone or update repository.
#
# If repository URI is not passed it defaults to EHG_REPO_URI, if module is
-# empty it defaults to basename of EHG_REPO_URI, sourcedir defaults to S.
+# empty it defaults to basename of EHG_REPO_URI, sourcedir defaults to
+# EHG_CHECKOUT_DIR, which defaults to S.
+
mercurial_fetch() {
debug-print-function ${FUNCNAME} "${@}"
@@ -85,12 +93,8 @@
EHG_REPO_URI=${1-${EHG_REPO_URI}}
[[ -z "${EHG_REPO_URI}" ]] && die "EHG_REPO_URI is empty"
- local cert_opt=()
- [[ -f ${EPREFIX}/etc/ssl/certs/ca-certificates.crt ]] && \
- cert_opt=( --config "web.cacerts=${EPREFIX}/etc/ssl/certs/ca-certificates.crt" )
-
local module="${2-$(basename "${EHG_REPO_URI}")}"
- local sourcedir="${3-${S}}"
+ local sourcedir="${3:-${EHG_CHECKOUT_DIR:-${S}}}"
# Should be set but blank to prevent using $HOME/.hgrc
export HGRCPATH=
@@ -114,7 +118,7 @@
# Clone/update repository:
if [[ ! -d "${module}" ]]; then
einfo "Cloning ${EHG_REPO_URI} to ${EHG_STORE_DIR}/${EHG_PROJECT}/${module}"
- ${EHG_CLONE_CMD} "${cert_opt[@]}" "${EHG_REPO_URI}" "${module}" || {
+ ${EHG_CLONE_CMD} "${EHG_REPO_URI}" "${module}" || {
rm -rf "${module}"
die "failed to clone ${EHG_REPO_URI}"
}
@@ -122,11 +126,12 @@
elif [[ -z "${EHG_OFFLINE}" ]]; then
einfo "Updating ${EHG_STORE_DIR}/${EHG_PROJECT}/${module} from ${EHG_REPO_URI}"
cd "${module}" || die "failed to cd to ${module}"
- ${EHG_PULL_CMD} "${cert_opt[@]}" "${EHG_REPO_URI}" || die "update failed"
+ ${EHG_PULL_CMD} "${EHG_REPO_URI}" || die "update failed"
fi
# Checkout working copy:
einfo "Creating working directory in ${sourcedir} (target revision: ${EHG_REVISION})"
+ mkdir -p "${sourcedir}" || die "failed to create ${sourcedir}"
hg clone \
${EHG_QUIET_CMD_OPT} \
--updaterev="${EHG_REVISION}" \
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-07-25 23:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-05 19:14 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mercurial.eclass Mike Gilbert (floppym)
-- strict thread matches above, loose matches on Subject: below --
2012-04-03 19:16 Krzysztof Pawlik (nelchael)
2012-12-26 23:08 Christoph Junghans (ottxor)
2013-11-04 22:05 Mike Gilbert (floppym)
2014-07-25 23:18 Christoph Junghans (ottxor)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox