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