/[gentoo-x86]/eclass/git.eclass
Gentoo

Diff of /eclass/git.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.28 Revision 1.45
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2009 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/Attic/git.eclass,v 1.28 2009/08/24 21:48:58 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/git.eclass,v 1.45 2010/07/26 02:22:18 reavertm Exp $
4 4
5# @ECLASS: git.eclass 5# @ECLASS: git.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Tomas Chvatal <scarabeus@gentoo.org> 7# Tomas Chvatal <scarabeus@gentoo.org>
8# Donnie Berkholz <dberkholz@gentoo.org> 8# Donnie Berkholz <dberkholz@gentoo.org>
16 16
17inherit eutils 17inherit eutils
18 18
19EGIT="git.eclass" 19EGIT="git.eclass"
20 20
21# We DEPEND on at least a bit recent git version
22DEPEND=">=dev-vcs/git-1.6"
23
21EXPORTED_FUNCTIONS="src_unpack" 24EXPORTED_FUNCTIONS="src_unpack"
22case "${EAPI:-0}" in 25case "${EAPI:-0}" in
23 2) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare" ;; 26 3|2) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare" ;;
24 0|1) ;; 27 1|0) ;;
25 *) die "Unknown EAPI, Bug eclass maintainers." ;; 28 :) DEPEND="EAPI-UNSUPPORTED" ;;
26esac 29esac
27EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} 30EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
28 31
29# define some nice defaults but only if nothing is set already 32# define some nice defaults but only if nothing is set already
30: ${HOMEPAGE:=http://git-scm.com/} 33: ${HOMEPAGE:=http://git-scm.com/}
31 34
32# We DEPEND on at least a bit recent git version
33DEPEND=">=dev-util/git-1.6"
34
35# @ECLASS-VARIABLE: EGIT_QUIET 35# @ECLASS-VARIABLE: EGIT_QUIET
36# @DESCRIPTION: 36# @DESCRIPTION:
37# Enables user specified verbosity for the eclass elog informations. 37# Set to nonempty value to supress some eclass messages.
38# The user just needs to add EGIT_QUIET="ON" to the /etc/make.conf. 38: ${EGIT_QUIET:=${ESCM_QUIET}}
39: ${EGIT_QUIET:="OFF"}
40 39
41# @ECLASS-VARIABLE: EGIT_STORE_DIR 40# @ECLASS-VARIABLE: EGIT_STORE_DIR
42# @DESCRIPTION: 41# @DESCRIPTION:
43# Storage directory for git sources. 42# Storage directory for git sources.
44# Can be redefined. 43# Can be redefined.
45[[ -z ${EGIT_STORE_DIR} ]] && EGIT_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/git-src" 44[[ -z ${EGIT_STORE_DIR} ]] && EGIT_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/git-src"
46 45
46# @ECLASS-VARIABLE: EGIT_HAS_SUBMODULES
47# @DESCRIPTION:
48# Set this to nonzero value to enable submodule support (slower).
49: ${EGIT_HAS_SUBMODULES:=}
50
47# @ECLASS-VARIABLE: EGIT_FETCH_CMD 51# @ECLASS-VARIABLE: EGIT_FETCH_CMD
48# @DESCRIPTION: 52# @DESCRIPTION:
49# Command for cloning the repository. 53# Command for cloning the repository.
50: ${EGIT_FETCH_CMD:="git clone --bare"} 54: ${EGIT_FETCH_CMD:="git clone"}
51 55
52# @ECLASS-VARIABLE: EGIT_UPDATE_CMD 56# @ECLASS-VARIABLE: EGIT_UPDATE_CMD
53# @DESCRIPTION: 57# @DESCRIPTION:
54# Git fetch command. 58# Git fetch command.
59if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
60 EGIT_UPDATE_CMD="git pull -f -u"
61else
55EGIT_UPDATE_CMD="git fetch -f -u" 62 EGIT_UPDATE_CMD="git fetch -f -u"
63fi
56 64
57# @ECLASS-VARIABLE: EGIT_DIFFSTAT_CMD 65# @ECLASS-VARIABLE: EGIT_DIFFSTAT_CMD
58# @DESCRIPTION: 66# @DESCRIPTION:
59# Git command for diffstat. 67# Git command for diffstat.
60EGIT_DIFFSTAT_CMD="git --no-pager diff --stat" 68EGIT_DIFFSTAT_CMD="git --no-pager diff --stat"
61 69
62# @ECLASS-VARIABLE: EGIT_OPTIONS 70# @ECLASS-VARIABLE: EGIT_OPTIONS
63# @DESCRIPTION: 71# @DESCRIPTION:
64# This variable value is passed to clone and fetch. 72# This variable value is passed to clone and fetch.
65: ${EGIT_OPTIONS:=} 73: ${EGIT_OPTIONS:=}
74
75# @ECLASS-VARIABLE: EGIT_MASTER
76# @DESCRIPTION:
77# Variable for specifying master branch.
78# Usefull when upstream don't have master branch.
79: ${EGIT_MASTER:=master}
66 80
67# @ECLASS-VARIABLE: EGIT_REPO_URI 81# @ECLASS-VARIABLE: EGIT_REPO_URI
68# @DESCRIPTION: 82# @DESCRIPTION:
69# URI for the repository 83# URI for the repository
70# e.g. http://foo, git://bar 84# e.g. http://foo, git://bar
73# https:// 87# https://
74# git:// 88# git://
75# git+ssh:// 89# git+ssh://
76# rsync:// 90# rsync://
77# ssh:// 91# ssh://
78eval X="\$${PN//-/_}_LIVE_REPO" 92eval X="\$${PN//[-+]/_}_LIVE_REPO"
79if [[ ${X} = "" ]]; then 93if [[ ${X} = "" ]]; then
80 EGIT_REPO_URI=${EGIT_REPO_URI:=} 94 EGIT_REPO_URI=${EGIT_REPO_URI:=}
81else 95else
82 EGIT_REPO_URI="${X}" 96 EGIT_REPO_URI="${X}"
83fi 97fi
90# http://git.collab.net/repo/git. and PN is subversion-git. 104# http://git.collab.net/repo/git. and PN is subversion-git.
91# it will check out like: 105# it will check out like:
92# ${EGIT_STORE_DIR}/subversion 106# ${EGIT_STORE_DIR}/subversion
93: ${EGIT_PROJECT:=${PN/-git}} 107: ${EGIT_PROJECT:=${PN/-git}}
94 108
95# @ECLASS-VARIABLE: EGIT_BOOSTRAP 109# @ECLASS-VARIABLE: EGIT_BOOTSTRAP
96# @DESCRIPTION: 110# @DESCRIPTION:
97# bootstrap script or command like autogen.sh or etc... 111# bootstrap script or command like autogen.sh or etc...
98: ${EGIT_BOOTSTRAP:=} 112: ${EGIT_BOOTSTRAP:=}
99 113
100# @ECLASS-VARIABLE: EGIT_OFFLINE 114# @ECLASS-VARIABLE: EGIT_OFFLINE
101# @DESCRIPTION: 115# @DESCRIPTION:
102# Set this variable to a non-empty value to disable the automatic updating of 116# Set this variable to a non-empty value to disable the automatic updating of
103# an GIT source tree. This is intended to be set outside the git source 117# an GIT source tree. This is intended to be set outside the git source
104# tree by users. 118# tree by users.
105EGIT_OFFLINE="${EGIT_OFFLINE:-${ESCM_OFFLINE}}" 119: ${EGIT_OFFLINE:=${ESCM_OFFLINE}}
106 120
107# @ECLASS-VARIABLE: EGIT_PATCHES 121# @ECLASS-VARIABLE: EGIT_PATCHES
108# @DESCRIPTION: 122# @DESCRIPTION:
109# Similar to PATCHES array from base.eclass 123# Similar to PATCHES array from base.eclass
110# Only difference is that this patches are applied before bootstrap. 124# Only difference is that this patches are applied before bootstrap.
111# Please take note that this variable should be bash array. 125# Please take note that this variable should be bash array.
112 126
113# @ECLASS-VARIABLE: EGIT_BRANCH 127# @ECLASS-VARIABLE: EGIT_BRANCH
114# @DESCRIPTION: 128# @DESCRIPTION:
115# git eclass can fetch any branch in git_fetch(). 129# git eclass can fetch any branch in git_fetch().
116eval X="\$${PN//-/_}_LIVE_BRANCH" 130eval X="\$${PN//[-+]/_}_LIVE_BRANCH"
117if [[ ${X} = "" ]]; then 131if [[ ${X} = "" ]]; then
118 EGIT_BRANCH=${EGIT_BRANCH:=master} 132 EGIT_BRANCH=${EGIT_BRANCH:=master}
119else 133else
120 EGIT_BRANCH="${X}" 134 EGIT_BRANCH="${X}"
121fi 135fi
122 136
123# @ECLASS-VARIABLE: EGIT_TREE 137# @ECLASS-VARIABLE: EGIT_COMMIT
124# @DESCRIPTION: 138# @DESCRIPTION:
125# git eclass can checkout any tree (commit). 139# git eclass can checkout any commit.
126eval X="\$${PN//-/_}_LIVE_TREE" 140eval X="\$${PN//[-+]/_}_LIVE_COMMIT"
127if [[ ${X} = "" ]]; then 141if [[ ${X} = "" ]]; then
128 : ${EGIT_TREE:=${EGIT_BRANCH}} 142 : ${EGIT_COMMIT:=${EGIT_BRANCH}}
129else 143else
130 EGIT_TREE="${X}" 144 EGIT_COMMIT="${X}"
131fi 145fi
132 146
133# @ECLASS-VARIABLE: EGIT_REPACK 147# @ECLASS-VARIABLE: EGIT_REPACK
134# @DESCRIPTION: 148# @DESCRIPTION:
135# git eclass will repack objects to save disk space. However this can take a 149# git eclass will repack objects to save disk space. However this can take a
136# long time with VERY big repositories. 150# long time with VERY big repositories.
137: ${EGIT_REPACK:=false} 151: ${EGIT_REPACK:=}
138 152
139# @ECLASS-VARIABLE: EGIT_PRUNE 153# @ECLASS-VARIABLE: EGIT_PRUNE
140# @DESCRIPTION: 154# @DESCRIPTION:
141# git.eclass can prune the local clone. This is useful if upstream rewinds and 155# git eclass can prune the local clone. This is useful if upstream rewinds and
142# rebases branches too often. 156# rebases branches too often.
143: ${EGIT_PRUNE:=false} 157: ${EGIT_PRUNE:=}
158
159# @FUNCTION: git_submodules
160# @DESCRIPTION:
161# Internal function wrapping the submodule initialisation and update
162git_submodules() {
163 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
164 debug-print "git submodule init"
165 git submodule init
166 debug-print "git submodule update"
167 git submodule update
168 fi
169}
170
171# @FUNCTION: git_branch
172# @DESCRIPTION:
173# Internal function that changes branch for the repo based on EGIT_TREE and
174# EGIT_BRANCH variables.
175git_branch() {
176 local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH}
177 if [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]]; then
178 branchname=tree-${EGIT_COMMIT}
179 src=${EGIT_COMMIT}
180 fi
181 debug-print "git checkout -b ${branchname} ${src}"
182 git checkout -b ${branchname} ${src} &> /dev/null
183
184 unset branchname src
185}
144 186
145# @FUNCTION: git_fetch 187# @FUNCTION: git_fetch
146# @DESCRIPTION: 188# @DESCRIPTION:
147# Gets repository from EGIT_REPO_URI and store it in specified EGIT_STORE_DIR 189# Gets repository from EGIT_REPO_URI and store it in specified EGIT_STORE_DIR
148git_fetch() { 190git_fetch() {
149 debug-print-function ${FUNCNAME} "$@" 191 debug-print-function ${FUNCNAME} "$@"
150 192
151 local EGIT_CLONE_DIR oldsha1 cursha1 193 local GIT_DIR EGIT_CLONE_DIR oldsha1 cursha1 extra_clone_opts upstream_branch
194 [[ -z ${EGIT_HAS_SUBMODULES} ]] && export GIT_DIR
152 195
153 # choose if user wants elog or just einfo. 196 # choose if user wants elog or just einfo.
154 if [[ ${EGIT_QUIET} != OFF ]]; then 197 if [[ -n ${EGIT_QUIET} ]]; then
155 elogcmd="einfo" 198 elogcmd="einfo"
156 else 199 else
157 elogcmd="elog" 200 elogcmd="elog"
158 fi 201 fi
159 202
160 # If we have same branch and the tree we can do --depth 1 clone 203 # If we have same branch and the tree we can do --depth 1 clone
161 # which outputs into really smaller data transfers. 204 # which outputs into really smaller data transfers.
162 # Sadly we can do shallow copy for now because quite a few packages need .git 205 # Sadly we can do shallow copy for now because quite a few packages need .git
163 # folder. 206 # folder.
164 #[[ ${EGIT_TREE} = ${EGIT_BRANCH} ]] && \ 207 #[[ ${EGIT_COMMIT} = ${EGIT_BRANCH} ]] && \
165 # EGIT_FETCH_CMD="${EGIT_FETCH_CMD} --depth 1" 208 # EGIT_FETCH_CMD="${EGIT_FETCH_CMD} --depth 1"
209 if [[ ! -z ${EGIT_TREE} ]] ; then
210 EGIT_COMMIT=${EGIT_TREE}
211 ewarn "QA: Usage of deprecated EGIT_TREE variable detected."
212 ewarn "QA: Use EGIT_COMMIT variable instead."
213 fi
166 214
167 # EGIT_REPO_URI is empty. 215 # EGIT_REPO_URI is empty.
168 [[ -z ${EGIT_REPO_URI} ]] && die "${EGIT}: EGIT_REPO_URI is empty." 216 [[ -z ${EGIT_REPO_URI} ]] && die "${EGIT}: EGIT_REPO_URI is empty."
169 217
170 # check for the protocol or pull from a local repo. 218 # check for the protocol or pull from a local repo.
194 [[ -z ${EGIT_REPO_URI##*/} ]] && EGIT_REPO_URI="${EGIT_REPO_URI%/}" 242 [[ -z ${EGIT_REPO_URI##*/} ]] && EGIT_REPO_URI="${EGIT_REPO_URI%/}"
195 EGIT_CLONE_DIR="${EGIT_PROJECT}" 243 EGIT_CLONE_DIR="${EGIT_PROJECT}"
196 244
197 debug-print "${FUNCNAME}: EGIT_OPTIONS = \"${EGIT_OPTIONS}\"" 245 debug-print "${FUNCNAME}: EGIT_OPTIONS = \"${EGIT_OPTIONS}\""
198 246
199 export GIT_DIR="${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" 247 GIT_DIR="${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
200
201 # we also have to remove all shallow copied repositories 248 # we also have to remove all shallow copied repositories
202 # and fetch them again 249 # and fetch them again
203 if [[ -e "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}/shallow" ]]; then 250 if [[ -e "${GIT_DIR}/shallow" ]]; then
204 rm -rf "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" 251 rm -rf "${GIT_DIR}"
205 einfo "The ${EGIT_CLONE_DIR} was shallow copy. Refetching." 252 einfo "The ${EGIT_CLONE_DIR} was shallow copy. Refetching."
206 fi 253 fi
254 # repack from bare copy to normal one
255 if [[ -n ${EGIT_HAS_SUBMODULES} ]] && [[ -d ${GIT_DIR} && ! -d "${GIT_DIR}/.git/" ]]; then
256 rm -rf "${GIT_DIR}"
257 einfo "The ${EGIT_CLONE_DIR} was bare copy. Refetching."
258 fi
259 if [[ -z ${EGIT_HAS_SUBMODULES} ]] && [[ -d ${GIT_DIR} && -d ${GIT_DIR}/.git ]]; then
260 rm -rf "${GIT_DIR}"
261 einfo "The ${EGIT_CLONE_DIR} was not a bare copy. Refetching."
262 fi
207 263
264 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
265 upstream_branch=origin/${EGIT_BRANCH}
266 else
267 upstream_branch=${EGIT_BRANCH}
268 extra_clone_opts=--bare
269 fi
270
208 if [[ ! -d ${EGIT_CLONE_DIR} ]] ; then 271 if [[ ! -d ${GIT_DIR} ]] ; then
209 # first clone 272 # first clone
210 ${elogcmd} "GIT NEW clone -->" 273 ${elogcmd} "GIT NEW clone -->"
211 ${elogcmd} " repository: ${EGIT_REPO_URI}" 274 ${elogcmd} " repository: ${EGIT_REPO_URI}"
212 275
276 debug-print "${EGIT_FETCH_CMD} ${extra_clone_opts} ${EGIT_OPTIONS} \"${EGIT_REPO_URI}\" ${GIT_DIR}"
213 ${EGIT_FETCH_CMD} ${EGIT_OPTIONS} "${EGIT_REPO_URI}" ${EGIT_PROJECT} \ 277 ${EGIT_FETCH_CMD} ${extra_clone_opts} ${EGIT_OPTIONS} "${EGIT_REPO_URI}" ${GIT_DIR} \
214 || die "${EGIT}: can't fetch from ${EGIT_REPO_URI}." 278 || die "${EGIT}: can't fetch from ${EGIT_REPO_URI}."
215 279
216 cursha1=$(git rev-parse ${EGIT_BRANCH}) 280 pushd "${GIT_DIR}" &> /dev/null
281 cursha1=$(git rev-parse ${upstream_branch})
217 ${elogcmd} " at the commit: ${cursha1}" 282 ${elogcmd} " at the commit: ${cursha1}"
218 # We use --bare cloning, so git doesn't do this for us. 283
219 git config remote.origin.url "${EGIT_REPO_URI}" 284 git_submodules
285 popd &> /dev/null
220 elif [[ -n ${EGIT_OFFLINE} ]] ; then 286 elif [[ -n ${EGIT_OFFLINE} ]] ; then
221 cursha1=$(git rev-parse ${EGIT_BRANCH}) 287 pushd "${GIT_DIR}" &> /dev/null
288 cursha1=$(git rev-parse ${upstream_branch})
222 ${elogcmd} "GIT offline update -->" 289 ${elogcmd} "GIT offline update -->"
223 ${elogcmd} " repository: ${EGIT_REPO_URI}" 290 ${elogcmd} " repository: ${EGIT_REPO_URI}"
224 ${elogcmd} " at the commit: ${cursha1}" 291 ${elogcmd} " at the commit: ${cursha1}"
292 popd &> /dev/null
225 else 293 else
294 pushd "${GIT_DIR}" &> /dev/null
226 # Git urls might change, so unconditionally set it here 295 # Git urls might change, so unconditionally set it here
227 git config remote.origin.url "${EGIT_REPO_URI}" 296 git config remote.origin.url "${EGIT_REPO_URI}"
228 297
229 # fetch updates 298 # fetch updates
230 ${elogcmd} "GIT update -->" 299 ${elogcmd} "GIT update -->"
231 ${elogcmd} " repository: ${EGIT_REPO_URI}" 300 ${elogcmd} " repository: ${EGIT_REPO_URI}"
232 301
233 oldsha1=$(git rev-parse ${EGIT_BRANCH}) 302 oldsha1=$(git rev-parse ${upstream_branch})
234 303
304 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
305 debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS}"
306 # fix branching
307 git checkout ${EGIT_MASTER}
308 for x in $(git branch |grep -v "* ${EGIT_MASTER}" |tr '\n' ' '); do
309 git branch -D ${x}
310 done
311 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} \
312 || die "${EGIT}: can't update from ${EGIT_REPO_URI}."
313 else
235 ${elogcmd} ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH} 314 debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH}"
236 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH} \ 315 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH} \
237 || die "${EGIT}: can't update from ${EGIT_REPO_URI}." 316 || die "${EGIT}: can't update from ${EGIT_REPO_URI}."
317 fi
238 318
239 cursha1=$(git rev-parse ${EGIT_BRANCH}) 319 git_submodules
320 cursha1=$(git rev-parse ${upstream_branch})
240 321
241 # write out message based on the revisions 322 # write out message based on the revisions
242 if [[ ${oldsha1} != ${cursha1} ]]; then 323 if [[ ${oldsha1} != ${cursha1} ]]; then
243 ${elogcmd} " updating from commit: ${oldsha1}" 324 ${elogcmd} " updating from commit: ${oldsha1}"
244 ${elogcmd} " to commit: ${cursha1}" 325 ${elogcmd} " to commit: ${cursha1}"
253 # TODO: this can lead to issues if more projects/packages use same repo 334 # TODO: this can lead to issues if more projects/packages use same repo
254 [[ ${LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED} = true ]] && \ 335 [[ ${LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED} = true ]] && \
255 debug-print "${FUNCNAME}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." && \ 336 debug-print "${FUNCNAME}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." && \
256 die "${EGIT}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." 337 die "${EGIT}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping."
257 fi 338 fi
258 ${EGIT_DIFFSTAT_CMD} ${oldsha1}..${EGIT_BRANCH} 339 ${EGIT_DIFFSTAT_CMD} ${oldsha1}..${upstream_branch}
340 popd &> /dev/null
259 fi 341 fi
260 342
343 pushd "${GIT_DIR}" &> /dev/null
261 if ${EGIT_REPACK} || ${EGIT_PRUNE} ; then 344 if [[ -n ${EGIT_REPACK} ]] || [[ -n ${EGIT_PRUNE} ]]; then
262 ebegin "Garbage collecting the repository" 345 ebegin "Garbage collecting the repository"
263 git gc $(${EGIT_PRUNE} && echo '--prune') 346 git gc $(${EGIT_PRUNE} && echo '--prune')
264 eend $? 347 eend $?
265 fi 348 fi
266 349 popd &> /dev/null
350
267 # export the git version 351 # export the git version
268 export EGIT_VERSION="${cursha1}" 352 export EGIT_VERSION="${cursha1}"
269 353
354 # log the repo state
270 [[ ${EGIT_TREE} != ${EGIT_BRANCH} ]] && elog " tree: ${EGIT_TREE}" 355 [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]] && elog " commit: ${EGIT_COMMIT}"
271 ${elogcmd} " branch: ${EGIT_BRANCH}" 356 ${elogcmd} " branch: ${EGIT_BRANCH}"
272 ${elogcmd} " storage directory: \"${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}\"" 357 ${elogcmd} " storage directory: \"${GIT_DIR}\""
273 358
274 # unpack to the ${S} 359 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
360 pushd "${GIT_DIR}" &> /dev/null
361 debug-print "rsync -rlpgo . \"${S}\""
362 time rsync -rlpgo . "${S}"
363 popd &> /dev/null
364 else
275 unset GIT_DIR 365 unset GIT_DIR
276 debug-print "git clone -l -s -n \"${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}\" \"${S}\"" 366 debug-print "git clone -l -s -n \"${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}\" \"${S}\""
277 git clone -l -s -n "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" "${S}" 367 git clone -l -s -n "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" "${S}"
278 368 fi
279 # set correct branch and the tree ebuild specified 369
280 pushd "${S}" > /dev/null 370 pushd "${S}" &> /dev/null
281 local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH} 371 git_branch
282 if [[ ${EGIT_TREE} != ${EGIT_BRANCH} ]]; then 372 # submodules always reqire net (thanks to branches changing)
283 branchname=tree-${EGIT_TREE} 373 [[ -n ${EGIT_OFFLINE} ]] || git_submodules
284 src=${EGIT_TREE}
285 fi
286 debug-print "git checkout -b ${branchname} ${src}"
287 git checkout -b ${branchname} ${src} 2>&1 > /dev/null
288 debug-print "git submodule init"
289 git submodule init 2>&1 > /dev/null
290 debug-print "git submodule update"
291 git submodule update 2>&1 > /dev/null
292 popd > /dev/null 374 popd &> /dev/null
293
294 unset branchname src
295 375
296 echo ">>> Unpacked to ${S}" 376 echo ">>> Unpacked to ${S}"
297} 377}
298 378
299# @FUNCTION: git_bootstrap 379# @FUNCTION: git_bootstrap
371# @FUNCTION: git_src_prepare 451# @FUNCTION: git_src_prepare
372# @DESCRIPTION: 452# @DESCRIPTION:
373# src_prepare function for git stuff. Patches, bootstrap... 453# src_prepare function for git stuff. Patches, bootstrap...
374git_src_prepare() { 454git_src_prepare() {
375 debug-print-function ${FUNCNAME} "$@" 455 debug-print-function ${FUNCNAME} "$@"
376 456
377 git_apply_patches 457 git_apply_patches
378 git_bootstrap 458 git_bootstrap
379} 459}

Legend:
Removed from v.1.28  
changed lines
  Added in v.1.45

  ViewVC Help
Powered by ViewVC 1.1.20