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