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

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

  ViewVC Help
Powered by ViewVC 1.1.20