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

Diff of /eclass/subversion.eclass

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

Revision 1.44 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.44 2007/07/03 08:27:40 peper 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
24DESCRIPTION="Based on the ${ECLASS} eclass" 25DESCRIPTION="Based on the ${ECLASS} eclass"
25 26
26
27## -- add subversion in DEPEND
28#
29DEPEND="dev-util/subversion" 27DEPEND="dev-util/subversion
28 net-misc/rsync"
30 29
31 30# @ECLASS-VARIABLE: ESVN_STORE_DIR
32## -- ESVN_STORE_DIR: subversion sources store directory 31# @DESCRIPTION:
33# 32# subversion sources store directory. Users may override this in /etc/make.conf
34ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/svn-src" 33[[ -z ${ESVN_STORE_DIR} ]] && ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/svn-src"
35 34
36 35# @ECLASS-VARIABLE: ESVN_FETCH_CMD
37## -- ESVN_FETCH_CMD: subversion fetch command 36# @DESCRIPTION:
38# 37# subversion checkout command
39ESVN_FETCH_CMD="svn checkout" 38ESVN_FETCH_CMD="svn checkout"
40 39
41## -- ESVN_UPDATE_CMD: subversion update command 40# @ECLASS-VARIABLE: ESVN_UPDATE_CMD
42# 41# @DESCRIPTION:
42# subversion update command
43ESVN_UPDATE_CMD="svn update" 43ESVN_UPDATE_CMD="svn update"
44 44
45# @ECLASS-VARIABLE: ESVN_SWITCH_CMD
46# @DESCRIPTION:
47# subversion switch command
48ESVN_SWITCH_CMD="svn switch"
45 49
46## -- ESVN_OPTIONS: 50# @ECLASS-VARIABLE: ESVN_OPTIONS
47# 51# @DESCRIPTION:
48# the options passed to checkout or update. 52# the options passed to checkout or update. If you want a specific revision see
49# 53# ESVN_REPO_URI instead of using -rREV.
50: ${ESVN_OPTIONS=} 54ESVN_OPTIONS="${ESVN_OPTIONS:-}"
51 55
52 56# @ECLASS-VARIABLE: ESVN_REPO_URI
53## -- ESVN_REPO_URI: repository uri 57# @DESCRIPTION:
58# repository uri
54# 59#
55# e.g. http://foo/trunk, svn://bar/trunk 60# e.g. http://foo/trunk, svn://bar/trunk, svn://bar/branch/foo@1234
56# 61#
57# supported protocols: 62# supported protocols:
58# http:// 63# http://
59# https:// 64# https://
60# svn:// 65# svn://
61# svn+ssh:// 66# svn+ssh://
62# 67#
63: ${ESVN_REPO_URI=} 68# to peg to a specific revision, append @REV to the repo's uri
69ESVN_REPO_URI="${ESVN_REPO_URI:-}"
64 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:-}"
65 80
81# @ECLASS-VARIABLE: ESVN_PROJECT
82# @DESCRIPTION:
66## -- ESVN_PROJECT: project name of your ebuild (= name space) 83# project name of your ebuild (= name space)
67# 84#
68# subversion eclass will check out the subversion repository like: 85# subversion eclass will check out the subversion repository like:
69# 86#
70# ${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/} 87# ${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}
71# 88#
80# 97#
81# # jakarta commons-loggin 98# # jakarta commons-loggin
82# ESVN_PROJECT=commons/logging 99# ESVN_PROJECT=commons/logging
83# 100#
84# default: ${PN/-svn}. 101# default: ${PN/-svn}.
85# 102ESVN_PROJECT="${ESVN_PROJECT:-${PN/-svn}}"
86: ${ESVN_PROJECT:=${PN/-svn}}
87 103
88 104# @ECLASS-VARIABLE: ESVN_BOOTSTRAP
89## -- ESVN_BOOTSTRAP: 105# @DESCRIPTION:
90#
91# bootstrap script or command like autogen.sh or etc.. 106# bootstrap script or command like autogen.sh or etc..
92# 107ESVN_BOOTSTRAP="${ESVN_BOOTSTRAP:-}"
93: ${ESVN_BOOTSTRAP=}
94 108
95 109# @ECLASS-VARIABLE: ESVN_PATCHES
96## -- ESVN_PATCHES: 110# @DESCRIPTION:
97#
98# subversion eclass can apply pathces in subversion_bootstrap(). 111# subversion eclass can apply patches in subversion_bootstrap().
99# you can use regexp in this variable like *.diff or *.patch or etc. 112# you can use regexp in this variable like *.diff or *.patch or etc.
100# NOTE: patches will be applied before ESVN_BOOTSTRAP is processed. 113# NOTE: patches will be applied before ESVN_BOOTSTRAP is processed.
101# 114#
102# Patches are searched both in / and ${FILESDIR}, if not found in both locations, 115# Patches are searched both in ${PWD} and ${FILESDIR}, if not found in either
103# the installation dies. 116# location, the installation dies.
104# 117ESVN_PATCHES="${ESVN_PATCHES:-}"
105: ${ESVN_PATCHES=}
106 118
107 119# @ECLASS-VARIABLE: ESVN_RESTRICT
108## -- ESVN_RESTRICT: 120# @DESCRIPTION:
109#
110# 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
111# restrict. 122# restrict.
112# export) 123# export)
113# don't export the working copy to S. 124# don't export the working copy to S.
114# 125ESVN_RESTRICT="${ESVN_RESTRICT:-}"
115: ${ESVN_RESTRICT=}
116 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}}"
117 133
118## -- 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}.
119# 139#
140# Can take two optional parameters:
120# @param $1 - a repository URI. default is the ESVN_REPO_URI. 141# repo_uri - a repository URI. default is ESVN_REPO_URI.
121# @param $2 - a check out path in S. 142# destination - a check out path in S.
122#
123function subversion_fetch() { 143subversion_fetch() {
124 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}}")"
125 local S_dest="${2}" 146 local S_dest="${2}"
147
148 [[ -n "${ESVN_REVISION}" ]] && revision="${ESVN_REVISION}"
126 149
127 # check for the protocol 150 # check for the protocol
128 local protocol="${repo_uri%%:*}" 151 local protocol="${repo_uri%%:*}"
129 152
130 case "${protocol}" in 153 case "${protocol}" in
138 fi 161 fi
139 ;; 162 ;;
140 svn|svn+ssh) 163 svn|svn+ssh)
141 ;; 164 ;;
142 *) 165 *)
143 die "${ESVN}: fetch from "${protocol}" is not yet implemented." 166 die "${ESVN}: fetch from '${protocol}' is not yet implemented."
144 ;; 167 ;;
145 esac 168 esac
146 169
147 addread "/etc/subversion" 170 addread "/etc/subversion"
148 addwrite "${ESVN_STORE_DIR}" 171 addwrite "${ESVN_STORE_DIR}"
149 172
150 if [[ ! -d "${ESVN_STORE_DIR}" ]]; then 173 if [[ ! -d ${ESVN_STORE_DIR} ]]; then
151 debug-print "${FUNCNAME}: initial checkout. creating subversion directory" 174 debug-print "${FUNCNAME}: initial checkout. creating subversion directory"
152 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}."
153 fi 176 fi
154 177
155 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}"
156 179
157 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 180 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
158 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
159 189
160 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\"" 190 debug-print "${FUNCNAME}: wc_path = \"${wc_path}\""
161 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\"" 191 debug-print "${FUNCNAME}: ESVN_OPTIONS = \"${ESVN_OPTIONS}\""
162 debug-print "${FUNCNAME}: options = \"${options}\"" 192 debug-print "${FUNCNAME}: options = \"${options}\""
163 193
164 if [[ ! -d "${wc_path}/.svn" ]]; then 194 if [[ ! -d ${wc_path}/.svn ]]; then
165 # first check out 195 # first check out
166 einfo "subversion check out start -->" 196 einfo "subversion check out start -->"
167 einfo " repository: ${repo_uri}" 197 einfo " repository: ${repo_uri}${revision:+@}${revision}"
168 198
169 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}" 199 debug-print "${FUNCNAME}: ${ESVN_FETCH_CMD} ${options} ${repo_uri}"
170 200
171 mkdir -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}." 201 mkdir -p "${ESVN_PROJECT}" || die "${ESVN}: can't mkdir ${ESVN_PROJECT}."
172 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}" 202 cd "${ESVN_PROJECT}" || die "${ESVN}: can't chdir to ${ESVN_PROJECT}"
173 ${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}."
174 204
205 elif [[ -n ${ESVN_OFFLINE} ]]; then
175 subversion_wc_info "${repo_uri}" || die "${ESVN}: unknown problem occurred while accessing working copy." 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"
176 else 211 else
177 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."
213
178 if [ "${ESVN_WC_URL}" != "$(subversion__get_repository_uri "${repo_uri}" 1)" ]; then 214 if [[ ${ESVN_WC_URL} != $(subversion__get_repository_uri "${repo_uri}") ]]; then
179 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}."
180 fi 232 fi
181 233
182 # update working copy
183 einfo "subversion update start -->"
184 einfo " repository: ${repo_uri}"
185
186 debug-print "${FUNCNAME}: ${ESVN_UPDATE_CMD} ${options}"
187
188 cd "${wc_path}" || die "${ESVN}: can't chdir to ${wc_path}"
189 ${ESVN_UPDATE_CMD} ${options} || die "${ESVN}: can't update from ${repo_uri}."
190 fi 234 fi
191 235
192 einfo " working copy: ${wc_path}" 236 einfo " working copy: ${wc_path}"
193 237
194 if ! has "export" ${ESVN_RESTRICT}; then 238 if ! has "export" ${ESVN_RESTRICT}; then
203 fi 247 fi
204 248
205 echo 249 echo
206} 250}
207 251
208 252# @FUNCTION: subversion_bootstrap
209## -- subversion_bootstrap() ------------------------------------------------ # 253# @DESCRIPTION:
210# 254# Apply patches in ${ESVN_PATCHES} and run ${ESVN_BOOTSTRAP} if specified.
211function subversion_bootstrap() { 255subversion_bootstrap() {
212 if has "export" ${ESVN_RESTRICT}; then 256 if has "export" ${ESVN_RESTRICT}; then
213 return 257 return
214 fi 258 fi
215 259
216 cd "${S}" 260 cd "${S}"
217 261
218 if [[ -n "${ESVN_PATCHES}" ]]; then 262 if [[ -n ${ESVN_PATCHES} ]]; then
219 einfo "apply patches -->" 263 einfo "apply patches -->"
220 264
221 local patch fpatch 265 local patch fpatch
266
222 for patch in ${ESVN_PATCHES}; do 267 for patch in ${ESVN_PATCHES}; do
223 if [[ -f "${patch}" ]]; then 268 if [[ -f ${patch} ]]; then
224 epatch "${patch}" 269 epatch "${patch}"
270
225 else 271 else
226 for fpatch in ${FILESDIR}/${patch}; do 272 for fpatch in ${FILESDIR}/${patch}; do
227 if [[ -f "${fpatch}" ]]; then 273 if [[ -f ${fpatch} ]]; then
228 epatch "${fpatch}" 274 epatch "${fpatch}"
275
229 else 276 else
230 die "${ESVN}: ${patch} not found" 277 die "${ESVN}: ${patch} not found"
278
231 fi 279 fi
232 done 280 done
281
233 fi 282 fi
234 done 283 done
284
235 echo 285 echo
236 fi 286 fi
237 287
238 if [[ -n "${ESVN_BOOTSTRAP}" ]]; then 288 if [[ -n ${ESVN_BOOTSTRAP} ]]; then
239 einfo "begin bootstrap -->" 289 einfo "begin bootstrap -->"
240 290
241 if [[ -f "${ESVN_BOOTSTRAP}" && -x "${ESVN_BOOTSTRAP}" ]]; then 291 if [[ -f ${ESVN_BOOTSTRAP} && -x ${ESVN_BOOTSTRAP} ]]; then
242 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}" 292 einfo " bootstrap with a file: ${ESVN_BOOTSTRAP}"
243 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP." 293 eval "./${ESVN_BOOTSTRAP}" || die "${ESVN}: can't execute ESVN_BOOTSTRAP."
294
244 else 295 else
245 einfo " bootstrap with command: ${ESVN_BOOTSTRAP}" 296 einfo " bootstrap with command: ${ESVN_BOOTSTRAP}"
246 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP." 297 eval "${ESVN_BOOTSTRAP}" || die "${ESVN}: can't eval ESVN_BOOTSTRAP."
298
247 fi 299 fi
248 fi 300 fi
249} 301}
250 302
251## -- subversion_src_unpack() ------------------------------------------------ # 303# @FUNCTION: subversion_src_unpack
252# 304# @DESCRIPTION:
305# default src_unpack. fetch and bootstrap.
253function subversion_src_unpack() { 306subversion_src_unpack() {
254 subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch." 307 subversion_fetch || die "${ESVN}: unknown problem occurred in subversion_fetch."
255 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap." 308 subversion_bootstrap || die "${ESVN}: unknown problem occurred in subversion_bootstrap."
256} 309}
257 310
258 311# @FUNCTION: subversion_wc_info
259## -- 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.
260# 316#
261# @param $1 - repository URI. default is ESVN_REPO_URI. 317# The working copy information on the specified repository URI are set to
262# 318# ESVN_WC_* variables.
263function subversion_wc_info() { 319subversion_wc_info() {
264 local repo_uri="$(subversion__get_repository_uri "${1}")" 320 local repo_uri="$(subversion__get_repository_uri "${1}")"
265 local wc_path="$(subversion__get_wc_path "${repo_uri}")" 321 local wc_path="$(subversion__get_wc_path "${repo_uri}")"
266 322
267 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 323 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
268 debug-print "${FUNCNAME}: wc_path = ${wc_path}" 324 debug-print "${FUNCNAME}: wc_path = ${wc_path}"
269 325
270 if [[ ! -e "${wc_path}" ]]; then 326 if [[ ! -d ${wc_path} ]]; then
271 return 1 327 return 1
272 fi 328 fi
273 329
274 local k 330 export ESVN_WC_URL="$(subversion__svn_info "${wc_path}" "URL")"
275 for k in url revision; do 331 export ESVN_WC_ROOT="$(subversion__svn_info "${wc_path}" "Repository Root")"
276 export ESVN_WC_$(subversion__to_upper_case "${k}")="$(subversion__svn_info "${wc_path}" "${k}")" 332 export ESVN_WC_UUID="$(subversion__svn_info "${wc_path}" "Repository UUID")"
277 done 333 export ESVN_WC_REVISION="$(subversion__svn_info "${wc_path}" "Revision")"
334 export ESVN_WC_PATH="${wc_path}"
278} 335}
279 336
280## -- Private Functions 337## -- Private Functions
281 338
282
283## -- subversion__svn_info() ------------------------------------------------- # 339## -- subversion__svn_info() ------------------------------------------------- #
284# 340#
285# @param $1 - a target. 341# param $1 - a target.
286# @param $2 - a key name. 342# param $2 - a key name.
287# 343#
288function subversion__svn_info() { 344subversion__svn_info() {
289 local target="${1}" 345 local target="${1}"
290 local key="${2}" 346 local key="${2}"
291 347
292 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-
293} 349}
294 350
295
296## -- subversion__get_repository_uri() --------------------------------------- # 351## -- subversion__get_repository_uri() --------------------------------------- #
297# 352#
298# @param $1 - a repository URI. 353# param $1 - a repository URI.
299# @param $2 - a peg revision is deleted from a return value if this is
300# specified.
301#
302function subversion__get_repository_uri() { 354subversion__get_repository_uri() {
303 local repo_uri="${1:-${ESVN_REPO_URI}}" 355 local repo_uri="${1}"
304 local remove_peg_revision="${2}"
305 356
306 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 357 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
307 debug-print "${FUNCNAME}: remove_peg_revision = ${remove_peg_revision}"
308 358
309 if [[ -z "${repo_uri}" ]]; then 359 if [[ -z ${repo_uri} ]]; then
310 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty." 360 die "${ESVN}: ESVN_REPO_URI (or specified URI) is empty."
311 fi 361 fi
312 362
313 # delete trailing slash 363 # delete trailing slash
314 if [[ -z "${repo_uri##*/}" ]]; then 364 if [[ -z ${repo_uri##*/} ]]; then
315 repo_uri="${repo_uri%/}" 365 repo_uri="${repo_uri%/}"
316 fi 366 fi
317 367
318 if [[ -n "${remove_peg_revision}" ]]; then
319 if subversion__has_peg_revision "${repo_uri}"; then
320 repo_uri="${repo_uri%@*}" 368 repo_uri="${repo_uri%@*}"
321
322 debug-print "${FUNCNAME}: repo_uri has a peg revision"
323 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
324 fi
325 fi
326 369
327 echo "${repo_uri}" 370 echo "${repo_uri}"
328} 371}
329 372
330
331## -- subversion__get_wc_path() ---------------------------------------------- # 373## -- subversion__get_wc_path() ---------------------------------------------- #
332# 374#
333# @param $1 - a repository URI. 375# param $1 - a repository URI.
334#
335function subversion__get_wc_path() { 376subversion__get_wc_path() {
336 local repo_uri="$(subversion__get_repository_uri "${1}" 1)" 377 local repo_uri="$(subversion__get_repository_uri "${1}")"
337 378
338 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 379 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
339 380
340 echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}" 381 echo "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${repo_uri##*/}"
341} 382}
342 383
343
344## -- subversion__has_peg_revision() ----------------------------------------- # 384## -- subversion__get_peg_revision() ----------------------------------------- #
345# 385#
346# @param $1 - a repository URI. 386# param $1 - a repository URI.
347#
348function subversion__has_peg_revision() { 387subversion__get_peg_revision() {
349 local repo_uri="${1}" 388 local repo_uri="${1}"
350 389
351 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}" 390 debug-print "${FUNCNAME}: repo_uri = ${repo_uri}"
352 391
353 # repo_uri has peg revision ? 392 # repo_uri has peg revision ?
354 if [[ "${repo_uri}" != *@* ]]; then 393 if [[ ${repo_uri} != *@* ]]; then
355 debug-print "${FUNCNAME}: repo_uri does not have a peg revision." 394 debug-print "${FUNCNAME}: repo_uri does not have a peg revision."
356 return 1
357 fi 395 fi
358 396
359 local peg_rev="${repo_uri##*@}" 397 local peg_rev=
360 398 [[ ${repo_uri} = *@* ]] && peg_rev="${repo_uri##*@}"
361 case "$(subversion__to_upper_case "${peg_rev}")" in
362 [[:digit:]]*)
363 # NUMBER
364 ;;
365 HEAD|BASE|COMMITED|PREV)
366 ;;
367 {[^}]*})
368 # DATE
369 ;;
370 *)
371 debug-print "${FUNCNAME}: repo_uri does not have a peg revision."
372 return 1
373 ;;
374 esac
375 399
376 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}" 400 debug-print "${FUNCNAME}: peg_rev = ${peg_rev}"
377 401
378 return 0 402 echo "${peg_rev}"
379} 403}
380
381
382## -- subversion__to_upper_case() ----------------------------------------- #
383#
384# @param $@ - the strings to upper case.
385#
386function subversion__to_upper_case() {
387 echo "${@}" | tr "[a-z]" "[A-Z]"
388}

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

  ViewVC Help
Powered by ViewVC 1.1.20