/[gentoo-x86]/eclass/git-2.eclass
Gentoo

Diff of /eclass/git-2.eclass

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

Revision 1.17 Revision 1.24
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2011 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/git-2.eclass,v 1.17 2011/09/23 13:57:15 mgorny Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v 1.24 2011/09/23 13:58:58 mgorny Exp $
4 4
5# @ECLASS: git-2.eclass 5# @ECLASS: git-2.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Donnie Berkholz <dberkholz@gentoo.org> 7# Donnie Berkholz <dberkholz@gentoo.org>
8# @BLURB: Eclass for fetching and unpacking git repositories. 8# @BLURB: Eclass for fetching and unpacking git repositories.
118# @DESCRIPTION: 118# @DESCRIPTION:
119# If non-empty this variable bans unpacking of ${A} content into the srcdir. 119# If non-empty this variable bans unpacking of ${A} content into the srcdir.
120# Default behaviour is to unpack ${A} content. 120# Default behaviour is to unpack ${A} content.
121 121
122# @FUNCTION: git-2_init_variables 122# @FUNCTION: git-2_init_variables
123# @INTERNAL
123# @DESCRIPTION: 124# @DESCRIPTION:
124# Internal function initializing all git variables. 125# Internal function initializing all git variables.
125# We define it in function scope so user can define 126# We define it in function scope so user can define
126# all the variables before and after inherit. 127# all the variables before and after inherit.
127git-2_init_variables() { 128git-2_init_variables() {
158 159
159 : ${EGIT_PRUNE:=} 160 : ${EGIT_PRUNE:=}
160} 161}
161 162
162# @FUNCTION: git-2_submodules 163# @FUNCTION: git-2_submodules
164# @INTERNAL
163# @DESCRIPTION: 165# @DESCRIPTION:
164# Internal function wrapping the submodule initialisation and update. 166# Internal function wrapping the submodule initialisation and update.
165git-2_submodules() { 167git-2_submodules() {
166 debug-print-function ${FUNCNAME} "$@" 168 debug-print-function ${FUNCNAME} "$@"
167 if [[ ${EGIT_HAS_SUBMODULES} ]]; then 169 if [[ ${EGIT_HAS_SUBMODULES} ]]; then
184 popd > /dev/null 186 popd > /dev/null
185 fi 187 fi
186} 188}
187 189
188# @FUNCTION: git-2_branch 190# @FUNCTION: git-2_branch
191# @INTERNAL
189# @DESCRIPTION: 192# @DESCRIPTION:
190# Internal function that changes branch for the repo based on EGIT_COMMIT and 193# Internal function that changes branch for the repo based on EGIT_COMMIT and
191# EGIT_BRANCH variables. 194# EGIT_BRANCH variables.
192git-2_branch() { 195git-2_branch() {
193 debug-print-function ${FUNCNAME} "$@" 196 debug-print-function ${FUNCNAME} "$@"
208 211
209 popd > /dev/null 212 popd > /dev/null
210} 213}
211 214
212# @FUNCTION: git-2_gc 215# @FUNCTION: git-2_gc
216# @INTERNAL
213# @DESCRIPTION: 217# @DESCRIPTION:
214# Internal function running garbage collector on checked out tree. 218# Internal function running garbage collector on checked out tree.
215git-2_gc() { 219git-2_gc() {
216 debug-print-function ${FUNCNAME} "$@" 220 debug-print-function ${FUNCNAME} "$@"
217 221
218 local args 222 local args
219 223
220 pushd "${EGIT_DIR}" > /dev/null
221 if [[ ${EGIT_REPACK} || ${EGIT_PRUNE} ]]; then 224 if [[ ${EGIT_REPACK} || ${EGIT_PRUNE} ]]; then
225 pushd "${EGIT_DIR}" > /dev/null
222 ebegin "Garbage collecting the repository" 226 ebegin "Garbage collecting the repository"
223 [[ ${EGIT_PRUNE} ]] && args='--prune' 227 [[ ${EGIT_PRUNE} ]] && args='--prune'
224 debug-print "${FUNCNAME}: git gc ${args}" 228 debug-print "${FUNCNAME}: git gc ${args}"
225 git gc ${args} 229 git gc ${args}
226 eend $? 230 eend $?
227 fi
228 popd > /dev/null 231 popd > /dev/null
232 fi
229} 233}
230 234
231# @FUNCTION: git-2_prepare_storedir 235# @FUNCTION: git-2_prepare_storedir
236# @INTERNAL
232# @DESCRIPTION: 237# @DESCRIPTION:
233# Internal function preparing directory where we are going to store SCM 238# Internal function preparing directory where we are going to store SCM
234# repository. 239# repository.
235git-2_prepare_storedir() { 240git-2_prepare_storedir() {
236 debug-print-function ${FUNCNAME} "$@" 241 debug-print-function ${FUNCNAME} "$@"
257 clone_dir=${EGIT_PROJECT} 262 clone_dir=${EGIT_PROJECT}
258 else 263 else
259 clone_dir=${EGIT_REPO_URI##*/} 264 clone_dir=${EGIT_REPO_URI##*/}
260 fi 265 fi
261 EGIT_DIR=${EGIT_STORE_DIR}/${clone_dir} 266 EGIT_DIR=${EGIT_STORE_DIR}/${clone_dir}
267
268 # Try to migrate from git.eclass git-src/
269 if [[ ! -d ${EGIT_DIR} && ${EGIT_STORE_DIR} == */egit-src ]]; then
270 local old_store_dir=${EGIT_STORE_DIR/%egit-src/git-src}
271 local old_location=${old_store_dir}/${EGIT_PROJECT:-${PN}}
272
273 if [[ -d ${old_location} ]]; then
274 elog "${FUNCNAME}: ${CATEGORY}/${PF} will be cloned from old location."
275 elog "It will be necessary to rebuild the package to fetch updates."
276 EGIT_REPO_URI="${old_location} ${EGIT_REPO_URI}"
277 fi
278 fi
262 fi 279 fi
263 export EGIT_DIR=${EGIT_DIR} 280 export EGIT_DIR=${EGIT_DIR}
264 debug-print "${FUNCNAME}: Storing the repo into \"${EGIT_DIR}\"." 281 debug-print "${FUNCNAME}: Storing the repo into \"${EGIT_DIR}\"."
265} 282}
266 283
267# @FUNCTION: git-2_move_source 284# @FUNCTION: git-2_move_source
285# @INTERNAL
268# @DESCRIPTION: 286# @DESCRIPTION:
269# Internal function moving sources from the EGIT_DIR to EGIT_SOURCEDIR dir. 287# Internal function moving sources from the EGIT_DIR to EGIT_SOURCEDIR dir.
270git-2_move_source() { 288git-2_move_source() {
271 debug-print-function ${FUNCNAME} "$@" 289 debug-print-function ${FUNCNAME} "$@"
272 290
278 || die "${FUNCNAME}: sync to \"${EGIT_SOURCEDIR}\" failed" 296 || die "${FUNCNAME}: sync to \"${EGIT_SOURCEDIR}\" failed"
279 popd > /dev/null 297 popd > /dev/null
280} 298}
281 299
282# @FUNCTION: git-2_initial_clone 300# @FUNCTION: git-2_initial_clone
301# @INTERNAL
283# @DESCRIPTION: 302# @DESCRIPTION:
284# Internal function running initial clone on specified repo_uri. 303# Internal function running initial clone on specified repo_uri.
285git-2_initial_clone() { 304git-2_initial_clone() {
286 debug-print-function ${FUNCNAME} "$@" 305 debug-print-function ${FUNCNAME} "$@"
287 306
288 local repo_uri 307 local repo_uri
289 308
290 EGIT_REPO_URI_SELECTED="" 309 EGIT_REPO_URI_SELECTED=""
291 for repo_uri in ${EGIT_REPO_URI}; do 310 for repo_uri in ${EGIT_REPO_URI}; do
292 debug-print "${FUNCNAME}: git clone ${EGIT_LOCAL_OPTIONS} \"${repo_uri}\" \"${EGIT_DIR}\"" 311 debug-print "${FUNCNAME}: git clone ${EGIT_LOCAL_OPTIONS} \"${repo_uri}\" \"${EGIT_DIR}\""
293 git clone ${EGIT_LOCAL_OPTIONS} "${repo_uri}" "${EGIT_DIR}" 312 if git clone ${EGIT_LOCAL_OPTIONS} "${repo_uri}" "${EGIT_DIR}"; then
294 if [[ $? -eq 0 ]]; then
295 # global variable containing the repo_name we will be using 313 # global variable containing the repo_name we will be using
296 debug-print "${FUNCNAME}: EGIT_REPO_URI_SELECTED=\"${repo_uri}\"" 314 debug-print "${FUNCNAME}: EGIT_REPO_URI_SELECTED=\"${repo_uri}\""
297 EGIT_REPO_URI_SELECTED="${repo_uri}" 315 EGIT_REPO_URI_SELECTED="${repo_uri}"
298 break 316 break
299 fi 317 fi
302 [[ ${EGIT_REPO_URI_SELECTED} ]] \ 320 [[ ${EGIT_REPO_URI_SELECTED} ]] \
303 || die "${FUNCNAME}: can't fetch from ${EGIT_REPO_URI}" 321 || die "${FUNCNAME}: can't fetch from ${EGIT_REPO_URI}"
304} 322}
305 323
306# @FUNCTION: git-2_update_repo 324# @FUNCTION: git-2_update_repo
325# @INTERNAL
307# @DESCRIPTION: 326# @DESCRIPTION:
308# Internal function running update command on specified repo_uri. 327# Internal function running update command on specified repo_uri.
309git-2_update_repo() { 328git-2_update_repo() {
310 debug-print-function ${FUNCNAME} "$@" 329 debug-print-function ${FUNCNAME} "$@"
311 330
324 for repo_uri in ${EGIT_REPO_URI}; do 343 for repo_uri in ${EGIT_REPO_URI}; do
325 # git urls might change, so reset it 344 # git urls might change, so reset it
326 git config remote.origin.url "${repo_uri}" 345 git config remote.origin.url "${repo_uri}"
327 346
328 debug-print "${EGIT_UPDATE_CMD}" 347 debug-print "${EGIT_UPDATE_CMD}"
329 ${EGIT_UPDATE_CMD} > /dev/null 348 if ${EGIT_UPDATE_CMD} > /dev/null; then
330 if [[ $? -eq 0 ]]; then
331 # global variable containing the repo_name we will be using 349 # global variable containing the repo_name we will be using
332 debug-print "${FUNCNAME}: EGIT_REPO_URI_SELECTED=\"${repo_uri}\"" 350 debug-print "${FUNCNAME}: EGIT_REPO_URI_SELECTED=\"${repo_uri}\""
333 EGIT_REPO_URI_SELECTED="${repo_uri}" 351 EGIT_REPO_URI_SELECTED="${repo_uri}"
334 break 352 break
335 fi 353 fi
338 [[ ${EGIT_REPO_URI_SELECTED} ]] \ 356 [[ ${EGIT_REPO_URI_SELECTED} ]] \
339 || die "${FUNCNAME}: can't update from ${EGIT_REPO_URI}" 357 || die "${FUNCNAME}: can't update from ${EGIT_REPO_URI}"
340} 358}
341 359
342# @FUNCTION: git-2_fetch 360# @FUNCTION: git-2_fetch
361# @INTERNAL
343# @DESCRIPTION: 362# @DESCRIPTION:
344# Internal function fetching repository from EGIT_REPO_URI and storing it in 363# Internal function fetching repository from EGIT_REPO_URI and storing it in
345# specified EGIT_STORE_DIR. 364# specified EGIT_STORE_DIR.
346git-2_fetch() { 365git-2_fetch() {
347 debug-print-function ${FUNCNAME} "$@" 366 debug-print-function ${FUNCNAME} "$@"
396 echo " storage directory: \"${EGIT_DIR}\"" 415 echo " storage directory: \"${EGIT_DIR}\""
397 echo " checkout type: ${repo_type}" 416 echo " checkout type: ${repo_type}"
398} 417}
399 418
400# @FUNCTION: git_bootstrap 419# @FUNCTION: git_bootstrap
420# @INTERNAL
401# @DESCRIPTION: 421# @DESCRIPTION:
402# Internal function that runs bootstrap command on unpacked source. 422# Internal function that runs bootstrap command on unpacked source.
403git-2_bootstrap() { 423git-2_bootstrap() {
404 debug-print-function ${FUNCNAME} "$@" 424 debug-print-function ${FUNCNAME} "$@"
405 425
438 popd > /dev/null 458 popd > /dev/null
439 fi 459 fi
440} 460}
441 461
442# @FUNCTION: git-2_migrate_repository 462# @FUNCTION: git-2_migrate_repository
463# @INTERNAL
443# @DESCRIPTION: 464# @DESCRIPTION:
444# Internal function migrating between bare and normal checkout repository. 465# Internal function migrating between bare and normal checkout repository.
445# This is based on usage of EGIT_SUBMODULES, at least until they 466# This is based on usage of EGIT_SUBMODULES, at least until they
446# start to work with bare checkouts sanely. 467# start to work with bare checkouts sanely.
447# This function also set some global variables that differ between 468# This function also set some global variables that differ between
448# bare and non-bare checkout. 469# bare and non-bare checkout.
449git-2_migrate_repository() { 470git-2_migrate_repository() {
450 debug-print-function ${FUNCNAME} "$@" 471 debug-print-function ${FUNCNAME} "$@"
451 472
452 local target returnstate 473 local bare returnstate
453 474
454 # first find out if we have submodules 475 # first find out if we have submodules
476 # or user explicitly wants us to use non-bare clones
455 if [[ ! ${EGIT_HAS_SUBMODULES} ]]; then 477 if ! [[ ${EGIT_HAS_SUBMODULES} || ${EGIT_NONBARE} ]]; then
456 target="bare" 478 bare=1
457 else
458 target="full"
459 fi
460 # check if user didn't specify that we want non-bare repo
461 if [[ ${EGIT_NONBARE} ]]; then
462 target="full"
463 EGIT_LOCAL_NONBARE="true"
464 fi 479 fi
465 480
466 # test if we already have some repo and if so find out if we have 481 # test if we already have some repo and if so find out if we have
467 # to migrate the data 482 # to migrate the data
468 if [[ -d ${EGIT_DIR} ]]; then 483 if [[ -d ${EGIT_DIR} ]]; then
469 if [[ ${target} == bare && -d ${EGIT_DIR}/.git ]]; then 484 if [[ ${bare} && -d ${EGIT_DIR}/.git ]]; then
470 debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to bare copy" 485 debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to bare copy"
471 486
472 ebegin "Converting \"${EGIT_DIR}\" from non-bare to bare copy" 487 ebegin "Converting \"${EGIT_DIR}\" from non-bare to bare copy"
473 mv "${EGIT_DIR}/.git" "${EGIT_DIR}.bare" 488 mv "${EGIT_DIR}/.git" "${EGIT_DIR}.bare"
474 export GIT_DIR="${EGIT_DIR}.bare" 489 export GIT_DIR="${EGIT_DIR}.bare"
476 returnstate=$? 491 returnstate=$?
477 unset GIT_DIR 492 unset GIT_DIR
478 rm -rf "${EGIT_DIR}" 493 rm -rf "${EGIT_DIR}"
479 mv "${EGIT_DIR}.bare" "${EGIT_DIR}" 494 mv "${EGIT_DIR}.bare" "${EGIT_DIR}"
480 eend ${returnstate} 495 eend ${returnstate}
481 fi
482 if [[ ${target} == full && ! -d ${EGIT_DIR}/.git ]]; then 496 elif [[ ! ${bare} && ! -d ${EGIT_DIR}/.git ]]; then
483 debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to non-bare copy" 497 debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to non-bare copy"
484 498
485 ebegin "Converting \"${EGIT_DIR}\" from bare to non-bare copy" 499 ebegin "Converting \"${EGIT_DIR}\" from bare to non-bare copy"
486 git clone -l "${EGIT_DIR}" "${EGIT_DIR}.nonbare" > /dev/null 500 git clone -l "${EGIT_DIR}" "${EGIT_DIR}.nonbare" > /dev/null
487 returnstate=$? 501 returnstate=$?
497 einfo "Migration failed, removing \"${EGIT_DIR}\" to start from scratch." 511 einfo "Migration failed, removing \"${EGIT_DIR}\" to start from scratch."
498 rm -rf "${EGIT_DIR}" 512 rm -rf "${EGIT_DIR}"
499 fi 513 fi
500 514
501 # set various options to work with both targets 515 # set various options to work with both targets
502 if [[ ${target} == bare ]]; then 516 if [[ ${bare} ]]; then
503 debug-print "${FUNCNAME}: working in bare repository for \"${EGIT_DIR}\"" 517 debug-print "${FUNCNAME}: working in bare repository for \"${EGIT_DIR}\""
504 EGIT_LOCAL_OPTIONS+="${EGIT_OPTIONS} --bare" 518 EGIT_LOCAL_OPTIONS+="${EGIT_OPTIONS} --bare"
505 MOVE_COMMAND="git clone -l -s -n ${EGIT_DIR// /\\ }" 519 MOVE_COMMAND="git clone -l -s -n ${EGIT_DIR// /\\ }"
506 EGIT_UPDATE_CMD="git fetch -t -f -u origin ${EGIT_BRANCH}:${EGIT_BRANCH}" 520 EGIT_UPDATE_CMD="git fetch -t -f -u origin ${EGIT_BRANCH}:${EGIT_BRANCH}"
507 UPSTREAM_BRANCH="${EGIT_BRANCH}" 521 UPSTREAM_BRANCH="${EGIT_BRANCH}"
522 EGIT_LOCAL_NONBARE=
508 else 523 else
509 debug-print "${FUNCNAME}: working in bare repository for non-bare \"${EGIT_DIR}\"" 524 debug-print "${FUNCNAME}: working in bare repository for non-bare \"${EGIT_DIR}\""
510 MOVE_COMMAND="cp -pPR ." 525 MOVE_COMMAND="cp -pPR ."
511 EGIT_LOCAL_OPTIONS="${EGIT_OPTIONS}" 526 EGIT_LOCAL_OPTIONS="${EGIT_OPTIONS}"
512 EGIT_UPDATE_CMD="git pull -f -u ${EGIT_OPTIONS}" 527 EGIT_UPDATE_CMD="git pull -f -u ${EGIT_OPTIONS}"
514 EGIT_LOCAL_NONBARE="true" 529 EGIT_LOCAL_NONBARE="true"
515 fi 530 fi
516} 531}
517 532
518# @FUNCTION: git-2_cleanup 533# @FUNCTION: git-2_cleanup
534# @INTERNAL
519# @DESCRIPTION: 535# @DESCRIPTION:
520# Internal function cleaning up all the global variables 536# Internal function cleaning up all the global variables
521# that are not required after the unpack has been done. 537# that are not required after the unpack has been done.
522git-2_cleanup() { 538git-2_cleanup() {
523 debug-print-function ${FUNCNAME} "$@" 539 debug-print-function ${FUNCNAME} "$@"

Legend:
Removed from v.1.17  
changed lines
  Added in v.1.24

  ViewVC Help
Powered by ViewVC 1.1.20