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

Legend:
Removed from v.1.16  
changed lines
  Added in v.1.30

  ViewVC Help
Powered by ViewVC 1.1.20