/[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.43
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/git.eclass,v 1.35 2010/01/13 20:04:19 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.43 2010/02/24 01:16:35 abcd 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-util/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
32# We DEPEND on at least a bit recent git version
33DEPEND=">=dev-util/git-1.6"
34 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# Enables user specified verbosity for the eclass elog informations.
38# The user just needs to add EGIT_QUIET="ON" to the /etc/make.conf. 38# The user just needs to add EGIT_QUIET="ON" to the /etc/make.conf.
… …
42# @DESCRIPTION: 42# @DESCRIPTION:
43# Storage directory for git sources. 43# Storage directory for git sources.
44# Can be redefined. 44# Can be redefined.
45[[ -z ${EGIT_STORE_DIR} ]] && EGIT_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/git-src" 45[[ -z ${EGIT_STORE_DIR} ]] && EGIT_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/git-src"
46 46
47# @ECLASS-VARIABLE: EGIT_HAS_SUBMODULES
48# @DESCRIPTION:
49# Set this to "true" to enable the (slower) submodule support.
50# This variable should be set before inheriting git.eclass
51: ${EGIT_HAS_SUBMODULES:=false}
52
47# @ECLASS-VARIABLE: EGIT_FETCH_CMD 53# @ECLASS-VARIABLE: EGIT_FETCH_CMD
48# @DESCRIPTION: 54# @DESCRIPTION:
49# Command for cloning the repository. 55# Command for cloning the repository.
50: ${EGIT_FETCH_CMD:="git clone"} 56: ${EGIT_FETCH_CMD:="git clone"}
51 57
52# @ECLASS-VARIABLE: EGIT_UPDATE_CMD 58# @ECLASS-VARIABLE: EGIT_UPDATE_CMD
53# @DESCRIPTION: 59# @DESCRIPTION:
54# Git fetch command. 60# Git fetch command.
61if ${EGIT_HAS_SUBMODULES}; then
55EGIT_UPDATE_CMD="git pull -f -u" 62 EGIT_UPDATE_CMD="git pull -f -u"
63else
64 EGIT_UPDATE_CMD="git fetch -f -u"
65fi
56 66
57# @ECLASS-VARIABLE: EGIT_DIFFSTAT_CMD 67# @ECLASS-VARIABLE: EGIT_DIFFSTAT_CMD
58# @DESCRIPTION: 68# @DESCRIPTION:
59# Git command for diffstat. 69# Git command for diffstat.
60EGIT_DIFFSTAT_CMD="git --no-pager diff --stat" 70EGIT_DIFFSTAT_CMD="git --no-pager diff --stat"
61 71
62# @ECLASS-VARIABLE: EGIT_OPTIONS 72# @ECLASS-VARIABLE: EGIT_OPTIONS
63# @DESCRIPTION: 73# @DESCRIPTION:
64# This variable value is passed to clone and fetch. 74# This variable value is passed to clone and fetch.
65: ${EGIT_OPTIONS:=} 75: ${EGIT_OPTIONS:=}
76
77# @ECLASS-VARIABLE: EGIT_MASTER
78# @DESCRIPTION:
79# Variable for specifying master branch.
80# Usefull when upstream don't have master branch.
81: ${EGIT_MASTER:=master}
66 82
67# @ECLASS-VARIABLE: EGIT_REPO_URI 83# @ECLASS-VARIABLE: EGIT_REPO_URI
68# @DESCRIPTION: 84# @DESCRIPTION:
69# URI for the repository 85# URI for the repository
70# e.g. http://foo, git://bar 86# e.g. http://foo, git://bar
… …
143: ${EGIT_PRUNE:=false} 159: ${EGIT_PRUNE:=false}
144 160
145# @FUNCTION: git_submodules 161# @FUNCTION: git_submodules
146# @DESCRIPTION: 162# @DESCRIPTION:
147# Internal function wrapping the submodule initialisation and update 163# Internal function wrapping the submodule initialisation and update
148git_sumbodules() { 164git_submodules() {
165 if ${EGIT_HAS_SUBMODULES}; then
149 debug-print "git submodule init" 166 debug-print "git submodule init"
150 git submodule init 167 git submodule init
151 debug-print "git submodule update" 168 debug-print "git submodule update"
152 git submodule update 169 git submodule update
170 fi
171}
172
173# @FUNCTION: git_branch
174# @DESCRIPTION:
175# Internal function that changes branch for the repo based on EGIT_TREE and
176# EGIT_BRANCH variables.
177git_branch() {
178 local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH}
179 if [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]]; then
180 branchname=tree-${EGIT_COMMIT}
181 src=${EGIT_COMMIT}
182 fi
183 debug-print "git checkout -b ${branchname} ${src}"
184 git checkout -b ${branchname} ${src} &> /dev/null
185
186 unset branchname src
153} 187}
154 188
155# @FUNCTION: git_fetch 189# @FUNCTION: git_fetch
156# @DESCRIPTION: 190# @DESCRIPTION:
157# Gets repository from EGIT_REPO_URI and store it in specified EGIT_STORE_DIR 191# Gets repository from EGIT_REPO_URI and store it in specified EGIT_STORE_DIR
158git_fetch() { 192git_fetch() {
159 debug-print-function ${FUNCNAME} "$@" 193 debug-print-function ${FUNCNAME} "$@"
160 194
161 local GIT_DIR EGIT_CLONE_DIR oldsha1 cursha1 195 local GIT_DIR EGIT_CLONE_DIR oldsha1 cursha1 extra_clone_opts upstream_branch
196 ${EGIT_HAS_SUBMODULES} || export GIT_DIR
162 197
163 # choose if user wants elog or just einfo. 198 # choose if user wants elog or just einfo.
164 if [[ ${EGIT_QUIET} != OFF ]]; then 199 if [[ ${EGIT_QUIET} != OFF ]]; then
165 elogcmd="einfo" 200 elogcmd="einfo"
166 else 201 else
… …
173 # folder. 208 # folder.
174 #[[ ${EGIT_COMMIT} = ${EGIT_BRANCH} ]] && \ 209 #[[ ${EGIT_COMMIT} = ${EGIT_BRANCH} ]] && \
175 # EGIT_FETCH_CMD="${EGIT_FETCH_CMD} --depth 1" 210 # EGIT_FETCH_CMD="${EGIT_FETCH_CMD} --depth 1"
176 if [[ ! -z ${EGIT_TREE} ]] ; then 211 if [[ ! -z ${EGIT_TREE} ]] ; then
177 EGIT_COMMIT=${EGIT_TREE} 212 EGIT_COMMIT=${EGIT_TREE}
178 eqawarn "Usage of deprecated EGIT_TREE variable detected." 213 ewarn "QA: Usage of deprecated EGIT_TREE variable detected."
179 eqawarn "Use EGIT_COMMIT variable instead." 214 ewarn "QA: Use EGIT_COMMIT variable instead."
180 fi 215 fi
181 216
182 # EGIT_REPO_URI is empty. 217 # EGIT_REPO_URI is empty.
183 [[ -z ${EGIT_REPO_URI} ]] && die "${EGIT}: EGIT_REPO_URI is empty." 218 [[ -z ${EGIT_REPO_URI} ]] && die "${EGIT}: EGIT_REPO_URI is empty."
184 219
… …
210 EGIT_CLONE_DIR="${EGIT_PROJECT}" 245 EGIT_CLONE_DIR="${EGIT_PROJECT}"
211 246
212 debug-print "${FUNCNAME}: EGIT_OPTIONS = \"${EGIT_OPTIONS}\"" 247 debug-print "${FUNCNAME}: EGIT_OPTIONS = \"${EGIT_OPTIONS}\""
213 248
214 GIT_DIR="${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" 249 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 250 # we also have to remove all shallow copied repositories
217 # and fetch them again 251 # and fetch them again
218 if [[ -e "${GIT_DIR}/shallow" ]]; then 252 if [[ -e "${GIT_DIR}/shallow" ]]; then
219 rm -rf "${GIT_DIR}" 253 rm -rf "${GIT_DIR}"
220 einfo "The ${EGIT_CLONE_DIR} was shallow copy. Refetching." 254 einfo "The ${EGIT_CLONE_DIR} was shallow copy. Refetching."
221 fi 255 fi
222 # repack from bare copy to normal one 256 # repack from bare copy to normal one
223 if [[ -d ${GIT_DIR} && ! -d "${GIT_DIR}/.git/" ]]; then 257 if ${EGIT_HAS_SUBMODULES} && [[ -d ${GIT_DIR} && ! -d "${GIT_DIR}/.git/" ]]; then
224 rm -rf "${GIT_DIR}" 258 rm -rf "${GIT_DIR}"
225 einfo "The ${EGIT_CLONE_DIR} was bare copy. Refetching." 259 einfo "The ${EGIT_CLONE_DIR} was bare copy. Refetching."
260 fi
261 if ! ${EGIT_HAS_SUBMODULES} && [[ -d ${GIT_DIR} && -d ${GIT_DIR}/.git ]]; then
262 rm -rf "${GIT_DIR}"
263 einfo "The ${EGIT_CLONE_DIR} was not a bare copy. Refetching."
264 fi
265
266 if ${EGIT_HAS_SUBMODULES}; then
267 upstream_branch=origin/${EGIT_BRANCH}
268 else
269 upstream_branch=${EGIT_BRANCH}
270 extra_clone_opts=--bare
226 fi 271 fi
227 272
228 if [[ ! -d ${GIT_DIR} ]] ; then 273 if [[ ! -d ${GIT_DIR} ]] ; then
229 # first clone 274 # first clone
230 ${elogcmd} "GIT NEW clone -->" 275 ${elogcmd} "GIT NEW clone -->"
231 ${elogcmd} " repository: ${EGIT_REPO_URI}" 276 ${elogcmd} " repository: ${EGIT_REPO_URI}"
232 277
233 debug-print "${EGIT_FETCH_CMD} ${EGIT_OPTIONS} \"${EGIT_REPO_URI}\" ${GIT_DIR}" 278 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} \ 279 ${EGIT_FETCH_CMD} ${extra_clone_opts} ${EGIT_OPTIONS} "${EGIT_REPO_URI}" ${GIT_DIR} \
235 || die "${EGIT}: can't fetch from ${EGIT_REPO_URI}." 280 || die "${EGIT}: can't fetch from ${EGIT_REPO_URI}."
236 281
237 pushd "${GIT_DIR}" &> /dev/null 282 pushd "${GIT_DIR}" &> /dev/null
238 cursha1=$(git rev-parse origin/${EGIT_BRANCH}) 283 cursha1=$(git rev-parse ${upstream_branch})
239 ${elogcmd} " at the commit: ${cursha1}" 284 ${elogcmd} " at the commit: ${cursha1}"
240 285
241 git_sumbodules 286 git_submodules
242 popd &> /dev/null 287 popd &> /dev/null
243 elif [[ -n ${EGIT_OFFLINE} ]] ; then 288 elif [[ -n ${EGIT_OFFLINE} ]] ; then
244 pushd "${GIT_DIR}" &> /dev/null 289 pushd "${GIT_DIR}" &> /dev/null
245 cursha1=$(git rev-parse origin/${EGIT_BRANCH}) 290 cursha1=$(git rev-parse ${upstream_branch})
246 ${elogcmd} "GIT offline update -->" 291 ${elogcmd} "GIT offline update -->"
247 ${elogcmd} " repository: ${EGIT_REPO_URI}" 292 ${elogcmd} " repository: ${EGIT_REPO_URI}"
248 ${elogcmd} " at the commit: ${cursha1}" 293 ${elogcmd} " at the commit: ${cursha1}"
249 popd &> /dev/null 294 popd &> /dev/null
250 else 295 else
… …
253 git config remote.origin.url "${EGIT_REPO_URI}" 298 git config remote.origin.url "${EGIT_REPO_URI}"
254 299
255 # fetch updates 300 # fetch updates
256 ${elogcmd} "GIT update -->" 301 ${elogcmd} "GIT update -->"
257 ${elogcmd} " repository: ${EGIT_REPO_URI}" 302 ${elogcmd} " repository: ${EGIT_REPO_URI}"
258
259 oldsha1=$(git rev-parse origin/${EGIT_BRANCH})
260 303
304 oldsha1=$(git rev-parse ${upstream_branch})
305
306 if ${EGIT_HAS_SUBMODULES}; then
261 debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS}" 307 debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS}"
308 # fix branching
309 git checkout ${EGIT_MASTER}
310 for x in $(git branch |grep -v "* ${EGIT_MASTER}" |tr '\n' ' '); do
311 git branch -D ${x}
312 done
262 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} \ 313 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} \
263 || die "${EGIT}: can't update from ${EGIT_REPO_URI}." 314 || die "${EGIT}: can't update from ${EGIT_REPO_URI}."
315 else
316 debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH}"
317 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH} \
318 || die "${EGIT}: can't update from ${EGIT_REPO_URI}."
319 fi
264 320
265 git_sumbodules 321 git_submodules
266 cursha1=$(git rev-parse origin/${EGIT_BRANCH}) 322 cursha1=$(git rev-parse ${upstream_branch})
267 323
268 # write out message based on the revisions 324 # write out message based on the revisions
269 if [[ ${oldsha1} != ${cursha1} ]]; then 325 if [[ ${oldsha1} != ${cursha1} ]]; then
270 ${elogcmd} " updating from commit: ${oldsha1}" 326 ${elogcmd} " updating from commit: ${oldsha1}"
271 ${elogcmd} " to commit: ${cursha1}" 327 ${elogcmd} " to commit: ${cursha1}"
… …
280 # TODO: this can lead to issues if more projects/packages use same repo 336 # TODO: this can lead to issues if more projects/packages use same repo
281 [[ ${LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED} = true ]] && \ 337 [[ ${LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED} = true ]] && \
282 debug-print "${FUNCNAME}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." && \ 338 debug-print "${FUNCNAME}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." && \
283 die "${EGIT}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." 339 die "${EGIT}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping."
284 fi 340 fi
285 ${EGIT_DIFFSTAT_CMD} ${oldsha1}..origin/${EGIT_BRANCH} 341 ${EGIT_DIFFSTAT_CMD} ${oldsha1}..${upstream_branch}
286 popd &> /dev/null 342 popd &> /dev/null
287 fi 343 fi
288 344
289 pushd "${GIT_DIR}" &> /dev/null 345 pushd "${GIT_DIR}" &> /dev/null
290 if ${EGIT_REPACK} || ${EGIT_PRUNE} ; then 346 if ${EGIT_REPACK} || ${EGIT_PRUNE} ; then
291 ebegin "Garbage collecting the repository" 347 ebegin "Garbage collecting the repository"
292 git gc $(${EGIT_PRUNE} && echo '--prune') 348 git gc $(${EGIT_PRUNE} && echo '--prune')
293 eend $? 349 eend $?
… …
295 popd &> /dev/null 351 popd &> /dev/null
296 352
297 # export the git version 353 # export the git version
298 export EGIT_VERSION="${cursha1}" 354 export EGIT_VERSION="${cursha1}"
299 355
356 # log the repo state
300 [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]] && elog " commit: ${EGIT_COMMIT}" 357 [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]] && elog " commit: ${EGIT_COMMIT}"
301 ${elogcmd} " branch: ${EGIT_BRANCH}" 358 ${elogcmd} " branch: ${EGIT_BRANCH}"
302 ${elogcmd} " storage directory: \"${GIT_DIR}\"" 359 ${elogcmd} " storage directory: \"${GIT_DIR}\""
303 360
304 # unpack to the ${S} 361 if ${EGIT_HAS_SUBMODULES}; then
362 pushd "${GIT_DIR}" &> /dev/null
363 debug-print "rsync -rlpgo . \"${S}\""
364 time rsync -rlpgo . "${S}"
365 popd &> /dev/null
366 else
367 unset GIT_DIR
368 debug-print "git clone -l -s -n \"${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}\" \"${S}\""
369 git clone -l -s -n "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" "${S}"
370 fi
371
372 pushd "${S}" &> /dev/null
373 git_branch
374 # submodules always reqire net (thanks to branches changing)
375 [[ -n ${EGIT_OFFLINE} ]] || git_submodules
305 popd &> /dev/null 376 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 377
323 echo ">>> Unpacked to ${S}" 378 echo ">>> Unpacked to ${S}"
324} 379}
325 380
326# @FUNCTION: git_bootstrap 381# @FUNCTION: git_bootstrap
Legend:
Removed from v.1.35  
changed lines
  Added in v.1.43
  ViewVC Help
Powered by ViewVC 1.1.13