/[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.53
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.53 2011/04/15 08:57:04 hkbst 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>
9# @BLURB: This eclass provides functions for fetch and unpack git repositories 9# @BLURB: Fetching and unpacking of git repositories
10# @DESCRIPTION: 10# @DESCRIPTION:
11# The eclass is based on subversion eclass. 11# The git eclass provides functions to fetch, patch and bootstrap
12# If you use this eclass, the ${S} is ${WORKDIR}/${P}. 12# 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. 13# It is necessary to define at least the EGIT_REPO_URI variable.
14# @THANKS TO: 14# @THANKS TO:
15# Fernando J. Pereda <ferdy@gentoo.org> 15# Fernando J. Pereda <ferdy@gentoo.org>
16 16
17inherit eutils 17inherit eutils
18 18
19EGIT="git.eclass" 19EGIT="git.eclass"
20 20
21# We DEPEND on a not too ancient 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 *) die "EAPI=${EAPI} is not supported" ;;
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_UNPACK_DIR
47# @DESCRIPTION:
48# Directory to unpack git sources in.
49
50# @ECLASS-VARIABLE: EGIT_HAS_SUBMODULES
51# @DESCRIPTION:
52# Set this to non-empty value to enable submodule support (slower).
53: ${EGIT_HAS_SUBMODULES:=}
46 54
47# @ECLASS-VARIABLE: EGIT_FETCH_CMD 55# @ECLASS-VARIABLE: EGIT_FETCH_CMD
48# @DESCRIPTION: 56# @DESCRIPTION:
49# Command for cloning the repository. 57# Command for cloning the repository.
50: ${EGIT_FETCH_CMD:="git clone"} 58: ${EGIT_FETCH_CMD:="git clone"}
51 59
52# @ECLASS-VARIABLE: EGIT_UPDATE_CMD 60# @ECLASS-VARIABLE: EGIT_UPDATE_CMD
53# @DESCRIPTION: 61# @DESCRIPTION:
54# Git fetch command. 62# Git fetch command.
63if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
55EGIT_UPDATE_CMD="git pull -f -u" 64 EGIT_UPDATE_CMD="git pull -f -u"
65else
66 EGIT_UPDATE_CMD="git fetch -f -u"
67fi
56 68
57# @ECLASS-VARIABLE: EGIT_DIFFSTAT_CMD 69# @ECLASS-VARIABLE: EGIT_DIFFSTAT_CMD
58# @DESCRIPTION: 70# @DESCRIPTION:
59# Git command for diffstat. 71# Git command for diffstat.
60EGIT_DIFFSTAT_CMD="git --no-pager diff --stat" 72EGIT_DIFFSTAT_CMD="git --no-pager diff --stat"
61 73
62# @ECLASS-VARIABLE: EGIT_OPTIONS 74# @ECLASS-VARIABLE: EGIT_OPTIONS
63# @DESCRIPTION: 75# @DESCRIPTION:
64# This variable value is passed to clone and fetch. 76# This variable value is passed to clone and fetch.
65: ${EGIT_OPTIONS:=} 77: ${EGIT_OPTIONS:=}
78
79# @ECLASS-VARIABLE: EGIT_MASTER
80# @DESCRIPTION:
81# Variable for specifying master branch.
82# Usefull when upstream don't have master branch.
83: ${EGIT_MASTER:=master}
66 84
67# @ECLASS-VARIABLE: EGIT_REPO_URI 85# @ECLASS-VARIABLE: EGIT_REPO_URI
68# @DESCRIPTION: 86# @DESCRIPTION:
69# URI for the repository 87# URI for the repository
70# e.g. http://foo, git://bar 88# e.g. http://foo, git://bar
… …
75# git+ssh:// 93# git+ssh://
76# rsync:// 94# rsync://
77# ssh:// 95# ssh://
78eval X="\$${PN//[-+]/_}_LIVE_REPO" 96eval X="\$${PN//[-+]/_}_LIVE_REPO"
79if [[ ${X} = "" ]]; then 97if [[ ${X} = "" ]]; then
80 EGIT_REPO_URI=${EGIT_REPO_URI:=} 98 : ${EGIT_REPO_URI:=}
81else 99else
82 EGIT_REPO_URI="${X}" 100 EGIT_REPO_URI="${X}"
83fi 101fi
84# @ECLASS-VARIABLE: EGIT_PROJECT 102# @ECLASS-VARIABLE: EGIT_PROJECT
85# @DESCRIPTION: 103# @DESCRIPTION:
86# Project name of your ebuild. 104# Project name, it must be unique across EGIT_STORE_DIR.
87# Git eclass will check out the git repository like: 105# 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##*/} 106# 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}} 107: ${EGIT_PROJECT:=${PN}}
94 108
95# @ECLASS-VARIABLE: EGIT_BOOTSTRAP 109# @ECLASS-VARIABLE: EGIT_BOOTSTRAP
96# @DESCRIPTION: 110# @DESCRIPTION:
97# bootstrap script or command like autogen.sh or etc... 111# bootstrap script or command like autogen.sh or etc...
98: ${EGIT_BOOTSTRAP:=} 112: ${EGIT_BOOTSTRAP:=}
… …
100# @ECLASS-VARIABLE: EGIT_OFFLINE 114# @ECLASS-VARIABLE: EGIT_OFFLINE
101# @DESCRIPTION: 115# @DESCRIPTION:
102# Set this variable to a non-empty value to disable the automatic updating of 116# 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 117# an GIT source tree. This is intended to be set outside the git source
104# tree by users. 118# tree by users.
105EGIT_OFFLINE="${EGIT_OFFLINE:-${ESCM_OFFLINE}}" 119: ${EGIT_OFFLINE:=${ESCM_OFFLINE}}
106 120
107# @ECLASS-VARIABLE: EGIT_PATCHES 121# @ECLASS-VARIABLE: EGIT_PATCHES
108# @DESCRIPTION: 122# @DESCRIPTION:
109# Similar to PATCHES array from base.eclass 123# Similar to PATCHES array from base.eclass
110# Only difference is that this patches are applied before bootstrap. 124# Only difference is that this patches are applied before bootstrap.
… …
112 126
113# @ECLASS-VARIABLE: EGIT_BRANCH 127# @ECLASS-VARIABLE: EGIT_BRANCH
114# @DESCRIPTION: 128# @DESCRIPTION:
115# git eclass can fetch any branch in git_fetch(). 129# git eclass can fetch any branch in git_fetch().
116eval X="\$${PN//[-+]/_}_LIVE_BRANCH" 130eval X="\$${PN//[-+]/_}_LIVE_BRANCH"
117if [[ ${X} = "" ]]; then 131if [[ "${X}" = "" ]]; then
118 EGIT_BRANCH=${EGIT_BRANCH:=master} 132 : ${EGIT_BRANCH:=master}
119else 133else
120 EGIT_BRANCH="${X}" 134 EGIT_BRANCH="${X}"
121fi 135fi
122 136
123# @ECLASS-VARIABLE: EGIT_COMMIT 137# @ECLASS-VARIABLE: EGIT_COMMIT
124# @DESCRIPTION: 138# @DESCRIPTION:
125# git eclass can checkout any commit. 139# git eclass can checkout any commit.
126eval X="\$${PN//[-+]/_}_LIVE_COMMIT" 140eval X="\$${PN//[-+]/_}_LIVE_COMMIT"
127if [[ ${X} = "" ]]; then 141if [[ "${X}" = "" ]]; then
128 : ${EGIT_COMMIT:=${EGIT_BRANCH}} 142 : ${EGIT_COMMIT:=${EGIT_BRANCH}}
129else 143else
130 EGIT_COMMIT="${X}" 144 EGIT_COMMIT="${X}"
131fi 145fi
132 146
133# @ECLASS-VARIABLE: EGIT_REPACK 147# @ECLASS-VARIABLE: EGIT_REPACK
134# @DESCRIPTION: 148# @DESCRIPTION:
135# git eclass will repack objects to save disk space. However this can take a 149# Set to non-empty value to repack objects to save disk space. However this can
136# long time with VERY big repositories. 150# take a long time with VERY big repositories.
137: ${EGIT_REPACK:=false} 151: ${EGIT_REPACK:=}
138 152
139# @ECLASS-VARIABLE: EGIT_PRUNE 153# @ECLASS-VARIABLE: EGIT_PRUNE
140# @DESCRIPTION: 154# @DESCRIPTION:
141# git eclass can prune the local clone. This is useful if upstream rewinds and 155# Set to non-empty value to prune loose objects on each fetch. This is useful
142# rebases branches too often. 156# if upstream rewinds and rebases branches often.
143: ${EGIT_PRUNE:=false} 157: ${EGIT_PRUNE:=}
144 158
145# @FUNCTION: git_submodules 159# @FUNCTION: git_submodules
146# @DESCRIPTION: 160# @DESCRIPTION:
147# Internal function wrapping the submodule initialisation and update 161# Internal function wrapping the submodule initialisation and update
148git_sumbodules() { 162git_submodules() {
163 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
149 debug-print "git submodule init" 164 debug-print "git submodule init"
150 git submodule init 165 git submodule init
166 debug-print "git submodule sync"
167 git submodule sync
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 [[ -z ${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 [[ -n ${EGIT_QUIET} ]]; then
165 elogcmd="einfo" 200 elogcmd="einfo"
166 else 201 else
167 elogcmd="elog" 202 elogcmd="elog"
168 fi 203 fi
169 204
… …
171 # which outputs into really smaller data transfers. 206 # which outputs into really smaller data transfers.
172 # Sadly we can do shallow copy for now because quite a few packages need .git 207 # Sadly we can do shallow copy for now because quite a few packages need .git
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 [[ -n ${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 [[ -n ${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 [[ -z ${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 [[ -n ${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 [[ -n ${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}"
272 else 328 else
273 ${elogcmd} " at the commit: ${cursha1}" 329 ${elogcmd} " at the commit: ${cursha1}"
274 # @ECLASS_VARIABLE: LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED 330 # @ECLASS_VARIABLE: LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED
… …
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 [[ -n ${EGIT_REPACK} ]] || [[ -n ${EGIT_PRUNE} ]]; then
291 ebegin "Garbage collecting the repository" 347 ebegin "Garbage collecting the repository"
292 git gc $(${EGIT_PRUNE} && echo '--prune') 348 local args
349 [[ -n ${EGIT_PRUNE} ]] && args='--prune'
350 git gc ${args}
293 eend $? 351 eend $?
294 fi 352 fi
295 popd &> /dev/null 353 popd &> /dev/null
296 354
297 # export the git version 355 # export the git version
298 export EGIT_VERSION="${cursha1}" 356 export EGIT_VERSION="${cursha1}"
299 357
300 [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]] && elog " commit: ${EGIT_COMMIT}" 358 # log the repo state
359 [[ "${EGIT_COMMIT}" != "${EGIT_BRANCH}" ]] && ${elogcmd} " commit: ${EGIT_COMMIT}"
301 ${elogcmd} " branch: ${EGIT_BRANCH}" 360 ${elogcmd} " branch: ${EGIT_BRANCH}"
302 ${elogcmd} " storage directory: \"${GIT_DIR}\"" 361 ${elogcmd} " storage directory: \"${GIT_DIR}\""
303 362
304 # unpack to the ${S} 363 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
364 pushd "${GIT_DIR}" &> /dev/null
365 debug-print "rsync -rlpgo . \"${EGIT_UNPACK_DIR:-${S}}\""
366 time rsync -rlpgo . "${EGIT_UNPACK_DIR:-${S}}"
367 popd &> /dev/null
368 else
369 unset GIT_DIR
370 debug-print "git clone -l -s -n \"${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}\" \"${EGIT_UNPACK_DIR:-${S}}\""
371 git clone -l -s -n "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" "${EGIT_UNPACK_DIR:-${S}}"
372 fi
373
374 pushd "${EGIT_UNPACK_DIR:-${S}}" &> /dev/null
375 git_branch
376 # submodules always reqire net (thanks to branches changing)
377 [[ -z ${EGIT_OFFLINE} ]] && git_submodules
305 popd &> /dev/null 378 popd &> /dev/null
306 debug-print "git clone -l \"${GIT_DIR}\" \"${S}\""
307 git clone -l "${GIT_DIR}" "${S}"
308 379
309 # set correct branch and the tree ebuild specified 380 echo ">>> Unpacked to ${EGIT_UNPACK_DIR:-${S}}"
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
323 echo ">>> Unpacked to ${S}"
324} 381}
325 382
326# @FUNCTION: git_bootstrap 383# @FUNCTION: git_bootstrap
327# @DESCRIPTION: 384# @DESCRIPTION:
328# Runs bootstrap command if EGIT_BOOTSTRAP variable contains some value 385# Runs bootstrap command if EGIT_BOOTSTRAP variable contains some value
… …
361} 418}
362 419
363# @FUNCTION: git_apply_patches 420# @FUNCTION: git_apply_patches
364# @DESCRIPTION: 421# @DESCRIPTION:
365# Apply patches from EGIT_PATCHES bash array. 422# Apply patches from EGIT_PATCHES bash array.
366# Preffered is using the variable as bash array but for now it allows to write 423# 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 424# it also as normal space separated string list. (This part of code should be
368# removed when all ebuilds get converted on bash array). 425# removed when all ebuilds get converted on bash array).
369git_apply_patches() { 426git_apply_patches() {
370 debug-print-function ${FUNCNAME} "$@" 427 debug-print-function ${FUNCNAME} "$@"
371 428
372 pushd "${S}" > /dev/null 429 pushd "${EGIT_UNPACK_DIR:-${S}}" > /dev/null
373 if [[ ${#EGIT_PATCHES[@]} -gt 1 ]] ; then 430 if [[ ${#EGIT_PATCHES[@]} -gt 1 ]] ; then
374 for i in "${EGIT_PATCHES[@]}"; do 431 for i in "${EGIT_PATCHES[@]}"; do
375 debug-print "$FUNCNAME: git_autopatch: patching from ${i}" 432 debug-print "$FUNCNAME: git_autopatch: patching from ${i}"
376 epatch "${i}" 433 epatch "${i}"
377 done 434 done
378 elif [[ ${EGIT_PATCHES} != "" ]]; then 435 elif [[ -n ${EGIT_PATCHES} ]]; then
379 # no need for loop if space separated string is passed. 436 # no need for loop if space separated string is passed.
380 debug-print "$FUNCNAME: git_autopatch: patching from ${EGIT_PATCHES}" 437 debug-print "$FUNCNAME: git_autopatch: patching from ${EGIT_PATCHES}"
381 epatch "${EGIT_PATCHES}" 438 epatch "${EGIT_PATCHES}"
382 fi 439 fi
383 440
Legend:
Removed from v.1.35  
changed lines
  Added in v.1.53
  ViewVC Help
Powered by ViewVC 1.1.13