/[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.41
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.28 2009/08/24 21:48:58 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/git.eclass,v 1.41 2010/01/31 10:13:57 scarabeus 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>
… …
18 18
19EGIT="git.eclass" 19EGIT="git.eclass"
20 20
21EXPORTED_FUNCTIONS="src_unpack" 21EXPORTED_FUNCTIONS="src_unpack"
22case "${EAPI:-0}" in 22case "${EAPI:-0}" in
23 2) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare" ;; 23 3|2) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare" ;;
24 0|1) ;; 24 1|0) ;;
25 *) die "Unknown EAPI, Bug eclass maintainers." ;; 25 :) DEPEND="EAPI-UNSUPPORTED" ;;
26esac 26esac
27EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} 27EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
28 28
29# define some nice defaults but only if nothing is set already 29# define some nice defaults but only if nothing is set already
30: ${HOMEPAGE:=http://git-scm.com/} 30: ${HOMEPAGE:=http://git-scm.com/}
… …
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_FETCH_CMD 47# @ECLASS-VARIABLE: EGIT_FETCH_CMD
48# @DESCRIPTION: 48# @DESCRIPTION:
49# Command for cloning the repository. 49# Command for cloning the repository.
50: ${EGIT_FETCH_CMD:="git clone --bare"} 50: ${EGIT_FETCH_CMD:="git clone"}
51 51
52# @ECLASS-VARIABLE: EGIT_UPDATE_CMD 52# @ECLASS-VARIABLE: EGIT_UPDATE_CMD
53# @DESCRIPTION: 53# @DESCRIPTION:
54# Git fetch command. 54# Git fetch command.
55EGIT_UPDATE_CMD="git fetch -f -u" 55EGIT_UPDATE_CMD="git pull -f -u"
56 56
57# @ECLASS-VARIABLE: EGIT_DIFFSTAT_CMD 57# @ECLASS-VARIABLE: EGIT_DIFFSTAT_CMD
58# @DESCRIPTION: 58# @DESCRIPTION:
59# Git command for diffstat. 59# Git command for diffstat.
60EGIT_DIFFSTAT_CMD="git --no-pager diff --stat" 60EGIT_DIFFSTAT_CMD="git --no-pager diff --stat"
61 61
62# @ECLASS-VARIABLE: EGIT_OPTIONS 62# @ECLASS-VARIABLE: EGIT_OPTIONS
63# @DESCRIPTION: 63# @DESCRIPTION:
64# This variable value is passed to clone and fetch. 64# This variable value is passed to clone and fetch.
65: ${EGIT_OPTIONS:=} 65: ${EGIT_OPTIONS:=}
66
67# @ECLASS-VARIABLE: EGIT_MASTER
68# @DESCRIPTION:
69# Variable for specifying master branch.
70# Usefull when upstream don't have master branch.
71: ${EGIT_MASTER:=master}
66 72
67# @ECLASS-VARIABLE: EGIT_REPO_URI 73# @ECLASS-VARIABLE: EGIT_REPO_URI
68# @DESCRIPTION: 74# @DESCRIPTION:
69# URI for the repository 75# URI for the repository
70# e.g. http://foo, git://bar 76# e.g. http://foo, git://bar
… …
73# https:// 79# https://
74# git:// 80# git://
75# git+ssh:// 81# git+ssh://
76# rsync:// 82# rsync://
77# ssh:// 83# ssh://
78eval X="\$${PN//-/_}_LIVE_REPO" 84eval X="\$${PN//[-+]/_}_LIVE_REPO"
79if [[ ${X} = "" ]]; then 85if [[ ${X} = "" ]]; then
80 EGIT_REPO_URI=${EGIT_REPO_URI:=} 86 EGIT_REPO_URI=${EGIT_REPO_URI:=}
81else 87else
82 EGIT_REPO_URI="${X}" 88 EGIT_REPO_URI="${X}"
83fi 89fi
… …
90# http://git.collab.net/repo/git. and PN is subversion-git. 96# http://git.collab.net/repo/git. and PN is subversion-git.
91# it will check out like: 97# it will check out like:
92# ${EGIT_STORE_DIR}/subversion 98# ${EGIT_STORE_DIR}/subversion
93: ${EGIT_PROJECT:=${PN/-git}} 99: ${EGIT_PROJECT:=${PN/-git}}
94 100
95# @ECLASS-VARIABLE: EGIT_BOOSTRAP 101# @ECLASS-VARIABLE: EGIT_BOOTSTRAP
96# @DESCRIPTION: 102# @DESCRIPTION:
97# bootstrap script or command like autogen.sh or etc... 103# bootstrap script or command like autogen.sh or etc...
98: ${EGIT_BOOTSTRAP:=} 104: ${EGIT_BOOTSTRAP:=}
99 105
100# @ECLASS-VARIABLE: EGIT_OFFLINE 106# @ECLASS-VARIABLE: EGIT_OFFLINE
… …
111# Please take note that this variable should be bash array. 117# Please take note that this variable should be bash array.
112 118
113# @ECLASS-VARIABLE: EGIT_BRANCH 119# @ECLASS-VARIABLE: EGIT_BRANCH
114# @DESCRIPTION: 120# @DESCRIPTION:
115# git eclass can fetch any branch in git_fetch(). 121# git eclass can fetch any branch in git_fetch().
116eval X="\$${PN//-/_}_LIVE_BRANCH" 122eval X="\$${PN//[-+]/_}_LIVE_BRANCH"
117if [[ ${X} = "" ]]; then 123if [[ ${X} = "" ]]; then
118 EGIT_BRANCH=${EGIT_BRANCH:=master} 124 EGIT_BRANCH=${EGIT_BRANCH:=master}
119else 125else
120 EGIT_BRANCH="${X}" 126 EGIT_BRANCH="${X}"
121fi 127fi
122 128
123# @ECLASS-VARIABLE: EGIT_TREE 129# @ECLASS-VARIABLE: EGIT_COMMIT
124# @DESCRIPTION: 130# @DESCRIPTION:
125# git eclass can checkout any tree (commit). 131# git eclass can checkout any commit.
126eval X="\$${PN//-/_}_LIVE_TREE" 132eval X="\$${PN//[-+]/_}_LIVE_COMMIT"
127if [[ ${X} = "" ]]; then 133if [[ ${X} = "" ]]; then
128 : ${EGIT_TREE:=${EGIT_BRANCH}} 134 : ${EGIT_COMMIT:=${EGIT_BRANCH}}
129else 135else
130 EGIT_TREE="${X}" 136 EGIT_COMMIT="${X}"
131fi 137fi
132 138
133# @ECLASS-VARIABLE: EGIT_REPACK 139# @ECLASS-VARIABLE: EGIT_REPACK
134# @DESCRIPTION: 140# @DESCRIPTION:
135# git eclass will repack objects to save disk space. However this can take a 141# git eclass will repack objects to save disk space. However this can take a
136# long time with VERY big repositories. 142# long time with VERY big repositories.
137: ${EGIT_REPACK:=false} 143: ${EGIT_REPACK:=false}
138 144
139# @ECLASS-VARIABLE: EGIT_PRUNE 145# @ECLASS-VARIABLE: EGIT_PRUNE
140# @DESCRIPTION: 146# @DESCRIPTION:
141# git.eclass can prune the local clone. This is useful if upstream rewinds and 147# git eclass can prune the local clone. This is useful if upstream rewinds and
142# rebases branches too often. 148# rebases branches too often.
143: ${EGIT_PRUNE:=false} 149: ${EGIT_PRUNE:=false}
150
151# @FUNCTION: git_submodules
152# @DESCRIPTION:
153# Internal function wrapping the submodule initialisation and update
154git_submodules() {
155 debug-print "git submodule init"
156 git submodule init
157 debug-print "git submodule update"
158 git submodule update
159}
160
161# @FUNCTION: git_branch
162# @DESCRIPTION:
163# Internal function that changes branch for the repo based on EGIT_TREE and
164# EGIT_BRANCH variables.
165git_branch() {
166 local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH}
167 if [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]]; then
168 branchname=tree-${EGIT_COMMIT}
169 src=${EGIT_COMMIT}
170 fi
171 debug-print "git checkout -b ${branchname} ${src}"
172 git checkout -b ${branchname} ${src} &> /dev/null
173
174 unset branchname src
175}
144 176
145# @FUNCTION: git_fetch 177# @FUNCTION: git_fetch
146# @DESCRIPTION: 178# @DESCRIPTION:
147# Gets repository from EGIT_REPO_URI and store it in specified EGIT_STORE_DIR 179# Gets repository from EGIT_REPO_URI and store it in specified EGIT_STORE_DIR
148git_fetch() { 180git_fetch() {
149 debug-print-function ${FUNCNAME} "$@" 181 debug-print-function ${FUNCNAME} "$@"
150 182
151 local EGIT_CLONE_DIR oldsha1 cursha1 183 local GIT_DIR EGIT_CLONE_DIR oldsha1 cursha1
152 184
153 # choose if user wants elog or just einfo. 185 # choose if user wants elog or just einfo.
154 if [[ ${EGIT_QUIET} != OFF ]]; then 186 if [[ ${EGIT_QUIET} != OFF ]]; then
155 elogcmd="einfo" 187 elogcmd="einfo"
156 else 188 else
… …
159 191
160 # If we have same branch and the tree we can do --depth 1 clone 192 # If we have same branch and the tree we can do --depth 1 clone
161 # which outputs into really smaller data transfers. 193 # which outputs into really smaller data transfers.
162 # Sadly we can do shallow copy for now because quite a few packages need .git 194 # Sadly we can do shallow copy for now because quite a few packages need .git
163 # folder. 195 # folder.
164 #[[ ${EGIT_TREE} = ${EGIT_BRANCH} ]] && \ 196 #[[ ${EGIT_COMMIT} = ${EGIT_BRANCH} ]] && \
165 # EGIT_FETCH_CMD="${EGIT_FETCH_CMD} --depth 1" 197 # EGIT_FETCH_CMD="${EGIT_FETCH_CMD} --depth 1"
198 if [[ ! -z ${EGIT_TREE} ]] ; then
199 EGIT_COMMIT=${EGIT_TREE}
200 ewarn "QA: Usage of deprecated EGIT_TREE variable detected."
201 ewarn "QA: Use EGIT_COMMIT variable instead."
202 fi
166 203
167 # EGIT_REPO_URI is empty. 204 # EGIT_REPO_URI is empty.
168 [[ -z ${EGIT_REPO_URI} ]] && die "${EGIT}: EGIT_REPO_URI is empty." 205 [[ -z ${EGIT_REPO_URI} ]] && die "${EGIT}: EGIT_REPO_URI is empty."
169 206
170 # check for the protocol or pull from a local repo. 207 # check for the protocol or pull from a local repo.
… …
194 [[ -z ${EGIT_REPO_URI##*/} ]] && EGIT_REPO_URI="${EGIT_REPO_URI%/}" 231 [[ -z ${EGIT_REPO_URI##*/} ]] && EGIT_REPO_URI="${EGIT_REPO_URI%/}"
195 EGIT_CLONE_DIR="${EGIT_PROJECT}" 232 EGIT_CLONE_DIR="${EGIT_PROJECT}"
196 233
197 debug-print "${FUNCNAME}: EGIT_OPTIONS = \"${EGIT_OPTIONS}\"" 234 debug-print "${FUNCNAME}: EGIT_OPTIONS = \"${EGIT_OPTIONS}\""
198 235
199 export GIT_DIR="${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" 236 GIT_DIR="${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
200
201 # we also have to remove all shallow copied repositories 237 # we also have to remove all shallow copied repositories
202 # and fetch them again 238 # and fetch them again
203 if [[ -e "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}/shallow" ]]; then 239 if [[ -e "${GIT_DIR}/shallow" ]]; then
204 rm -rf "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" 240 rm -rf "${GIT_DIR}"
205 einfo "The ${EGIT_CLONE_DIR} was shallow copy. Refetching." 241 einfo "The ${EGIT_CLONE_DIR} was shallow copy. Refetching."
206 fi 242 fi
243 # repack from bare copy to normal one
244 if [[ -d ${GIT_DIR} && ! -d "${GIT_DIR}/.git/" ]]; then
245 rm -rf "${GIT_DIR}"
246 einfo "The ${EGIT_CLONE_DIR} was bare copy. Refetching."
247 fi
207 248
208 if [[ ! -d ${EGIT_CLONE_DIR} ]] ; then 249 if [[ ! -d ${GIT_DIR} ]] ; then
209 # first clone 250 # first clone
210 ${elogcmd} "GIT NEW clone -->" 251 ${elogcmd} "GIT NEW clone -->"
211 ${elogcmd} " repository: ${EGIT_REPO_URI}" 252 ${elogcmd} " repository: ${EGIT_REPO_URI}"
212 253
254 debug-print "${EGIT_FETCH_CMD} ${EGIT_OPTIONS} \"${EGIT_REPO_URI}\" ${GIT_DIR}"
213 ${EGIT_FETCH_CMD} ${EGIT_OPTIONS} "${EGIT_REPO_URI}" ${EGIT_PROJECT} \ 255 ${EGIT_FETCH_CMD} ${EGIT_OPTIONS} "${EGIT_REPO_URI}" ${GIT_DIR} \
214 || die "${EGIT}: can't fetch from ${EGIT_REPO_URI}." 256 || die "${EGIT}: can't fetch from ${EGIT_REPO_URI}."
215 257
258 pushd "${GIT_DIR}" &> /dev/null
216 cursha1=$(git rev-parse ${EGIT_BRANCH}) 259 cursha1=$(git rev-parse origin/${EGIT_BRANCH})
217 ${elogcmd} " at the commit: ${cursha1}" 260 ${elogcmd} " at the commit: ${cursha1}"
218 # We use --bare cloning, so git doesn't do this for us. 261
219 git config remote.origin.url "${EGIT_REPO_URI}" 262 git_submodules
263 popd &> /dev/null
220 elif [[ -n ${EGIT_OFFLINE} ]] ; then 264 elif [[ -n ${EGIT_OFFLINE} ]] ; then
265 pushd "${GIT_DIR}" &> /dev/null
221 cursha1=$(git rev-parse ${EGIT_BRANCH}) 266 cursha1=$(git rev-parse origin/${EGIT_BRANCH})
222 ${elogcmd} "GIT offline update -->" 267 ${elogcmd} "GIT offline update -->"
223 ${elogcmd} " repository: ${EGIT_REPO_URI}" 268 ${elogcmd} " repository: ${EGIT_REPO_URI}"
224 ${elogcmd} " at the commit: ${cursha1}" 269 ${elogcmd} " at the commit: ${cursha1}"
270 popd &> /dev/null
225 else 271 else
272 pushd "${GIT_DIR}" &> /dev/null
226 # Git urls might change, so unconditionally set it here 273 # Git urls might change, so unconditionally set it here
227 git config remote.origin.url "${EGIT_REPO_URI}" 274 git config remote.origin.url "${EGIT_REPO_URI}"
228 275
229 # fetch updates 276 # fetch updates
230 ${elogcmd} "GIT update -->" 277 ${elogcmd} "GIT update -->"
231 ${elogcmd} " repository: ${EGIT_REPO_URI}" 278 ${elogcmd} " repository: ${EGIT_REPO_URI}"
232 279
233 oldsha1=$(git rev-parse ${EGIT_BRANCH}) 280 oldsha1=$(git rev-parse origin/${EGIT_BRANCH})
234 281
235 ${elogcmd} ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH} 282 debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS}"
236 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH} \ 283 # fix branching
284 git checkout ${EGIT_MASTER}
285 for x in $(git branch |grep -v "* ${EGIT_MASTER}" |tr '\n' ' '); do
286 git branch -D ${x}
287 done
288 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} \
237 || die "${EGIT}: can't update from ${EGIT_REPO_URI}." 289 || die "${EGIT}: can't update from ${EGIT_REPO_URI}."
238 290
291 git_submodules
239 cursha1=$(git rev-parse ${EGIT_BRANCH}) 292 cursha1=$(git rev-parse origin/${EGIT_BRANCH})
240 293
241 # write out message based on the revisions 294 # write out message based on the revisions
242 if [[ ${oldsha1} != ${cursha1} ]]; then 295 if [[ ${oldsha1} != ${cursha1} ]]; then
243 ${elogcmd} " updating from commit: ${oldsha1}" 296 ${elogcmd} " updating from commit: ${oldsha1}"
244 ${elogcmd} " to commit: ${cursha1}" 297 ${elogcmd} " to commit: ${cursha1}"
… …
253 # TODO: this can lead to issues if more projects/packages use same repo 306 # TODO: this can lead to issues if more projects/packages use same repo
254 [[ ${LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED} = true ]] && \ 307 [[ ${LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED} = true ]] && \
255 debug-print "${FUNCNAME}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." && \ 308 debug-print "${FUNCNAME}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." && \
256 die "${EGIT}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." 309 die "${EGIT}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping."
257 fi 310 fi
258 ${EGIT_DIFFSTAT_CMD} ${oldsha1}..${EGIT_BRANCH} 311 ${EGIT_DIFFSTAT_CMD} ${oldsha1}..origin/${EGIT_BRANCH}
312 popd &> /dev/null
259 fi 313 fi
260 314
315 pushd "${GIT_DIR}" &> /dev/null
261 if ${EGIT_REPACK} || ${EGIT_PRUNE} ; then 316 if ${EGIT_REPACK} || ${EGIT_PRUNE} ; then
262 ebegin "Garbage collecting the repository" 317 ebegin "Garbage collecting the repository"
263 git gc $(${EGIT_PRUNE} && echo '--prune') 318 git gc $(${EGIT_PRUNE} && echo '--prune')
264 eend $? 319 eend $?
265 fi 320 fi
266 321 popd &> /dev/null
322
267 # export the git version 323 # export the git version
268 export EGIT_VERSION="${cursha1}" 324 export EGIT_VERSION="${cursha1}"
269 325
326 # log the repo state
270 [[ ${EGIT_TREE} != ${EGIT_BRANCH} ]] && elog " tree: ${EGIT_TREE}" 327 [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]] && elog " commit: ${EGIT_COMMIT}"
271 ${elogcmd} " branch: ${EGIT_BRANCH}" 328 ${elogcmd} " branch: ${EGIT_BRANCH}"
272 ${elogcmd} " storage directory: \"${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}\"" 329 ${elogcmd} " storage directory: \"${GIT_DIR}\""
273 330
274 # unpack to the ${S} 331 pushd "${GIT_DIR}" &> /dev/null
275 unset GIT_DIR 332 debug-print "rsync -rlpgo . \"${S}\""
276 debug-print "git clone -l -s -n \"${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}\" \"${S}\"" 333 time rsync -rlpgo . "${S}"
277 git clone -l -s -n "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" "${S}" 334 popd &> /dev/null
278 335
279 # set correct branch and the tree ebuild specified
280 pushd "${S}" > /dev/null 336 pushd "${S}" &> /dev/null
281 local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH} 337 git_branch
282 if [[ ${EGIT_TREE} != ${EGIT_BRANCH} ]]; then 338 # submodules always reqire net (thanks to branches changing)
283 branchname=tree-${EGIT_TREE} 339 [[ -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 340 popd &> /dev/null
293
294 unset branchname src
295 341
296 echo ">>> Unpacked to ${S}" 342 echo ">>> Unpacked to ${S}"
297} 343}
298 344
299# @FUNCTION: git_bootstrap 345# @FUNCTION: git_bootstrap
… …
371# @FUNCTION: git_src_prepare 417# @FUNCTION: git_src_prepare
372# @DESCRIPTION: 418# @DESCRIPTION:
373# src_prepare function for git stuff. Patches, bootstrap... 419# src_prepare function for git stuff. Patches, bootstrap...
374git_src_prepare() { 420git_src_prepare() {
375 debug-print-function ${FUNCNAME} "$@" 421 debug-print-function ${FUNCNAME} "$@"
376 422
377 git_apply_patches 423 git_apply_patches
378 git_bootstrap 424 git_bootstrap
379} 425}
Legend:
Removed from v.1.28  
changed lines
  Added in v.1.41
  ViewVC Help
Powered by ViewVC 1.1.13