/[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.48
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.48 2010/07/27 12:39:34 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 non-empty 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: ${EGIT_STORE_DIR:="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/git-src"}
45
46# @ECLASS-VARIABLE: EGIT_HAS_SUBMODULES
47# @DESCRIPTION:
48# Set this to non-empty value to enable submodule support (slower).
49: ${EGIT_HAS_SUBMODULES:=}
46 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:=}
81else 95else
82 EGIT_REPO_URI="${X}" 96 EGIT_REPO_URI="${X}"
83fi 97fi
84# @ECLASS-VARIABLE: EGIT_PROJECT 98# @ECLASS-VARIABLE: EGIT_PROJECT
85# @DESCRIPTION: 99# @DESCRIPTION:
86# Project name of your ebuild. 100# Project name, it must be unique across EGIT_STORE_DIR.
87# Git eclass will check out the git repository like: 101# Git eclass will check out the git repository into ${EGIT_STORE_DIR}/${EGIT_PROJECT}/${EGIT_REPO_URI##*/}
88# ${EGIT_STORE_DIR}/${EGIT_PROJECT}/${EGIT_REPO_URI##*/} 102# Default is ${PN}.
89# so if you define EGIT_REPO_URI as http://git.collab.net/repo/git or
90# http://git.collab.net/repo/git. and PN is subversion-git.
91# it will check out like:
92# ${EGIT_STORE_DIR}/subversion
93: ${EGIT_PROJECT:=${PN/-git}} 103: ${EGIT_PROJECT:=${PN}}
94 104
95# @ECLASS-VARIABLE: EGIT_BOOSTRAP 105# @ECLASS-VARIABLE: EGIT_BOOTSTRAP
96# @DESCRIPTION: 106# @DESCRIPTION:
97# bootstrap script or command like autogen.sh or etc... 107# bootstrap script or command like autogen.sh or etc...
98: ${EGIT_BOOTSTRAP:=} 108: ${EGIT_BOOTSTRAP:=}
99 109
100# @ECLASS-VARIABLE: EGIT_OFFLINE 110# @ECLASS-VARIABLE: EGIT_OFFLINE
101# @DESCRIPTION: 111# @DESCRIPTION:
102# Set this variable to a non-empty value to disable the automatic updating of 112# 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 113# an GIT source tree. This is intended to be set outside the git source
104# tree by users. 114# tree by users.
105EGIT_OFFLINE="${EGIT_OFFLINE:-${ESCM_OFFLINE}}" 115: ${EGIT_OFFLINE:=${ESCM_OFFLINE}}
106 116
107# @ECLASS-VARIABLE: EGIT_PATCHES 117# @ECLASS-VARIABLE: EGIT_PATCHES
108# @DESCRIPTION: 118# @DESCRIPTION:
109# Similar to PATCHES array from base.eclass 119# Similar to PATCHES array from base.eclass
110# Only difference is that this patches are applied before bootstrap. 120# Only difference is that this patches are applied before bootstrap.
111# Please take note that this variable should be bash array. 121# Please take note that this variable should be bash array.
112 122
113# @ECLASS-VARIABLE: EGIT_BRANCH 123# @ECLASS-VARIABLE: EGIT_BRANCH
114# @DESCRIPTION: 124# @DESCRIPTION:
115# git eclass can fetch any branch in git_fetch(). 125# git eclass can fetch any branch in git_fetch().
116eval X="\$${PN//-/_}_LIVE_BRANCH" 126eval X="\$${PN//[-+]/_}_LIVE_BRANCH"
117if [[ ${X} = "" ]]; then 127if [[ "${X}" = "" ]]; then
118 EGIT_BRANCH=${EGIT_BRANCH:=master} 128 : ${EGIT_BRANCH:=master}
119else 129else
120 EGIT_BRANCH="${X}" 130 EGIT_BRANCH="${X}"
121fi 131fi
122 132
123# @ECLASS-VARIABLE: EGIT_TREE 133# @ECLASS-VARIABLE: EGIT_COMMIT
124# @DESCRIPTION: 134# @DESCRIPTION:
125# git eclass can checkout any tree (commit). 135# git eclass can checkout any commit.
126eval X="\$${PN//-/_}_LIVE_TREE" 136eval X="\$${PN//[-+]/_}_LIVE_COMMIT"
127if [[ ${X} = "" ]]; then 137if [[ "${X}" = "" ]]; then
128 : ${EGIT_TREE:=${EGIT_BRANCH}} 138 : ${EGIT_COMMIT:=${EGIT_BRANCH}}
129else 139else
130 EGIT_TREE="${X}" 140 EGIT_COMMIT="${X}"
131fi 141fi
132 142
133# @ECLASS-VARIABLE: EGIT_REPACK 143# @ECLASS-VARIABLE: EGIT_REPACK
134# @DESCRIPTION: 144# @DESCRIPTION:
135# git eclass will repack objects to save disk space. However this can take a 145# Set to non-empty value to repack objects to save disk space. However this can
136# long time with VERY big repositories. 146# take a long time with VERY big repositories.
137: ${EGIT_REPACK:=false} 147: ${EGIT_REPACK:=}
138 148
139# @ECLASS-VARIABLE: EGIT_PRUNE 149# @ECLASS-VARIABLE: EGIT_PRUNE
140# @DESCRIPTION: 150# @DESCRIPTION:
141# git.eclass can prune the local clone. This is useful if upstream rewinds and 151# Set to non-empty value to prune loose objects on each fetch. This is useful
142# rebases branches too often. 152# if upstream rewinds and rebases branches often.
143: ${EGIT_PRUNE:=false} 153: ${EGIT_PRUNE:=}
154
155# @FUNCTION: git_submodules
156# @DESCRIPTION:
157# Internal function wrapping the submodule initialisation and update
158git_submodules() {
159 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
160 debug-print "git submodule init"
161 git submodule init
162 debug-print "git submodule update"
163 git submodule update
164 fi
165}
166
167# @FUNCTION: git_branch
168# @DESCRIPTION:
169# Internal function that changes branch for the repo based on EGIT_TREE and
170# EGIT_BRANCH variables.
171git_branch() {
172 local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH}
173 if [[ "${EGIT_COMMIT}" != "${EGIT_BRANCH}" ]]; then
174 branchname=tree-${EGIT_COMMIT}
175 src=${EGIT_COMMIT}
176 fi
177 debug-print "git checkout -b ${branchname} ${src}"
178 git checkout -b ${branchname} ${src} &> /dev/null
179
180 unset branchname src
181}
144 182
145# @FUNCTION: git_fetch 183# @FUNCTION: git_fetch
146# @DESCRIPTION: 184# @DESCRIPTION:
147# Gets repository from EGIT_REPO_URI and store it in specified EGIT_STORE_DIR 185# Gets repository from EGIT_REPO_URI and store it in specified EGIT_STORE_DIR
148git_fetch() { 186git_fetch() {
149 debug-print-function ${FUNCNAME} "$@" 187 debug-print-function ${FUNCNAME} "$@"
150 188
151 local EGIT_CLONE_DIR oldsha1 cursha1 189 local GIT_DIR EGIT_CLONE_DIR oldsha1 cursha1 extra_clone_opts upstream_branch
190 [[ -z ${EGIT_HAS_SUBMODULES} ]] && export GIT_DIR
152 191
153 # choose if user wants elog or just einfo. 192 # choose if user wants elog or just einfo.
154 if [[ ${EGIT_QUIET} != OFF ]]; then 193 if [[ -n ${EGIT_QUIET} ]]; then
155 elogcmd="einfo" 194 elogcmd="einfo"
156 else 195 else
157 elogcmd="elog" 196 elogcmd="elog"
158 fi 197 fi
159 198
160 # If we have same branch and the tree we can do --depth 1 clone 199 # If we have same branch and the tree we can do --depth 1 clone
161 # which outputs into really smaller data transfers. 200 # which outputs into really smaller data transfers.
162 # Sadly we can do shallow copy for now because quite a few packages need .git 201 # Sadly we can do shallow copy for now because quite a few packages need .git
163 # folder. 202 # folder.
164 #[[ ${EGIT_TREE} = ${EGIT_BRANCH} ]] && \ 203 #[[ ${EGIT_COMMIT} = ${EGIT_BRANCH} ]] && \
165 # EGIT_FETCH_CMD="${EGIT_FETCH_CMD} --depth 1" 204 # EGIT_FETCH_CMD="${EGIT_FETCH_CMD} --depth 1"
205 if [[ -n ${EGIT_TREE} ]] ; then
206 EGIT_COMMIT=${EGIT_TREE}
207 ewarn "QA: Usage of deprecated EGIT_TREE variable detected."
208 ewarn "QA: Use EGIT_COMMIT variable instead."
209 fi
166 210
167 # EGIT_REPO_URI is empty. 211 # EGIT_REPO_URI is empty.
168 [[ -z ${EGIT_REPO_URI} ]] && die "${EGIT}: EGIT_REPO_URI is empty." 212 [[ -z ${EGIT_REPO_URI} ]] && die "${EGIT}: EGIT_REPO_URI is empty."
169 213
170 # check for the protocol or pull from a local repo. 214 # check for the protocol or pull from a local repo.
194 [[ -z ${EGIT_REPO_URI##*/} ]] && EGIT_REPO_URI="${EGIT_REPO_URI%/}" 238 [[ -z ${EGIT_REPO_URI##*/} ]] && EGIT_REPO_URI="${EGIT_REPO_URI%/}"
195 EGIT_CLONE_DIR="${EGIT_PROJECT}" 239 EGIT_CLONE_DIR="${EGIT_PROJECT}"
196 240
197 debug-print "${FUNCNAME}: EGIT_OPTIONS = \"${EGIT_OPTIONS}\"" 241 debug-print "${FUNCNAME}: EGIT_OPTIONS = \"${EGIT_OPTIONS}\""
198 242
199 export GIT_DIR="${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" 243 GIT_DIR="${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
200
201 # we also have to remove all shallow copied repositories 244 # we also have to remove all shallow copied repositories
202 # and fetch them again 245 # and fetch them again
203 if [[ -e "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}/shallow" ]]; then 246 if [[ -e "${GIT_DIR}/shallow" ]]; then
204 rm -rf "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" 247 rm -rf "${GIT_DIR}"
205 einfo "The ${EGIT_CLONE_DIR} was shallow copy. Refetching." 248 einfo "The ${EGIT_CLONE_DIR} was shallow copy. Refetching."
206 fi 249 fi
250 # repack from bare copy to normal one
251 if [[ -n ${EGIT_HAS_SUBMODULES} ]] && [[ -d ${GIT_DIR} && ! -d ${GIT_DIR}/.git ]]; then
252 rm -rf "${GIT_DIR}"
253 einfo "The ${EGIT_CLONE_DIR} was bare copy. Refetching."
254 fi
255 if [[ -z ${EGIT_HAS_SUBMODULES} ]] && [[ -d ${GIT_DIR} && -d ${GIT_DIR}/.git ]]; then
256 rm -rf "${GIT_DIR}"
257 einfo "The ${EGIT_CLONE_DIR} was not a bare copy. Refetching."
258 fi
207 259
260 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
261 upstream_branch=origin/${EGIT_BRANCH}
262 else
263 upstream_branch=${EGIT_BRANCH}
264 extra_clone_opts=--bare
265 fi
266
208 if [[ ! -d ${EGIT_CLONE_DIR} ]] ; then 267 if [[ ! -d ${GIT_DIR} ]] ; then
209 # first clone 268 # first clone
210 ${elogcmd} "GIT NEW clone -->" 269 ${elogcmd} "GIT NEW clone -->"
211 ${elogcmd} " repository: ${EGIT_REPO_URI}" 270 ${elogcmd} " repository: ${EGIT_REPO_URI}"
212 271
272 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} \ 273 ${EGIT_FETCH_CMD} ${extra_clone_opts} ${EGIT_OPTIONS} "${EGIT_REPO_URI}" ${GIT_DIR} \
214 || die "${EGIT}: can't fetch from ${EGIT_REPO_URI}." 274 || die "${EGIT}: can't fetch from ${EGIT_REPO_URI}."
215 275
216 cursha1=$(git rev-parse ${EGIT_BRANCH}) 276 pushd "${GIT_DIR}" &> /dev/null
277 cursha1=$(git rev-parse ${upstream_branch})
217 ${elogcmd} " at the commit: ${cursha1}" 278 ${elogcmd} " at the commit: ${cursha1}"
218 # We use --bare cloning, so git doesn't do this for us. 279
219 git config remote.origin.url "${EGIT_REPO_URI}" 280 git_submodules
281 popd &> /dev/null
220 elif [[ -n ${EGIT_OFFLINE} ]] ; then 282 elif [[ -n ${EGIT_OFFLINE} ]] ; then
221 cursha1=$(git rev-parse ${EGIT_BRANCH}) 283 pushd "${GIT_DIR}" &> /dev/null
284 cursha1=$(git rev-parse ${upstream_branch})
222 ${elogcmd} "GIT offline update -->" 285 ${elogcmd} "GIT offline update -->"
223 ${elogcmd} " repository: ${EGIT_REPO_URI}" 286 ${elogcmd} " repository: ${EGIT_REPO_URI}"
224 ${elogcmd} " at the commit: ${cursha1}" 287 ${elogcmd} " at the commit: ${cursha1}"
288 popd &> /dev/null
225 else 289 else
290 pushd "${GIT_DIR}" &> /dev/null
226 # Git urls might change, so unconditionally set it here 291 # Git urls might change, so unconditionally set it here
227 git config remote.origin.url "${EGIT_REPO_URI}" 292 git config remote.origin.url "${EGIT_REPO_URI}"
228 293
229 # fetch updates 294 # fetch updates
230 ${elogcmd} "GIT update -->" 295 ${elogcmd} "GIT update -->"
231 ${elogcmd} " repository: ${EGIT_REPO_URI}" 296 ${elogcmd} " repository: ${EGIT_REPO_URI}"
232 297
233 oldsha1=$(git rev-parse ${EGIT_BRANCH}) 298 oldsha1=$(git rev-parse ${upstream_branch})
234 299
300 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
301 debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS}"
302 # fix branching
303 git checkout ${EGIT_MASTER}
304 for x in $(git branch |grep -v "* ${EGIT_MASTER}" |tr '\n' ' '); do
305 git branch -D ${x}
306 done
307 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} \
308 || die "${EGIT}: can't update from ${EGIT_REPO_URI}."
309 else
235 ${elogcmd} ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH} 310 debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH}"
236 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH} \ 311 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH} \
237 || die "${EGIT}: can't update from ${EGIT_REPO_URI}." 312 || die "${EGIT}: can't update from ${EGIT_REPO_URI}."
313 fi
238 314
239 cursha1=$(git rev-parse ${EGIT_BRANCH}) 315 git_submodules
316 cursha1=$(git rev-parse ${upstream_branch})
240 317
241 # write out message based on the revisions 318 # write out message based on the revisions
242 if [[ ${oldsha1} != ${cursha1} ]]; then 319 if [[ "${oldsha1}" != "${cursha1}" ]]; then
243 ${elogcmd} " updating from commit: ${oldsha1}" 320 ${elogcmd} " updating from commit: ${oldsha1}"
244 ${elogcmd} " to commit: ${cursha1}" 321 ${elogcmd} " to commit: ${cursha1}"
245 else 322 else
246 ${elogcmd} " at the commit: ${cursha1}" 323 ${elogcmd} " at the commit: ${cursha1}"
247 # @ECLASS_VARIABLE: LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED 324 # @ECLASS_VARIABLE: LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED
253 # TODO: this can lead to issues if more projects/packages use same repo 330 # TODO: this can lead to issues if more projects/packages use same repo
254 [[ ${LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED} = true ]] && \ 331 [[ ${LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED} = true ]] && \
255 debug-print "${FUNCNAME}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." && \ 332 debug-print "${FUNCNAME}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." && \
256 die "${EGIT}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." 333 die "${EGIT}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping."
257 fi 334 fi
258 ${EGIT_DIFFSTAT_CMD} ${oldsha1}..${EGIT_BRANCH} 335 ${EGIT_DIFFSTAT_CMD} ${oldsha1}..${upstream_branch}
336 popd &> /dev/null
259 fi 337 fi
260 338
339 pushd "${GIT_DIR}" &> /dev/null
261 if ${EGIT_REPACK} || ${EGIT_PRUNE} ; then 340 if [[ -n ${EGIT_REPACK} ]] || [[ -n ${EGIT_PRUNE} ]]; then
262 ebegin "Garbage collecting the repository" 341 ebegin "Garbage collecting the repository"
263 git gc $(${EGIT_PRUNE} && echo '--prune') 342 local args
343 [[ -n ${EGIT_PRUNE} ]] && args='--prune'
344 git gc ${args}
264 eend $? 345 eend $?
265 fi 346 fi
266 347 popd &> /dev/null
348
267 # export the git version 349 # export the git version
268 export EGIT_VERSION="${cursha1}" 350 export EGIT_VERSION="${cursha1}"
269 351
352 # log the repo state
270 [[ ${EGIT_TREE} != ${EGIT_BRANCH} ]] && elog " tree: ${EGIT_TREE}" 353 [[ "${EGIT_COMMIT}" != "${EGIT_BRANCH}" ]] && ${elogcmd} " commit: ${EGIT_COMMIT}"
271 ${elogcmd} " branch: ${EGIT_BRANCH}" 354 ${elogcmd} " branch: ${EGIT_BRANCH}"
272 ${elogcmd} " storage directory: \"${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}\"" 355 ${elogcmd} " storage directory: \"${GIT_DIR}\""
273 356
274 # unpack to the ${S} 357 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
358 pushd "${GIT_DIR}" &> /dev/null
359 debug-print "rsync -rlpgo . \"${S}\""
360 time rsync -rlpgo . "${S}"
361 popd &> /dev/null
362 else
275 unset GIT_DIR 363 unset GIT_DIR
276 debug-print "git clone -l -s -n \"${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}\" \"${S}\"" 364 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}" 365 git clone -l -s -n "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" "${S}"
278 366 fi
279 # set correct branch and the tree ebuild specified 367
280 pushd "${S}" > /dev/null 368 pushd "${S}" &> /dev/null
281 local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH} 369 git_branch
282 if [[ ${EGIT_TREE} != ${EGIT_BRANCH} ]]; then 370 # submodules always reqire net (thanks to branches changing)
283 branchname=tree-${EGIT_TREE} 371 [[ -z ${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 372 popd &> /dev/null
293
294 unset branchname src
295 373
296 echo ">>> Unpacked to ${S}" 374 echo ">>> Unpacked to ${S}"
297} 375}
298 376
299# @FUNCTION: git_bootstrap 377# @FUNCTION: git_bootstrap
334} 412}
335 413
336# @FUNCTION: git_apply_patches 414# @FUNCTION: git_apply_patches
337# @DESCRIPTION: 415# @DESCRIPTION:
338# Apply patches from EGIT_PATCHES bash array. 416# Apply patches from EGIT_PATCHES bash array.
339# Preffered is using the variable as bash array but for now it allows to write 417# Preferred is using the variable as bash array but for now it allows to write
340# it also as normal space separated string list. (This part of code should be 418# it also as normal space separated string list. (This part of code should be
341# removed when all ebuilds get converted on bash array). 419# removed when all ebuilds get converted on bash array).
342git_apply_patches() { 420git_apply_patches() {
343 debug-print-function ${FUNCNAME} "$@" 421 debug-print-function ${FUNCNAME} "$@"
344 422
346 if [[ ${#EGIT_PATCHES[@]} -gt 1 ]] ; then 424 if [[ ${#EGIT_PATCHES[@]} -gt 1 ]] ; then
347 for i in "${EGIT_PATCHES[@]}"; do 425 for i in "${EGIT_PATCHES[@]}"; do
348 debug-print "$FUNCNAME: git_autopatch: patching from ${i}" 426 debug-print "$FUNCNAME: git_autopatch: patching from ${i}"
349 epatch "${i}" 427 epatch "${i}"
350 done 428 done
351 elif [[ ${EGIT_PATCHES} != "" ]]; then 429 elif [[ -n ${EGIT_PATCHES} ]]; then
352 # no need for loop if space separated string is passed. 430 # no need for loop if space separated string is passed.
353 debug-print "$FUNCNAME: git_autopatch: patching from ${EGIT_PATCHES}" 431 debug-print "$FUNCNAME: git_autopatch: patching from ${EGIT_PATCHES}"
354 epatch "${EGIT_PATCHES}" 432 epatch "${EGIT_PATCHES}"
355 fi 433 fi
356 434
371# @FUNCTION: git_src_prepare 449# @FUNCTION: git_src_prepare
372# @DESCRIPTION: 450# @DESCRIPTION:
373# src_prepare function for git stuff. Patches, bootstrap... 451# src_prepare function for git stuff. Patches, bootstrap...
374git_src_prepare() { 452git_src_prepare() {
375 debug-print-function ${FUNCNAME} "$@" 453 debug-print-function ${FUNCNAME} "$@"
376 454
377 git_apply_patches 455 git_apply_patches
378 git_bootstrap 456 git_bootstrap
379} 457}

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

  ViewVC Help
Powered by ViewVC 1.1.20