/[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.54
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.35 2010/01/13 20:04:19 scarabeus Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/git.eclass,v 1.54 2011/04/20 10:57:42 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> 11# Tomas Chvatal <scarabeus@gentoo.org>
8# Donnie Berkholz <dberkholz@gentoo.org> 12# Donnie Berkholz <dberkholz@gentoo.org>
9# @BLURB: This eclass provides functions for fetch and unpack git repositories 13# @BLURB: Fetching and unpacking of git repositories
10# @DESCRIPTION: 14# @DESCRIPTION:
11# The eclass is based on subversion eclass. 15# The git eclass provides functions to fetch, patch and bootstrap
12# If you use this eclass, the ${S} is ${WORKDIR}/${P}. 16# 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. 17# It is necessary to define at least the EGIT_REPO_URI variable.
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"
20 24
25# We DEPEND on a not too ancient git version
26DEPEND=">=dev-vcs/git-1.6"
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 4|3|2) 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"} 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
55EGIT_UPDATE_CMD="git pull -f -u" 68 EGIT_UPDATE_CMD="git pull -f -u"
69else
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
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_BOOTSTRAP 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:=}
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.
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_COMMIT 141# @ECLASS-VARIABLE: EGIT_COMMIT
124# @DESCRIPTION: 142# @DESCRIPTION:
125# git eclass can checkout any commit. 143# git eclass can checkout any commit.
126eval X="\$${PN//[-+]/_}_LIVE_COMMIT" 144eval X="\$${PN//[-+]/_}_LIVE_COMMIT"
127if [[ ${X} = "" ]]; then 145if [[ "${X}" = "" ]]; then
128 : ${EGIT_COMMIT:=${EGIT_BRANCH}} 146 : ${EGIT_COMMIT:=${EGIT_BRANCH}}
129else 147else
130 EGIT_COMMIT="${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:=}
144 162
145# @FUNCTION: git_submodules 163# @FUNCTION: git_submodules
146# @DESCRIPTION: 164# @DESCRIPTION:
147# Internal function wrapping the submodule initialisation and update 165# Internal function wrapping the submodule initialisation and update
148git_sumbodules() { 166git_submodules() {
167 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
149 debug-print "git submodule init" 168 debug-print "git submodule init"
150 git submodule init 169 git submodule init
170 debug-print "git submodule sync"
171 git submodule sync
151 debug-print "git submodule update" 172 debug-print "git submodule update"
152 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
153} 191}
154 192
155# @FUNCTION: git_fetch 193# @FUNCTION: git_fetch
156# @DESCRIPTION: 194# @DESCRIPTION:
157# 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
158git_fetch() { 196git_fetch() {
159 debug-print-function ${FUNCNAME} "$@" 197 debug-print-function ${FUNCNAME} "$@"
160 198
161 local GIT_DIR EGIT_CLONE_DIR oldsha1 cursha1 199 local GIT_DIR EGIT_CLONE_DIR oldsha1 cursha1 extra_clone_opts upstream_branch
200 [[ -z ${EGIT_HAS_SUBMODULES} ]] && export GIT_DIR
162 201
163 # choose if user wants elog or just einfo. 202 # choose if user wants elog or just einfo.
164 if [[ ${EGIT_QUIET} != OFF ]]; then 203 if [[ -n ${EGIT_QUIET} ]]; then
165 elogcmd="einfo" 204 elogcmd="einfo"
166 else 205 else
167 elogcmd="elog" 206 elogcmd="elog"
168 fi 207 fi
169 208
171 # which outputs into really smaller data transfers. 210 # which outputs into really smaller data transfers.
172 # Sadly we can do shallow copy for now because quite a few packages need .git 211 # Sadly we can do shallow copy for now because quite a few packages need .git
173 # folder. 212 # folder.
174 #[[ ${EGIT_COMMIT} = ${EGIT_BRANCH} ]] && \ 213 #[[ ${EGIT_COMMIT} = ${EGIT_BRANCH} ]] && \
175 # EGIT_FETCH_CMD="${EGIT_FETCH_CMD} --depth 1" 214 # EGIT_FETCH_CMD="${EGIT_FETCH_CMD} --depth 1"
176 if [[ ! -z ${EGIT_TREE} ]] ; then 215 if [[ -n ${EGIT_TREE} ]] ; then
177 EGIT_COMMIT=${EGIT_TREE} 216 EGIT_COMMIT=${EGIT_TREE}
178 eqawarn "Usage of deprecated EGIT_TREE variable detected." 217 ewarn "QA: Usage of deprecated EGIT_TREE variable detected."
179 eqawarn "Use EGIT_COMMIT variable instead." 218 ewarn "QA: Use EGIT_COMMIT variable instead."
180 fi 219 fi
181 220
182 # EGIT_REPO_URI is empty. 221 # EGIT_REPO_URI is empty.
183 [[ -z ${EGIT_REPO_URI} ]] && die "${EGIT}: EGIT_REPO_URI is empty." 222 [[ -z ${EGIT_REPO_URI} ]] && die "${EGIT}: EGIT_REPO_URI is empty."
184 223
210 EGIT_CLONE_DIR="${EGIT_PROJECT}" 249 EGIT_CLONE_DIR="${EGIT_PROJECT}"
211 250
212 debug-print "${FUNCNAME}: EGIT_OPTIONS = \"${EGIT_OPTIONS}\"" 251 debug-print "${FUNCNAME}: EGIT_OPTIONS = \"${EGIT_OPTIONS}\""
213 252
214 GIT_DIR="${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" 253 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 254 # we also have to remove all shallow copied repositories
217 # and fetch them again 255 # and fetch them again
218 if [[ -e "${GIT_DIR}/shallow" ]]; then 256 if [[ -e "${GIT_DIR}/shallow" ]]; then
219 rm -rf "${GIT_DIR}" 257 rm -rf "${GIT_DIR}"
220 einfo "The ${EGIT_CLONE_DIR} was shallow copy. Refetching." 258 einfo "The ${EGIT_CLONE_DIR} was shallow copy. Refetching."
221 fi 259 fi
222 # repack from bare copy to normal one 260 # repack from bare copy to normal one
223 if [[ -d ${GIT_DIR} && ! -d "${GIT_DIR}/.git/" ]]; then 261 if [[ -n ${EGIT_HAS_SUBMODULES} ]] && [[ -d ${GIT_DIR} && ! -d ${GIT_DIR}/.git ]]; then
224 rm -rf "${GIT_DIR}" 262 rm -rf "${GIT_DIR}"
225 einfo "The ${EGIT_CLONE_DIR} was bare copy. Refetching." 263 einfo "The ${EGIT_CLONE_DIR} was bare copy. Refetching."
264 fi
265 if [[ -z ${EGIT_HAS_SUBMODULES} ]] && [[ -d ${GIT_DIR} && -d ${GIT_DIR}/.git ]]; then
266 rm -rf "${GIT_DIR}"
267 einfo "The ${EGIT_CLONE_DIR} was not a bare copy. Refetching."
268 fi
269
270 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
271 upstream_branch=origin/${EGIT_BRANCH}
272 else
273 upstream_branch=${EGIT_BRANCH}
274 extra_clone_opts=--bare
226 fi 275 fi
227 276
228 if [[ ! -d ${GIT_DIR} ]] ; then 277 if [[ ! -d ${GIT_DIR} ]] ; then
229 # first clone 278 # first clone
230 ${elogcmd} "GIT NEW clone -->" 279 ${elogcmd} "GIT NEW clone -->"
231 ${elogcmd} " repository: ${EGIT_REPO_URI}" 280 ${elogcmd} " repository: ${EGIT_REPO_URI}"
232 281
233 debug-print "${EGIT_FETCH_CMD} ${EGIT_OPTIONS} \"${EGIT_REPO_URI}\" ${GIT_DIR}" 282 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} \ 283 ${EGIT_FETCH_CMD} ${extra_clone_opts} ${EGIT_OPTIONS} "${EGIT_REPO_URI}" ${GIT_DIR} \
235 || die "${EGIT}: can't fetch from ${EGIT_REPO_URI}." 284 || die "${EGIT}: can't fetch from ${EGIT_REPO_URI}."
236 285
237 pushd "${GIT_DIR}" &> /dev/null 286 pushd "${GIT_DIR}" &> /dev/null
238 cursha1=$(git rev-parse origin/${EGIT_BRANCH}) 287 cursha1=$(git rev-parse ${upstream_branch})
239 ${elogcmd} " at the commit: ${cursha1}" 288 ${elogcmd} " at the commit: ${cursha1}"
240 289
241 git_sumbodules 290 git_submodules
242 popd &> /dev/null 291 popd &> /dev/null
243 elif [[ -n ${EGIT_OFFLINE} ]] ; then 292 elif [[ -n ${EGIT_OFFLINE} ]] ; then
244 pushd "${GIT_DIR}" &> /dev/null 293 pushd "${GIT_DIR}" &> /dev/null
245 cursha1=$(git rev-parse origin/${EGIT_BRANCH}) 294 cursha1=$(git rev-parse ${upstream_branch})
246 ${elogcmd} "GIT offline update -->" 295 ${elogcmd} "GIT offline update -->"
247 ${elogcmd} " repository: ${EGIT_REPO_URI}" 296 ${elogcmd} " repository: ${EGIT_REPO_URI}"
248 ${elogcmd} " at the commit: ${cursha1}" 297 ${elogcmd} " at the commit: ${cursha1}"
249 popd &> /dev/null 298 popd &> /dev/null
250 else 299 else
253 git config remote.origin.url "${EGIT_REPO_URI}" 302 git config remote.origin.url "${EGIT_REPO_URI}"
254 303
255 # fetch updates 304 # fetch updates
256 ${elogcmd} "GIT update -->" 305 ${elogcmd} "GIT update -->"
257 ${elogcmd} " repository: ${EGIT_REPO_URI}" 306 ${elogcmd} " repository: ${EGIT_REPO_URI}"
258
259 oldsha1=$(git rev-parse origin/${EGIT_BRANCH})
260 307
308 oldsha1=$(git rev-parse ${upstream_branch})
309
310 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
261 debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS}" 311 debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS}"
312 # fix branching
313 git checkout ${EGIT_MASTER}
314 for x in $(git branch |grep -v "* ${EGIT_MASTER}" |tr '\n' ' '); do
315 git branch -D ${x}
316 done
262 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} \ 317 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} \
263 || die "${EGIT}: can't update from ${EGIT_REPO_URI}." 318 || die "${EGIT}: can't update from ${EGIT_REPO_URI}."
319 else
320 debug-print "${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH}"
321 ${EGIT_UPDATE_CMD} ${EGIT_OPTIONS} origin ${EGIT_BRANCH}:${EGIT_BRANCH} \
322 || die "${EGIT}: can't update from ${EGIT_REPO_URI}."
323 fi
264 324
265 git_sumbodules 325 git_submodules
266 cursha1=$(git rev-parse origin/${EGIT_BRANCH}) 326 cursha1=$(git rev-parse ${upstream_branch})
267 327
268 # write out message based on the revisions 328 # write out message based on the revisions
269 if [[ ${oldsha1} != ${cursha1} ]]; then 329 if [[ "${oldsha1}" != "${cursha1}" ]]; then
270 ${elogcmd} " updating from commit: ${oldsha1}" 330 ${elogcmd} " updating from commit: ${oldsha1}"
271 ${elogcmd} " to commit: ${cursha1}" 331 ${elogcmd} " to commit: ${cursha1}"
272 else 332 else
273 ${elogcmd} " at the commit: ${cursha1}" 333 ${elogcmd} " at the commit: ${cursha1}"
274 # @ECLASS_VARIABLE: LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED 334 # @ECLASS_VARIABLE: LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED
280 # TODO: this can lead to issues if more projects/packages use same repo 340 # TODO: this can lead to issues if more projects/packages use same repo
281 [[ ${LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED} = true ]] && \ 341 [[ ${LIVE_FAIL_FETCH_IF_REPO_NOT_UPDATED} = true ]] && \
282 debug-print "${FUNCNAME}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." && \ 342 debug-print "${FUNCNAME}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." && \
283 die "${EGIT}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping." 343 die "${EGIT}: Repository \"${EGIT_REPO_URI}\" is up-to-date. Skipping."
284 fi 344 fi
285 ${EGIT_DIFFSTAT_CMD} ${oldsha1}..origin/${EGIT_BRANCH} 345 ${EGIT_DIFFSTAT_CMD} ${oldsha1}..${upstream_branch}
286 popd &> /dev/null 346 popd &> /dev/null
287 fi 347 fi
288 348
289 pushd "${GIT_DIR}" &> /dev/null 349 pushd "${GIT_DIR}" &> /dev/null
290 if ${EGIT_REPACK} || ${EGIT_PRUNE} ; then 350 if [[ -n ${EGIT_REPACK} ]] || [[ -n ${EGIT_PRUNE} ]]; then
291 ebegin "Garbage collecting the repository" 351 ebegin "Garbage collecting the repository"
292 git gc $(${EGIT_PRUNE} && echo '--prune') 352 local args
353 [[ -n ${EGIT_PRUNE} ]] && args='--prune'
354 git gc ${args}
293 eend $? 355 eend $?
294 fi 356 fi
295 popd &> /dev/null 357 popd &> /dev/null
296 358
297 # export the git version 359 # export the git version
298 export EGIT_VERSION="${cursha1}" 360 export EGIT_VERSION="${cursha1}"
299 361
300 [[ ${EGIT_COMMIT} != ${EGIT_BRANCH} ]] && elog " commit: ${EGIT_COMMIT}" 362 # log the repo state
363 [[ "${EGIT_COMMIT}" != "${EGIT_BRANCH}" ]] && ${elogcmd} " commit: ${EGIT_COMMIT}"
301 ${elogcmd} " branch: ${EGIT_BRANCH}" 364 ${elogcmd} " branch: ${EGIT_BRANCH}"
302 ${elogcmd} " storage directory: \"${GIT_DIR}\"" 365 ${elogcmd} " storage directory: \"${GIT_DIR}\""
303 366
304 # unpack to the ${S} 367 if [[ -n ${EGIT_HAS_SUBMODULES} ]]; then
368 pushd "${GIT_DIR}" &> /dev/null
369 debug-print "rsync -rlpgo . \"${EGIT_UNPACK_DIR:-${S}}\""
370 time rsync -rlpgo . "${EGIT_UNPACK_DIR:-${S}}"
371 popd &> /dev/null
372 else
373 unset GIT_DIR
374 debug-print "git clone -l -s -n \"${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}\" \"${EGIT_UNPACK_DIR:-${S}}\""
375 git clone -l -s -n "${EGIT_STORE_DIR}/${EGIT_CLONE_DIR}" "${EGIT_UNPACK_DIR:-${S}}"
376 fi
377
378 pushd "${EGIT_UNPACK_DIR:-${S}}" &> /dev/null
379 git_branch
380 # submodules always reqire net (thanks to branches changing)
381 [[ -z ${EGIT_OFFLINE} ]] && git_submodules
305 popd &> /dev/null 382 popd &> /dev/null
306 debug-print "git clone -l \"${GIT_DIR}\" \"${S}\""
307 git clone -l "${GIT_DIR}" "${S}"
308 383
309 # set correct branch and the tree ebuild specified 384 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} 385}
325 386
326# @FUNCTION: git_bootstrap 387# @FUNCTION: git_bootstrap
327# @DESCRIPTION: 388# @DESCRIPTION:
328# Runs bootstrap command if EGIT_BOOTSTRAP variable contains some value 389# Runs bootstrap command if EGIT_BOOTSTRAP variable contains some value
361} 422}
362 423
363# @FUNCTION: git_apply_patches 424# @FUNCTION: git_apply_patches
364# @DESCRIPTION: 425# @DESCRIPTION:
365# Apply patches from EGIT_PATCHES bash array. 426# Apply patches from EGIT_PATCHES bash array.
366# Preffered is using the variable as bash array but for now it allows to write 427# 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 428# it also as normal space separated string list. (This part of code should be
368# removed when all ebuilds get converted on bash array). 429# removed when all ebuilds get converted on bash array).
369git_apply_patches() { 430git_apply_patches() {
370 debug-print-function ${FUNCNAME} "$@" 431 debug-print-function ${FUNCNAME} "$@"
371 432
372 pushd "${S}" > /dev/null 433 pushd "${EGIT_UNPACK_DIR:-${S}}" > /dev/null
373 if [[ ${#EGIT_PATCHES[@]} -gt 1 ]] ; then 434 if [[ ${#EGIT_PATCHES[@]} -gt 1 ]] ; then
374 for i in "${EGIT_PATCHES[@]}"; do 435 for i in "${EGIT_PATCHES[@]}"; do
375 debug-print "$FUNCNAME: git_autopatch: patching from ${i}" 436 debug-print "$FUNCNAME: git_autopatch: patching from ${i}"
376 epatch "${i}" 437 epatch "${i}"
377 done 438 done
378 elif [[ ${EGIT_PATCHES} != "" ]]; then 439 elif [[ -n ${EGIT_PATCHES} ]]; then
379 # no need for loop if space separated string is passed. 440 # no need for loop if space separated string is passed.
380 debug-print "$FUNCNAME: git_autopatch: patching from ${EGIT_PATCHES}" 441 debug-print "$FUNCNAME: git_autopatch: patching from ${EGIT_PATCHES}"
381 epatch "${EGIT_PATCHES}" 442 epatch "${EGIT_PATCHES}"
382 fi 443 fi
383 444

Legend:
Removed from v.1.35  
changed lines
  Added in v.1.54

  ViewVC Help
Powered by ViewVC 1.1.20