/[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.18 Revision 1.25
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.18 2011/09/23 13:57:28 mgorny Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v 1.25 2011/09/23 13:59:11 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} "$@"
246 || die "${FUNCNAME}: can't mkdir \"${EGIT_STORE_DIR}\"" 251 || die "${FUNCNAME}: can't mkdir \"${EGIT_STORE_DIR}\""
247 fi 252 fi
248 253
249 # allow writing into EGIT_STORE_DIR 254 # allow writing into EGIT_STORE_DIR
250 addwrite "${EGIT_STORE_DIR}" 255 addwrite "${EGIT_STORE_DIR}"
256
257 # calculate git.eclass store dir for data
258 # We will try to clone the old repository,
259 # and we will remove it if we don't need it anymore.
260 EGIT_OLD_CLONE=
261 if [[ ${EGIT_STORE_DIR} == */egit-src ]]; then
262 local old_store_dir=${EGIT_STORE_DIR/%egit-src/git-src}
263 local old_location=${old_store_dir}/${EGIT_PROJECT:-${PN}}
264
265 if [[ -d ${old_location} ]]; then
266 EGIT_OLD_CLONE=${old_location}
267 # required to remove the old clone
268 addwrite "${old_store_dir}"
269 fi
270 fi
271
251 # calculate the proper store dir for data 272 # calculate the proper store dir for data
252 # If user didn't specify the EGIT_DIR, we check if he did specify 273 # If user didn't specify the EGIT_DIR, we check if he did specify
253 # the EGIT_PROJECT or get the folder name from EGIT_REPO_URI. 274 # the EGIT_PROJECT or get the folder name from EGIT_REPO_URI.
254 EGIT_REPO_URI=${EGIT_REPO_URI%/} 275 EGIT_REPO_URI=${EGIT_REPO_URI%/}
255 if [[ ! ${EGIT_DIR} ]]; then 276 if [[ ! ${EGIT_DIR} ]]; then
257 clone_dir=${EGIT_PROJECT} 278 clone_dir=${EGIT_PROJECT}
258 else 279 else
259 clone_dir=${EGIT_REPO_URI##*/} 280 clone_dir=${EGIT_REPO_URI##*/}
260 fi 281 fi
261 EGIT_DIR=${EGIT_STORE_DIR}/${clone_dir} 282 EGIT_DIR=${EGIT_STORE_DIR}/${clone_dir}
283
284 if [[ ${EGIT_OLD_CLONE} && ! -d ${EGIT_DIR} ]]; then
285 elog "${FUNCNAME}: ${CATEGORY}/${PF} will be cloned from old location."
286 elog "It will be necessary to rebuild the package to fetch updates."
287 EGIT_REPO_URI="${EGIT_OLD_CLONE} ${EGIT_REPO_URI}"
288 fi
262 fi 289 fi
263 export EGIT_DIR=${EGIT_DIR} 290 export EGIT_DIR=${EGIT_DIR}
264 debug-print "${FUNCNAME}: Storing the repo into \"${EGIT_DIR}\"." 291 debug-print "${FUNCNAME}: Storing the repo into \"${EGIT_DIR}\"."
265} 292}
266 293
267# @FUNCTION: git-2_move_source 294# @FUNCTION: git-2_move_source
295# @INTERNAL
268# @DESCRIPTION: 296# @DESCRIPTION:
269# Internal function moving sources from the EGIT_DIR to EGIT_SOURCEDIR dir. 297# Internal function moving sources from the EGIT_DIR to EGIT_SOURCEDIR dir.
270git-2_move_source() { 298git-2_move_source() {
271 debug-print-function ${FUNCNAME} "$@" 299 debug-print-function ${FUNCNAME} "$@"
272 300
278 || die "${FUNCNAME}: sync to \"${EGIT_SOURCEDIR}\" failed" 306 || die "${FUNCNAME}: sync to \"${EGIT_SOURCEDIR}\" failed"
279 popd > /dev/null 307 popd > /dev/null
280} 308}
281 309
282# @FUNCTION: git-2_initial_clone 310# @FUNCTION: git-2_initial_clone
311# @INTERNAL
283# @DESCRIPTION: 312# @DESCRIPTION:
284# Internal function running initial clone on specified repo_uri. 313# Internal function running initial clone on specified repo_uri.
285git-2_initial_clone() { 314git-2_initial_clone() {
286 debug-print-function ${FUNCNAME} "$@" 315 debug-print-function ${FUNCNAME} "$@"
287 316
301 [[ ${EGIT_REPO_URI_SELECTED} ]] \ 330 [[ ${EGIT_REPO_URI_SELECTED} ]] \
302 || die "${FUNCNAME}: can't fetch from ${EGIT_REPO_URI}" 331 || die "${FUNCNAME}: can't fetch from ${EGIT_REPO_URI}"
303} 332}
304 333
305# @FUNCTION: git-2_update_repo 334# @FUNCTION: git-2_update_repo
335# @INTERNAL
306# @DESCRIPTION: 336# @DESCRIPTION:
307# Internal function running update command on specified repo_uri. 337# Internal function running update command on specified repo_uri.
308git-2_update_repo() { 338git-2_update_repo() {
309 debug-print-function ${FUNCNAME} "$@" 339 debug-print-function ${FUNCNAME} "$@"
310 340
336 [[ ${EGIT_REPO_URI_SELECTED} ]] \ 366 [[ ${EGIT_REPO_URI_SELECTED} ]] \
337 || die "${FUNCNAME}: can't update from ${EGIT_REPO_URI}" 367 || die "${FUNCNAME}: can't update from ${EGIT_REPO_URI}"
338} 368}
339 369
340# @FUNCTION: git-2_fetch 370# @FUNCTION: git-2_fetch
371# @INTERNAL
341# @DESCRIPTION: 372# @DESCRIPTION:
342# Internal function fetching repository from EGIT_REPO_URI and storing it in 373# Internal function fetching repository from EGIT_REPO_URI and storing it in
343# specified EGIT_STORE_DIR. 374# specified EGIT_STORE_DIR.
344git-2_fetch() { 375git-2_fetch() {
345 debug-print-function ${FUNCNAME} "$@" 376 debug-print-function ${FUNCNAME} "$@"
391 [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]] \ 422 [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]] \
392 && echo " commit: ${EGIT_COMMIT}" 423 && echo " commit: ${EGIT_COMMIT}"
393 echo " branch: ${EGIT_BRANCH}" 424 echo " branch: ${EGIT_BRANCH}"
394 echo " storage directory: \"${EGIT_DIR}\"" 425 echo " storage directory: \"${EGIT_DIR}\""
395 echo " checkout type: ${repo_type}" 426 echo " checkout type: ${repo_type}"
427
428 # Cleanup after git.eclass
429 if [[ ${EGIT_OLD_CLONE} ]]; then
430 einfo "${FUNCNAME}: removing old clone in ${EGIT_OLD_CLONE}."
431 rm -rf "${EGIT_OLD_CLONE}"
432 fi
396} 433}
397 434
398# @FUNCTION: git_bootstrap 435# @FUNCTION: git_bootstrap
436# @INTERNAL
399# @DESCRIPTION: 437# @DESCRIPTION:
400# Internal function that runs bootstrap command on unpacked source. 438# Internal function that runs bootstrap command on unpacked source.
401git-2_bootstrap() { 439git-2_bootstrap() {
402 debug-print-function ${FUNCNAME} "$@" 440 debug-print-function ${FUNCNAME} "$@"
403 441
436 popd > /dev/null 474 popd > /dev/null
437 fi 475 fi
438} 476}
439 477
440# @FUNCTION: git-2_migrate_repository 478# @FUNCTION: git-2_migrate_repository
479# @INTERNAL
441# @DESCRIPTION: 480# @DESCRIPTION:
442# Internal function migrating between bare and normal checkout repository. 481# Internal function migrating between bare and normal checkout repository.
443# This is based on usage of EGIT_SUBMODULES, at least until they 482# This is based on usage of EGIT_SUBMODULES, at least until they
444# start to work with bare checkouts sanely. 483# start to work with bare checkouts sanely.
445# This function also set some global variables that differ between 484# This function also set some global variables that differ between
446# bare and non-bare checkout. 485# bare and non-bare checkout.
447git-2_migrate_repository() { 486git-2_migrate_repository() {
448 debug-print-function ${FUNCNAME} "$@" 487 debug-print-function ${FUNCNAME} "$@"
449 488
450 local target returnstate 489 local bare returnstate
451 490
452 # first find out if we have submodules 491 # first find out if we have submodules
492 # or user explicitly wants us to use non-bare clones
453 if [[ ! ${EGIT_HAS_SUBMODULES} ]]; then 493 if ! [[ ${EGIT_HAS_SUBMODULES} || ${EGIT_NONBARE} ]]; then
454 target="bare" 494 bare=1
455 else
456 target="full"
457 fi
458 # check if user didn't specify that we want non-bare repo
459 if [[ ${EGIT_NONBARE} ]]; then
460 target="full"
461 EGIT_LOCAL_NONBARE="true"
462 fi 495 fi
463 496
464 # test if we already have some repo and if so find out if we have 497 # test if we already have some repo and if so find out if we have
465 # to migrate the data 498 # to migrate the data
466 if [[ -d ${EGIT_DIR} ]]; then 499 if [[ -d ${EGIT_DIR} ]]; then
467 if [[ ${target} == bare && -d ${EGIT_DIR}/.git ]]; then 500 if [[ ${bare} && -d ${EGIT_DIR}/.git ]]; then
468 debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to bare copy" 501 debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to bare copy"
469 502
470 ebegin "Converting \"${EGIT_DIR}\" from non-bare to bare copy" 503 ebegin "Converting \"${EGIT_DIR}\" from non-bare to bare copy"
471 mv "${EGIT_DIR}/.git" "${EGIT_DIR}.bare" 504 mv "${EGIT_DIR}/.git" "${EGIT_DIR}.bare"
472 export GIT_DIR="${EGIT_DIR}.bare" 505 export GIT_DIR="${EGIT_DIR}.bare"
474 returnstate=$? 507 returnstate=$?
475 unset GIT_DIR 508 unset GIT_DIR
476 rm -rf "${EGIT_DIR}" 509 rm -rf "${EGIT_DIR}"
477 mv "${EGIT_DIR}.bare" "${EGIT_DIR}" 510 mv "${EGIT_DIR}.bare" "${EGIT_DIR}"
478 eend ${returnstate} 511 eend ${returnstate}
479 fi
480 if [[ ${target} == full && ! -d ${EGIT_DIR}/.git ]]; then 512 elif [[ ! ${bare} && ! -d ${EGIT_DIR}/.git ]]; then
481 debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to non-bare copy" 513 debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to non-bare copy"
482 514
483 ebegin "Converting \"${EGIT_DIR}\" from bare to non-bare copy" 515 ebegin "Converting \"${EGIT_DIR}\" from bare to non-bare copy"
484 git clone -l "${EGIT_DIR}" "${EGIT_DIR}.nonbare" > /dev/null 516 git clone -l "${EGIT_DIR}" "${EGIT_DIR}.nonbare" > /dev/null
485 returnstate=$? 517 returnstate=$?
495 einfo "Migration failed, removing \"${EGIT_DIR}\" to start from scratch." 527 einfo "Migration failed, removing \"${EGIT_DIR}\" to start from scratch."
496 rm -rf "${EGIT_DIR}" 528 rm -rf "${EGIT_DIR}"
497 fi 529 fi
498 530
499 # set various options to work with both targets 531 # set various options to work with both targets
500 if [[ ${target} == bare ]]; then 532 if [[ ${bare} ]]; then
501 debug-print "${FUNCNAME}: working in bare repository for \"${EGIT_DIR}\"" 533 debug-print "${FUNCNAME}: working in bare repository for \"${EGIT_DIR}\""
502 EGIT_LOCAL_OPTIONS+="${EGIT_OPTIONS} --bare" 534 EGIT_LOCAL_OPTIONS+="${EGIT_OPTIONS} --bare"
503 MOVE_COMMAND="git clone -l -s -n ${EGIT_DIR// /\\ }" 535 MOVE_COMMAND="git clone -l -s -n ${EGIT_DIR// /\\ }"
504 EGIT_UPDATE_CMD="git fetch -t -f -u origin ${EGIT_BRANCH}:${EGIT_BRANCH}" 536 EGIT_UPDATE_CMD="git fetch -t -f -u origin ${EGIT_BRANCH}:${EGIT_BRANCH}"
505 UPSTREAM_BRANCH="${EGIT_BRANCH}" 537 UPSTREAM_BRANCH="${EGIT_BRANCH}"
538 EGIT_LOCAL_NONBARE=
506 else 539 else
507 debug-print "${FUNCNAME}: working in bare repository for non-bare \"${EGIT_DIR}\"" 540 debug-print "${FUNCNAME}: working in bare repository for non-bare \"${EGIT_DIR}\""
508 MOVE_COMMAND="cp -pPR ." 541 MOVE_COMMAND="cp -pPR ."
509 EGIT_LOCAL_OPTIONS="${EGIT_OPTIONS}" 542 EGIT_LOCAL_OPTIONS="${EGIT_OPTIONS}"
510 EGIT_UPDATE_CMD="git pull -f -u ${EGIT_OPTIONS}" 543 EGIT_UPDATE_CMD="git pull -f -u ${EGIT_OPTIONS}"
512 EGIT_LOCAL_NONBARE="true" 545 EGIT_LOCAL_NONBARE="true"
513 fi 546 fi
514} 547}
515 548
516# @FUNCTION: git-2_cleanup 549# @FUNCTION: git-2_cleanup
550# @INTERNAL
517# @DESCRIPTION: 551# @DESCRIPTION:
518# Internal function cleaning up all the global variables 552# Internal function cleaning up all the global variables
519# that are not required after the unpack has been done. 553# that are not required after the unpack has been done.
520git-2_cleanup() { 554git-2_cleanup() {
521 debug-print-function ${FUNCNAME} "$@" 555 debug-print-function ${FUNCNAME} "$@"

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.25

  ViewVC Help
Powered by ViewVC 1.1.20