Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 279769 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/eclass/mercurial.eclass (-6 / +32 lines)
Lines 14-19 Link Here
14
14
15
inherit eutils
15
inherit eutils
16
16
17
IUSE="release-branch release-tag"
18
17
EXPORT_FUNCTIONS src_unpack
19
EXPORT_FUNCTIONS src_unpack
18
20
19
DEPEND="dev-util/mercurial"
21
DEPEND="dev-util/mercurial"
Lines 28-34 Link Here
28
#
30
#
29
# EHG_REVISION is passed as a value for --rev parameter, so it can be more than
31
# EHG_REVISION is passed as a value for --rev parameter, so it can be more than
30
# just a revision, please consult `hg help revisions' for more details.
32
# just a revision, please consult `hg help revisions' for more details.
31
[[ -z "${EHG_REVISION}" ]] && EHG_REVISION="tip"
33
#[[ -z "${EHG_REVISION}" ]] && EHG_REVISION="tip"
32
34
33
# @ECLASS-VARIABLE: EHG_PROJECT
35
# @ECLASS-VARIABLE: EHG_PROJECT
34
# @DESCRIPTION:
36
# @DESCRIPTION:
Lines 110-122 Link Here
110
		${EHG_PULL_CMD} || die "update failed"
112
		${EHG_PULL_CMD} || die "update failed"
111
	fi
113
	fi
112
114
115
	local EHG_REVISION
116
	# if release-branch|release-tag useflag given - use first named revision before tip or default
117
	if [[ -z "${EHG_REVISION}" ]]; then
118
		if use release-branch; then
119
			for EHG_REVISION in `hg branches -c -R "${hg_src_dir}/${EHG_PROJECT}/${module}" | sed -e 's: .*$::g'` ; do
120
				[[ "${EHG_REVISION}" == "default" ]] || break
121
			done
122
		fi
123
		if use release-tag &&
124
		    ( ! use release-branch ||
125
			[[ "${EHG_REVISION}" == "default" ]] ||
126
			[[ -z "${EHG_REVISION}" ]] ); then
127
			for EHG_REVISION in `hg tags -R "${hg_src_dir}/${EHG_PROJECT}/${module}" | sed -e 's: .*$::g'` ; do
128
				[[ "${EHG_REVISION}" == "tip" ]] || break
129
			done
130
		fi
131
	fi
132
133
	# don't use empty/tip revision: to compatibility with '--date' EHG_EXTRA_OPT
134
	[[ -n "${EHG_REVISION}" ]] && EHG_REVISION="--rev ${EHG_REVISION}"
135
113
	# Checkout working copy:
136
	# Checkout working copy:
114
	einfo "Creating working directory in ${WORKDIR}/${module} (revision: ${EHG_REVISION})"
137
	einfo "Creating working directory in ${WORKDIR}/${module} (${EHG_REVISION} ${EHG_EXTRA_OPT})"
115
	hg clone \
138
	mkdir "${WORKDIR}/${module}"
139
	ln -s "${hg_src_dir}/${EHG_PROJECT}/${module}"/.hg "${WORKDIR}/${module}"/.hg || die
140
	hg update \
116
		${EHG_QUIET_CMD_OPT} \
141
		${EHG_QUIET_CMD_OPT} \
117
		--rev="${EHG_REVISION}" \
142
		${EHG_REVISION} -C \
118
		"${hg_src_dir}/${EHG_PROJECT}/${module}" \
143
		-R "${WORKDIR}/${module}" ${EHG_EXTRA_OPT} || die "hg update failed"
119
		"${WORKDIR}/${module}" || die "hg clone failed"
144
	# commented for compatibility with clone
145
#	rm "${WORKDIR}/${module}"/.hg
120
}
146
}
121
147
122
# @FUNCTION: mercurial_src_unpack
148
# @FUNCTION: mercurial_src_unpack

Return to bug 279769