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