/[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.15 Revision 1.26
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.15 2011/09/23 13:55:47 mgorny Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/git-2.eclass,v 1.26 2011/09/23 14:10:47 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# Michał Górny <mgorny@gentoo.org>
8# @BLURB: Eclass for fetching and unpacking git repositories. 9# @BLURB: Eclass for fetching and unpacking git repositories.
9# @DESCRIPTION: 10# @DESCRIPTION:
10# Eclass for easing maitenance of live ebuilds using git as remote repository. 11# Eclass for easing maitenance of live ebuilds using git as remote repository.
11# Eclass support working with git submodules and branching. 12# Eclass support working with git submodules and branching.
12 13
118# @DESCRIPTION: 119# @DESCRIPTION:
119# If non-empty this variable bans unpacking of ${A} content into the srcdir. 120# If non-empty this variable bans unpacking of ${A} content into the srcdir.
120# Default behaviour is to unpack ${A} content. 121# Default behaviour is to unpack ${A} content.
121 122
122# @FUNCTION: git-2_init_variables 123# @FUNCTION: git-2_init_variables
124# @INTERNAL
123# @DESCRIPTION: 125# @DESCRIPTION:
124# Internal function initializing all git variables. 126# Internal function initializing all git variables.
125# We define it in function scope so user can define 127# We define it in function scope so user can define
126# all the variables before and after inherit. 128# all the variables before and after inherit.
127git-2_init_variables() { 129git-2_init_variables() {
140 142
141 : ${EGIT_MASTER:=master} 143 : ${EGIT_MASTER:=master}
142 144
143 liverepo=${esc_pn}_LIVE_REPO 145 liverepo=${esc_pn}_LIVE_REPO
144 EGIT_REPO_URI=${!liverepo:-${EGIT_REPO_URI}} 146 EGIT_REPO_URI=${!liverepo:-${EGIT_REPO_URI}}
145 [[ -z ${EGIT_REPO_URI} ]] && die "EGIT_REPO_URI must have some value" 147 [[ ${EGIT_REPO_URI} ]] || die "EGIT_REPO_URI must have some value"
146 148
147 : ${EVCS_OFFLINE:=} 149 : ${EVCS_OFFLINE:=}
148 150
149 livebranch=${esc_pn}_LIVE_BRANCH 151 livebranch=${esc_pn}_LIVE_BRANCH
150 [[ -n ${!livebranch} ]] && ewarn "QA: using \"${esc_pn}_LIVE_BRANCH\" variable, you won't get any support" 152 [[ ${!livebranch} ]] && ewarn "QA: using \"${esc_pn}_LIVE_BRANCH\" variable, you won't get any support"
151 EGIT_BRANCH=${!livebranch:-${EGIT_BRANCH:-${EGIT_MASTER}}} 153 EGIT_BRANCH=${!livebranch:-${EGIT_BRANCH:-${EGIT_MASTER}}}
152 154
153 livecommit=${esc_pn}_LIVE_COMMIT 155 livecommit=${esc_pn}_LIVE_COMMIT
154 [[ -n ${!livecommit} ]] && ewarn "QA: using \"${esc_pn}_LIVE_COMMIT\" variable, you won't get any support" 156 [[ ${!livecommit} ]] && ewarn "QA: using \"${esc_pn}_LIVE_COMMIT\" variable, you won't get any support"
155 EGIT_COMMIT=${!livecommit:-${EGIT_COMMIT:-${EGIT_BRANCH}}} 157 EGIT_COMMIT=${!livecommit:-${EGIT_COMMIT:-${EGIT_BRANCH}}}
156 158
157 : ${EGIT_REPACK:=} 159 : ${EGIT_REPACK:=}
158 160
159 : ${EGIT_PRUNE:=} 161 : ${EGIT_PRUNE:=}
160} 162}
161 163
162# @FUNCTION: git-2_submodules 164# @FUNCTION: git-2_submodules
165# @INTERNAL
163# @DESCRIPTION: 166# @DESCRIPTION:
164# Internal function wrapping the submodule initialisation and update. 167# Internal function wrapping the submodule initialisation and update.
165git-2_submodules() { 168git-2_submodules() {
166 debug-print-function ${FUNCNAME} "$@" 169 debug-print-function ${FUNCNAME} "$@"
167 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then 170 if [[ ${EGIT_HAS_SUBMODULES} ]]; then
168 if [[ -n ${EVCS_OFFLINE} ]]; then 171 if [[ ${EVCS_OFFLINE} ]]; then
169 # for submodules operations we need to be online 172 # for submodules operations we need to be online
170 debug-print "${FUNCNAME}: not updating submodules in offline mode" 173 debug-print "${FUNCNAME}: not updating submodules in offline mode"
171 return 1 174 return 1
172 fi 175 fi
173 176
184 popd > /dev/null 187 popd > /dev/null
185 fi 188 fi
186} 189}
187 190
188# @FUNCTION: git-2_branch 191# @FUNCTION: git-2_branch
192# @INTERNAL
189# @DESCRIPTION: 193# @DESCRIPTION:
190# Internal function that changes branch for the repo based on EGIT_COMMIT and 194# Internal function that changes branch for the repo based on EGIT_COMMIT and
191# EGIT_BRANCH variables. 195# EGIT_BRANCH variables.
192git-2_branch() { 196git-2_branch() {
193 debug-print-function ${FUNCNAME} "$@" 197 debug-print-function ${FUNCNAME} "$@"
208 212
209 popd > /dev/null 213 popd > /dev/null
210} 214}
211 215
212# @FUNCTION: git-2_gc 216# @FUNCTION: git-2_gc
217# @INTERNAL
213# @DESCRIPTION: 218# @DESCRIPTION:
214# Internal function running garbage collector on checked out tree. 219# Internal function running garbage collector on checked out tree.
215git-2_gc() { 220git-2_gc() {
216 debug-print-function ${FUNCNAME} "$@" 221 debug-print-function ${FUNCNAME} "$@"
217 222
218 local args 223 local args
219 224
225 if [[ ${EGIT_REPACK} || ${EGIT_PRUNE} ]]; then
220 pushd "${EGIT_DIR}" > /dev/null 226 pushd "${EGIT_DIR}" > /dev/null
221 if [[ -n ${EGIT_REPACK} || -n ${EGIT_PRUNE} ]]; then
222 ebegin "Garbage collecting the repository" 227 ebegin "Garbage collecting the repository"
223 [[ -n ${EGIT_PRUNE} ]] && args='--prune' 228 [[ ${EGIT_PRUNE} ]] && args='--prune'
224 debug-print "${FUNCNAME}: git gc ${args}" 229 debug-print "${FUNCNAME}: git gc ${args}"
225 git gc ${args} 230 git gc ${args}
226 eend $? 231 eend $?
227 fi
228 popd > /dev/null 232 popd > /dev/null
233 fi
229} 234}
230 235
231# @FUNCTION: git-2_prepare_storedir 236# @FUNCTION: git-2_prepare_storedir
237# @INTERNAL
232# @DESCRIPTION: 238# @DESCRIPTION:
233# Internal function preparing directory where we are going to store SCM 239# Internal function preparing directory where we are going to store SCM
234# repository. 240# repository.
235git-2_prepare_storedir() { 241git-2_prepare_storedir() {
236 debug-print-function ${FUNCNAME} "$@" 242 debug-print-function ${FUNCNAME} "$@"
246 || die "${FUNCNAME}: can't mkdir \"${EGIT_STORE_DIR}\"" 252 || die "${FUNCNAME}: can't mkdir \"${EGIT_STORE_DIR}\""
247 fi 253 fi
248 254
249 # allow writing into EGIT_STORE_DIR 255 # allow writing into EGIT_STORE_DIR
250 addwrite "${EGIT_STORE_DIR}" 256 addwrite "${EGIT_STORE_DIR}"
257
258 # calculate git.eclass store dir for data
259 # We will try to clone the old repository,
260 # and we will remove it if we don't need it anymore.
261 EGIT_OLD_CLONE=
262 if [[ ${EGIT_STORE_DIR} == */egit-src ]]; then
263 local old_store_dir=${EGIT_STORE_DIR/%egit-src/git-src}
264 local old_location=${old_store_dir}/${EGIT_PROJECT:-${PN}}
265
266 if [[ -d ${old_location} ]]; then
267 EGIT_OLD_CLONE=${old_location}
268 # required to remove the old clone
269 addwrite "${old_store_dir}"
270 fi
271 fi
272
251 # calculate the proper store dir for data 273 # calculate the proper store dir for data
252 # If user didn't specify the EGIT_DIR, we check if he did specify 274 # 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. 275 # the EGIT_PROJECT or get the folder name from EGIT_REPO_URI.
254 [[ -z ${EGIT_REPO_URI##*/} ]] && EGIT_REPO_URI="${EGIT_REPO_URI%/}" 276 EGIT_REPO_URI=${EGIT_REPO_URI%/}
255 if [[ -z ${EGIT_DIR} ]]; then 277 if [[ ! ${EGIT_DIR} ]]; then
256 if [[ -n ${EGIT_PROJECT} ]]; then 278 if [[ ${EGIT_PROJECT} ]]; then
257 clone_dir=${EGIT_PROJECT} 279 clone_dir=${EGIT_PROJECT}
258 else 280 else
259 clone_dir=${EGIT_REPO_URI##*/} 281 clone_dir=${EGIT_REPO_URI##*/}
260 fi 282 fi
261 EGIT_DIR=${EGIT_STORE_DIR}/${clone_dir} 283 EGIT_DIR=${EGIT_STORE_DIR}/${clone_dir}
284
285 if [[ ${EGIT_OLD_CLONE} && ! -d ${EGIT_DIR} ]]; then
286 elog "${FUNCNAME}: ${CATEGORY}/${PF} will be cloned from old location."
287 elog "It will be necessary to rebuild the package to fetch updates."
288 EGIT_REPO_URI="${EGIT_OLD_CLONE} ${EGIT_REPO_URI}"
289 fi
262 fi 290 fi
263 export EGIT_DIR=${EGIT_DIR} 291 export EGIT_DIR=${EGIT_DIR}
264 debug-print "${FUNCNAME}: Storing the repo into \"${EGIT_DIR}\"." 292 debug-print "${FUNCNAME}: Storing the repo into \"${EGIT_DIR}\"."
265} 293}
266 294
267# @FUNCTION: git-2_move_source 295# @FUNCTION: git-2_move_source
296# @INTERNAL
268# @DESCRIPTION: 297# @DESCRIPTION:
269# Internal function moving sources from the EGIT_DIR to EGIT_SOURCEDIR dir. 298# Internal function moving sources from the EGIT_DIR to EGIT_SOURCEDIR dir.
270git-2_move_source() { 299git-2_move_source() {
271 debug-print-function ${FUNCNAME} "$@" 300 debug-print-function ${FUNCNAME} "$@"
272 301
278 || die "${FUNCNAME}: sync to \"${EGIT_SOURCEDIR}\" failed" 307 || die "${FUNCNAME}: sync to \"${EGIT_SOURCEDIR}\" failed"
279 popd > /dev/null 308 popd > /dev/null
280} 309}
281 310
282# @FUNCTION: git-2_initial_clone 311# @FUNCTION: git-2_initial_clone
312# @INTERNAL
283# @DESCRIPTION: 313# @DESCRIPTION:
284# Internal function running initial clone on specified repo_uri. 314# Internal function running initial clone on specified repo_uri.
285git-2_initial_clone() { 315git-2_initial_clone() {
286 debug-print-function ${FUNCNAME} "$@" 316 debug-print-function ${FUNCNAME} "$@"
287 317
288 local repo_uri 318 local repo_uri
289 319
290 EGIT_REPO_URI_SELECTED="" 320 EGIT_REPO_URI_SELECTED=""
291 for repo_uri in ${EGIT_REPO_URI}; do 321 for repo_uri in ${EGIT_REPO_URI}; do
292 debug-print "${FUNCNAME}: git clone ${EGIT_LOCAL_OPTIONS} \"${repo_uri}\" \"${EGIT_DIR}\"" 322 debug-print "${FUNCNAME}: git clone ${EGIT_LOCAL_OPTIONS} \"${repo_uri}\" \"${EGIT_DIR}\""
293 git clone ${EGIT_LOCAL_OPTIONS} "${repo_uri}" "${EGIT_DIR}" 323 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 324 # global variable containing the repo_name we will be using
296 debug-print "${FUNCNAME}: EGIT_REPO_URI_SELECTED=\"${repo_uri}\"" 325 debug-print "${FUNCNAME}: EGIT_REPO_URI_SELECTED=\"${repo_uri}\""
297 EGIT_REPO_URI_SELECTED="${repo_uri}" 326 EGIT_REPO_URI_SELECTED="${repo_uri}"
298 break 327 break
299 fi 328 fi
300 done 329 done
301 330
302 if [[ -z ${EGIT_REPO_URI_SELECTED} ]]; then 331 [[ ${EGIT_REPO_URI_SELECTED} ]] \
303 die "${FUNCNAME}: can't fetch from ${EGIT_REPO_URI}" 332 || die "${FUNCNAME}: can't fetch from ${EGIT_REPO_URI}"
304 fi
305} 333}
306 334
307# @FUNCTION: git-2_update_repo 335# @FUNCTION: git-2_update_repo
336# @INTERNAL
308# @DESCRIPTION: 337# @DESCRIPTION:
309# Internal function running update command on specified repo_uri. 338# Internal function running update command on specified repo_uri.
310git-2_update_repo() { 339git-2_update_repo() {
311 debug-print-function ${FUNCNAME} "$@" 340 debug-print-function ${FUNCNAME} "$@"
312 341
313 local repo_uri 342 local repo_uri
314 343
315 if [[ -n ${EGIT_LOCAL_NONBARE} ]]; then 344 if [[ ${EGIT_LOCAL_NONBARE} ]]; then
316 # checkout master branch and drop all other local branches 345 # checkout master branch and drop all other local branches
317 git checkout ${EGIT_MASTER} || die "${FUNCNAME}: can't checkout master branch ${EGIT_MASTER}" 346 git checkout ${EGIT_MASTER} || die "${FUNCNAME}: can't checkout master branch ${EGIT_MASTER}"
318 for x in $(git branch | grep -v "* ${EGIT_MASTER}" | tr '\n' ' '); do 347 for x in $(git branch | grep -v "* ${EGIT_MASTER}" | tr '\n' ' '); do
319 debug-print "${FUNCNAME}: git branch -D ${x}" 348 debug-print "${FUNCNAME}: git branch -D ${x}"
320 git branch -D ${x} > /dev/null 349 git branch -D ${x} > /dev/null
325 for repo_uri in ${EGIT_REPO_URI}; do 354 for repo_uri in ${EGIT_REPO_URI}; do
326 # git urls might change, so reset it 355 # git urls might change, so reset it
327 git config remote.origin.url "${repo_uri}" 356 git config remote.origin.url "${repo_uri}"
328 357
329 debug-print "${EGIT_UPDATE_CMD}" 358 debug-print "${EGIT_UPDATE_CMD}"
330 ${EGIT_UPDATE_CMD} > /dev/null 359 if ${EGIT_UPDATE_CMD} > /dev/null; then
331 if [[ $? -eq 0 ]]; then
332 # global variable containing the repo_name we will be using 360 # global variable containing the repo_name we will be using
333 debug-print "${FUNCNAME}: EGIT_REPO_URI_SELECTED=\"${repo_uri}\"" 361 debug-print "${FUNCNAME}: EGIT_REPO_URI_SELECTED=\"${repo_uri}\""
334 EGIT_REPO_URI_SELECTED="${repo_uri}" 362 EGIT_REPO_URI_SELECTED="${repo_uri}"
335 break 363 break
336 fi 364 fi
337 done 365 done
338 366
339 if [[ -z ${EGIT_REPO_URI_SELECTED} ]]; then 367 [[ ${EGIT_REPO_URI_SELECTED} ]] \
340 die "${FUNCNAME}: can't update from ${EGIT_REPO_URI}" 368 || die "${FUNCNAME}: can't update from ${EGIT_REPO_URI}"
341 fi
342} 369}
343 370
344# @FUNCTION: git-2_fetch 371# @FUNCTION: git-2_fetch
372# @INTERNAL
345# @DESCRIPTION: 373# @DESCRIPTION:
346# Internal function fetching repository from EGIT_REPO_URI and storing it in 374# Internal function fetching repository from EGIT_REPO_URI and storing it in
347# specified EGIT_STORE_DIR. 375# specified EGIT_STORE_DIR.
348git-2_fetch() { 376git-2_fetch() {
349 debug-print-function ${FUNCNAME} "$@" 377 debug-print-function ${FUNCNAME} "$@"
350 378
351 local oldsha cursha repo_type 379 local oldsha cursha repo_type
352 380
353 [[ -n ${EGIT_LOCAL_NONBARE} ]] && repo_type="non-bare repository" || repo_type="bare repository" 381 [[ ${EGIT_LOCAL_NONBARE} ]] && repo_type="non-bare repository" || repo_type="bare repository"
354 382
355 if [[ ! -d ${EGIT_DIR} ]]; then 383 if [[ ! -d ${EGIT_DIR} ]]; then
356 git-2_initial_clone 384 git-2_initial_clone
357 pushd "${EGIT_DIR}" > /dev/null 385 pushd "${EGIT_DIR}" > /dev/null
358 cursha=$(git rev-parse ${UPSTREAM_BRANCH}) 386 cursha=$(git rev-parse ${UPSTREAM_BRANCH})
359 echo "GIT NEW clone -->" 387 echo "GIT NEW clone -->"
360 echo " repository: ${EGIT_REPO_URI_SELECTED}" 388 echo " repository: ${EGIT_REPO_URI_SELECTED}"
361 echo " at the commit: ${cursha}" 389 echo " at the commit: ${cursha}"
362 390
363 popd > /dev/null 391 popd > /dev/null
364 elif [[ -n ${EVCS_OFFLINE} ]]; then 392 elif [[ ${EVCS_OFFLINE} ]]; then
365 pushd "${EGIT_DIR}" > /dev/null 393 pushd "${EGIT_DIR}" > /dev/null
366 cursha=$(git rev-parse ${UPSTREAM_BRANCH}) 394 cursha=$(git rev-parse ${UPSTREAM_BRANCH})
367 echo "GIT offline update -->" 395 echo "GIT offline update -->"
368 echo " repository: $(git config remote.origin.url)" 396 echo " repository: $(git config remote.origin.url)"
369 echo " at the commit: ${cursha}" 397 echo " at the commit: ${cursha}"
395 [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]] \ 423 [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]] \
396 && echo " commit: ${EGIT_COMMIT}" 424 && echo " commit: ${EGIT_COMMIT}"
397 echo " branch: ${EGIT_BRANCH}" 425 echo " branch: ${EGIT_BRANCH}"
398 echo " storage directory: \"${EGIT_DIR}\"" 426 echo " storage directory: \"${EGIT_DIR}\""
399 echo " checkout type: ${repo_type}" 427 echo " checkout type: ${repo_type}"
428
429 # Cleanup after git.eclass
430 if [[ ${EGIT_OLD_CLONE} ]]; then
431 einfo "${FUNCNAME}: removing old clone in ${EGIT_OLD_CLONE}."
432 rm -rf "${EGIT_OLD_CLONE}"
433 fi
400} 434}
401 435
402# @FUNCTION: git_bootstrap 436# @FUNCTION: git_bootstrap
437# @INTERNAL
403# @DESCRIPTION: 438# @DESCRIPTION:
404# Internal function that runs bootstrap command on unpacked source. 439# Internal function that runs bootstrap command on unpacked source.
405git-2_bootstrap() { 440git-2_bootstrap() {
406 debug-print-function ${FUNCNAME} "$@" 441 debug-print-function ${FUNCNAME} "$@"
407 442
410 # Command to be executed after checkout and clone of the specified 445 # Command to be executed after checkout and clone of the specified
411 # repository. 446 # repository.
412 # enviroment the package will fail if there is no update, thus in 447 # enviroment the package will fail if there is no update, thus in
413 # combination with --keep-going it would lead in not-updating 448 # combination with --keep-going it would lead in not-updating
414 # pakcages that are up-to-date. 449 # pakcages that are up-to-date.
415 if [[ -n ${EGIT_BOOTSTRAP} ]]; then 450 if [[ ${EGIT_BOOTSTRAP} ]]; then
416 pushd "${EGIT_SOURCEDIR}" > /dev/null 451 pushd "${EGIT_SOURCEDIR}" > /dev/null
417 einfo "Starting bootstrap" 452 einfo "Starting bootstrap"
418 453
419 if [[ -f ${EGIT_BOOTSTRAP} ]]; then 454 if [[ -f ${EGIT_BOOTSTRAP} ]]; then
420 # we have file in the repo which we should execute 455 # we have file in the repo which we should execute
440 popd > /dev/null 475 popd > /dev/null
441 fi 476 fi
442} 477}
443 478
444# @FUNCTION: git-2_migrate_repository 479# @FUNCTION: git-2_migrate_repository
480# @INTERNAL
445# @DESCRIPTION: 481# @DESCRIPTION:
446# Internal function migrating between bare and normal checkout repository. 482# Internal function migrating between bare and normal checkout repository.
447# This is based on usage of EGIT_SUBMODULES, at least until they 483# This is based on usage of EGIT_SUBMODULES, at least until they
448# start to work with bare checkouts sanely. 484# start to work with bare checkouts sanely.
449# This function also set some global variables that differ between 485# This function also set some global variables that differ between
450# bare and non-bare checkout. 486# bare and non-bare checkout.
451git-2_migrate_repository() { 487git-2_migrate_repository() {
452 debug-print-function ${FUNCNAME} "$@" 488 debug-print-function ${FUNCNAME} "$@"
453 489
454 local target returnstate 490 local bare returnstate
455 491
456 # first find out if we have submodules 492 # first find out if we have submodules
493 # or user explicitly wants us to use non-bare clones
457 if [[ -z ${EGIT_HAS_SUBMODULES} ]]; then 494 if ! [[ ${EGIT_HAS_SUBMODULES} || ${EGIT_NONBARE} ]]; then
458 target="bare" 495 bare=1
459 else
460 target="full"
461 fi
462 # check if user didn't specify that we want non-bare repo
463 if [[ -n ${EGIT_NONBARE} ]]; then
464 target="full"
465 EGIT_LOCAL_NONBARE="true"
466 fi 496 fi
467 497
468 # test if we already have some repo and if so find out if we have 498 # test if we already have some repo and if so find out if we have
469 # to migrate the data 499 # to migrate the data
470 if [[ -d ${EGIT_DIR} ]]; then 500 if [[ -d ${EGIT_DIR} ]]; then
471 if [[ ${target} == bare && -d ${EGIT_DIR}/.git ]]; then 501 if [[ ${bare} && -d ${EGIT_DIR}/.git ]]; then
472 debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to bare copy" 502 debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to bare copy"
473 503
474 ebegin "Converting \"${EGIT_DIR}\" from non-bare to bare copy" 504 ebegin "Converting \"${EGIT_DIR}\" from non-bare to bare copy"
475 mv "${EGIT_DIR}/.git" "${EGIT_DIR}.bare" 505 mv "${EGIT_DIR}/.git" "${EGIT_DIR}.bare"
476 export GIT_DIR="${EGIT_DIR}.bare" 506 export GIT_DIR="${EGIT_DIR}.bare"
478 returnstate=$? 508 returnstate=$?
479 unset GIT_DIR 509 unset GIT_DIR
480 rm -rf "${EGIT_DIR}" 510 rm -rf "${EGIT_DIR}"
481 mv "${EGIT_DIR}.bare" "${EGIT_DIR}" 511 mv "${EGIT_DIR}.bare" "${EGIT_DIR}"
482 eend ${returnstate} 512 eend ${returnstate}
483 fi
484 if [[ ${target} == full && ! -d ${EGIT_DIR}/.git ]]; then 513 elif [[ ! ${bare} && ! -d ${EGIT_DIR}/.git ]]; then
485 debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to non-bare copy" 514 debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to non-bare copy"
486 515
487 ebegin "Converting \"${EGIT_DIR}\" from bare to non-bare copy" 516 ebegin "Converting \"${EGIT_DIR}\" from bare to non-bare copy"
488 git clone -l "${EGIT_DIR}" "${EGIT_DIR}.nonbare" > /dev/null 517 git clone -l "${EGIT_DIR}" "${EGIT_DIR}.nonbare" > /dev/null
489 returnstate=$? 518 returnstate=$?
499 einfo "Migration failed, removing \"${EGIT_DIR}\" to start from scratch." 528 einfo "Migration failed, removing \"${EGIT_DIR}\" to start from scratch."
500 rm -rf "${EGIT_DIR}" 529 rm -rf "${EGIT_DIR}"
501 fi 530 fi
502 531
503 # set various options to work with both targets 532 # set various options to work with both targets
504 if [[ ${target} == bare ]]; then 533 if [[ ${bare} ]]; then
505 debug-print "${FUNCNAME}: working in bare repository for \"${EGIT_DIR}\"" 534 debug-print "${FUNCNAME}: working in bare repository for \"${EGIT_DIR}\""
506 EGIT_LOCAL_OPTIONS+="${EGIT_OPTIONS} --bare" 535 EGIT_LOCAL_OPTIONS+="${EGIT_OPTIONS} --bare"
507 MOVE_COMMAND="git clone -l -s -n ${EGIT_DIR// /\\ }" 536 MOVE_COMMAND="git clone -l -s -n ${EGIT_DIR// /\\ }"
508 EGIT_UPDATE_CMD="git fetch -t -f -u origin ${EGIT_BRANCH}:${EGIT_BRANCH}" 537 EGIT_UPDATE_CMD="git fetch -t -f -u origin ${EGIT_BRANCH}:${EGIT_BRANCH}"
509 UPSTREAM_BRANCH="${EGIT_BRANCH}" 538 UPSTREAM_BRANCH="${EGIT_BRANCH}"
539 EGIT_LOCAL_NONBARE=
510 else 540 else
511 debug-print "${FUNCNAME}: working in bare repository for non-bare \"${EGIT_DIR}\"" 541 debug-print "${FUNCNAME}: working in bare repository for non-bare \"${EGIT_DIR}\""
512 MOVE_COMMAND="cp -pPR ." 542 MOVE_COMMAND="cp -pPR ."
513 EGIT_LOCAL_OPTIONS="${EGIT_OPTIONS}" 543 EGIT_LOCAL_OPTIONS="${EGIT_OPTIONS}"
514 EGIT_UPDATE_CMD="git pull -f -u ${EGIT_OPTIONS}" 544 EGIT_UPDATE_CMD="git pull -f -u ${EGIT_OPTIONS}"
516 EGIT_LOCAL_NONBARE="true" 546 EGIT_LOCAL_NONBARE="true"
517 fi 547 fi
518} 548}
519 549
520# @FUNCTION: git-2_cleanup 550# @FUNCTION: git-2_cleanup
551# @INTERNAL
521# @DESCRIPTION: 552# @DESCRIPTION:
522# Internal function cleaning up all the global variables 553# Internal function cleaning up all the global variables
523# that are not required after the unpack has been done. 554# that are not required after the unpack has been done.
524git-2_cleanup() { 555git-2_cleanup() {
525 debug-print-function ${FUNCNAME} "$@" 556 debug-print-function ${FUNCNAME} "$@"
555 git-2_cleanup 586 git-2_cleanup
556 echo ">>> Unpacked to ${EGIT_SOURCEDIR}" 587 echo ">>> Unpacked to ${EGIT_SOURCEDIR}"
557 588
558 # Users can specify some SRC_URI and we should 589 # Users can specify some SRC_URI and we should
559 # unpack the files too. 590 # unpack the files too.
560 if [[ -z ${EGIT_NOUNPACK} ]]; then 591 if [[ ! ${EGIT_NOUNPACK} ]]; then
561 if has ${EAPI:-0} 0 1; then 592 if has ${EAPI:-0} 0 1; then
562 [[ -n ${A} ]] && unpack ${A} 593 [[ ${A} ]] && unpack ${A}
563 else 594 else
564 default_src_unpack 595 default_src_unpack
565 fi 596 fi
566 fi 597 fi
567} 598}

Legend:
Removed from v.1.15  
changed lines
  Added in v.1.26

  ViewVC Help
Powered by ViewVC 1.1.20