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