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

Diff of /eclass/git.eclass

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

Revision 1.35 Revision 1.51
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.35 2010/01/13 20:04:19 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/git.eclass,v 1.51 2011/02/02 19:26:53 ulm 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 4|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"} 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
55EGIT_UPDATE_CMD="git pull -f -u" 60 EGIT_UPDATE_CMD="git pull -f -u"
61else
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
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_BOOTSTRAP 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:=}
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.
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_COMMIT 133# @ECLASS-VARIABLE: EGIT_COMMIT
124# @DESCRIPTION: 134# @DESCRIPTION:
125# git eclass can checkout any commit. 135# git eclass can checkout any commit.
126eval X="\$${PN//[-+]/_}_LIVE_COMMIT" 136eval X="\$${PN//[-+]/_}_LIVE_COMMIT"
127if [[ ${X} = "" ]]; then 137if [[ "${X}" = "" ]]; then
128 : ${EGIT_COMMIT:=${EGIT_BRANCH}} 138 : ${EGIT_COMMIT:=${EGIT_BRANCH}}
129else 139else
130 EGIT_COMMIT="${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:=}
144 154
145# @FUNCTION: git_submodules 155# @FUNCTION: git_submodules
146# @DESCRIPTION: 156# @DESCRIPTION:
147# Internal function wrapping the submodule initialisation and update 157# Internal function wrapping the submodule initialisation and update
148git_sumbodules() { 158git_submodules() {
159 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
149 debug-print "git submodule init" 160 debug-print "git submodule init"
150 git submodule init 161 git submodule init
162 debug-print "git submodule sync"
163 git submodule sync
151 debug-print "git submodule update" 164 debug-print "git submodule update"
152 git submodule update 165 git submodule update
166 fi
167}
168
169# @FUNCTION: git_branch
170# @DESCRIPTION:
171# Internal function that changes branch for the repo based on EGIT_TREE and
172# EGIT_BRANCH variables.
173git_branch() {
174 local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH}
175 if [[ "${EGIT_COMMIT}" != "${EGIT_BRANCH}" ]]; then
176 branchname=tree-${EGIT_COMMIT}
177 src=${EGIT_COMMIT}
178 fi
179 debug-print "git checkout -b ${branchname} ${src}"
180 git checkout -b ${branchname} ${src} &> /dev/null
181
182 unset branchname src
153} 183}
154 184
155# @FUNCTION: git_fetch 185# @FUNCTION: git_fetch
156# @DESCRIPTION: 186# @DESCRIPTION:
157# Gets repository from EGIT_REPO_URI and store it in specified EGIT_STORE_DIR 187# Gets repository from EGIT_REPO_URI and store it in specified EGIT_STORE_DIR
158git_fetch() { 188git_fetch() {
159 debug-print-function ${FUNCNAME} "$@" 189 debug-print-function ${FUNCNAME} "$@"
160 190
161 local GIT_DIR EGIT_CLONE_DIR oldsha1 cursha1 191 local GIT_DIR EGIT_CLONE_DIR oldsha1 cursha1 extra_clone_opts upstream_branch
192 [[ -z ${EGIT_HAS_SUBMODULES} ]] && export GIT_DIR
162 193
163 # choose if user wants elog or just einfo. 194 # choose if user wants elog or just einfo.
164 if [[ ${EGIT_QUIET} != OFF ]]; then 195 if [[ -n ${EGIT_QUIET} ]]; then
165 elogcmd="einfo" 196 elogcmd="einfo"
166 else 197 else
167 elogcmd="elog" 198 elogcmd="elog"
168 fi 199 fi
169 200
171 # which outputs into really smaller data transfers. 202 # which outputs into really smaller data transfers.
172 # Sadly we can do shallow copy for now because quite a few packages need .git 203 # Sadly we can do shallow copy for now because quite a few packages need .git
173 # folder. 204 # folder.
174 #[[ ${EGIT_COMMIT} = ${EGIT_BRANCH} ]] && \ 205 #[[ ${EGIT_COMMIT} = ${EGIT_BRANCH} ]] && \
175 # EGIT_FETCH_CMD="${EGIT_FETCH_CMD} --depth 1" 206 # EGIT_FETCH_CMD="${EGIT_FETCH_CMD} --depth 1"
176 if [[ ! -z ${EGIT_TREE} ]] ; then 207 if [[ -n ${EGIT_TREE} ]] ; then
177 EGIT_COMMIT=${EGIT_TREE} 208 EGIT_COMMIT=${EGIT_TREE}
178 eqawarn "Usage of deprecated EGIT_TREE variable detected." 209 ewarn "QA: Usage of deprecated EGIT_TREE variable detected."
179 eqawarn "Use EGIT_COMMIT variable instead." 210 ewarn "QA: Use EGIT_COMMIT variable instead."
180 fi 211 fi
181 212
182 # EGIT_REPO_URI is empty. 213 # EGIT_REPO_URI is empty.
183 [[ -z ${EGIT_REPO_URI} ]] && die "${EGIT}: EGIT_REPO_URI is empty." 214 [[ -z ${EGIT_REPO_URI} ]] && die "${EGIT}: EGIT_REPO_URI is empty."
184 215
210 EGIT_CLONE_DIR="${EGIT_PROJECT}" 241 EGIT_CLONE_DIR="${EGIT_PROJECT}"
211 242
212 debug-print "${FUNCNAME}: EGIT_OPTIONS = \"${EGIT_OPTIONS}\"" 243 debug-print "${FUNCNAME}: EGIT_OPTIONS = \"${EGIT_OPTIONS}\""
213 244
214 GIT_DIR="${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" 245 GIT_DIR="${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
215 pushd ${EGIT_STORE_DIR} &> /dev/null
216 # we also have to remove all shallow copied repositories 246 # we also have to remove all shallow copied repositories
217 # and fetch them again 247 # and fetch them again
218 if [[ -e "${GIT_DIR}/shallow" ]]; then 248 if [[ -e "${GIT_DIR}/shallow" ]]; then
219 rm -rf "${GIT_DIR}" 249 rm -rf "${GIT_DIR}"
220 einfo "The ${EGIT_CLONE_DIR} was shallow copy. Refetching." 250 einfo "The ${EGIT_CLONE_DIR} was shallow copy. Refetching."
221 fi 251 fi
222 # repack from bare copy to normal one 252 # repack from bare copy to normal one
223 if [[ -d ${GIT_DIR} && ! -d "${GIT_DIR}/.git/" ]]; then 253 if [[ -n ${EGIT_HAS_SUBMODULES} ]] && [[ -d ${GIT_DIR} && ! -d ${GIT_DIR}/.git ]]; then
224 rm -rf "${GIT_DIR}" 254 rm -rf "${GIT_DIR}"
225 einfo "The ${EGIT_CLONE_DIR} was bare copy. Refetching." 255 einfo "The ${EGIT_CLONE_DIR} was bare copy. Refetching."
256 fi
257 if [[ -z ${EGIT_HAS_SUBMODULES} ]] && [[ -d ${GIT_DIR} && -d ${GIT_DIR}/.git ]]; then
258 rm -rf "${GIT_DIR}"
259 einfo "The ${EGIT_CLONE_DIR} was not a bare copy. Refetching."
260 fi
261
262 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
263 upstream_branch=origin/${EGIT_BRANCH}
264 else
265 upstream_branch=${EGIT_BRANCH}
266 extra_clone_opts=--bare
226 fi 267 fi
227 268
228 if [[ ! -d ${GIT_DIR} ]] ; then 269 if [[ ! -d ${GIT_DIR} ]] ; then
229 # first clone 270 # first clone
230 ${elogcmd} "GIT NEW clone -->" 271 ${elogcmd} "GIT NEW clone -->"
231 ${elogcmd} " repository: ${EGIT_REPO_URI}" 272 ${elogcmd} " repository: ${EGIT_REPO_URI}"
232 273
233 debug-print "${EGIT_FETCH_CMD} ${EGIT_OPTIONS} \"${EGIT_REPO_URI}\" ${GIT_DIR}" 274 debug-print "${EGIT_FETCH_CMD} ${extra_clone_opts} ${EGIT_OPTIONS} \"${EGIT_REPO_URI}\" ${GIT_DIR}"
234 ${EGIT_FETCH_CMD} ${EGIT_OPTIONS} "${EGIT_REPO_URI}" ${GIT_DIR} \ 275 ${EGIT_FETCH_CMD} ${extra_clone_opts} ${EGIT_OPTIONS} "${EGIT_REPO_URI}" ${GIT_DIR} \
235 || die "${EGIT}: can't fetch from ${EGIT_REPO_URI}." 276 || die "${EGIT}: can't fetch from ${EGIT_REPO_URI}."
236 277
237 pushd "${GIT_DIR}" &> /dev/null 278 pushd "${GIT_DIR}" &> /dev/null
238 cursha1=$(git rev-parse origin/${EGIT_BRANCH}) 279 cursha1=$(git rev-parse ${upstream_branch})
239 ${elogcmd} " at the commit: ${cursha1}" 280 ${elogcmd} " at the commit: ${cursha1}"
240 281
241 git_sumbodules 282 git_submodules
242 popd &> /dev/null 283 popd &> /dev/null
243 elif [[ -n ${EGIT_OFFLINE} ]] ; then 284 elif [[ -n ${EGIT_OFFLINE} ]] ; then
244 pushd "${GIT_DIR}" &> /dev/null 285 pushd "${GIT_DIR}" &> /dev/null
245 cursha1=$(git rev-parse origin/${EGIT_BRANCH}) 286 cursha1=$(git rev-parse ${upstream_branch})
246 ${elogcmd} "GIT offline update -->" 287 ${elogcmd} "GIT offline update -->"
247 ${elogcmd} " repository: ${EGIT_REPO_URI}" 288 ${elogcmd} " repository: ${EGIT_REPO_URI}"
248 ${elogcmd} " at the commit: ${cursha1}" 289 ${elogcmd} " at the commit: ${cursha1}"
249 popd &> /dev/null 290 popd &> /dev/null
250 else 291 else
253 git config remote.origin.url "${EGIT_REPO_URI}" 294 git config remote.origin.url "${EGIT_REPO_URI}"
254 295
255 # fetch updates 296 # fetch updates
256 ${elogcmd} "GIT update -->" 297 ${elogcmd} "GIT update -->"
257 ${elogcmd} " repository: ${EGIT_REPO_URI}" 298 ${elogcmd} " repository: ${EGIT_REPO_URI}"
258
259 oldsha1=$(git rev-parse origin/${EGIT_BRANCH})
260 299
300 oldsha1=$(git rev-parse ${upstream_branch})
301
302 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
261 debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS}" 303 debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS}"
304 # fix branching
305 git checkout ${EGIT_MASTER}
306 for x in $(git branch |grep -v "* ${EGIT_MASTER}" |tr '\n' ' '); do
307 git branch -D ${x}
308 done
262 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} \ 309 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} \
263 || die "${EGIT}: can't update from ${EGIT_REPO_URI}." 310 || die "${EGIT}: can't update from ${EGIT_REPO_URI}."
311 else
312 debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH}"
313 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH} \
314 || die "${EGIT}: can't update from ${EGIT_REPO_URI}."
315 fi
264 316
265 git_sumbodules 317 git_submodules
266 cursha1=$(git rev-parse origin/${EGIT_BRANCH}) 318 cursha1=$(git rev-parse ${upstream_branch})
267 319
268 # write out message based on the revisions 320 # write out message based on the revisions
269 if [[ ${oldsha1} != ${cursha1} ]]; then 321 if [[ "${oldsha1}" != "${cursha1}" ]]; then
270 ${elogcmd} " updating from commit: ${oldsha1}" 322 ${elogcmd} " updating from commit: ${oldsha1}"
271 ${elogcmd} " to commit: ${cursha1}" 323 ${elogcmd} " to commit: ${cursha1}"
272 else 324 else
273 ${elogcmd} " at the commit: ${cursha1}" 325 ${elogcmd} " at the commit: ${cursha1}"
274 # @ECLASS_VARIABLE: LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED 326 # @ECLASS_VARIABLE: LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED
280 # TODO: this can lead to issues if more projects/packages use same repo 332 # TODO: this can lead to issues if more projects/packages use same repo
281 [[ ${LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED} = true ]] && \ 333 [[ ${LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED} = true ]] && \
282 debug-print "${FUNCNAME}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." && \ 334 debug-print "${FUNCNAME}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." && \
283 die "${EGIT}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." 335 die "${EGIT}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping."
284 fi 336 fi
285 ${EGIT_DIFFSTAT_CMD} ${oldsha1}..origin/${EGIT_BRANCH} 337 ${EGIT_DIFFSTAT_CMD} ${oldsha1}..${upstream_branch}
286 popd &> /dev/null 338 popd &> /dev/null
287 fi 339 fi
288 340
289 pushd "${GIT_DIR}" &> /dev/null 341 pushd "${GIT_DIR}" &> /dev/null
290 if ${EGIT_REPACK} || ${EGIT_PRUNE} ; then 342 if [[ -n ${EGIT_REPACK} ]] || [[ -n ${EGIT_PRUNE} ]]; then
291 ebegin "Garbage collecting the repository" 343 ebegin "Garbage collecting the repository"
292 git gc $(${EGIT_PRUNE} && echo '--prune') 344 local args
345 [[ -n ${EGIT_PRUNE} ]] && args='--prune'
346 git gc ${args}
293 eend $? 347 eend $?
294 fi 348 fi
295 popd &> /dev/null 349 popd &> /dev/null
296 350
297 # export the git version 351 # export the git version
298 export EGIT_VERSION="${cursha1}" 352 export EGIT_VERSION="${cursha1}"
299 353
300 [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]] && elog " commit: ${EGIT_COMMIT}" 354 # log the repo state
355 [[ "${EGIT_COMMIT}" != "${EGIT_BRANCH}" ]] && ${elogcmd} " commit: ${EGIT_COMMIT}"
301 ${elogcmd} " branch: ${EGIT_BRANCH}" 356 ${elogcmd} " branch: ${EGIT_BRANCH}"
302 ${elogcmd} " storage directory: \"${GIT_DIR}\"" 357 ${elogcmd} " storage directory: \"${GIT_DIR}\""
303 358
304 # unpack to the ${S} 359 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
360 pushd "${GIT_DIR}" &> /dev/null
361 debug-print "rsync -rlpgo . \"${S}\""
362 rsync -rlpgo . "${S}"
363 popd &> /dev/null
364 else
365 unset GIT_DIR
366 debug-print "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}"
368 fi
369
370 pushd "${S}" &> /dev/null
371 git_branch
372 # submodules always reqire net (thanks to branches changing)
373 [[ -z ${EGIT_OFFLINE} ]] && git_submodules
305 popd &> /dev/null 374 popd &> /dev/null
306 debug-print "git clone -l \"${GIT_DIR}\" \"${S}\""
307 git clone -l "${GIT_DIR}" "${S}"
308
309 # set correct branch and the tree ebuild specified
310 pushd "${S}" > /dev/null
311 local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH}
312 if [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]]; then
313 branchname=tree-${EGIT_COMMIT}
314 src=${EGIT_COMMIT}
315 fi
316 debug-print "git checkout -b ${branchname} ${src}"
317 git checkout -b ${branchname} ${src} 2>&1 > /dev/null
318 git_sumbodules
319 popd > /dev/null
320
321 unset branchname src
322 375
323 echo ">>> Unpacked to ${S}" 376 echo ">>> Unpacked to ${S}"
324} 377}
325 378
326# @FUNCTION: git_bootstrap 379# @FUNCTION: git_bootstrap
361} 414}
362 415
363# @FUNCTION: git_apply_patches 416# @FUNCTION: git_apply_patches
364# @DESCRIPTION: 417# @DESCRIPTION:
365# Apply patches from EGIT_PATCHES bash array. 418# Apply patches from EGIT_PATCHES bash array.
366# Preffered is using the variable as bash array but for now it allows to write 419# Preferred is using the variable as bash array but for now it allows to write
367# it also as normal space separated string list. (This part of code should be 420# it also as normal space separated string list. (This part of code should be
368# removed when all ebuilds get converted on bash array). 421# removed when all ebuilds get converted on bash array).
369git_apply_patches() { 422git_apply_patches() {
370 debug-print-function ${FUNCNAME} "$@" 423 debug-print-function ${FUNCNAME} "$@"
371 424
373 if [[ ${#EGIT_PATCHES[@]} -gt 1 ]] ; then 426 if [[ ${#EGIT_PATCHES[@]} -gt 1 ]] ; then
374 for i in "${EGIT_PATCHES[@]}"; do 427 for i in "${EGIT_PATCHES[@]}"; do
375 debug-print "$FUNCNAME: git_autopatch: patching from ${i}" 428 debug-print "$FUNCNAME: git_autopatch: patching from ${i}"
376 epatch "${i}" 429 epatch "${i}"
377 done 430 done
378 elif [[ ${EGIT_PATCHES} != "" ]]; then 431 elif [[ -n ${EGIT_PATCHES} ]]; then
379 # no need for loop if space separated string is passed. 432 # no need for loop if space separated string is passed.
380 debug-print "$FUNCNAME: git_autopatch: patching from ${EGIT_PATCHES}" 433 debug-print "$FUNCNAME: git_autopatch: patching from ${EGIT_PATCHES}"
381 epatch "${EGIT_PATCHES}" 434 epatch "${EGIT_PATCHES}"
382 fi 435 fi
383 436

Legend:
Removed from v.1.35  
changed lines
  Added in v.1.51

  ViewVC Help
Powered by ViewVC 1.1.20