/[gentoo-x86]/eclass/git-r3.eclass
Gentoo

Diff of /eclass/git-r3.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.8 Revision 1.51
1# Copyright 1999-2013 Gentoo Foundation 1# Copyright 1999-2015 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-r3.eclass,v 1.8 2013/09/25 10:49:11 mgorny Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.51 2015/08/08 09:32:50 mgorny Exp $
4 4
5# @ECLASS: git-r3.eclass 5# @ECLASS: git-r3.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Michał Górny <mgorny@gentoo.org> 7# Michał Górny <mgorny@gentoo.org>
8# @BLURB: Eclass for fetching and unpacking git repositories. 8# @BLURB: Eclass for fetching and unpacking git repositories.
9# @DESCRIPTION: 9# @DESCRIPTION:
10# Third generation eclass for easing maitenance of live ebuilds using 10# Third generation eclass for easing maintenance of live ebuilds using
11# git as remote repository. The eclass supports lightweight (shallow) 11# git as remote repository.
12# clones and bare clones of submodules.
13 12
14case "${EAPI:-0}" in 13case "${EAPI:-0}" in
15 0|1|2|3|4|5) 14 0|1|2|3|4|5)
16 ;; 15 ;;
17 *) 16 *)
27 26
28EXPORT_FUNCTIONS src_unpack 27EXPORT_FUNCTIONS src_unpack
29 28
30if [[ ! ${_GIT_R3} ]]; then 29if [[ ! ${_GIT_R3} ]]; then
31 30
31if [[ ! ${_INHERITED_BY_GIT_2} ]]; then
32 DEPEND=">=dev-vcs/git-1.8.2.1"
33fi
34
35# @ECLASS-VARIABLE: EGIT_CLONE_TYPE
36# @DESCRIPTION:
37# Type of clone that should be used against the remote repository.
38# This can be either of: 'mirror', 'single', 'shallow'.
39#
40# This is intended to be set by user in make.conf. Ebuilds are supposed
41# to set EGIT_MIN_CLONE_TYPE if necessary instead.
42#
43# The 'mirror' type clones all remote branches and tags with complete
44# history and all notes. EGIT_COMMIT can specify any commit hash.
45# Upstream-removed branches and tags are purged from the local clone
46# while fetching. This mode is suitable for cloning the local copy
47# for development or hosting a local git mirror. However, clones
48# of repositories with large diverged branches may quickly grow large.
49#
50# The 'single+tags' type clones the requested branch and all tags
51# in the repository. All notes are fetched as well. EGIT_COMMIT
52# can safely specify hashes throughout the current branch and all tags.
53# No purging of old references is done (if you often switch branches,
54# you may need to remove stale branches yourself). This mode is intended
55# mostly for use with broken git servers such as Google Code that fail
56# to fetch tags along with the branch in 'single' mode.
57#
58# The 'single' type clones only the requested branch or tag. Tags
59# referencing commits throughout the branch history are fetched as well,
60# and all notes. EGIT_COMMIT can safely specify only hashes
61# in the current branch. No purging of old references is done (if you
62# often switch branches, you may need to remove stale branches
63# yourself). This mode is suitable for general use.
64#
65# The 'shallow' type clones only the newest commit on requested branch
66# or tag. EGIT_COMMIT can only specify tags, and since the history is
67# unavailable calls like 'git describe' will not reference prior tags.
68# No purging of old references is done. This mode is intended mostly for
69# embedded systems with limited disk space.
70: ${EGIT_CLONE_TYPE:=single}
71
72# @ECLASS-VARIABLE: EGIT_MIN_CLONE_TYPE
73# @DESCRIPTION:
74# 'Minimum' clone type supported by the ebuild. Takes same values
75# as EGIT_CLONE_TYPE. When user sets a type that's 'lower' (that is,
76# later on the list) than EGIT_MIN_CLONE_TYPE, the eclass uses
77# EGIT_MIN_CLONE_TYPE instead.
78#
79# This variable is intended to be used by ebuilds only. Users are
80# supposed to set EGIT_CLONE_TYPE instead.
81#
82# A common case is to use 'single' whenever the build system requires
83# access to full branch history, or 'single+tags' when Google Code
84# or a similar remote is used that does not support shallow clones
85# and fetching tags along with commits. Please use sparingly, and to fix
86# fatal errors rather than 'non-pretty versions'.
87: ${EGIT_MIN_CLONE_TYPE:=shallow}
88
32# @ECLASS-VARIABLE: EGIT3_STORE_DIR 89# @ECLASS-VARIABLE: EGIT3_STORE_DIR
33# @DESCRIPTION: 90# @DESCRIPTION:
34# Storage directory for git sources. 91# Storage directory for git sources.
35# 92#
93# This is intended to be set by user in make.conf. Ebuilds must not set
94# it.
95#
36# EGIT3_STORE_DIR=${DISTDIR}/git3-src 96# EGIT3_STORE_DIR=${DISTDIR}/git3-src
97
98# @ECLASS-VARIABLE: EGIT_MIRROR_URI
99# @DEFAULT_UNSET
100# @DESCRIPTION:
101# 'Top' URI to a local git mirror. If specified, the eclass will try
102# to fetch from the local mirror instead of using the remote repository.
103#
104# The mirror needs to follow EGIT3_STORE_DIR structure. The directory
105# created by eclass can be used for that purpose.
106#
107# Example:
108# @CODE
109# EGIT_MIRROR_URI="git://mirror.lan/"
110# @CODE
37 111
38# @ECLASS-VARIABLE: EGIT_REPO_URI 112# @ECLASS-VARIABLE: EGIT_REPO_URI
39# @REQUIRED 113# @REQUIRED
40# @DESCRIPTION: 114# @DESCRIPTION:
41# URIs to the repository, e.g. git://foo, https://foo. If multiple URIs 115# URIs to the repository, e.g. git://foo, https://foo. If multiple URIs
42# are provided, the eclass will consider them as fallback URIs to try 116# are provided, the eclass will consider them as fallback URIs to try
43# if the first URI does not work. 117# if the first URI does not work. For supported URI syntaxes, read up
118# the manpage for git-clone(1).
44# 119#
45# It can be overriden via env using ${PN}_LIVE_REPO variable. 120# It can be overriden via env using ${PN}_LIVE_REPO variable.
121#
122# Can be a whitespace-separated list or an array.
46# 123#
47# Example: 124# Example:
48# @CODE 125# @CODE
49# EGIT_REPO_URI="git://a/b.git https://c/d.git" 126# EGIT_REPO_URI="git://a/b.git https://c/d.git"
50# @CODE 127# @CODE
52# @ECLASS-VARIABLE: EVCS_OFFLINE 129# @ECLASS-VARIABLE: EVCS_OFFLINE
53# @DEFAULT_UNSET 130# @DEFAULT_UNSET
54# @DESCRIPTION: 131# @DESCRIPTION:
55# If non-empty, this variable prevents any online operations. 132# If non-empty, this variable prevents any online operations.
56 133
134# @ECLASS-VARIABLE: EVCS_UMASK
135# @DEFAULT_UNSET
136# @DESCRIPTION:
137# Set this variable to a custom umask. This is intended to be set by
138# users. By setting this to something like 002, it can make life easier
139# for people who do development as non-root (but are in the portage
140# group), and then switch over to building with FEATURES=userpriv.
141# Or vice-versa. Shouldn't be a security issue here as anyone who has
142# portage group write access already can screw the system over in more
143# creative ways.
144
57# @ECLASS-VARIABLE: EGIT_BRANCH 145# @ECLASS-VARIABLE: EGIT_BRANCH
58# @DEFAULT_UNSET 146# @DEFAULT_UNSET
59# @DESCRIPTION: 147# @DESCRIPTION:
60# The branch name to check out. If unset, the upstream default (HEAD) 148# The branch name to check out. If unset, the upstream default (HEAD)
61# will be used. 149# will be used.
75# @DESCRIPTION: 163# @DESCRIPTION:
76# The directory to check the git sources out to. 164# The directory to check the git sources out to.
77# 165#
78# EGIT_CHECKOUT_DIR=${WORKDIR}/${P} 166# EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
79 167
80# @ECLASS-VARIABLE: EGIT_NONSHALLOW
81# @DEFAULT_UNSET
82# @DESCRIPTION:
83# Disable performing shallow fetches/clones. Shallow clones have
84# a fair number of limitations. Therefore, if you'd like the eclass to
85# perform complete clones instead, set this to a non-null value.
86#
87# This variable is to be set in make.conf. Ebuilds are not allowed
88# to set it.
89
90# @FUNCTION: _git-r3_env_setup 168# @FUNCTION: _git-r3_env_setup
91# @INTERNAL 169# @INTERNAL
92# @DESCRIPTION: 170# @DESCRIPTION:
93# Set the eclass variables as necessary for operation. This can involve 171# Set the eclass variables as necessary for operation. This can involve
94# setting EGIT_* to defaults or ${PN}_LIVE_* variables. 172# setting EGIT_* to defaults or ${PN}_LIVE_* variables.
95_git-r3_env_setup() { 173_git-r3_env_setup() {
96 debug-print-function ${FUNCNAME} "$@" 174 debug-print-function ${FUNCNAME} "$@"
175
176 # check the clone type
177 case "${EGIT_CLONE_TYPE}" in
178 mirror|single+tags|single|shallow)
179 ;;
180 *)
181 die "Invalid EGIT_CLONE_TYPE=${EGIT_CLONE_TYPE}"
182 esac
183 case "${EGIT_MIN_CLONE_TYPE}" in
184 shallow)
185 ;;
186 single)
187 if [[ ${EGIT_CLONE_TYPE} == shallow ]]; then
188 einfo "git-r3: ebuild needs to be cloned in '\e[1msingle\e[22m' mode, adjusting"
189 EGIT_CLONE_TYPE=single
190 fi
191 ;;
192 single+tags)
193 if [[ ${EGIT_CLONE_TYPE} == shallow || ${EGIT_CLONE_TYPE} == single ]]; then
194 einfo "git-r3: ebuild needs to be cloned in '\e[1msingle+tags\e[22m' mode, adjusting"
195 EGIT_CLONE_TYPE=single+tags
196 fi
197 ;;
198 mirror)
199 if [[ ${EGIT_CLONE_TYPE} != mirror ]]; then
200 einfo "git-r3: ebuild needs to be cloned in '\e[1mmirror\e[22m' mode, adjusting"
201 EGIT_CLONE_TYPE=mirror
202 fi
203 ;;
204 *)
205 die "Invalid EGIT_MIN_CLONE_TYPE=${EGIT_MIN_CLONE_TYPE}"
206 esac
97 207
98 local esc_pn livevar 208 local esc_pn livevar
99 esc_pn=${PN//[-+]/_} 209 esc_pn=${PN//[-+]/_}
100 210
101 livevar=${esc_pn}_LIVE_REPO 211 livevar=${esc_pn}_LIVE_REPO
202 GIT_DIR=${EGIT3_STORE_DIR}/${repo_name} 312 GIT_DIR=${EGIT3_STORE_DIR}/${repo_name}
203 313
204 if [[ ! -d ${EGIT3_STORE_DIR} ]]; then 314 if [[ ! -d ${EGIT3_STORE_DIR} ]]; then
205 ( 315 (
206 addwrite / 316 addwrite /
207 mkdir -m0755 -p "${EGIT3_STORE_DIR}" 317 mkdir -p "${EGIT3_STORE_DIR}" || die
208 ) || die "Unable to create ${EGIT3_STORE_DIR}" 318 ) || die "Unable to create ${EGIT3_STORE_DIR}"
209 fi 319 fi
210 320
211 addwrite "${EGIT3_STORE_DIR}" 321 addwrite "${EGIT3_STORE_DIR}"
212 if [[ ! -d ${GIT_DIR} ]]; then 322 if [[ ! -d ${GIT_DIR} ]]; then
323 local saved_umask
324 if [[ ${EVCS_UMASK} ]]; then
325 saved_umask=$(umask)
326 umask "${EVCS_UMASK}" || die "Bad options to umask: ${EVCS_UMASK}"
327 fi
213 mkdir "${GIT_DIR}" || die 328 mkdir "${GIT_DIR}" || die
214 git init --bare || die 329 git init --bare || die
215 330 if [[ ${saved_umask} ]]; then
216 if [[ ! ${EGIT_NONSHALLOW} ]]; then 331 umask "${saved_umask}" || die
217 # avoid auto-unshallow :)
218 touch "${GIT_DIR}"/shallow || die
219 fi 332 fi
220 fi 333 fi
221} 334}
222 335
223# @FUNCTION: _git-r3_set_submodules 336# @FUNCTION: _git-r3_set_submodules
242 [[ ${l} == submodule.*.url=* ]] || continue 355 [[ ${l} == submodule.*.url=* ]] || continue
243 356
244 l=${l#submodule.} 357 l=${l#submodule.}
245 local subname=${l%%.url=*} 358 local subname=${l%%.url=*}
246 359
360 # skip modules that have 'update = none', bug #487262.
361 local upd=$(echo "${data}" | git config -f /dev/fd/0 \
362 submodule."${subname}".update)
363 [[ ${upd} == none ]] && continue
364
247 submodules+=( 365 submodules+=(
248 "${subname}" 366 "${subname}"
249 "$(echo "${data}" | git config -f /dev/fd/0 \ 367 "$(echo "${data}" | git config -f /dev/fd/0 \
250 submodule."${subname}".url)" 368 submodule."${subname}".url || die)"
251 "$(echo "${data}" | git config -f /dev/fd/0 \ 369 "$(echo "${data}" | git config -f /dev/fd/0 \
252 submodule."${subname}".path)" 370 submodule."${subname}".path || die)"
253 ) 371 )
254 done < <(echo "${data}" | git config -f /dev/fd/0 -l) 372 done < <(echo "${data}" | git config -f /dev/fd/0 -l || die)
255} 373}
256 374
257# @FUNCTION: _git-r3_smart_fetch 375# @FUNCTION: _git-r3_set_subrepos
258# @USAGE: <git-fetch-args>... 376# @USAGE: <submodule-uri> <parent-repo-uri>...
377# @INTERNAL
259# @DESCRIPTION: 378# @DESCRIPTION:
260# Try fetching without '--depth' and switch to '--depth 1' if that 379# Create 'subrepos' array containing absolute (canonical) submodule URIs
261# will involve less objects fetched. 380# for the given <submodule-uri>. If the URI is relative, URIs will be
262_git-r3_smart_fetch() { 381# constructed using all <parent-repo-uri>s. Otherwise, this single URI
382# will be placed in the array.
383_git-r3_set_subrepos() {
263 debug-print-function ${FUNCNAME} "$@" 384 debug-print-function ${FUNCNAME} "$@"
264 385
265 local sed_regexp='.*Counting objects: \([0-9]*\), done\..*' 386 local suburl=${1}
387 subrepos=( "${@:2}" )
266 388
267 # start the main fetch 389 if [[ ${suburl} == ./* || ${suburl} == ../* ]]; then
268 local cmd=( git fetch --progress "${@}" ) 390 # drop all possible trailing slashes for consistency
269 echo "${cmd[@]}" >&2 391 subrepos=( "${subrepos[@]%%/}" )
270 392
271 # we copy the output to the 'sed' pipe for parsing. whenever sed finds 393 while true; do
272 # the process count, it quits quickly to avoid delays in writing it. 394 if [[ ${suburl} == ./* ]]; then
273 # then, we start a dummy 'cat' to keep the pipe alive 395 suburl=${suburl:2}
396 elif [[ ${suburl} == ../* ]]; then
397 suburl=${suburl:3}
274 398
275 "${cmd[@]}" 2>&1 \ 399 # XXX: correctness checking
276 | tee >(
277 sed -n -e "/${sed_regexp}/{s/${sed_regexp}/\1/p;q}" \
278 > "${T}"/git-r3_main.count
279 exec cat >/dev/null
280 ) &
281 local main_pid=${!}
282 400
283 # start the helper process 401 # drop the last path component
284 _git-r3_sub_fetch() { 402 subrepos=( "${subrepos[@]%/*}" )
285 # wait for main fetch to get object count; if the server doesn't 403 # and then the trailing slashes, again
286 # output it, we won't even launch the parallel process 404 subrepos=( "${subrepos[@]%%/}" )
287 while [[ ! -s ${T}/git-r3_main.count ]]; do 405 else
288 sleep 0.25 406 break
407 fi
289 done 408 done
290 409
291 # ok, let's see if parallel fetch gives us smaller count 410 # append the preprocessed path to the preprocessed URIs
292 # --dry-run will prevent it from writing to the local clone 411 subrepos=( "${subrepos[@]/%//${suburl}}")
293 # and sed should terminate git with SIGPIPE 412 else
294 local sub_count=$(git fetch --progress --dry-run --depth 1 "${@}" 2>&1 \ 413 subrepos=( "${suburl}" )
295 | sed -n -e "/${sed_regexp}/{s/${sed_regexp}/\1/p;q}") 414 fi
296 local main_count=$(<"${T}"/git-r3_main.count) 415}
297 416
298 # let's be real sure that '--depth 1' will be good for us. 417
299 # note that we have purely objects counts, and '--depth 1' 418# @FUNCTION: _git-r3_is_local_repo
300 # may involve much bigger objects 419# @USAGE: <repo-uri>
301 if [[ ${main_count} && ${main_count} -ge $(( sub_count * 3/2 )) ]] 420# @INTERNAL
302 then 421# @DESCRIPTION:
303 # signal that we want shallow fetch instead, 422# Determine whether the given URI specifies a local (on-disk)
304 # and terminate the non-shallow fetch process 423# repository.
305 touch "${T}"/git-r3_want_shallow || die 424_git-r3_is_local_repo() {
306 kill ${main_pid} &>/dev/null 425 debug-print-function ${FUNCNAME} "$@"
307 exit 0 426
427 local uri=${1}
428
429 [[ ${uri} == file://* || ${uri} == /* ]]
430}
431
432# @FUNCTION: _git-r3_find_head
433# @USAGE: <head-ref>
434# @INTERNAL
435# @DESCRIPTION:
436# Given a ref to which remote HEAD was fetched, try to find
437# a branch matching the commit. Expects 'git show-ref'
438# or 'git ls-remote' output on stdin.
439_git-r3_find_head() {
440 debug-print-function ${FUNCNAME} "$@"
441
442 local head_ref=${1}
443 local head_hash=$(git rev-parse --verify "${1}" || die)
444 local matching_ref
445
446 # TODO: some transports support peeking at symbolic remote refs
447 # find a way to use that rather than guessing
448
449 # (based on guess_remote_head() in git-1.9.0/remote.c)
450 local h ref
451 while read h ref; do
452 # look for matching head
453 if [[ ${h} == ${head_hash} ]]; then
454 # either take the first matching ref, or master if it is there
455 if [[ ! ${matching_ref} || ${ref} == refs/heads/master ]]; then
456 matching_ref=${ref}
308 fi 457 fi
309
310 exit 1
311 }
312 _git-r3_sub_fetch "${@}" &
313 local sub_pid=${!}
314
315 # wait for main process to terminate, either of its own
316 # or by signal from subprocess
317 wait ${main_pid}
318 local main_ret=${?}
319
320 # wait for subprocess to terminate, killing it if necessary.
321 # if main fetch finished before it, there's no point in keeping
322 # it alive. if main fetch was killed by it, it's done anyway
323 kill ${sub_pid} &>/dev/null
324 wait ${sub_pid}
325
326 # now see if subprocess wanted to tell us something...
327 if [[ -f ${T}/git-r3_want_shallow ]]; then
328 rm "${T}"/git-r3_want_shallow || die
329
330 # if fetch finished already (wasn't killed), ignore it
331 [[ ${main_ret} -eq 0 ]] && return 0
332
333 # otherwise, restart as shallow fetch
334 einfo "Restarting fetch using --depth 1 to save bandwidth ..."
335 local cmd=( git fetch --progress --depth 1 "${@}" )
336 echo "${cmd[@]}" >&2
337 "${cmd[@]}"
338 main_ret=${?}
339 fi 458 fi
459 done
340 460
341 return ${main_ret} 461 if [[ ! ${matching_ref} ]]; then
462 die "Unable to find a matching branch for remote HEAD (${head_hash})"
463 fi
464
465 echo "${matching_ref}"
342} 466}
343 467
344# @FUNCTION: git-r3_fetch 468# @FUNCTION: git-r3_fetch
345# @USAGE: [<repo-uri> [<remote-ref> [<local-id>]]] 469# @USAGE: [<repo-uri> [<remote-ref> [<local-id>]]]
346# @DESCRIPTION: 470# @DESCRIPTION:
359# is set to a non-null value. 483# is set to a non-null value.
360# 484#
361# <local-id> specifies the local branch identifier that will be used to 485# <local-id> specifies the local branch identifier that will be used to
362# locally store the fetch result. It should be unique to multiple 486# locally store the fetch result. It should be unique to multiple
363# fetches within the repository that can be performed at the same time 487# fetches within the repository that can be performed at the same time
364# (including parallel merges). It defaults to ${CATEGORY}/${PN}/${SLOT}. 488# (including parallel merges). It defaults to ${CATEGORY}/${PN}/${SLOT%/*}.
365# This default should be fine unless you are fetching multiple trees 489# This default should be fine unless you are fetching multiple trees
366# from the same repository in the same ebuild. 490# from the same repository in the same ebuild.
367# 491#
368# The fetch operation will affect the EGIT_STORE only. It will not touch 492# The fetch operation will affect the EGIT_STORE only. It will not touch
369# the working copy, nor export any environment variables. 493# the working copy, nor export any environment variables.
370# If the repository contains submodules, they will be fetched 494# If the repository contains submodules, they will be fetched
371# recursively. 495# recursively.
372git-r3_fetch() { 496git-r3_fetch() {
373 debug-print-function ${FUNCNAME} "$@" 497 debug-print-function ${FUNCNAME} "$@"
374 498
499 [[ ${EVCS_OFFLINE} ]] && return
500
501 local repos
502 if [[ ${1} ]]; then
503 repos=( ${1} )
504 elif [[ $(declare -p EGIT_REPO_URI) == "declare -a"* ]]; then
505 repos=( "${EGIT_REPO_URI[@]}" )
506 else
375 local repos=( ${1:-${EGIT_REPO_URI}} ) 507 repos=( ${EGIT_REPO_URI} )
508 fi
509
376 local branch=${EGIT_BRANCH:+refs/heads/${EGIT_BRANCH}} 510 local branch=${EGIT_BRANCH:+refs/heads/${EGIT_BRANCH}}
377 local remote_ref=${2:-${EGIT_COMMIT:-${branch:-HEAD}}} 511 local remote_ref=${2:-${EGIT_COMMIT:-${branch:-HEAD}}}
378 local local_id=${3:-${CATEGORY}/${PN}/${SLOT}} 512 local local_id=${3:-${CATEGORY}/${PN}/${SLOT%/*}}
379 local local_ref=refs/heads/${local_id}/__main__ 513 local local_ref=refs/git-r3/${local_id}/__main__
380 514
381 [[ ${repos[@]} ]] || die "No URI provided and EGIT_REPO_URI unset" 515 [[ ${repos[@]} ]] || die "No URI provided and EGIT_REPO_URI unset"
382 516
383 local -x GIT_DIR 517 local -x GIT_DIR
384 _git-r3_set_gitdir ${repos[0]} 518 _git-r3_set_gitdir "${repos[0]}"
519
520 # prepend the local mirror if applicable
521 if [[ ${EGIT_MIRROR_URI} ]]; then
522 repos=(
523 "${EGIT_MIRROR_URI%/}/${GIT_DIR##*/}"
524 "${repos[@]}"
525 )
526 fi
385 527
386 # try to fetch from the remote 528 # try to fetch from the remote
529 local r success saved_umask
530 if [[ ${EVCS_UMASK} ]]; then
531 saved_umask=$(umask)
532 umask "${EVCS_UMASK}" || die "Bad options to umask: ${EVCS_UMASK}"
533 fi
534 for r in "${repos[@]}"; do
535 einfo "Fetching \e[1m${r}\e[22m ..."
536
537 local fetch_command=( git fetch "${r}" )
538 local clone_type=${EGIT_CLONE_TYPE}
539
540 if [[ ${r} == https://* ]] && ! ROOT=/ has_version 'dev-vcs/git[curl]'; then
541 eerror "git-r3: fetching from https:// requested. In order to support https,"
542 eerror "dev-vcs/git needs to be built with USE=curl. Example solution:"
543 eerror
544 eerror " echo dev-vcs/git curl >> /etc/portage/package.use"
545 eerror " emerge -1v dev-vcs/git"
546 die "dev-vcs/git built with USE=curl required."
547 fi
548
549 if [[ ${r} == https://code.google.com/* ]]; then
550 # Google Code has special magic on top of git that:
551 # 1) can't handle shallow clones at all,
552 # 2) fetches duplicately when tags are pulled in with branch
553 # so automatically switch to single+tags mode.
554 if [[ ${clone_type} == shallow ]]; then
555 einfo " Google Code does not support shallow clones"
556 einfo " using \e[1mEGIT_CLONE_TYPE=single+tags\e[22m"
557 clone_type=single+tags
558 elif [[ ${clone_type} == single ]]; then
559 einfo " git-r3: Google Code does not send tags properly in 'single' mode"
560 einfo " using \e[1mEGIT_CLONE_TYPE=single+tags\e[22m"
561 clone_type=single+tags
562 fi
563 fi
564
565 if [[ ${clone_type} == mirror ]]; then
566 fetch_command+=(
567 --prune
568 # mirror the remote branches as local branches
569 "+refs/heads/*:refs/heads/*"
570 # pull tags explicitly in order to prune them properly
571 "+refs/tags/*:refs/tags/*"
572 # notes in case something needs them
573 "+refs/notes/*:refs/notes/*"
574 # and HEAD in case we need the default branch
575 # (we keep it in refs/git-r3 since otherwise --prune interferes)
576 "+HEAD:refs/git-r3/HEAD"
577 )
578 else # single or shallow
579 local fetch_l fetch_r
580
581 if [[ ${remote_ref} == HEAD ]]; then
582 # HEAD
583 fetch_l=HEAD
584 elif [[ ${remote_ref} == refs/heads/* ]]; then
585 # regular branch
586 fetch_l=${remote_ref}
587 else
588 # tag or commit...
589 # let ls-remote figure it out
590 local tagref=$(git ls-remote "${r}" "refs/tags/${remote_ref}")
591
592 # if it was a tag, ls-remote obtained a hash
593 if [[ ${tagref} ]]; then
594 # tag
595 fetch_l=refs/tags/${remote_ref}
596 else
597 # commit
598 # so we need to fetch the branch
599 if [[ ${branch} ]]; then
600 fetch_l=${branch}
601 else
602 fetch_l=HEAD
603 fi
604
605 # fetching by commit in shallow mode? can't do.
606 if [[ ${clone_type} == shallow ]]; then
607 clone_type=single
608 fi
609 fi
610 fi
611
612 if [[ ${fetch_l} == HEAD ]]; then
613 fetch_r=refs/git-r3/HEAD
614 else
615 fetch_r=${fetch_l}
616 fi
617
618 fetch_command+=(
619 "+${fetch_l}:${fetch_r}"
620 )
621
622 if [[ ${clone_type} == single+tags ]]; then
623 fetch_command+=(
624 # pull tags explicitly as requested
625 "+refs/tags/*:refs/tags/*"
626 )
627 fi
628 fi
629
630 if [[ ${clone_type} == shallow ]]; then
631 if _git-r3_is_local_repo; then
632 # '--depth 1' causes sandbox violations with local repos
633 # bug #491260
634 clone_type=single
635 elif [[ ! $(git rev-parse --quiet --verify "${fetch_r}") ]]
636 then
637 # use '--depth 1' when fetching a new branch
638 fetch_command+=( --depth 1 )
639 fi
640 else # non-shallow mode
641 if [[ -f ${GIT_DIR}/shallow ]]; then
642 fetch_command+=( --unshallow )
643 fi
644 fi
645
646 set -- "${fetch_command[@]}"
647 echo "${@}" >&2
648 if "${@}"; then
649 if [[ ${clone_type} == mirror ]]; then
650 # find remote HEAD and update our HEAD properly
651 git symbolic-ref HEAD \
652 "$(_git-r3_find_head refs/git-r3/HEAD \
653 < <(git show-ref --heads || die))" \
654 || die "Unable to update HEAD"
655 else # single or shallow
656 if [[ ${fetch_l} == HEAD ]]; then
657 # find out what branch we fetched as HEAD
658 local head_branch=$(_git-r3_find_head \
659 refs/git-r3/HEAD \
660 < <(git ls-remote --heads "${r}" || die))
661
662 # and move it to its regular place
663 git update-ref --no-deref "${head_branch}" \
664 refs/git-r3/HEAD \
665 || die "Unable to sync HEAD branch ${head_branch}"
666 git symbolic-ref HEAD "${head_branch}" \
667 || die "Unable to update HEAD"
668 fi
669 fi
670
671 # now let's see what the user wants from us
672 local full_remote_ref=$(
673 git rev-parse --verify --symbolic-full-name "${remote_ref}"
674 )
675
676 if [[ ${full_remote_ref} ]]; then
677 # when we are given a ref, create a symbolic ref
678 # so that we preserve the actual argument
679 set -- git symbolic-ref "${local_ref}" "${full_remote_ref}"
680 else
681 # otherwise, we were likely given a commit id
682 set -- git update-ref --no-deref "${local_ref}" "${remote_ref}"
683 fi
684
685 echo "${@}" >&2
686 if ! "${@}"; then
687 die "Referencing ${remote_ref} failed (wrong ref?)."
688 fi
689
690 success=1
691 break
692 fi
693 done
694 if [[ ${saved_umask} ]]; then
695 umask "${saved_umask}" || die
696 fi
697 [[ ${success} ]] || die "Unable to fetch from any of EGIT_REPO_URI"
698
699 # submodules can reference commits in any branch
700 # always use the 'clone' mode to accomodate that, bug #503332
701 local EGIT_CLONE_TYPE=mirror
702
703 # recursively fetch submodules
704 if git cat-file -e "${local_ref}":.gitmodules &>/dev/null; then
705 local submodules
706 _git-r3_set_submodules \
707 "$(git cat-file -p "${local_ref}":.gitmodules || die)"
708
709 while [[ ${submodules[@]} ]]; do
710 local subname=${submodules[0]}
711 local url=${submodules[1]}
712 local path=${submodules[2]}
713
714 # use only submodules for which path does exist
715 # (this is in par with 'git submodule'), bug #551100
716 # note: git cat-file does not work for submodules
717 if [[ $(git ls-tree -d "${local_ref}" "${path}") ]]
718 then
719 local commit=$(git rev-parse "${local_ref}:${path}" || die)
720
721 if [[ ! ${commit} ]]; then
722 die "Unable to get commit id for submodule ${subname}"
723 fi
724
725 local subrepos
726 _git-r3_set_subrepos "${url}" "${repos[@]}"
727
728 git-r3_fetch "${subrepos[*]}" "${commit}" "${local_id}/${subname}"
729 fi
730
731 submodules=( "${submodules[@]:3}" ) # shift
732 done
733 fi
734}
735
736# @FUNCTION: git-r3_checkout
737# @USAGE: [<repo-uri> [<checkout-path> [<local-id>]]]
738# @DESCRIPTION:
739# Check the previously fetched tree to the working copy.
740#
741# <repo-uri> specifies the repository URIs, as a space-separated list.
742# The first URI will be used as repository group identifier
743# and therefore must be used consistently with git-r3_fetch.
744# The remaining URIs are not used and therefore may be omitted.
745# When not specified, defaults to ${EGIT_REPO_URI}.
746#
747# <checkout-path> specifies the path to place the checkout. It defaults
748# to ${EGIT_CHECKOUT_DIR} if set, otherwise to ${WORKDIR}/${P}.
749#
750# <local-id> needs to specify the local identifier that was used
751# for respective git-r3_fetch.
752#
753# The checkout operation will write to the working copy, and export
754# the repository state into the environment. If the repository contains
755# submodules, they will be checked out recursively.
756git-r3_checkout() {
757 debug-print-function ${FUNCNAME} "$@"
758
759 local repos
760 if [[ ${1} ]]; then
761 repos=( ${1} )
762 elif [[ $(declare -p EGIT_REPO_URI) == "declare -a"* ]]; then
763 repos=( "${EGIT_REPO_URI[@]}" )
764 else
765 repos=( ${EGIT_REPO_URI} )
766 fi
767
768 local out_dir=${2:-${EGIT_CHECKOUT_DIR:-${WORKDIR}/${P}}}
769 local local_id=${3:-${CATEGORY}/${PN}/${SLOT%/*}}
770
771 local -x GIT_DIR
772 _git-r3_set_gitdir "${repos[0]}"
773
774 einfo "Checking out \e[1m${repos[0]}\e[22m to \e[1m${out_dir}\[e22m ..."
775
776 if ! git cat-file -e refs/git-r3/"${local_id}"/__main__; then
777 if [[ ${EVCS_OFFLINE} ]]; then
778 die "No local clone of ${repos[0]}. Unable to work with EVCS_OFFLINE."
779 else
780 die "Logic error: no local clone of ${repos[0]}. git-r3_fetch not used?"
781 fi
782 fi
783 local remote_ref=$(
784 git symbolic-ref --quiet refs/git-r3/"${local_id}"/__main__
785 )
786 local new_commit_id=$(
787 git rev-parse --verify refs/git-r3/"${local_id}"/__main__
788 )
789
790 git-r3_sub_checkout() {
791 local orig_repo=${GIT_DIR}
792 local -x GIT_DIR=${out_dir}/.git
793 local -x GIT_WORK_TREE=${out_dir}
794
795 mkdir -p "${out_dir}" || die
796
797 # use git init+fetch instead of clone since the latter doesn't like
798 # non-empty directories.
799
800 git init --quiet || die
801 # setup 'alternates' to avoid copying objects
802 echo "${orig_repo}/objects" > "${GIT_DIR}"/objects/info/alternates || die
803 # now copy the refs
804 # [htn]* safely catches heads, tags, notes without complaining
805 # on non-existing ones, and omits internal 'git-r3' ref
806 cp -R "${orig_repo}"/refs/[htn]* "${GIT_DIR}"/refs/ || die
807
808 # (no need to copy HEAD, we will set it via checkout)
809
810 if [[ -f ${orig_repo}/shallow ]]; then
811 cp "${orig_repo}"/shallow "${GIT_DIR}"/ || die
812 fi
813
814 set -- git checkout --quiet
815 if [[ ${remote_ref} ]]; then
816 set -- "${@}" "${remote_ref#refs/heads/}"
817 else
818 set -- "${@}" "${new_commit_id}"
819 fi
820 echo "${@}" >&2
821 "${@}" || die "git checkout ${remote_ref:-${new_commit_id}} failed"
822 }
823 git-r3_sub_checkout
824
825 local old_commit_id=$(
826 git rev-parse --quiet --verify refs/git-r3/"${local_id}"/__old__
827 )
828 if [[ ! ${old_commit_id} ]]; then
829 echo "GIT NEW branch -->"
830 echo " repository: ${repos[0]}"
831 echo " at the commit: ${new_commit_id}"
832 else
833 # diff against previous revision
834 echo "GIT update -->"
835 echo " repository: ${repos[0]}"
836 # write out message based on the revisions
837 if [[ "${old_commit_id}" != "${new_commit_id}" ]]; then
838 echo " updating from commit: ${old_commit_id}"
839 echo " to commit: ${new_commit_id}"
840
841 git --no-pager diff --stat \
842 ${old_commit_id}..${new_commit_id}
843 else
844 echo " at the commit: ${new_commit_id}"
845 fi
846 fi
847 git update-ref --no-deref refs/git-r3/"${local_id}"/{__old__,__main__} || die
848
849 # recursively checkout submodules
850 if [[ -f ${out_dir}/.gitmodules ]]; then
851 local submodules
852 _git-r3_set_submodules \
853 "$(<"${out_dir}"/.gitmodules)"
854
855 while [[ ${submodules[@]} ]]; do
856 local subname=${submodules[0]}
857 local url=${submodules[1]}
858 local path=${submodules[2]}
859
860 # use only submodules for which path does exist
861 # (this is in par with 'git submodule'), bug #551100
862 if [[ -d ${out_dir}/${path} ]]; then
863 local subrepos
864 _git-r3_set_subrepos "${url}" "${repos[@]}"
865
866 git-r3_checkout "${subrepos[*]}" "${out_dir}/${path}" \
867 "${local_id}/${subname}"
868 fi
869
870 submodules=( "${submodules[@]:3}" ) # shift
871 done
872 fi
873
874 # keep this *after* submodules
875 export EGIT_DIR=${GIT_DIR}
876 export EGIT_VERSION=${new_commit_id}
877}
878
879# @FUNCTION: git-r3_peek_remote_ref
880# @USAGE: [<repo-uri> [<remote-ref>]]
881# @DESCRIPTION:
882# Peek the reference in the remote repository and print the matching
883# (newest) commit SHA1.
884#
885# <repo-uri> specifies the repository URIs to fetch from, as a space-
886# -separated list. When not specified, defaults to ${EGIT_REPO_URI}.
887#
888# <remote-ref> specifies the remote ref to peek. It is preferred to use
889# 'refs/heads/<branch-name>' for branches and 'refs/tags/<tag-name>'
890# for tags. Alternatively, 'HEAD' may be used for upstream default
891# branch. Defaults to the first of EGIT_COMMIT, EGIT_BRANCH or literal
892# 'HEAD' that is set to a non-null value.
893#
894# The operation will be done purely on the remote, without using local
895# storage. If commit SHA1 is provided as <remote-ref>, the function will
896# fail due to limitations of git protocol.
897#
898# On success, the function returns 0 and writes hexadecimal commit SHA1
899# to stdout. On failure, the function returns 1.
900git-r3_peek_remote_ref() {
901 debug-print-function ${FUNCNAME} "$@"
902
903 local repos
904 if [[ ${1} ]]; then
905 repos=( ${1} )
906 elif [[ $(declare -p EGIT_REPO_URI) == "declare -a"* ]]; then
907 repos=( "${EGIT_REPO_URI[@]}" )
908 else
909 repos=( ${EGIT_REPO_URI} )
910 fi
911
912 local branch=${EGIT_BRANCH:+refs/heads/${EGIT_BRANCH}}
913 local remote_ref=${2:-${EGIT_COMMIT:-${branch:-HEAD}}}
914
915 [[ ${repos[@]} ]] || die "No URI provided and EGIT_REPO_URI unset"
916
387 local r success 917 local r success
388 for r in ${repos[@]}; do 918 for r in "${repos[@]}"; do
389 einfo "Fetching ${remote_ref} from ${r} ..." 919 einfo "Peeking \e[1m${remote_ref}\e[22m on \e[1m${r}\e[22m ..." >&2
390 920
391 local is_branch lookup_ref 921 local is_branch lookup_ref
392 if [[ ${remote_ref} == refs/heads/* || ${remote_ref} == HEAD ]] 922 if [[ ${remote_ref} == refs/heads/* || ${remote_ref} == HEAD ]]
393 then 923 then
394 is_branch=1 924 is_branch=1
397 # ls-remote by commit is going to fail anyway, 927 # ls-remote by commit is going to fail anyway,
398 # so we may as well pass refs/tags/ABCDEF... 928 # so we may as well pass refs/tags/ABCDEF...
399 lookup_ref=refs/tags/${remote_ref} 929 lookup_ref=refs/tags/${remote_ref}
400 fi 930 fi
401 931
402 # first, try ls-remote to see if ${remote_ref} is a real ref
403 # and not a commit id. if it succeeds, we can pass ${remote_ref}
404 # to 'fetch'. otherwise, we will just fetch everything
405
406 # split on whitespace
407 local ref=(
408 $(git ls-remote "${r}" "${lookup_ref}" || echo __FAIL__)
409 )
410
411 # normally, ref[0] is a hash, so we can do magic strings here
412 [[ ${ref[0]} == __FAIL__ ]] && continue
413
414 local nonshallow=${EGIT_NONSHALLOW}
415 local ref_param=()
416 if [[ ! ${ref[0]} ]]; then
417 nonshallow=1
418 fi
419
420 # 1. if we need a non-shallow clone and we have a shallow one,
421 # we need to unshallow it explicitly.
422 # 2. if we want a shallow clone, we just pass '--depth 1'
423 # to the first fetch in the repo. passing '--depth'
424 # to further requests usually results in more data being
425 # downloaded than without it.
426 # 3. if we update a shallow clone, we try without '--depth'
427 # first since that usually transfers less data. however,
428 # we use git-r3_smart_fetch that can switch into '--depth 1'
429 # if that looks beneficial.
430
431 local fetch_command=( git fetch )
432 if [[ ${nonshallow} ]]; then
433 if [[ -f ${GIT_DIR}/shallow ]]; then
434 ref_param+=( --unshallow )
435 fi
436 else
437 # 'git show-ref --heads' returns 1 when there are no branches
438 if ! git show-ref --heads -q; then
439 ref_param+=( --depth 1 )
440 else
441 fetch_command=( _git-r3_smart_fetch )
442 fi
443 fi
444
445 # now, another important thing. we may only fetch a remote
446 # branch directly to a local branch. Otherwise, we need to fetch
447 # the commit and re-create the branch on top of it.
448
449 if [[ ${ref[0]} ]]; then
450 if [[ ${is_branch} ]]; then
451 ref_param+=( -f "${remote_ref}:${local_id}/__main__" )
452 else
453 ref_param+=( "refs/tags/${remote_ref}" )
454 fi
455 fi
456
457 # if ${remote_ref} is branch or tag, ${ref[@]} will contain
458 # the respective commit id. otherwise, it will be an empty
459 # array, so the following won't evaluate to a parameter.
460 set -- "${fetch_command[@]}" --no-tags "${r}" "${ref_param[@]}"
461 echo "${@}" >&2
462 if "${@}"; then
463 if [[ ! ${is_branch} ]]; then
464 set -- git branch -f "${local_id}/__main__" \
465 "${ref[0]:-${remote_ref}}"
466 echo "${@}" >&2
467 if ! "${@}"; then
468 die "Creating branch for ${remote_ref} failed (wrong ref?)."
469 fi
470 fi
471
472 success=1
473 break
474 fi
475 done
476 [[ ${success} ]] || die "Unable to fetch from any of EGIT_REPO_URI"
477
478 # recursively fetch submodules
479 if git cat-file -e "${local_ref}":.gitmodules &>/dev/null; then
480 local submodules
481 _git-r3_set_submodules \
482 "$(git cat-file -p "${local_ref}":.gitmodules || die)"
483
484 while [[ ${submodules[@]} ]]; do
485 local subname=${submodules[0]}
486 local url=${submodules[1]}
487 local path=${submodules[2]}
488 local commit=$(git rev-parse "${local_ref}:${path}")
489
490 if [[ ! ${commit} ]]; then
491 die "Unable to get commit id for submodule ${subname}"
492 fi
493
494 git-r3_fetch "${url}" "${commit}" "${local_id}/${subname}"
495
496 submodules=( "${submodules[@]:3}" ) # shift
497 done
498 fi
499}
500
501# @FUNCTION: git-r3_checkout
502# @USAGE: [<repo-uri> [<checkout-path> [<local-id>]]]
503# @DESCRIPTION:
504# Check the previously fetched tree to the working copy.
505#
506# <repo-uri> specifies the repository URIs, as a space-separated list.
507# The first URI will be used as repository group identifier
508# and therefore must be used consistently with git-r3_fetch.
509# The remaining URIs are not used and therefore may be omitted.
510# When not specified, defaults to ${EGIT_REPO_URI}.
511#
512# <checkout-path> specifies the path to place the checkout. It defaults
513# to ${EGIT_CHECKOUT_DIR} if set, otherwise to ${WORKDIR}/${P}.
514#
515# <local-id> needs to specify the local identifier that was used
516# for respective git-r3_fetch.
517#
518# The checkout operation will write to the working copy, and export
519# the repository state into the environment. If the repository contains
520# submodules, they will be checked out recursively.
521git-r3_checkout() {
522 debug-print-function ${FUNCNAME} "$@"
523
524 local repos=( ${1:-${EGIT_REPO_URI}} )
525 local out_dir=${2:-${EGIT_CHECKOUT_DIR:-${WORKDIR}/${P}}}
526 local local_id=${3:-${CATEGORY}/${PN}/${SLOT}}
527
528 local -x GIT_DIR GIT_WORK_TREE
529 _git-r3_set_gitdir ${repos[0]}
530 GIT_WORK_TREE=${out_dir}
531 mkdir -p "${GIT_WORK_TREE}"
532
533 einfo "Checking out ${repos[0]} to ${out_dir} ..."
534
535 if ! git cat-file -e refs/heads/"${local_id}"/__main__
536 then
537 if [[ ${EVCS_OFFLINE} ]]; then
538 die "No local clone of ${repos[0]}. Unable to work with EVCS_OFFLINE."
539 else
540 die "Logic error: no local clone of ${repos[0]}. git-r3_fetch not used?"
541 fi
542 fi
543
544 set -- git checkout -f "${local_id}"/__main__ .
545 echo "${@}" >&2
546 "${@}" || die "git checkout ${local_id}/__main__ failed"
547
548 # diff against previous revision (if any)
549 local new_commit_id=$(git rev-parse --verify "${local_id}"/__main__)
550 local old_commit_id=$(
551 git rev-parse --verify "${local_id}"/__old__ 2>/dev/null
552 )
553
554 if [[ ! ${old_commit_id} ]]; then
555 echo "GIT NEW branch -->"
556 echo " repository: ${repos[0]}"
557 echo " at the commit: ${new_commit_id}"
558 else
559 echo "GIT update -->"
560 echo " repository: ${repos[0]}"
561 # write out message based on the revisions
562 if [[ "${old_commit_id}" != "${new_commit_id}" ]]; then
563 echo " updating from commit: ${old_commit_id}"
564 echo " to commit: ${new_commit_id}"
565
566 git --no-pager diff --stat \
567 ${old_commit_id}..${new_commit_id}
568 else
569 echo " at the commit: ${new_commit_id}"
570 fi
571 fi
572 git branch -f "${local_id}"/{__old__,__main__} || die
573
574 # recursively checkout submodules
575 if [[ -f ${GIT_WORK_TREE}/.gitmodules ]]; then
576 local submodules
577 _git-r3_set_submodules \
578 "$(<"${GIT_WORK_TREE}"/.gitmodules)"
579
580 while [[ ${submodules[@]} ]]; do
581 local subname=${submodules[0]}
582 local url=${submodules[1]}
583 local path=${submodules[2]}
584
585 git-r3_checkout "${url}" "${GIT_WORK_TREE}/${path}" \
586 "${local_id}/${subname}"
587
588 submodules=( "${submodules[@]:3}" ) # shift
589 done
590 fi
591
592 # keep this *after* submodules
593 export EGIT_DIR=${GIT_DIR}
594 export EGIT_VERSION=${new_commit_id}
595}
596
597# @FUNCTION: git-r3_peek_remote_ref
598# @USAGE: [<repo-uri> [<remote-ref>]]
599# @DESCRIPTION:
600# Peek the reference in the remote repository and print the matching
601# (newest) commit SHA1.
602#
603# <repo-uri> specifies the repository URIs to fetch from, as a space-
604# -separated list. When not specified, defaults to ${EGIT_REPO_URI}.
605#
606# <remote-ref> specifies the remote ref to peek. It is preferred to use
607# 'refs/heads/<branch-name>' for branches and 'refs/tags/<tag-name>'
608# for tags. Alternatively, 'HEAD' may be used for upstream default
609# branch. Defaults to the first of EGIT_COMMIT, EGIT_BRANCH or literal
610# 'HEAD' that is set to a non-null value.
611#
612# The operation will be done purely on the remote, without using local
613# storage. If commit SHA1 is provided as <remote-ref>, the function will
614# fail due to limitations of git protocol.
615#
616# On success, the function returns 0 and writes hexadecimal commit SHA1
617# to stdout. On failure, the function returns 1.
618git-r3_peek_remote_ref() {
619 debug-print-function ${FUNCNAME} "$@"
620
621 local repos=( ${1:-${EGIT_REPO_URI}} )
622 local branch=${EGIT_BRANCH:+refs/heads/${EGIT_BRANCH}}
623 local remote_ref=${2:-${EGIT_COMMIT:-${branch:-HEAD}}}
624
625 [[ ${repos[@]} ]] || die "No URI provided and EGIT_REPO_URI unset"
626
627 local r success
628 for r in ${repos[@]}; do
629 einfo "Peeking ${remote_ref} on ${r} ..." >&2
630
631 local is_branch lookup_ref
632 if [[ ${remote_ref} == refs/heads/* || ${remote_ref} == HEAD ]]
633 then
634 is_branch=1
635 lookup_ref=${remote_ref}
636 else
637 # ls-remote by commit is going to fail anyway,
638 # so we may as well pass refs/tags/ABCDEF...
639 lookup_ref=refs/tags/${remote_ref}
640 fi
641
642 # split on whitespace 932 # split on whitespace
643 local ref=( 933 local ref=(
644 $(git ls-remote "${r}" "${lookup_ref}") 934 $(git ls-remote "${r}" "${lookup_ref}")
645 ) 935 )
646 936
653 return 1 943 return 1
654} 944}
655 945
656git-r3_src_fetch() { 946git-r3_src_fetch() {
657 debug-print-function ${FUNCNAME} "$@" 947 debug-print-function ${FUNCNAME} "$@"
658
659 [[ ${EVCS_OFFLINE} ]] && return
660 948
661 if [[ ! ${EGIT3_STORE_DIR} && ${EGIT_STORE_DIR} ]]; then 949 if [[ ! ${EGIT3_STORE_DIR} && ${EGIT_STORE_DIR} ]]; then
662 ewarn "You have set EGIT_STORE_DIR but not EGIT3_STORE_DIR. Please consider" 950 ewarn "You have set EGIT_STORE_DIR but not EGIT3_STORE_DIR. Please consider"
663 ewarn "setting EGIT3_STORE_DIR for git-r3.eclass. It is recommended to use" 951 ewarn "setting EGIT3_STORE_DIR for git-r3.eclass. It is recommended to use"
664 ewarn "a different directory than EGIT_STORE_DIR to ease removing old clones" 952 ewarn "a different directory than EGIT_STORE_DIR to ease removing old clones"
676 git-r3_src_fetch 964 git-r3_src_fetch
677 git-r3_checkout 965 git-r3_checkout
678} 966}
679 967
680# https://bugs.gentoo.org/show_bug.cgi?id=482666 968# https://bugs.gentoo.org/show_bug.cgi?id=482666
681git-r3_pkg_outofdate() { 969git-r3_pkg_needrebuild() {
682 debug-print-function ${FUNCNAME} "$@" 970 debug-print-function ${FUNCNAME} "$@"
683 971
684 local new_commit_id=$(git-r3_peek_remote_ref) 972 local new_commit_id=$(git-r3_peek_remote_ref)
685 ewarn "old: ${EGIT_VERSION}" 973 [[ ${new_commit_id} && ${EGIT_VERSION} ]] || die "Lookup failed"
686 ewarn "new: ${new_commit_id}" 974
687 [[ ${new_commit_id} && ${old_commit_id} ]] || return 2 975 if [[ ${EGIT_VERSION} != ${new_commit_id} ]]; then
976 einfo "Update from \e[1m${EGIT_VERSION}\e[22m to \e[1m${new_commit_id}\e[22m"
977 else
978 einfo "Local and remote at \e[1m${EGIT_VERSION}\e[22m"
979 fi
688 980
689 [[ ${EGIT_VERSION} != ${new_commit_id} ]] 981 [[ ${EGIT_VERSION} != ${new_commit_id} ]]
690} 982}
983
984# 'export' locally until this gets into EAPI
985pkg_needrebuild() { git-r3_pkg_needrebuild; }
691 986
692_GIT_R3=1 987_GIT_R3=1
693fi 988fi

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.51

  ViewVC Help
Powered by ViewVC 1.1.20