/[gentoo-x86]/eclass/subversion.eclass
Gentoo

Diff of /eclass/subversion.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.41 Revision 1.49
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2008 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.41 2007/04/01 14:48:37 hattya Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/subversion.eclass,v 1.49 2008/02/20 20:32:00 zlin Exp $
4 4
5## --------------------------------------------------------------------------- # 5# @ECLASS: subversion.eclass
6# @MAINTAINER:
7# Akinori Hattori <hattya@gentoo.org>
8# Bo ├śrsted Andresen <zlin@gentoo.org>
9#
6# Author: Akinori Hattori <hattya@gentoo.org> 10# Original Author: Akinori Hattori <hattya@gentoo.org>
7# 11#
8# The subversion eclass is written to fetch the software sources from 12# @BLURB: The subversion eclass is written to fetch software sources from subversion repositories
9# subversion repositories like the cvs eclass. 13# @DESCRIPTION:
14# The subversion eclass provides functions to fetch, patch and bootstrap
15# software sources from subversion repositories.
10# 16#
11# 17# You must define the ESVN_REPO_URI variable before inheriting this eclass.
12# Description:
13# If you use this eclass, the ${S} is ${WORKDIR}/${P}.
14# It is necessary to define the ESVN_REPO_URI variable at least.
15#
16## --------------------------------------------------------------------------- #
17 18
18inherit eutils 19inherit eutils
19 20
20ESVN="subversion.eclass" 21ESVN="${ECLASS}"
21 22
22EXPORT_FUNCTIONS src_unpack 23EXPORT_FUNCTIONS src_unpack
23 24
24HOMEPAGE="http://subversion.tigris.org/"
25DESCRIPTION="Based on the ${ECLASS} eclass" 25DESCRIPTION="Based on the ${ECLASS} eclass"
26 26
27
28## -- add subversion in DEPEND
29#
30DEPEND="dev-util/subversion" 27DEPEND="dev-util/subversion
28 net-misc/rsync"
31 29
32 30# @ECLASS-VARIABLE: ESVN_STORE_DIR
33## -- ESVN_STORE_DIR: subversion sources store directory 31# @DESCRIPTION:
34# 32# subversion sources store directory. Users may override this in /etc/make.conf
35ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/svn-src" 33[[ -z ${ESVN_STORE_DIR} ]] && ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src"
36 34
37 35# @ECLASS-VARIABLE: ESVN_FETCH_CMD
38## -- ESVN_FETCH_CMD: subversion fetch command 36# @DESCRIPTION:
39# 37# subversion checkout command
40ESVN_FETCH_CMD="svn checkout" 38ESVN_FETCH_CMD="svn checkout"
41 39
42## -- ESVN_UPDATE_CMD: subversion update command 40# @ECLASS-VARIABLE: ESVN_UPDATE_CMD
43# 41# @DESCRIPTION:
42# subversion update command
44ESVN_UPDATE_CMD="svn update" 43ESVN_UPDATE_CMD="svn update"
45 44
45# @ECLASS-VARIABLE: ESVN_SWITCH_CMD
46# @DESCRIPTION:
47# subversion switch command
48ESVN_SWITCH_CMD="svn switch"
46 49
47## -- ESVN_OPTIONS: 50# @ECLASS-VARIABLE: ESVN_OPTIONS
48# 51# @DESCRIPTION:
49# the options passed to checkout or update. 52# the options passed to checkout or update. If you want a specific revision see
50# 53# ESVN_REPO_URI instead of using -rREV.
51: ESVN_OPTIONS=${ESVN_OPTIONS:=} 54ESVN_OPTIONS="${ESVN_OPTIONS:-}"
52 55
53 56# @ECLASS-VARIABLE: ESVN_REPO_URI
54## -- ESVN_REPO_URI: repository uri 57# @DESCRIPTION:
58# repository uri
55# 59#
56# e.g. http://foo/trunk, svn://bar/trunk 60# e.g. http://foo/trunk, svn://bar/trunk, svn://bar/branch/foo@1234
57# 61#
58# supported protocols: 62# supported protocols:
59# http:// 63# http://
60# https:// 64# https://
61# svn:// 65# svn://
62# svn+ssh:// 66# svn+ssh://
63# 67#
68# to peg to a specific revision, append @REV to the repo's uri
64: ESVN_REPO_URI=${ESVN_REPO_URI:=} 69ESVN_REPO_URI="${ESVN_REPO_URI:-}"
65 70
71# @ECLASS-VARIABLE: ESVN_REVISION
72# @DESCRIPTION:
73# User configurable revision checkout or update to from the repository
74#
75# Useful for live svn or trunk svn ebuilds allowing the user to peg
76# to a specific revision
77#
78# Note: This should never be set in an ebuild!
79ESVN_REVISION="${ESVN_REVISION:-}"
66 80
81# @ECLASS-VARIABLE: ESVN_PROJECT
82# @DESCRIPTION:
67## -- ESVN_PROJECT: project name of your ebuild (= name space) 83# project name of your ebuild (= name space)
68# 84#
69# subversion eclass will check out the subversion repository like: 85# subversion eclass will check out the subversion repository like:
70# 86#
71# ${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/} 87# ${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}
72# 88#
81# 97#
82# # jakarta commons-loggin 98# # jakarta commons-loggin
83# ESVN_PROJECT=commons/logging 99# ESVN_PROJECT=commons/logging
84# 100#
85# default: ${PN/-svn}. 101# default: ${PN/-svn}.
86#
87: ESVN_PROJECT=${ESVN_PROJECT:=${PN/-svn}} 102ESVN_PROJECT="${ESVN_PROJECT:-${PN/-svn}}"
88 103
89 104# @ECLASS-VARIABLE: ESVN_BOOTSTRAP
90## -- ESVN_BOOTSTRAP: 105# @DESCRIPTION:
91#
92# bootstrap script or command like autogen.sh or etc.. 106# bootstrap script or command like autogen.sh or etc..
93#
94: ESVN_BOOTSTRAP=${ESVN_BOOTSTRAP:=} 107ESVN_BOOTSTRAP="${ESVN_BOOTSTRAP:-}"
95 108
96 109# @ECLASS-VARIABLE: ESVN_PATCHES
97## -- ESVN_PATCHES: 110# @DESCRIPTION:
98#
99# subversion eclass can apply pathces in subversion_bootstrap(). 111# subversion eclass can apply patches in subversion_bootstrap().
100# you can use regexp in this valiable like *.diff or *.patch or etc. 112# you can use regexp in this variable like *.diff or *.patch or etc.
101# NOTE: this patches will apply before eval ESVN_BOOTSTRAP. 113# NOTE: patches will be applied before ESVN_BOOTSTRAP is processed.
102# 114#
103# the process of applying the patch is: 115# Patches are searched both in ${PWD} and ${FILESDIR}, if not found in either
104# 1. just epatch it, if the patch exists in the path. 116# location, the installation dies.
105# 2. scan it under FILESDIR and epatch it, if the patch exists in FILESDIR.
106# 3. die.
107#
108: ESVN_PATCHES=${ESVN_PATCHES:=} 117ESVN_PATCHES="${ESVN_PATCHES:-}"
109 118
110 119# @ECLASS-VARIABLE: ESVN_RESTRICT
111## -- ESVN_RESTRICT: 120# @DESCRIPTION:
112#
113# this should be a space delimited list of subversion eclass features to 121# this should be a space delimited list of subversion eclass features to
114# restrict. 122# restrict.
115# export) 123# export)
116# don't export the working copy to S. 124# don't export the working copy to S.
117#
118: ESVN_RESTRICT=${ESVN_RESTRICT:=} 125ESVN_RESTRICT="${ESVN_RESTRICT:-}"
119 126
127# @ECLASS-VARIABLE: ESVN_OFFLINE
128# @DESCRIPTION:
129# Set this variable to a non-empty value to disable the automatic updating of
130# an svn source tree. This is intended to be set outside the subversion source
131# tree by users.
132ESVN_OFFLINE="${ESVN_OFFLINE:-${ESCM_OFFLINE}}"
120 133
121## -- subversion_fetch() ----------------------------------------------------- # 134# @FUNCTION: subversion_fetch
135# @USAGE: [repo_uri] [destination]
136# @DESCRIPTION:
137# Wrapper function to fetch sources from subversion via svn checkout or svn update,
138# depending on whether there is an existing working copy in ${ESVN_STORE_DIR}.
122# 139#
140# Can take two optional parameters:
123# @param $1 - a repository URI. default is the ESVN_REPO_URI. 141# repo_uri - a repository URI. default is ESVN_REPO_URI.
124# @param $2 - a check out path in S. 142# destination - a check out path in S.
125#
126function subversion_fetch() { 143subversion_fetch() {
127
128 local repo_uri="$(subversion__get_repository_uri "${1}")" 144 local repo_uri="$(subversion__get_repository_uri "${1:-${ESVN_REPO_URI}}")"
145 local revision="$(subversion__get_peg_revision "${1:-${ESVN_REPO_URI}}")"
129 local S_dest="${2}" 146 local S_dest="${2}"
147
148 [[ -n "${ESVN_REVISION}" ]] && revision="${ESVN_REVISION}"
130 149
131 # check for the protocol 150 # check for the protocol
132 local protocol="${repo_uri%%:*}" 151 local protocol="${repo_uri%%:*}"
133 152
134 case "${protocol}" in 153 case "${protocol}" in
142 fi 161 fi
143 ;; 162 ;;
144 svn|svn+ssh) 163 svn|svn+ssh)
145 ;; 164 ;;
146 *) 165 *)
147 die "${ESVN}: fetch from "${protocol}" is not yet implemented." 166 die "${ESVN}: fetch from '${protocol}' is not yet implemented."
148 ;; 167 ;;
149 esac 168 esac
150 169
151 # every time
152 addread "/etc/subversion" 170 addread "/etc/subversion"
153 addwrite "${ESVN_STORE_DIR}" 171 addwrite "${ESVN_STORE_DIR}"
154 172
155 if [[ ! -d "${ESVN_STORE_DIR}" ]]; then 173 if [[ ! -d ${ESVN_STORE_DIR} ]]; then
156 debug-print "${FUNCNAME}: initial checkout. creating subversion directory" 174 debug-print "${FUNCNAME}: initial checkout. creating subversion directory"
157 mkdir -p "${ESVN_STORE_DIR}" || die "${ESVN}: can't mkdir ${ESVN_STORE_DIR}." 175 mkdir -p "${ESVN_STORE_DIR}" || die "${ESVN}: can't mkdir ${ESVN_STORE_DIR}."
158 fi 176 fi
159 177
160 cd "${ESVN_STORE_DIR}" || die "${ESVN}: can't chdir to ${ESVN_STORE_DIR}" 178 cd "${ESVN_STORE_DIR}" || die "${ESVN}: can't chdir to ${ESVN_STORE_DIR}"
161 179
162 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 180 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
163 local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion" 181 local options="${ESVN_OPTIONS} --config-dir ${ESVN_STORE_DIR}/.subversion"
182
183 [[ -n "${revision}" ]] && options="${options} -r ${revision}"
184
185 if [[ "${ESVN_OPTIONS}" = *-r* ]]; then
186 ewarn "\${ESVN_OPTIONS} contains -r, this usage is unsupported. Please"
187 ewarn "see \${ESVN_REPO_URI}"
188 fi
164 189
165 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\"" 190 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\""
166 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\"" 191 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\""
167 debug-print "${FUNCNAME}: options = \"${options}\"" 192 debug-print "${FUNCNAME}: options = \"${options}\""
168 193
169 if [[ ! -d "${wc_path}/.svn" ]]; then 194 if [[ ! -d ${wc_path}/.svn ]]; then
170 # first check out 195 # first check out
171 einfo "subversion check out start -->" 196 einfo "subversion check out start -->"
172 einfo " repository: ${repo_uri}" 197 einfo " repository: ${repo_uri}${revision:+@}${revision}"
173 198
174 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}" 199 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}"
175 200
176 mkdir -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}." 201 mkdir -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}."
177 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}" 202 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}"
178 ${ESVN_FETCH_CMD} ${options} "${repo_uri}" || die "${ESVN}: can't fetch from ${repo_uri}." 203 ${ESVN_FETCH_CMD} ${options} "${repo_uri}" || die "${ESVN}: can't fetch from ${repo_uri}."
179 204
205 elif [[ -n ${ESVN_OFFLINE} ]]; then
206 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy."
207 if [[ -n ${ESVN_REVISION} && ${ESVN_REVISION} != ${ESVN_WC_REVISION} ]]; then
208 die "${ESVN}: You requested off-line updating and revision ${ESVN_REVISION} but only revision ${ESVN_WC_REVISION} is available locally."
209 fi
210 einfo "Fetching disabled: Using existing repository copy"
180 else 211 else
181 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy." 212 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy."
182 213
183 if [ "${ESVN_WC_URL}" != "$(subversion__get_repository_uri "${repo_uri}" 1)" ]; then 214 if [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}") ]]; then
184 die "${ESVN}: ESVN_REPO_URI (or specified URI) and working copy's URL are not matched." 215 einfo "suversion switch start -->"
216 einfo " old repository: ${ESVN_WC_URL}@${ESVN_WC_REVISION}"
217 einfo " new repository: ${repo_uri}${revision:+@}${revision}"
218
219 debug-print "${FUNCNAME}: ${ESVN_SWITCH_CMD} ${options} ${repo_uri}"
220
221 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
222 ${ESVN_SWITCH_CMD} ${options} ${repo_uri} || die "${ESVN}: can't update from ${repo_uri}"
223 else
224 # update working copy
225 einfo "subversion update start -->"
226 einfo " repository: ${repo_uri}${revision:+@}${revision}"
227
228 debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}"
229
230 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
231 ${ESVN_UPDATE_CMD} ${options} || die "${ESVN}: can't update from ${repo_uri}."
185 fi 232 fi
186
187 # update working copy
188 einfo "subversion update start -->"
189 einfo " repository: ${repo_uri}"
190
191 debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}"
192
193 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
194 ${ESVN_UPDATE_CMD} ${options} || die "${ESVN}: can't update from ${repo_uri}."
195 233
196 fi 234 fi
197 235
198 einfo " working copy: ${wc_path}" 236 einfo " working copy: ${wc_path}"
199 237
207 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}." 245 #* svn export . "${S}" || die "${ESVN}: can't export to ${S}."
208 rsync -rlpgo --exclude=".svn/" . "${S}" || die "${ESVN}: can't export to ${S}." 246 rsync -rlpgo --exclude=".svn/" . "${S}" || die "${ESVN}: can't export to ${S}."
209 fi 247 fi
210 248
211 echo 249 echo
212
213} 250}
214 251
215 252# @FUNCTION: subversion_bootstrap
216## -- subversion_bootstrap() ------------------------------------------------ # 253# @DESCRIPTION:
217# 254# Apply patches in ${ESVN_PATCHES} and run ${ESVN_BOOTSTRAP} if specified.
218function subversion_bootstrap() { 255subversion_bootstrap() {
219
220 if has "export" ${ESVN_RESTRICT}; then 256 if has "export" ${ESVN_RESTRICT}; then
221 return 257 return
222 fi 258 fi
223 259
224 cd "${S}" 260 cd "${S}"
225 261
226 if [[ -n "${ESVN_PATCHES}" ]]; then 262 if [[ -n ${ESVN_PATCHES} ]]; then
227 einfo "apply patches -->" 263 einfo "apply patches -->"
228 264
229 local p= 265 local patch fpatch
230 266
231 for p in ${ESVN_PATCHES}; do 267 for patch in ${ESVN_PATCHES}; do
232 if [[ -f "${p}" ]]; then 268 if [[ -f ${patch} ]]; then
233 epatch "${p}" 269 epatch "${patch}"
234 270
235 else 271 else
236 local q=
237
238 for q in ${FILESDIR}/${p}; do 272 for fpatch in ${FILESDIR}/${patch}; do
239 if [[ -f "${q}" ]]; then 273 if [[ -f ${fpatch} ]]; then
240 epatch "${q}" 274 epatch "${fpatch}"
241 275
242 else 276 else
243 die "${ESVN}; ${p} is not found" 277 die "${ESVN}: ${patch} not found"
244 278
245 fi 279 fi
246 done 280 done
281
247 fi 282 fi
248 done 283 done
249 284
250 echo 285 echo
251
252 fi 286 fi
253 287
254 if [[ -n "${ESVN_BOOTSTRAP}" ]]; then 288 if [[ -n ${ESVN_BOOTSTRAP} ]]; then
255 einfo "begin bootstrap -->" 289 einfo "begin bootstrap -->"
256 290
257 if [[ -f "${ESVN_BOOTSTRAP}" && -x "${ESVN_BOOTSTRAP}" ]]; then 291 if [[ -f ${ESVN_BOOTSTRAP} && -x ${ESVN_BOOTSTRAP} ]]; then
258 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}" 292 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}"
259 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP." 293 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP."
260 294
261 else 295 else
262 einfo " bootstrap with commands: ${ESVN_BOOTSTRAP}" 296 einfo " bootstrap with command: ${ESVN_BOOTSTRAP}"
263 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP." 297 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP."
264 298
265 fi 299 fi
266 fi 300 fi
267
268} 301}
269 302
270 303# @FUNCTION: subversion_src_unpack
271## -- subversion_src_unpack() ------------------------------------------------ # 304# @DESCRIPTION:
272# 305# default src_unpack. fetch and bootstrap.
273function subversion_src_unpack() { 306subversion_src_unpack() {
274
275 subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch." 307 subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch."
276 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap." 308 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
277
278} 309}
279 310
280 311# @FUNCTION: subversion_wc_info
281## -- subversion_wc_info() --------------------------------------------------- # 312# @USAGE: [repo_uri]
313# @RETURN: ESVN_WC_URL, ESVN_WC_ROOT, ESVN_WC_UUID, ESVN_WC_REVISION and ESVN_WC_PATH
314# @DESCRIPTION:
315# Get svn info for the specified repo_uri. The default repo_uri is ESVN_REPO_URI.
282# 316#
283# @param $1 - repository URI. default is ESVN_REPO_URI. 317# The working copy information on the specified repository URI are set to
284# 318# ESVN_WC_* variables.
285function subversion_wc_info() { 319subversion_wc_info() {
286
287 local repo_uri="$(subversion__get_repository_uri "${1}")" 320 local repo_uri="$(subversion__get_repository_uri "${1}")"
288 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 321 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
289 322
290 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 323 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
291 debug-print "${FUNCNAME}: wc_path = ${wc_path}" 324 debug-print "${FUNCNAME}: wc_path = ${wc_path}"
292 325
293 if [[ ! -e "${wc_path}" ]]; then 326 if [[ ! -d ${wc_path} ]]; then
294 return 1 327 return 1
295 fi 328 fi
296 329
297 local k 330 export ESVN_WC_URL="$(subversion__svn_info "${wc_path}" "URL")"
298 331 export ESVN_WC_ROOT="$(subversion__svn_info "${wc_path}" "Repository Root")"
299 for k in url revision; do 332 export ESVN_WC_UUID="$(subversion__svn_info "${wc_path}" "Repository UUID")"
300 export ESVN_WC_$(subversion__to_upper_case "${k}")="$(subversion__svn_info "${wc_path}" "${k}")" 333 export ESVN_WC_REVISION="$(subversion__svn_info "${wc_path}" "Revision")"
301 done 334 export ESVN_WC_PATH="${wc_path}"
302
303} 335}
304
305 336
306## -- Private Functions 337## -- Private Functions
307 338
308
309## -- subversion__svn_info() ------------------------------------------------- # 339## -- subversion__svn_info() ------------------------------------------------- #
310# 340#
311# @param $1 - a target. 341# param $1 - a target.
312# @param $2 - a key name. 342# param $2 - a key name.
313# 343#
314function subversion__svn_info() { 344subversion__svn_info() {
315
316 local target="${1}" 345 local target="${1}"
317 local key="${2}" 346 local key="${2}"
318 347
319 env LC_ALL=C svn info "${target}" | grep -i "^${key}" | cut -d" " -f2- 348 env LC_ALL=C svn info "${target}" | grep -i "^${key}" | cut -d" " -f2-
320
321} 349}
322
323 350
324## -- subversion__get_repository_uri() --------------------------------------- # 351## -- subversion__get_repository_uri() --------------------------------------- #
325# 352#
326# @param $1 - a repository URI. 353# param $1 - a repository URI.
327# @param $2 - a peg revision is deleted from a return value if this is
328# specified.
329#
330function subversion__get_repository_uri() { 354subversion__get_repository_uri() {
331 355 local repo_uri="${1}"
332 local repo_uri="${1:-${ESVN_REPO_URI}}"
333 local remove_peg_revision="${2}"
334 356
335 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 357 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
336 debug-print "${FUNCNAME}: remove_peg_revision = ${remove_peg_revision}"
337 358
338 if [[ -z "${repo_uri}" ]]; then 359 if [[ -z ${repo_uri} ]]; then
339 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty." 360 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty."
340 fi 361 fi
341 362
342 # delete trailing slash 363 # delete trailing slash
343 if [[ -z "${repo_uri##*/}" ]]; then 364 if [[ -z ${repo_uri##*/} ]]; then
344 repo_uri="${repo_uri%/}" 365 repo_uri="${repo_uri%/}"
345 fi 366 fi
346 367
347 if [[ -n "${remove_peg_revision}" ]]; then
348 if subversion__has_peg_revision "${repo_uri}"; then
349 repo_uri="${repo_uri%@*}" 368 repo_uri="${repo_uri%@*}"
350
351 debug-print "${FUNCNAME}: repo_uri has a peg revision"
352 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
353 fi
354 fi
355 369
356 echo "${repo_uri}" 370 echo "${repo_uri}"
357
358} 371}
359
360 372
361## -- subversion__get_wc_path() ---------------------------------------------- # 373## -- subversion__get_wc_path() ---------------------------------------------- #
362# 374#
363# @param $1 - a repository URI. 375# param $1 - a repository URI.
364#
365function subversion__get_wc_path() { 376subversion__get_wc_path() {
366
367 local repo_uri="$(subversion__get_repository_uri "${1}" 1)" 377 local repo_uri="$(subversion__get_repository_uri "${1}")"
368 378
369 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 379 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
370 380
371 echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}" 381 echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}"
372
373} 382}
374 383
375
376## -- subversion__has_peg_revision() ----------------------------------------- # 384## -- subversion__get_peg_revision() ----------------------------------------- #
377# 385#
378# @param $1 - a repository URI. 386# param $1 - a repository URI.
379#
380function subversion__has_peg_revision() { 387subversion__get_peg_revision() {
381
382 local repo_uri="${1}" 388 local repo_uri="${1}"
383 389
384 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 390 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
385 391
386 # repo_uri has peg revision ? 392 # repo_uri has peg revision ?
387 if [[ "${repo_uri}" != *@* ]]; then 393 if [[ ${repo_uri} != *@* ]]; then
388 debug-print "${FUNCNAME}: repo_uri does not have a peg revision." 394 debug-print "${FUNCNAME}: repo_uri does not have a peg revision."
389 return 1
390 fi 395 fi
391 396
392 local peg_rev="${repo_uri##*@}" 397 local peg_rev=
393 398 [[ ${repo_uri} = *@* ]] && peg_rev="${repo_uri##*@}"
394 case "$(subversion__to_upper_case "${peg_rev}")" in
395 [[:digit:]]*)
396 # NUMBER
397 ;;
398 HEAD|BASE|COMMITED|PREV)
399 ;;
400 {[^}]*})
401 # DATE
402 ;;
403 *)
404 debug-print "${FUNCNAME}: repo_uri does not have a peg revision."
405 return 1
406 ;;
407 esac
408 399
409 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}" 400 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}"
410 401
411 return 0 402 echo "${peg_rev}"
412
413} 403}
414
415
416## -- subversion__to_upper_case() ----------------------------------------- #
417#
418# @param $@ - the strings to upper case.
419#
420function subversion__to_upper_case() {
421 echo "${@}" | tr "[a-z]" "[A-Z]"
422}

Legend:
Removed from v.1.41  
changed lines
  Added in v.1.49

  ViewVC Help
Powered by ViewVC 1.1.20