/[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.7 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.7 2011/05/20 14:35:01 scarabeus 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# Tomas Chvatal <scarabeus@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
55# EGIT_PROJECT="${EGIT_REPO_URI##*/}" 56# EGIT_PROJECT="${EGIT_REPO_URI##*/}"
56 57
57# @ECLASS-VARIABLE: EGIT_DIR 58# @ECLASS-VARIABLE: EGIT_DIR
58# @DESCRIPTION: 59# @DESCRIPTION:
59# Directory where we want to store the git data. 60# Directory where we want to store the git data.
60# This should not be overriden unless really required. 61# This variable should not be overriden.
61# 62#
62# EGIT_DIR="${EGIT_STORE_DIR}/${EGIT_PROJECT}" 63# EGIT_DIR="${EGIT_STORE_DIR}/${EGIT_PROJECT}"
63 64
64# @ECLASS-VARIABLE: EGIT_REPO_URI 65# @ECLASS-VARIABLE: EGIT_REPO_URI
65# @REQUIRED 66# @REQUIRED
111# @DESCRIPTION: 112# @DESCRIPTION:
112# If non-empty this variable specifies that all checkouts will be done using 113# If non-empty this variable specifies that all checkouts will be done using
113# non bare repositories. This is useful if you can't operate with bare 114# non bare repositories. This is useful if you can't operate with bare
114# checkouts for some reason. 115# checkouts for some reason.
115 116
117# @ECLASS-VARIABLE: EGIT_NOUNPACK
118# @DEFAULT_UNSET
119# @DESCRIPTION:
120# If non-empty this variable bans unpacking of ${A} content into the srcdir.
121# Default behaviour is to unpack ${A} content.
122
116# @FUNCTION: git-2_init_variables 123# @FUNCTION: git-2_init_variables
124# @INTERNAL
117# @DESCRIPTION: 125# @DESCRIPTION:
118# Internal function initializing all git variables. 126# Internal function initializing all git variables.
119# We define it in function scope so user can define 127# We define it in function scope so user can define
120# all the variables before and after inherit. 128# all the variables before and after inherit.
121git-2_init_variables() { 129git-2_init_variables() {
122 debug-print-function ${FUNCNAME} "$@" 130 debug-print-function ${FUNCNAME} "$@"
123 131
124 local x 132 local esc_pn liverepo livebranch livecommit
133 esc_pn=${PN//[-+]/_}
125 134
126 : ${EGIT_SOURCEDIR="${S}"} 135 : ${EGIT_SOURCEDIR="${S}"}
127 136
128 : ${EGIT_STORE_DIR:="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/egit-src"} 137 : ${EGIT_STORE_DIR:="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/egit-src"}
129 138
131 140
132 : ${EGIT_OPTIONS:=} 141 : ${EGIT_OPTIONS:=}
133 142
134 : ${EGIT_MASTER:=master} 143 : ${EGIT_MASTER:=master}
135 144
136 eval x="\$${PN//[-+]/_}_LIVE_REPO" 145 liverepo=${esc_pn}_LIVE_REPO
137 EGIT_REPO_URI=${x:-${EGIT_REPO_URI}} 146 EGIT_REPO_URI=${!liverepo:-${EGIT_REPO_URI}}
138 [[ -z ${EGIT_REPO_URI} ]] && die "EGIT_REPO_URI must have some value" 147 [[ ${EGIT_REPO_URI} ]] || die "EGIT_REPO_URI must have some value"
139 148
140 : ${EVCS_OFFLINE:=} 149 : ${EVCS_OFFLINE:=}
141 150
142 eval x="\$${PN//[-+]/_}_LIVE_BRANCH" 151 livebranch=${esc_pn}_LIVE_BRANCH
143 [[ -n ${x} ]] && ewarn "QA: using \"${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"
144 EGIT_BRANCH=${x:-${EGIT_BRANCH:-${EGIT_MASTER}}} 153 EGIT_BRANCH=${!livebranch:-${EGIT_BRANCH:-${EGIT_MASTER}}}
145 154
146 eval x="\$${PN//[-+]/_}_LIVE_COMMIT" 155 livecommit=${esc_pn}_LIVE_COMMIT
147 [[ -n ${x} ]] && ewarn "QA: using \"${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"
148 EGIT_COMMIT=${x:-${EGIT_COMMIT:-${EGIT_BRANCH}}} 157 EGIT_COMMIT=${!livecommit:-${EGIT_COMMIT:-${EGIT_BRANCH}}}
149 158
150 : ${EGIT_REPACK:=} 159 : ${EGIT_REPACK:=}
151 160
152 : ${EGIT_PRUNE:=} 161 : ${EGIT_PRUNE:=}
153} 162}
154 163
155# @FUNCTION: git-2_submodules 164# @FUNCTION: git-2_submodules
165# @INTERNAL
156# @DESCRIPTION: 166# @DESCRIPTION:
157# Internal function wrapping the submodule initialisation and update. 167# Internal function wrapping the submodule initialisation and update.
158git-2_submodules() { 168git-2_submodules() {
159 debug-print-function ${FUNCNAME} "$@" 169 debug-print-function ${FUNCNAME} "$@"
160 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then 170 if [[ ${EGIT_HAS_SUBMODULES} ]]; then
161 if [[ -n ${EVCS_OFFLINE} ]]; then 171 if [[ ${EVCS_OFFLINE} ]]; then
162 # for submodules operations we need to be online 172 # for submodules operations we need to be online
163 debug-print "${FUNCNAME}: not updating submodules in offline mode" 173 debug-print "${FUNCNAME}: not updating submodules in offline mode"
164 return 1 174 return 1
165 fi 175 fi
166 176
177 popd > /dev/null 187 popd > /dev/null
178 fi 188 fi
179} 189}
180 190
181# @FUNCTION: git-2_branch 191# @FUNCTION: git-2_branch
192# @INTERNAL
182# @DESCRIPTION: 193# @DESCRIPTION:
183# 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
184# EGIT_BRANCH variables. 195# EGIT_BRANCH variables.
185git-2_branch() { 196git-2_branch() {
186 debug-print-function ${FUNCNAME} "$@" 197 debug-print-function ${FUNCNAME} "$@"
198
199 local branchname src
187 200
188 debug-print "${FUNCNAME}: working in \"${EGIT_SOURCEDIR}\"" 201 debug-print "${FUNCNAME}: working in \"${EGIT_SOURCEDIR}\""
189 pushd "${EGIT_SOURCEDIR}" > /dev/null 202 pushd "${EGIT_SOURCEDIR}" > /dev/null
190 203
191 local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH} 204 local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH}
196 debug-print "${FUNCNAME}: git checkout -b ${branchname} ${src}" 209 debug-print "${FUNCNAME}: git checkout -b ${branchname} ${src}"
197 git checkout -b ${branchname} ${src} \ 210 git checkout -b ${branchname} ${src} \
198 || die "${FUNCNAME}: changing the branch failed" 211 || die "${FUNCNAME}: changing the branch failed"
199 212
200 popd > /dev/null 213 popd > /dev/null
201
202 unset branchname src
203} 214}
204 215
205# @FUNCTION: git-2_gc 216# @FUNCTION: git-2_gc
217# @INTERNAL
206# @DESCRIPTION: 218# @DESCRIPTION:
207# Internal function running garbage collector on checked out tree. 219# Internal function running garbage collector on checked out tree.
208git-2_gc() { 220git-2_gc() {
209 debug-print-function ${FUNCNAME} "$@" 221 debug-print-function ${FUNCNAME} "$@"
210 222
223 local args
224
225 if [[ ${EGIT_REPACK} || ${EGIT_PRUNE} ]]; then
211 pushd "${EGIT_DIR}" > /dev/null 226 pushd "${EGIT_DIR}" > /dev/null
212 if [[ -n ${EGIT_REPACK} || -n ${EGIT_PRUNE} ]]; then
213 ebegin "Garbage collecting the repository" 227 ebegin "Garbage collecting the repository"
214 local args
215 [[ -n ${EGIT_PRUNE} ]] && args='--prune' 228 [[ ${EGIT_PRUNE} ]] && args='--prune'
216 debug-print "${FUNCNAME}: git gc ${args}" 229 debug-print "${FUNCNAME}: git gc ${args}"
217 git gc ${args} 230 git gc ${args}
218 eend $? 231 eend $?
219 fi
220 popd > /dev/null 232 popd > /dev/null
233 fi
221} 234}
222 235
223# @FUNCTION: git-2_prepare_storedir 236# @FUNCTION: git-2_prepare_storedir
237# @INTERNAL
224# @DESCRIPTION: 238# @DESCRIPTION:
225# Internal function preparing directory where we are going to store SCM 239# Internal function preparing directory where we are going to store SCM
226# repository. 240# repository.
227git-2_prepare_storedir() { 241git-2_prepare_storedir() {
228 debug-print-function ${FUNCNAME} "$@" 242 debug-print-function ${FUNCNAME} "$@"
236 addwrite / 250 addwrite /
237 mkdir -p "${EGIT_STORE_DIR}" \ 251 mkdir -p "${EGIT_STORE_DIR}" \
238 || die "${FUNCNAME}: can't mkdir \"${EGIT_STORE_DIR}\"" 252 || die "${FUNCNAME}: can't mkdir \"${EGIT_STORE_DIR}\""
239 fi 253 fi
240 254
241 cd -P "${EGIT_STORE_DIR}" \
242 || die "${FUNCNAME}: can't chdir to \"${EGIT_STORE_DIR}\""
243 # allow writing into EGIT_STORE_DIR 255 # allow writing into EGIT_STORE_DIR
244 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
245 # calculate the proper store dir for data 273 # calculate the proper store dir for data
246 # 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
247 # 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.
248 [[ -z ${EGIT_REPO_URI##*/} ]] && EGIT_REPO_URI="${EGIT_REPO_URI%/}" 276 EGIT_REPO_URI=${EGIT_REPO_URI%/}
249 if [[ -z ${EGIT_DIR} ]]; then 277 if [[ ! ${EGIT_DIR} ]]; then
250 if [[ -n ${EGIT_PROJECT} ]]; then 278 if [[ ${EGIT_PROJECT} ]]; then
251 clone_dir=${EGIT_PROJECT} 279 clone_dir=${EGIT_PROJECT}
252 else 280 else
253 clone_dir=${EGIT_REPO_URI##*/} 281 clone_dir=${EGIT_REPO_URI##*/}
254 fi 282 fi
255 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
256 fi 290 fi
257 export EGIT_DIR=${EGIT_DIR} 291 export EGIT_DIR=${EGIT_DIR}
258 debug-print "${FUNCNAME}: Storing the repo into \"${EGIT_DIR}\"." 292 debug-print "${FUNCNAME}: Storing the repo into \"${EGIT_DIR}\"."
259} 293}
260 294
261# @FUNCTION: git-2_move_source 295# @FUNCTION: git-2_move_source
296# @INTERNAL
262# @DESCRIPTION: 297# @DESCRIPTION:
263# 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.
264git-2_move_source() { 299git-2_move_source() {
265 debug-print-function ${FUNCNAME} "$@" 300 debug-print-function ${FUNCNAME} "$@"
266 301
272 || die "${FUNCNAME}: sync to \"${EGIT_SOURCEDIR}\" failed" 307 || die "${FUNCNAME}: sync to \"${EGIT_SOURCEDIR}\" failed"
273 popd > /dev/null 308 popd > /dev/null
274} 309}
275 310
276# @FUNCTION: git-2_initial_clone 311# @FUNCTION: git-2_initial_clone
312# @INTERNAL
277# @DESCRIPTION: 313# @DESCRIPTION:
278# Internal function running initial clone on specified repo_uri. 314# Internal function running initial clone on specified repo_uri.
279git-2_initial_clone() { 315git-2_initial_clone() {
280 debug-print-function ${FUNCNAME} "$@" 316 debug-print-function ${FUNCNAME} "$@"
281 317
282 local repo_uri 318 local repo_uri
283 319
284 EGIT_REPO_URI_SELECTED="" 320 EGIT_REPO_URI_SELECTED=""
285 for repo_uri in ${EGIT_REPO_URI}; do 321 for repo_uri in ${EGIT_REPO_URI}; do
286 debug-print "${FUNCNAME}: git clone ${EGIT_OPTIONS} \"${repo_uri}\" \"${EGIT_DIR}\"" 322 debug-print "${FUNCNAME}: git clone ${EGIT_LOCAL_OPTIONS} \"${repo_uri}\" \"${EGIT_DIR}\""
287 git clone ${EGIT_OPTIONS} "${repo_uri}" "${EGIT_DIR}" 323 if git clone ${EGIT_LOCAL_OPTIONS} "${repo_uri}" "${EGIT_DIR}"; then
288 if [[ $? -eq 0 ]]; then
289 # global variable containing the repo_name we will be using 324 # global variable containing the repo_name we will be using
290 debug-print "${FUNCNAME}: EGIT_REPO_URI_SELECTED=\"${repo_uri}\"" 325 debug-print "${FUNCNAME}: EGIT_REPO_URI_SELECTED=\"${repo_uri}\""
291 EGIT_REPO_URI_SELECTED="${repo_uri}" 326 EGIT_REPO_URI_SELECTED="${repo_uri}"
292 break 327 break
293 fi 328 fi
294 done 329 done
295 330
296 if [[ -z ${EGIT_REPO_URI_SELECTED} ]]; then 331 [[ ${EGIT_REPO_URI_SELECTED} ]] \
297 die "${FUNCNAME}: can't fetch from ${EGIT_REPO_URI}" 332 || die "${FUNCNAME}: can't fetch from ${EGIT_REPO_URI}"
298 fi
299} 333}
300 334
301# @FUNCTION: git-2_update_repo 335# @FUNCTION: git-2_update_repo
336# @INTERNAL
302# @DESCRIPTION: 337# @DESCRIPTION:
303# Internal function running update command on specified repo_uri. 338# Internal function running update command on specified repo_uri.
304git-2_update_repo() { 339git-2_update_repo() {
305 debug-print-function ${FUNCNAME} "$@" 340 debug-print-function ${FUNCNAME} "$@"
306 341
307 local repo_uri 342 local repo_uri
308 343
309 if [[ -n ${EGIT_NONBARE} ]]; then 344 if [[ ${EGIT_LOCAL_NONBARE} ]]; then
310 # checkout master branch and drop all other local branches 345 # checkout master branch and drop all other local branches
311 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}"
312 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
313 debug-print "${FUNCNAME}: git branch -D ${x}" 348 debug-print "${FUNCNAME}: git branch -D ${x}"
314 git branch -D ${x} > /dev/null 349 git branch -D ${x} > /dev/null
319 for repo_uri in ${EGIT_REPO_URI}; do 354 for repo_uri in ${EGIT_REPO_URI}; do
320 # git urls might change, so reset it 355 # git urls might change, so reset it
321 git config remote.origin.url "${repo_uri}" 356 git config remote.origin.url "${repo_uri}"
322 357
323 debug-print "${EGIT_UPDATE_CMD}" 358 debug-print "${EGIT_UPDATE_CMD}"
324 ${EGIT_UPDATE_CMD} > /dev/null 359 if ${EGIT_UPDATE_CMD} > /dev/null; then
325 if [[ $? -eq 0 ]]; then
326 # global variable containing the repo_name we will be using 360 # global variable containing the repo_name we will be using
327 debug-print "${FUNCNAME}: EGIT_REPO_URI_SELECTED=\"${repo_uri}\"" 361 debug-print "${FUNCNAME}: EGIT_REPO_URI_SELECTED=\"${repo_uri}\""
328 EGIT_REPO_URI_SELECTED="${repo_uri}" 362 EGIT_REPO_URI_SELECTED="${repo_uri}"
329 break 363 break
330 fi 364 fi
331 done 365 done
332 366
333 if [[ -z ${EGIT_REPO_URI_SELECTED} ]]; then 367 [[ ${EGIT_REPO_URI_SELECTED} ]] \
334 die "${FUNCNAME}: can't update from ${EGIT_REPO_URI}" 368 || die "${FUNCNAME}: can't update from ${EGIT_REPO_URI}"
335 fi
336} 369}
337 370
338# @FUNCTION: git-2_fetch 371# @FUNCTION: git-2_fetch
372# @INTERNAL
339# @DESCRIPTION: 373# @DESCRIPTION:
340# 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
341# specified EGIT_STORE_DIR. 375# specified EGIT_STORE_DIR.
342git-2_fetch() { 376git-2_fetch() {
343 debug-print-function ${FUNCNAME} "$@" 377 debug-print-function ${FUNCNAME} "$@"
344 378
345 local oldsha cursha repo_type 379 local oldsha cursha repo_type
346 380
347 [[ -n ${EGIT_NONBARE} ]] && repo_type="non-bare repository" || repo_type="bare repository" 381 [[ ${EGIT_LOCAL_NONBARE} ]] && repo_type="non-bare repository" || repo_type="bare repository"
348 382
349 if [[ ! -d ${EGIT_DIR} ]]; then 383 if [[ ! -d ${EGIT_DIR} ]]; then
350 git-2_initial_clone 384 git-2_initial_clone
351 pushd "${EGIT_DIR}" > /dev/null 385 pushd "${EGIT_DIR}" > /dev/null
352 cursha=$(git rev-parse ${UPSTREAM_BRANCH}) 386 cursha=$(git rev-parse ${UPSTREAM_BRANCH})
353 echo "GIT NEW clone -->" 387 echo "GIT NEW clone -->"
354 echo " repository: ${EGIT_REPO_URI_SELECTED}" 388 echo " repository: ${EGIT_REPO_URI_SELECTED}"
355 echo " at the commit: ${cursha}" 389 echo " at the commit: ${cursha}"
356 390
357 popd > /dev/null 391 popd > /dev/null
358 elif [[ -n ${EVCS_OFFLINE} ]]; then 392 elif [[ ${EVCS_OFFLINE} ]]; then
359 pushd "${EGIT_DIR}" > /dev/null 393 pushd "${EGIT_DIR}" > /dev/null
360 cursha=$(git rev-parse ${UPSTREAM_BRANCH}) 394 cursha=$(git rev-parse ${UPSTREAM_BRANCH})
361 echo "GIT offline update -->" 395 echo "GIT offline update -->"
362 echo " repository: $(git config remote.origin.url)" 396 echo " repository: $(git config remote.origin.url)"
363 echo " at the commit: ${cursha}" 397 echo " at the commit: ${cursha}"
389 [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]] \ 423 [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]] \
390 && echo " commit: ${EGIT_COMMIT}" 424 && echo " commit: ${EGIT_COMMIT}"
391 echo " branch: ${EGIT_BRANCH}" 425 echo " branch: ${EGIT_BRANCH}"
392 echo " storage directory: \"${EGIT_DIR}\"" 426 echo " storage directory: \"${EGIT_DIR}\""
393 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
394} 434}
395 435
396# @FUNCTION: git_bootstrap 436# @FUNCTION: git_bootstrap
437# @INTERNAL
397# @DESCRIPTION: 438# @DESCRIPTION:
398# Internal function that runs bootstrap command on unpacked source. 439# Internal function that runs bootstrap command on unpacked source.
399git-2_bootstrap() { 440git-2_bootstrap() {
400 debug-print-function ${FUNCNAME} "$@" 441 debug-print-function ${FUNCNAME} "$@"
401 442
402 # @ECLASS_VARIABLE: EGIT_BOOTSTRAP 443 # @ECLASS-VARIABLE: EGIT_BOOTSTRAP
403 # @DESCRIPTION: 444 # @DESCRIPTION:
404 # Command to be executed after checkout and clone of the specified 445 # Command to be executed after checkout and clone of the specified
405 # repository. 446 # repository.
406 # 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
407 # combination with --keep-going it would lead in not-updating 448 # combination with --keep-going it would lead in not-updating
408 # pakcages that are up-to-date. 449 # pakcages that are up-to-date.
409 if [[ -n ${EGIT_BOOTSTRAP} ]]; then 450 if [[ ${EGIT_BOOTSTRAP} ]]; then
410 pushd "${EGIT_SOURCEDIR}" > /dev/null 451 pushd "${EGIT_SOURCEDIR}" > /dev/null
411 einfo "Starting bootstrap" 452 einfo "Starting bootstrap"
412 453
413 if [[ -f ${EGIT_BOOTSTRAP} ]]; then 454 if [[ -f ${EGIT_BOOTSTRAP} ]]; then
414 # we have file in the repo which we should execute 455 # we have file in the repo which we should execute
434 popd > /dev/null 475 popd > /dev/null
435 fi 476 fi
436} 477}
437 478
438# @FUNCTION: git-2_migrate_repository 479# @FUNCTION: git-2_migrate_repository
480# @INTERNAL
439# @DESCRIPTION: 481# @DESCRIPTION:
440# Internal function migrating between bare and normal checkout repository. 482# Internal function migrating between bare and normal checkout repository.
441# 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
442# start to work with bare checkouts sanely. 484# start to work with bare checkouts sanely.
485# This function also set some global variables that differ between
486# bare and non-bare checkout.
443git-2_migrate_repository() { 487git-2_migrate_repository() {
444 debug-print-function ${FUNCNAME} "$@" 488 debug-print-function ${FUNCNAME} "$@"
445 489
446 local target returnstate 490 local bare returnstate
447 491
448 # 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
449 if [[ -z ${EGIT_HAS_SUBMODULES} ]]; then 494 if ! [[ ${EGIT_HAS_SUBMODULES} || ${EGIT_NONBARE} ]]; then
450 target="bare" 495 bare=1
451 else
452 target="full"
453 fi 496 fi
454 [[ -n ${EGIT_NONBARE} ]] && target="full"
455 497
456 # 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
457 # to migrate the data 499 # to migrate the data
458 if [[ -d ${EGIT_DIR} ]]; then 500 if [[ -d ${EGIT_DIR} ]]; then
459 if [[ ${target} == bare && -d ${EGIT_DIR}/.git ]]; then 501 if [[ ${bare} && -d ${EGIT_DIR}/.git ]]; then
460 debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to bare copy" 502 debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to bare copy"
461 503
462 ebegin "Converting \"${EGIT_DIR}\" from non-bare to bare copy" 504 ebegin "Converting \"${EGIT_DIR}\" from non-bare to bare copy"
463 mv "${EGIT_DIR}/.git" "${EGIT_DIR}.bare" 505 mv "${EGIT_DIR}/.git" "${EGIT_DIR}.bare"
464 export GIT_DIR="${EGIT_DIR}.bare" 506 export GIT_DIR="${EGIT_DIR}.bare"
466 returnstate=$? 508 returnstate=$?
467 unset GIT_DIR 509 unset GIT_DIR
468 rm -rf "${EGIT_DIR}" 510 rm -rf "${EGIT_DIR}"
469 mv "${EGIT_DIR}.bare" "${EGIT_DIR}" 511 mv "${EGIT_DIR}.bare" "${EGIT_DIR}"
470 eend ${returnstate} 512 eend ${returnstate}
471 fi
472 if [[ ${target} == full && ! -d ${EGIT_DIR}/.git ]]; then 513 elif [[ ! ${bare} && ! -d ${EGIT_DIR}/.git ]]; then
473 debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to non-bare copy" 514 debug-print "${FUNCNAME}: converting \"${EGIT_DIR}\" to non-bare copy"
474 515
475 ebegin "Converting \"${EGIT_DIR}\" from bare to non-bare copy" 516 ebegin "Converting \"${EGIT_DIR}\" from bare to non-bare copy"
476 git clone -l "${EGIT_DIR}" "${EGIT_DIR}.nonbare" > /dev/null 517 git clone -l "${EGIT_DIR}" "${EGIT_DIR}.nonbare" > /dev/null
477 returnstate=$? 518 returnstate=$?
487 einfo "Migration failed, removing \"${EGIT_DIR}\" to start from scratch." 528 einfo "Migration failed, removing \"${EGIT_DIR}\" to start from scratch."
488 rm -rf "${EGIT_DIR}" 529 rm -rf "${EGIT_DIR}"
489 fi 530 fi
490 531
491 # set various options to work with both targets 532 # set various options to work with both targets
492 if [[ ${target} == bare ]]; then 533 if [[ ${bare} ]]; then
493 debug-print "${FUNCNAME}: working in bare repository for \"${EGIT_DIR}\"" 534 debug-print "${FUNCNAME}: working in bare repository for \"${EGIT_DIR}\""
494 EGIT_OPTIONS+=" --bare" 535 EGIT_LOCAL_OPTIONS+="${EGIT_OPTIONS} --bare"
495 MOVE_COMMAND="git clone -l -s -n ${EGIT_DIR// /\\ }" 536 MOVE_COMMAND="git clone -l -s -n ${EGIT_DIR// /\\ }"
496 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}"
497 UPSTREAM_BRANCH="${EGIT_BRANCH}" 538 UPSTREAM_BRANCH="${EGIT_BRANCH}"
539 EGIT_LOCAL_NONBARE=
498 else 540 else
499 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}\""
500 MOVE_COMMAND="cp -pPR ." 542 MOVE_COMMAND="cp -pPR ."
543 EGIT_LOCAL_OPTIONS="${EGIT_OPTIONS}"
501 EGIT_UPDATE_CMD="git pull -f -u ${EGIT_OPTIONS}" 544 EGIT_UPDATE_CMD="git pull -f -u ${EGIT_OPTIONS}"
502 UPSTREAM_BRANCH="origin/${EGIT_BRANCH}" 545 UPSTREAM_BRANCH="origin/${EGIT_BRANCH}"
503 EGIT_NONBARE="true" 546 EGIT_LOCAL_NONBARE="true"
504 fi 547 fi
548}
549
550# @FUNCTION: git-2_cleanup
551# @INTERNAL
552# @DESCRIPTION:
553# Internal function cleaning up all the global variables
554# that are not required after the unpack has been done.
555git-2_cleanup() {
556 debug-print-function ${FUNCNAME} "$@"
557
558 # Here we can unset only variables that are GLOBAL
559 # defined by the eclass, BUT NOT subject to change
560 # by user (like EGIT_PROJECT).
561 # If ebuild writer polutes his environment it is
562 # his problem only.
563 unset EGIT_DIR
564 unset MOVE_COMMAND
565 unset EGIT_LOCAL_OPTIONS
566 unset EGIT_UPDATE_CMD
567 unset UPSTREAM_BRANCH
568 unset EGIT_LOCAL_NONBARE
505} 569}
506 570
507# @FUNCTION: git-2_src_unpack 571# @FUNCTION: git-2_src_unpack
508# @DESCRIPTION: 572# @DESCRIPTION:
509# Default git src_unpack function. 573# Default git src_unpack function.
517 git-2_gc 581 git-2_gc
518 git-2_submodules 582 git-2_submodules
519 git-2_move_source 583 git-2_move_source
520 git-2_branch 584 git-2_branch
521 git-2_bootstrap 585 git-2_bootstrap
586 git-2_cleanup
522 echo ">>> Unpacked to ${EGIT_SOURCEDIR}" 587 echo ">>> Unpacked to ${EGIT_SOURCEDIR}"
588
589 # Users can specify some SRC_URI and we should
590 # unpack the files too.
591 if [[ ! ${EGIT_NOUNPACK} ]]; then
592 if has ${EAPI:-0} 0 1; then
593 [[ ${A} ]] && unpack ${A}
594 else
595 default_src_unpack
596 fi
597 fi
523} 598}

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

  ViewVC Help
Powered by ViewVC 1.1.20