/[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.55
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.55 2011/05/31 10:17:01 scarabeus Exp $
4
5# @DEPRECATED
6# This eclass has been superseded by git-2 eclass.
7# Please modify your ebuilds to use that one instead.
4 8
5# @ECLASS: git.eclass 9# @ECLASS: git.eclass
6# @MAINTAINER: 10# @MAINTAINER:
7# Tomas Chvatal <scarabeus@gentoo.org>
8# Donnie Berkholz <dberkholz@gentoo.org> 11# Donnie Berkholz <dberkholz@gentoo.org>
9# @BLURB: This eclass provides functions for fetch and unpack git repositories 12# @BLURB: Fetching and unpacking of git repositories
10# @DESCRIPTION: 13# @DESCRIPTION:
11# The eclass is based on subversion eclass. 14# The git eclass provides functions to fetch, patch and bootstrap
12# If you use this eclass, the ${S} is ${WORKDIR}/${P}. 15# software sources from git repositories and is based on the subversion eclass.
13# It is necessary to define the EGIT_REPO_URI variable at least. 16# It is necessary to define at least the EGIT_REPO_URI variable.
14# @THANKS TO: 17# @THANKS TO:
15# Fernando J. Pereda <ferdy@gentoo.org> 18# Fernando J. Pereda <ferdy@gentoo.org>
16 19
17inherit eutils 20inherit eutils
18 21
19EGIT="git.eclass" 22EGIT="git.eclass"
20 23
24# We DEPEND on a not too ancient git version
25DEPEND=">=dev-vcs/git-1.6"
26
21EXPORTED_FUNCTIONS="src_unpack" 27EXPORTED_FUNCTIONS="src_unpack"
22case "${EAPI:-0}" in 28case "${EAPI:-0}" in
23 2) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare" ;; 29 4|3|2) EXPORTED_FUNCTIONS="${EXPORTED_FUNCTIONS} src_prepare" ;;
24 0|1) ;; 30 1|0) ;;
25 *) die "Unknown EAPI, Bug eclass maintainers." ;; 31 *) die "EAPI=${EAPI} is not supported" ;;
26esac 32esac
27EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS} 33EXPORT_FUNCTIONS ${EXPORTED_FUNCTIONS}
28 34
29# define some nice defaults but only if nothing is set already 35# define some nice defaults but only if nothing is set already
30: ${HOMEPAGE:=http://git-scm.com/} 36: ${HOMEPAGE:=http://git-scm.com/}
31 37
32# We DEPEND on at least a bit recent git version
33DEPEND=">=dev-util/git-1.6"
34
35# @ECLASS-VARIABLE: EGIT_QUIET 38# @ECLASS-VARIABLE: EGIT_QUIET
36# @DESCRIPTION: 39# @DESCRIPTION:
37# Enables user specified verbosity for the eclass elog informations. 40# 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. 41: ${EGIT_QUIET:=${ESCM_QUIET}}
39: ${EGIT_QUIET:="OFF"}
40 42
41# @ECLASS-VARIABLE: EGIT_STORE_DIR 43# @ECLASS-VARIABLE: EGIT_STORE_DIR
42# @DESCRIPTION: 44# @DESCRIPTION:
43# Storage directory for git sources. 45# Storage directory for git sources.
44# Can be redefined. 46# Can be redefined.
45[[ -z ${EGIT_STORE_DIR} ]] && EGIT_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/git-src" 47: ${EGIT_STORE_DIR:="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/git-src"}
48
49# @ECLASS-VARIABLE: EGIT_UNPACK_DIR
50# @DESCRIPTION:
51# Directory to unpack git sources in.
52
53# @ECLASS-VARIABLE: EGIT_HAS_SUBMODULES
54# @DESCRIPTION:
55# Set this to non-empty value to enable submodule support (slower).
56: ${EGIT_HAS_SUBMODULES:=}
46 57
47# @ECLASS-VARIABLE: EGIT_FETCH_CMD 58# @ECLASS-VARIABLE: EGIT_FETCH_CMD
48# @DESCRIPTION: 59# @DESCRIPTION:
49# Command for cloning the repository. 60# Command for cloning the repository.
50: ${EGIT_FETCH_CMD:="git clone --bare"} 61: ${EGIT_FETCH_CMD:="git clone"}
51 62
52# @ECLASS-VARIABLE: EGIT_UPDATE_CMD 63# @ECLASS-VARIABLE: EGIT_UPDATE_CMD
53# @DESCRIPTION: 64# @DESCRIPTION:
54# Git fetch command. 65# Git fetch command.
66if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
67 EGIT_UPDATE_CMD="git pull -f -u"
68else
55EGIT_UPDATE_CMD="git fetch -f -u" 69 EGIT_UPDATE_CMD="git fetch -f -u"
70fi
56 71
57# @ECLASS-VARIABLE: EGIT_DIFFSTAT_CMD 72# @ECLASS-VARIABLE: EGIT_DIFFSTAT_CMD
58# @DESCRIPTION: 73# @DESCRIPTION:
59# Git command for diffstat. 74# Git command for diffstat.
60EGIT_DIFFSTAT_CMD="git --no-pager diff --stat" 75EGIT_DIFFSTAT_CMD="git --no-pager diff --stat"
61 76
62# @ECLASS-VARIABLE: EGIT_OPTIONS 77# @ECLASS-VARIABLE: EGIT_OPTIONS
63# @DESCRIPTION: 78# @DESCRIPTION:
64# This variable value is passed to clone and fetch. 79# This variable value is passed to clone and fetch.
65: ${EGIT_OPTIONS:=} 80: ${EGIT_OPTIONS:=}
81
82# @ECLASS-VARIABLE: EGIT_MASTER
83# @DESCRIPTION:
84# Variable for specifying master branch.
85# Usefull when upstream don't have master branch.
86: ${EGIT_MASTER:=master}
66 87
67# @ECLASS-VARIABLE: EGIT_REPO_URI 88# @ECLASS-VARIABLE: EGIT_REPO_URI
68# @DESCRIPTION: 89# @DESCRIPTION:
69# URI for the repository 90# URI for the repository
70# e.g. http://foo, git://bar 91# e.g. http://foo, git://bar
73# https:// 94# https://
74# git:// 95# git://
75# git+ssh:// 96# git+ssh://
76# rsync:// 97# rsync://
77# ssh:// 98# ssh://
78eval X="\$${PN//-/_}_LIVE_REPO" 99eval X="\$${PN//[-+]/_}_LIVE_REPO"
79if [[ ${X} = "" ]]; then 100if [[ ${X} = "" ]]; then
80 EGIT_REPO_URI=${EGIT_REPO_URI:=} 101 : ${EGIT_REPO_URI:=}
81else 102else
82 EGIT_REPO_URI="${X}" 103 EGIT_REPO_URI="${X}"
83fi 104fi
84# @ECLASS-VARIABLE: EGIT_PROJECT 105# @ECLASS-VARIABLE: EGIT_PROJECT
85# @DESCRIPTION: 106# @DESCRIPTION:
86# Project name of your ebuild. 107# Project name, it must be unique across EGIT_STORE_DIR.
87# Git eclass will check out the git repository like: 108# 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##*/} 109# 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}} 110: ${EGIT_PROJECT:=${PN}}
94 111
95# @ECLASS-VARIABLE: EGIT_BOOSTRAP 112# @ECLASS-VARIABLE: EGIT_BOOTSTRAP
96# @DESCRIPTION: 113# @DESCRIPTION:
97# bootstrap script or command like autogen.sh or etc... 114# bootstrap script or command like autogen.sh or etc...
98: ${EGIT_BOOTSTRAP:=} 115: ${EGIT_BOOTSTRAP:=}
99 116
100# @ECLASS-VARIABLE: EGIT_OFFLINE 117# @ECLASS-VARIABLE: EGIT_OFFLINE
101# @DESCRIPTION: 118# @DESCRIPTION:
102# Set this variable to a non-empty value to disable the automatic updating of 119# 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 120# an GIT source tree. This is intended to be set outside the git source
104# tree by users. 121# tree by users.
105EGIT_OFFLINE="${EGIT_OFFLINE:-${ESCM_OFFLINE}}" 122: ${EGIT_OFFLINE:=${ESCM_OFFLINE}}
106 123
107# @ECLASS-VARIABLE: EGIT_PATCHES 124# @ECLASS-VARIABLE: EGIT_PATCHES
108# @DESCRIPTION: 125# @DESCRIPTION:
109# Similar to PATCHES array from base.eclass 126# Similar to PATCHES array from base.eclass
110# Only difference is that this patches are applied before bootstrap. 127# Only difference is that this patches are applied before bootstrap.
111# Please take note that this variable should be bash array. 128# Please take note that this variable should be bash array.
112 129
113# @ECLASS-VARIABLE: EGIT_BRANCH 130# @ECLASS-VARIABLE: EGIT_BRANCH
114# @DESCRIPTION: 131# @DESCRIPTION:
115# git eclass can fetch any branch in git_fetch(). 132# git eclass can fetch any branch in git_fetch().
116eval X="\$${PN//-/_}_LIVE_BRANCH" 133eval X="\$${PN//[-+]/_}_LIVE_BRANCH"
117if [[ ${X} = "" ]]; then 134if [[ "${X}" = "" ]]; then
118 EGIT_BRANCH=${EGIT_BRANCH:=master} 135 : ${EGIT_BRANCH:=master}
119else 136else
120 EGIT_BRANCH="${X}" 137 EGIT_BRANCH="${X}"
121fi 138fi
122 139
123# @ECLASS-VARIABLE: EGIT_TREE 140# @ECLASS-VARIABLE: EGIT_COMMIT
124# @DESCRIPTION: 141# @DESCRIPTION:
125# git eclass can checkout any tree (commit). 142# git eclass can checkout any commit.
126eval X="\$${PN//-/_}_LIVE_TREE" 143eval X="\$${PN//[-+]/_}_LIVE_COMMIT"
127if [[ ${X} = "" ]]; then 144if [[ "${X}" = "" ]]; then
128 : ${EGIT_TREE:=${EGIT_BRANCH}} 145 : ${EGIT_COMMIT:=${EGIT_BRANCH}}
129else 146else
130 EGIT_TREE="${X}" 147 EGIT_COMMIT="${X}"
131fi 148fi
132 149
133# @ECLASS-VARIABLE: EGIT_REPACK 150# @ECLASS-VARIABLE: EGIT_REPACK
134# @DESCRIPTION: 151# @DESCRIPTION:
135# git eclass will repack objects to save disk space. However this can take a 152# Set to non-empty value to repack objects to save disk space. However this can
136# long time with VERY big repositories. 153# take a long time with VERY big repositories.
137: ${EGIT_REPACK:=false} 154: ${EGIT_REPACK:=}
138 155
139# @ECLASS-VARIABLE: EGIT_PRUNE 156# @ECLASS-VARIABLE: EGIT_PRUNE
140# @DESCRIPTION: 157# @DESCRIPTION:
141# git.eclass can prune the local clone. This is useful if upstream rewinds and 158# Set to non-empty value to prune loose objects on each fetch. This is useful
142# rebases branches too often. 159# if upstream rewinds and rebases branches often.
143: ${EGIT_PRUNE:=false} 160: ${EGIT_PRUNE:=}
161
162# @FUNCTION: git_submodules
163# @DESCRIPTION:
164# Internal function wrapping the submodule initialisation and update
165git_submodules() {
166 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
167 debug-print "git submodule init"
168 git submodule init
169 debug-print "git submodule sync"
170 git submodule sync
171 debug-print "git submodule update"
172 git submodule update
173 fi
174}
175
176# @FUNCTION: git_branch
177# @DESCRIPTION:
178# Internal function that changes branch for the repo based on EGIT_TREE and
179# EGIT_BRANCH variables.
180git_branch() {
181 local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH}
182 if [[ "${EGIT_COMMIT}" != "${EGIT_BRANCH}" ]]; then
183 branchname=tree-${EGIT_COMMIT}
184 src=${EGIT_COMMIT}
185 fi
186 debug-print "git checkout -b ${branchname} ${src}"
187 git checkout -b ${branchname} ${src} &> /dev/null
188
189 unset branchname src
190}
144 191
145# @FUNCTION: git_fetch 192# @FUNCTION: git_fetch
146# @DESCRIPTION: 193# @DESCRIPTION:
147# Gets repository from EGIT_REPO_URI and store it in specified EGIT_STORE_DIR 194# Gets repository from EGIT_REPO_URI and store it in specified EGIT_STORE_DIR
148git_fetch() { 195git_fetch() {
149 debug-print-function ${FUNCNAME} "$@" 196 debug-print-function ${FUNCNAME} "$@"
150 197
151 local EGIT_CLONE_DIR oldsha1 cursha1 198 local GIT_DIR EGIT_CLONE_DIR oldsha1 cursha1 extra_clone_opts upstream_branch
199 [[ -z ${EGIT_HAS_SUBMODULES} ]] && export GIT_DIR
152 200
153 # choose if user wants elog or just einfo. 201 # choose if user wants elog or just einfo.
154 if [[ ${EGIT_QUIET} != OFF ]]; then 202 if [[ -n ${EGIT_QUIET} ]]; then
155 elogcmd="einfo" 203 elogcmd="einfo"
156 else 204 else
157 elogcmd="elog" 205 elogcmd="elog"
158 fi 206 fi
159 207
160 # If we have same branch and the tree we can do --depth 1 clone 208 # If we have same branch and the tree we can do --depth 1 clone
161 # which outputs into really smaller data transfers. 209 # which outputs into really smaller data transfers.
162 # Sadly we can do shallow copy for now because quite a few packages need .git 210 # Sadly we can do shallow copy for now because quite a few packages need .git
163 # folder. 211 # folder.
164 #[[ ${EGIT_TREE} = ${EGIT_BRANCH} ]] && \ 212 #[[ ${EGIT_COMMIT} = ${EGIT_BRANCH} ]] && \
165 # EGIT_FETCH_CMD="${EGIT_FETCH_CMD} --depth 1" 213 # EGIT_FETCH_CMD="${EGIT_FETCH_CMD} --depth 1"
214 if [[ -n ${EGIT_TREE} ]] ; then
215 EGIT_COMMIT=${EGIT_TREE}
216 ewarn "QA: Usage of deprecated EGIT_TREE variable detected."
217 ewarn "QA: Use EGIT_COMMIT variable instead."
218 fi
166 219
167 # EGIT_REPO_URI is empty. 220 # EGIT_REPO_URI is empty.
168 [[ -z ${EGIT_REPO_URI} ]] && die "${EGIT}: EGIT_REPO_URI is empty." 221 [[ -z ${EGIT_REPO_URI} ]] && die "${EGIT}: EGIT_REPO_URI is empty."
169 222
170 # check for the protocol or pull from a local repo. 223 # check for the protocol or pull from a local repo.
194 [[ -z ${EGIT_REPO_URI##*/} ]] && EGIT_REPO_URI="${EGIT_REPO_URI%/}" 247 [[ -z ${EGIT_REPO_URI##*/} ]] && EGIT_REPO_URI="${EGIT_REPO_URI%/}"
195 EGIT_CLONE_DIR="${EGIT_PROJECT}" 248 EGIT_CLONE_DIR="${EGIT_PROJECT}"
196 249
197 debug-print "${FUNCNAME}: EGIT_OPTIONS = \"${EGIT_OPTIONS}\"" 250 debug-print "${FUNCNAME}: EGIT_OPTIONS = \"${EGIT_OPTIONS}\""
198 251
199 export GIT_DIR="${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" 252 GIT_DIR="${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}"
200
201 # we also have to remove all shallow copied repositories 253 # we also have to remove all shallow copied repositories
202 # and fetch them again 254 # and fetch them again
203 if [[ -e "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}/shallow" ]]; then 255 if [[ -e "${GIT_DIR}/shallow" ]]; then
204 rm -rf "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" 256 rm -rf "${GIT_DIR}"
205 einfo "The ${EGIT_CLONE_DIR} was shallow copy. Refetching." 257 einfo "The ${EGIT_CLONE_DIR} was shallow copy. Refetching."
206 fi 258 fi
259 # repack from bare copy to normal one
260 if [[ -n ${EGIT_HAS_SUBMODULES} ]] && [[ -d ${GIT_DIR} && ! -d ${GIT_DIR}/.git ]]; then
261 rm -rf "${GIT_DIR}"
262 einfo "The ${EGIT_CLONE_DIR} was bare copy. Refetching."
263 fi
264 if [[ -z ${EGIT_HAS_SUBMODULES} ]] && [[ -d ${GIT_DIR} && -d ${GIT_DIR}/.git ]]; then
265 rm -rf "${GIT_DIR}"
266 einfo "The ${EGIT_CLONE_DIR} was not a bare copy. Refetching."
267 fi
207 268
269 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
270 upstream_branch=origin/${EGIT_BRANCH}
271 else
272 upstream_branch=${EGIT_BRANCH}
273 extra_clone_opts=--bare
274 fi
275
208 if [[ ! -d ${EGIT_CLONE_DIR} ]] ; then 276 if [[ ! -d ${GIT_DIR} ]] ; then
209 # first clone 277 # first clone
210 ${elogcmd} "GIT NEW clone -->" 278 ${elogcmd} "GIT NEW clone -->"
211 ${elogcmd} " repository: ${EGIT_REPO_URI}" 279 ${elogcmd} " repository: ${EGIT_REPO_URI}"
212 280
281 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} \ 282 ${EGIT_FETCH_CMD} ${extra_clone_opts} ${EGIT_OPTIONS} "${EGIT_REPO_URI}" ${GIT_DIR} \
214 || die "${EGIT}: can't fetch from ${EGIT_REPO_URI}." 283 || die "${EGIT}: can't fetch from ${EGIT_REPO_URI}."
215 284
216 cursha1=$(git rev-parse ${EGIT_BRANCH}) 285 pushd "${GIT_DIR}" &> /dev/null
286 cursha1=$(git rev-parse ${upstream_branch})
217 ${elogcmd} " at the commit: ${cursha1}" 287 ${elogcmd} " at the commit: ${cursha1}"
218 # We use --bare cloning, so git doesn't do this for us. 288
219 git config remote.origin.url "${EGIT_REPO_URI}" 289 git_submodules
290 popd &> /dev/null
220 elif [[ -n ${EGIT_OFFLINE} ]] ; then 291 elif [[ -n ${EGIT_OFFLINE} ]] ; then
221 cursha1=$(git rev-parse ${EGIT_BRANCH}) 292 pushd "${GIT_DIR}" &> /dev/null
293 cursha1=$(git rev-parse ${upstream_branch})
222 ${elogcmd} "GIT offline update -->" 294 ${elogcmd} "GIT offline update -->"
223 ${elogcmd} " repository: ${EGIT_REPO_URI}" 295 ${elogcmd} " repository: ${EGIT_REPO_URI}"
224 ${elogcmd} " at the commit: ${cursha1}" 296 ${elogcmd} " at the commit: ${cursha1}"
297 popd &> /dev/null
225 else 298 else
299 pushd "${GIT_DIR}" &> /dev/null
226 # Git urls might change, so unconditionally set it here 300 # Git urls might change, so unconditionally set it here
227 git config remote.origin.url "${EGIT_REPO_URI}" 301 git config remote.origin.url "${EGIT_REPO_URI}"
228 302
229 # fetch updates 303 # fetch updates
230 ${elogcmd} "GIT update -->" 304 ${elogcmd} "GIT update -->"
231 ${elogcmd} " repository: ${EGIT_REPO_URI}" 305 ${elogcmd} " repository: ${EGIT_REPO_URI}"
232 306
233 oldsha1=$(git rev-parse ${EGIT_BRANCH}) 307 oldsha1=$(git rev-parse ${upstream_branch})
234 308
309 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
310 debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS}"
311 # fix branching
312 git checkout ${EGIT_MASTER}
313 for x in $(git branch |grep -v "* ${EGIT_MASTER}" |tr '\n' ' '); do
314 git branch -D ${x}
315 done
316 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} \
317 || die "${EGIT}: can't update from ${EGIT_REPO_URI}."
318 else
235 ${elogcmd} ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH} 319 debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH}"
236 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH} \ 320 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH} \
237 || die "${EGIT}: can't update from ${EGIT_REPO_URI}." 321 || die "${EGIT}: can't update from ${EGIT_REPO_URI}."
322 fi
238 323
239 cursha1=$(git rev-parse ${EGIT_BRANCH}) 324 git_submodules
325 cursha1=$(git rev-parse ${upstream_branch})
240 326
241 # write out message based on the revisions 327 # write out message based on the revisions
242 if [[ ${oldsha1} != ${cursha1} ]]; then 328 if [[ "${oldsha1}" != "${cursha1}" ]]; then
243 ${elogcmd} " updating from commit: ${oldsha1}" 329 ${elogcmd} " updating from commit: ${oldsha1}"
244 ${elogcmd} " to commit: ${cursha1}" 330 ${elogcmd} " to commit: ${cursha1}"
245 else 331 else
246 ${elogcmd} " at the commit: ${cursha1}" 332 ${elogcmd} " at the commit: ${cursha1}"
247 # @ECLASS_VARIABLE: LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED 333 # @ECLASS_VARIABLE: LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED
253 # TODO: this can lead to issues if more projects/packages use same repo 339 # TODO: this can lead to issues if more projects/packages use same repo
254 [[ ${LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED} = true ]] && \ 340 [[ ${LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED} = true ]] && \
255 debug-print "${FUNCNAME}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." && \ 341 debug-print "${FUNCNAME}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." && \
256 die "${EGIT}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." 342 die "${EGIT}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping."
257 fi 343 fi
258 ${EGIT_DIFFSTAT_CMD} ${oldsha1}..${EGIT_BRANCH} 344 ${EGIT_DIFFSTAT_CMD} ${oldsha1}..${upstream_branch}
345 popd &> /dev/null
259 fi 346 fi
260 347
348 pushd "${GIT_DIR}" &> /dev/null
261 if ${EGIT_REPACK} || ${EGIT_PRUNE} ; then 349 if [[ -n ${EGIT_REPACK} ]] || [[ -n ${EGIT_PRUNE} ]]; then
262 ebegin "Garbage collecting the repository" 350 ebegin "Garbage collecting the repository"
263 git gc $(${EGIT_PRUNE} && echo '--prune') 351 local args
352 [[ -n ${EGIT_PRUNE} ]] && args='--prune'
353 git gc ${args}
264 eend $? 354 eend $?
265 fi 355 fi
266 356 popd &> /dev/null
357
267 # export the git version 358 # export the git version
268 export EGIT_VERSION="${cursha1}" 359 export EGIT_VERSION="${cursha1}"
269 360
361 # log the repo state
270 [[ ${EGIT_TREE} != ${EGIT_BRANCH} ]] && elog " tree: ${EGIT_TREE}" 362 [[ "${EGIT_COMMIT}" != "${EGIT_BRANCH}" ]] && ${elogcmd} " commit: ${EGIT_COMMIT}"
271 ${elogcmd} " branch: ${EGIT_BRANCH}" 363 ${elogcmd} " branch: ${EGIT_BRANCH}"
272 ${elogcmd} " storage directory: \"${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}\"" 364 ${elogcmd} " storage directory: \"${GIT_DIR}\""
273 365
274 # unpack to the ${S} 366 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
367 pushd "${GIT_DIR}" &> /dev/null
368 debug-print "rsync -rlpgo . \"${EGIT_UNPACK_DIR:-${S}}\""
369 time rsync -rlpgo . "${EGIT_UNPACK_DIR:-${S}}"
370 popd &> /dev/null
371 else
275 unset GIT_DIR 372 unset GIT_DIR
276 debug-print "git clone -l -s -n \"${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}\" \"${S}\"" 373 debug-print "git clone -l -s -n \"${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}\" \"${EGIT_UNPACK_DIR:-${S}}\""
277 git clone -l -s -n "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" "${S}" 374 git clone -l -s -n "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" "${EGIT_UNPACK_DIR:-${S}}"
278
279 # set correct branch and the tree ebuild specified
280 pushd "${S}" > /dev/null
281 local branchname=branch-${EGIT_BRANCH} src=origin/${EGIT_BRANCH}
282 if [[ ${EGIT_TREE} != ${EGIT_BRANCH} ]]; then
283 branchname=tree-${EGIT_TREE}
284 src=${EGIT_TREE}
285 fi 375 fi
286 debug-print "git checkout -b ${branchname} ${src}" 376
287 git checkout -b ${branchname} ${src} 2>&1 > /dev/null 377 pushd "${EGIT_UNPACK_DIR:-${S}}" &> /dev/null
288 debug-print "git submodule init" 378 git_branch
289 git submodule init 2>&1 > /dev/null 379 # submodules always reqire net (thanks to branches changing)
290 debug-print "git submodule update" 380 [[ -z ${EGIT_OFFLINE} ]] && git_submodules
291 git submodule update 2>&1 > /dev/null
292 popd > /dev/null 381 popd &> /dev/null
293 382
294 unset branchname src 383 echo ">>> Unpacked to ${EGIT_UNPACK_DIR:-${S}}"
295
296 echo ">>> Unpacked to ${S}"
297} 384}
298 385
299# @FUNCTION: git_bootstrap 386# @FUNCTION: git_bootstrap
300# @DESCRIPTION: 387# @DESCRIPTION:
301# Runs bootstrap command if EGIT_BOOTSTRAP variable contains some value 388# Runs bootstrap command if EGIT_BOOTSTRAP variable contains some value
334} 421}
335 422
336# @FUNCTION: git_apply_patches 423# @FUNCTION: git_apply_patches
337# @DESCRIPTION: 424# @DESCRIPTION:
338# Apply patches from EGIT_PATCHES bash array. 425# Apply patches from EGIT_PATCHES bash array.
339# Preffered is using the variable as bash array but for now it allows to write 426# 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 427# it also as normal space separated string list. (This part of code should be
341# removed when all ebuilds get converted on bash array). 428# removed when all ebuilds get converted on bash array).
342git_apply_patches() { 429git_apply_patches() {
343 debug-print-function ${FUNCNAME} "$@" 430 debug-print-function ${FUNCNAME} "$@"
344 431
345 pushd "${S}" > /dev/null 432 pushd "${EGIT_UNPACK_DIR:-${S}}" > /dev/null
346 if [[ ${#EGIT_PATCHES[@]} -gt 1 ]] ; then 433 if [[ ${#EGIT_PATCHES[@]} -gt 1 ]] ; then
347 for i in "${EGIT_PATCHES[@]}"; do 434 for i in "${EGIT_PATCHES[@]}"; do
348 debug-print "$FUNCNAME: git_autopatch: patching from ${i}" 435 debug-print "$FUNCNAME: git_autopatch: patching from ${i}"
349 epatch "${i}" 436 epatch "${i}"
350 done 437 done
351 elif [[ ${EGIT_PATCHES} != "" ]]; then 438 elif [[ -n ${EGIT_PATCHES} ]]; then
352 # no need for loop if space separated string is passed. 439 # no need for loop if space separated string is passed.
353 debug-print "$FUNCNAME: git_autopatch: patching from ${EGIT_PATCHES}" 440 debug-print "$FUNCNAME: git_autopatch: patching from ${EGIT_PATCHES}"
354 epatch "${EGIT_PATCHES}" 441 epatch "${EGIT_PATCHES}"
355 fi 442 fi
356 443
371# @FUNCTION: git_src_prepare 458# @FUNCTION: git_src_prepare
372# @DESCRIPTION: 459# @DESCRIPTION:
373# src_prepare function for git stuff. Patches, bootstrap... 460# src_prepare function for git stuff. Patches, bootstrap...
374git_src_prepare() { 461git_src_prepare() {
375 debug-print-function ${FUNCNAME} "$@" 462 debug-print-function ${FUNCNAME} "$@"
376 463
377 git_apply_patches 464 git_apply_patches
378 git_bootstrap 465 git_bootstrap
379} 466}

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

  ViewVC Help
Powered by ViewVC 1.1.20