blob: 956f45bf5d331df59f10b9668eaa5c0662a3d481 [file] [log] [blame]
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001# Copyright (C) 2008 The Android Open Source Project
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
Shawn O. Pearce438ee1c2008-11-03 09:59:36 -080015import errno
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070016import filecmp
17import os
18import re
19import shutil
20import stat
21import sys
22import urllib2
23
24from color import Coloring
25from git_command import GitCommand
26from git_config import GitConfig, IsId
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070027from error import GitError, ImportError, UploadError
Shawn O. Pearce559b8462009-03-02 12:56:08 -080028from error import ManifestInvalidRevisionError
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070029
Shawn O. Pearced237b692009-04-17 18:49:50 -070030from git_refs import GitRefs, HEAD, R_HEADS, R_TAGS, R_PUB, R_M
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070031
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -070032def _lwrite(path, content):
33 lock = '%s.lock' % path
34
35 fd = open(lock, 'wb')
36 try:
37 fd.write(content)
38 finally:
39 fd.close()
40
41 try:
42 os.rename(lock, path)
43 except OSError:
44 os.remove(lock)
45 raise
46
Shawn O. Pearce48244782009-04-16 08:25:57 -070047def _error(fmt, *args):
48 msg = fmt % args
49 print >>sys.stderr, 'error: %s' % msg
50
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070051def not_rev(r):
52 return '^' + r
53
Shawn O. Pearceb54a3922009-01-05 16:18:58 -080054def sq(r):
55 return "'" + r.replace("'", "'\''") + "'"
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -080056
57hook_list = None
58def repo_hooks():
59 global hook_list
60 if hook_list is None:
61 d = os.path.abspath(os.path.dirname(__file__))
62 d = os.path.join(d , 'hooks')
63 hook_list = map(lambda x: os.path.join(d, x), os.listdir(d))
64 return hook_list
65
66def relpath(dst, src):
67 src = os.path.dirname(src)
68 top = os.path.commonprefix([dst, src])
69 if top.endswith('/'):
70 top = top[:-1]
71 else:
72 top = os.path.dirname(top)
73
74 tmp = src
75 rel = ''
76 while top != tmp:
77 rel += '../'
78 tmp = os.path.dirname(tmp)
79 return rel + dst[len(top) + 1:]
80
81
Shawn O. Pearce632768b2008-10-23 11:58:52 -070082class DownloadedChange(object):
83 _commit_cache = None
84
85 def __init__(self, project, base, change_id, ps_id, commit):
86 self.project = project
87 self.base = base
88 self.change_id = change_id
89 self.ps_id = ps_id
90 self.commit = commit
91
92 @property
93 def commits(self):
94 if self._commit_cache is None:
95 self._commit_cache = self.project.bare_git.rev_list(
96 '--abbrev=8',
97 '--abbrev-commit',
98 '--pretty=oneline',
99 '--reverse',
100 '--date-order',
101 not_rev(self.base),
102 self.commit,
103 '--')
104 return self._commit_cache
105
106
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700107class ReviewableBranch(object):
108 _commit_cache = None
109
110 def __init__(self, project, branch, base):
111 self.project = project
112 self.branch = branch
113 self.base = base
Shawn O. Pearcec99883f2008-11-11 17:12:43 -0800114 self.replace_changes = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700115
116 @property
117 def name(self):
118 return self.branch.name
119
120 @property
121 def commits(self):
122 if self._commit_cache is None:
123 self._commit_cache = self.project.bare_git.rev_list(
124 '--abbrev=8',
125 '--abbrev-commit',
126 '--pretty=oneline',
127 '--reverse',
128 '--date-order',
129 not_rev(self.base),
130 R_HEADS + self.name,
131 '--')
132 return self._commit_cache
133
134 @property
Shawn O. Pearcec99883f2008-11-11 17:12:43 -0800135 def unabbrev_commits(self):
136 r = dict()
137 for commit in self.project.bare_git.rev_list(
138 not_rev(self.base),
139 R_HEADS + self.name,
140 '--'):
141 r[commit[0:8]] = commit
142 return r
143
144 @property
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700145 def date(self):
146 return self.project.bare_git.log(
147 '--pretty=format:%cd',
148 '-n', '1',
149 R_HEADS + self.name,
150 '--')
151
Joe Onorato2896a792008-11-17 16:56:36 -0500152 def UploadForReview(self, people):
Shawn O. Pearcec99883f2008-11-11 17:12:43 -0800153 self.project.UploadForReview(self.name,
Joe Onorato2896a792008-11-17 16:56:36 -0500154 self.replace_changes,
155 people)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700156
Ficus Kirkpatrickbc7ef672009-05-04 12:45:11 -0700157 def GetPublishedRefs(self):
158 refs = {}
159 output = self.project.bare_git.ls_remote(
160 self.branch.remote.SshReviewUrl(self.project.UserEmail),
161 'refs/changes/*')
162 for line in output.split('\n'):
163 try:
164 (sha, ref) = line.split()
165 refs[sha] = ref
166 except ValueError:
167 pass
168
169 return refs
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700170
171class StatusColoring(Coloring):
172 def __init__(self, config):
173 Coloring.__init__(self, config, 'status')
174 self.project = self.printer('header', attr = 'bold')
175 self.branch = self.printer('header', attr = 'bold')
176 self.nobranch = self.printer('nobranch', fg = 'red')
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700177 self.important = self.printer('important', fg = 'red')
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700178
179 self.added = self.printer('added', fg = 'green')
180 self.changed = self.printer('changed', fg = 'red')
181 self.untracked = self.printer('untracked', fg = 'red')
182
183
184class DiffColoring(Coloring):
185 def __init__(self, config):
186 Coloring.__init__(self, config, 'diff')
187 self.project = self.printer('header', attr = 'bold')
188
189
190class _CopyFile:
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800191 def __init__(self, src, dest, abssrc, absdest):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700192 self.src = src
193 self.dest = dest
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800194 self.abs_src = abssrc
195 self.abs_dest = absdest
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700196
197 def _Copy(self):
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800198 src = self.abs_src
199 dest = self.abs_dest
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700200 # copy file if it does not exist or is out of date
201 if not os.path.exists(dest) or not filecmp.cmp(src, dest):
202 try:
203 # remove existing file first, since it might be read-only
204 if os.path.exists(dest):
205 os.remove(dest)
Matthew Buckett2daf6672009-07-11 09:43:47 -0400206 else:
207 dir = os.path.dirname(dest)
208 if not os.path.isdir(dir):
209 os.makedirs(dir)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700210 shutil.copy(src, dest)
211 # make the file read-only
212 mode = os.stat(dest)[stat.ST_MODE]
213 mode = mode & ~(stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH)
214 os.chmod(dest, mode)
215 except IOError:
Shawn O. Pearce48244782009-04-16 08:25:57 -0700216 _error('Cannot copy file %s to %s', src, dest)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700217
Shawn O. Pearced1f70d92009-05-19 14:58:02 -0700218class RemoteSpec(object):
219 def __init__(self,
220 name,
221 url = None,
222 review = None):
223 self.name = name
224 self.url = url
225 self.review = review
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700226
227class Project(object):
228 def __init__(self,
229 manifest,
230 name,
231 remote,
232 gitdir,
233 worktree,
234 relpath,
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700235 revisionExpr,
236 revisionId):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700237 self.manifest = manifest
238 self.name = name
239 self.remote = remote
240 self.gitdir = gitdir
241 self.worktree = worktree
242 self.relpath = relpath
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700243 self.revisionExpr = revisionExpr
244
245 if revisionId is None \
246 and revisionExpr \
247 and IsId(revisionExpr):
248 self.revisionId = revisionExpr
249 else:
250 self.revisionId = revisionId
251
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700252 self.snapshots = {}
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700253 self.copyfiles = []
254 self.config = GitConfig.ForRepository(
255 gitdir = self.gitdir,
256 defaults = self.manifest.globalConfig)
257
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800258 if self.worktree:
259 self.work_git = self._GitGetByExec(self, bare=False)
260 else:
261 self.work_git = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700262 self.bare_git = self._GitGetByExec(self, bare=True)
Shawn O. Pearced237b692009-04-17 18:49:50 -0700263 self.bare_ref = GitRefs(gitdir)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700264
265 @property
266 def Exists(self):
267 return os.path.isdir(self.gitdir)
268
269 @property
270 def CurrentBranch(self):
271 """Obtain the name of the currently checked out branch.
272 The branch name omits the 'refs/heads/' prefix.
273 None is returned if the project is on a detached HEAD.
274 """
Shawn O. Pearce5b23f242009-04-17 18:43:33 -0700275 b = self.work_git.GetHead()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700276 if b.startswith(R_HEADS):
277 return b[len(R_HEADS):]
278 return None
279
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700280 def IsRebaseInProgress(self):
281 w = self.worktree
282 g = os.path.join(w, '.git')
283 return os.path.exists(os.path.join(g, 'rebase-apply')) \
284 or os.path.exists(os.path.join(g, 'rebase-merge')) \
285 or os.path.exists(os.path.join(w, '.dotest'))
Julius Gustavsson0cb1b3f2010-06-17 17:55:02 +0200286
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700287 def IsDirty(self, consider_untracked=True):
288 """Is the working directory modified in some way?
289 """
290 self.work_git.update_index('-q',
291 '--unmerged',
292 '--ignore-missing',
293 '--refresh')
294 if self.work_git.DiffZ('diff-index','-M','--cached',HEAD):
295 return True
296 if self.work_git.DiffZ('diff-files'):
297 return True
298 if consider_untracked and self.work_git.LsOthers():
299 return True
300 return False
301
302 _userident_name = None
303 _userident_email = None
304
305 @property
306 def UserName(self):
307 """Obtain the user's personal name.
308 """
309 if self._userident_name is None:
310 self._LoadUserIdentity()
311 return self._userident_name
312
313 @property
314 def UserEmail(self):
315 """Obtain the user's email address. This is very likely
316 to be their Gerrit login.
317 """
318 if self._userident_email is None:
319 self._LoadUserIdentity()
320 return self._userident_email
321
322 def _LoadUserIdentity(self):
323 u = self.bare_git.var('GIT_COMMITTER_IDENT')
324 m = re.compile("^(.*) <([^>]*)> ").match(u)
325 if m:
326 self._userident_name = m.group(1)
327 self._userident_email = m.group(2)
328 else:
329 self._userident_name = ''
330 self._userident_email = ''
331
332 def GetRemote(self, name):
333 """Get the configuration for a single remote.
334 """
335 return self.config.GetRemote(name)
336
337 def GetBranch(self, name):
338 """Get the configuration for a single branch.
339 """
340 return self.config.GetBranch(name)
341
Shawn O. Pearce27b07322009-04-10 16:02:48 -0700342 def GetBranches(self):
343 """Get all existing local branches.
344 """
345 current = self.CurrentBranch
Shawn O. Pearced237b692009-04-17 18:49:50 -0700346 all = self._allrefs
Shawn O. Pearce27b07322009-04-10 16:02:48 -0700347 heads = {}
348 pubd = {}
349
350 for name, id in all.iteritems():
351 if name.startswith(R_HEADS):
352 name = name[len(R_HEADS):]
353 b = self.GetBranch(name)
354 b.current = name == current
355 b.published = None
356 b.revision = id
357 heads[name] = b
358
359 for name, id in all.iteritems():
360 if name.startswith(R_PUB):
361 name = name[len(R_PUB):]
362 b = heads.get(name)
363 if b:
364 b.published = id
365
366 return heads
367
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700368
369## Status Display ##
370
371 def PrintWorkTreeStatus(self):
372 """Prints the status of the repository to stdout.
373 """
374 if not os.path.isdir(self.worktree):
375 print ''
376 print 'project %s/' % self.relpath
377 print ' missing (run "repo sync")'
378 return
379
380 self.work_git.update_index('-q',
381 '--unmerged',
382 '--ignore-missing',
383 '--refresh')
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700384 rb = self.IsRebaseInProgress()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700385 di = self.work_git.DiffZ('diff-index', '-M', '--cached', HEAD)
386 df = self.work_git.DiffZ('diff-files')
387 do = self.work_git.LsOthers()
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700388 if not rb and not di and not df and not do:
Shawn O. Pearce161f4452009-04-10 17:41:44 -0700389 return 'CLEAN'
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700390
391 out = StatusColoring(self.config)
392 out.project('project %-40s', self.relpath + '/')
393
394 branch = self.CurrentBranch
395 if branch is None:
396 out.nobranch('(*** NO BRANCH ***)')
397 else:
398 out.branch('branch %s', branch)
399 out.nl()
400
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700401 if rb:
402 out.important('prior sync failed; rebase still in progress')
403 out.nl()
404
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700405 paths = list()
406 paths.extend(di.keys())
407 paths.extend(df.keys())
408 paths.extend(do)
409
410 paths = list(set(paths))
411 paths.sort()
412
413 for p in paths:
414 try: i = di[p]
415 except KeyError: i = None
416
417 try: f = df[p]
418 except KeyError: f = None
Julius Gustavsson0cb1b3f2010-06-17 17:55:02 +0200419
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700420 if i: i_status = i.status.upper()
421 else: i_status = '-'
422
423 if f: f_status = f.status.lower()
424 else: f_status = '-'
425
426 if i and i.src_path:
Shawn O. Pearcefe086752009-03-03 13:49:48 -0800427 line = ' %s%s\t%s => %s (%s%%)' % (i_status, f_status,
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700428 i.src_path, p, i.level)
429 else:
430 line = ' %s%s\t%s' % (i_status, f_status, p)
431
432 if i and not f:
433 out.added('%s', line)
434 elif (i and f) or (not i and f):
435 out.changed('%s', line)
436 elif not i and not f:
437 out.untracked('%s', line)
438 else:
439 out.write('%s', line)
440 out.nl()
Shawn O. Pearce161f4452009-04-10 17:41:44 -0700441 return 'DIRTY'
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700442
443 def PrintWorkTreeDiff(self):
444 """Prints the status of the repository to stdout.
445 """
446 out = DiffColoring(self.config)
447 cmd = ['diff']
448 if out.is_on:
449 cmd.append('--color')
450 cmd.append(HEAD)
451 cmd.append('--')
452 p = GitCommand(self,
453 cmd,
454 capture_stdout = True,
455 capture_stderr = True)
456 has_diff = False
457 for line in p.process.stdout:
458 if not has_diff:
459 out.nl()
460 out.project('project %s/' % self.relpath)
461 out.nl()
462 has_diff = True
463 print line[:-1]
464 p.Wait()
465
466
467## Publish / Upload ##
468
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700469 def WasPublished(self, branch, all=None):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700470 """Was the branch published (uploaded) for code review?
471 If so, returns the SHA-1 hash of the last published
472 state for the branch.
473 """
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700474 key = R_PUB + branch
475 if all is None:
476 try:
477 return self.bare_git.rev_parse(key)
478 except GitError:
479 return None
480 else:
481 try:
482 return all[key]
483 except KeyError:
484 return None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700485
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700486 def CleanPublishedCache(self, all=None):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700487 """Prunes any stale published refs.
488 """
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700489 if all is None:
490 all = self._allrefs
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700491 heads = set()
492 canrm = {}
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700493 for name, id in all.iteritems():
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700494 if name.startswith(R_HEADS):
495 heads.add(name)
496 elif name.startswith(R_PUB):
497 canrm[name] = id
498
499 for name, id in canrm.iteritems():
500 n = name[len(R_PUB):]
501 if R_HEADS + n not in heads:
502 self.bare_git.DeleteRef(name, id)
503
504 def GetUploadableBranches(self):
505 """List any branches which can be uploaded for review.
506 """
507 heads = {}
508 pubed = {}
509
510 for name, id in self._allrefs.iteritems():
511 if name.startswith(R_HEADS):
512 heads[name[len(R_HEADS):]] = id
513 elif name.startswith(R_PUB):
514 pubed[name[len(R_PUB):]] = id
515
516 ready = []
517 for branch, id in heads.iteritems():
518 if branch in pubed and pubed[branch] == id:
519 continue
520
Shawn O. Pearce35f25962008-11-11 17:03:13 -0800521 rb = self.GetUploadableBranch(branch)
522 if rb:
523 ready.append(rb)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700524 return ready
525
Shawn O. Pearce35f25962008-11-11 17:03:13 -0800526 def GetUploadableBranch(self, branch_name):
527 """Get a single uploadable branch, or None.
528 """
529 branch = self.GetBranch(branch_name)
530 base = branch.LocalMerge
531 if branch.LocalMerge:
532 rb = ReviewableBranch(self, branch, base)
533 if rb.commits:
534 return rb
535 return None
536
Joe Onorato2896a792008-11-17 16:56:36 -0500537 def UploadForReview(self, branch=None, replace_changes=None, people=([],[])):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700538 """Uploads the named branch for code review.
539 """
540 if branch is None:
541 branch = self.CurrentBranch
542 if branch is None:
543 raise GitError('not currently on a branch')
544
545 branch = self.GetBranch(branch)
546 if not branch.LocalMerge:
547 raise GitError('branch %s does not track a remote' % branch.name)
548 if not branch.remote.review:
549 raise GitError('remote %s has no review url' % branch.remote.name)
550
551 dest_branch = branch.merge
552 if not dest_branch.startswith(R_HEADS):
553 dest_branch = R_HEADS + dest_branch
554
Shawn O. Pearce339ba9f2008-11-06 09:52:51 -0800555 if not branch.remote.projectname:
556 branch.remote.projectname = self.name
557 branch.remote.Save()
558
Shawn O. Pearce370e3fa2009-01-26 10:55:39 -0800559 if branch.remote.ReviewProtocol == 'ssh':
Shawn O. Pearceb54a3922009-01-05 16:18:58 -0800560 if dest_branch.startswith(R_HEADS):
561 dest_branch = dest_branch[len(R_HEADS):]
562
563 rp = ['gerrit receive-pack']
564 for e in people[0]:
565 rp.append('--reviewer=%s' % sq(e))
566 for e in people[1]:
567 rp.append('--cc=%s' % sq(e))
568
569 cmd = ['push']
570 cmd.append('--receive-pack=%s' % " ".join(rp))
571 cmd.append(branch.remote.SshReviewUrl(self.UserEmail))
572 cmd.append('%s:refs/for/%s' % (R_HEADS + branch.name, dest_branch))
573 if replace_changes:
574 for change_id,commit_id in replace_changes.iteritems():
575 cmd.append('%s:refs/changes/%s/new' % (commit_id, change_id))
576 if GitCommand(self, cmd, bare = True).Wait() != 0:
577 raise UploadError('Upload failed')
578
579 else:
580 raise UploadError('Unsupported protocol %s' \
581 % branch.remote.review)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700582
583 msg = "posted to %s for %s" % (branch.remote.review, dest_branch)
584 self.bare_git.UpdateRef(R_PUB + branch.name,
585 R_HEADS + branch.name,
586 message = msg)
587
588
589## Sync ##
590
591 def Sync_NetworkHalf(self):
592 """Perform only the network IO portion of the sync process.
593 Local working directory/branch state is not affected.
594 """
595 if not self.Exists:
596 print >>sys.stderr
597 print >>sys.stderr, 'Initializing project %s ...' % self.name
598 self._InitGitDir()
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800599
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700600 self._InitRemote()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700601 if not self._RemoteFetch():
602 return False
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800603
Julius Gustavsson0cb1b3f2010-06-17 17:55:02 +0200604 #Check that the requested ref was found after fetch
605 #
606 try:
607 self.GetRevisionId()
608 except ManifestInvalidRevisionError:
609 # if the ref is a tag. We can try fetching
610 # the tag manually as a last resort
611 #
612 rev = self.revisionExpr
613 if rev.startswith(R_TAGS):
614 self._RemoteFetch(None, rev[len(R_TAGS):])
615
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800616 if self.worktree:
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800617 self._InitMRef()
618 else:
619 self._InitMirrorHead()
620 try:
621 os.remove(os.path.join(self.gitdir, 'FETCH_HEAD'))
622 except OSError:
623 pass
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700624 return True
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -0800625
626 def PostRepoUpgrade(self):
627 self._InitHooks()
628
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700629 def _CopyFiles(self):
630 for file in self.copyfiles:
631 file._Copy()
632
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700633 def GetRevisionId(self, all=None):
634 if self.revisionId:
635 return self.revisionId
636
637 rem = self.GetRemote(self.remote.name)
638 rev = rem.ToLocal(self.revisionExpr)
639
640 if all is not None and rev in all:
641 return all[rev]
642
643 try:
644 return self.bare_git.rev_parse('--verify', '%s^0' % rev)
645 except GitError:
646 raise ManifestInvalidRevisionError(
647 'revision %s in %s not found' % (self.revisionExpr,
648 self.name))
649
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700650 def Sync_LocalHalf(self, syncbuf):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700651 """Perform only the local IO portion of the sync process.
652 Network access is not required.
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700653 """
654 self._InitWorkTree()
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700655 all = self.bare_ref.all
656 self.CleanPublishedCache(all)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700657
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700658 revid = self.GetRevisionId(all)
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700659 head = self.work_git.GetHead()
660 if head.startswith(R_HEADS):
661 branch = head[len(R_HEADS):]
662 try:
663 head = all[head]
664 except KeyError:
665 head = None
666 else:
667 branch = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700668
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700669 if branch is None or syncbuf.detach_head:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700670 # Currently on a detached HEAD. The user is assumed to
671 # not have any local modifications worth worrying about.
672 #
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700673 if self.IsRebaseInProgress():
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700674 syncbuf.fail(self, _PriorSyncFailedError())
675 return
676
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700677 if head == revid:
678 # No changes; don't do anything further.
679 #
680 return
681
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700682 lost = self._revlist(not_rev(revid), HEAD)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700683 if lost:
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700684 syncbuf.info(self, "discarding %d commits", len(lost))
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700685 try:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700686 self._Checkout(revid, quiet=True)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700687 except GitError, e:
688 syncbuf.fail(self, e)
689 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700690 self._CopyFiles()
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700691 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700692
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700693 if head == revid:
694 # No changes; don't do anything further.
695 #
696 return
697
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700698 branch = self.GetBranch(branch)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700699
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700700 if not branch.LocalMerge:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700701 # The current branch has no tracking configuration.
702 # Jump off it to a deatched HEAD.
703 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700704 syncbuf.info(self,
705 "leaving %s; does not track upstream",
706 branch.name)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700707 try:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700708 self._Checkout(revid, quiet=True)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700709 except GitError, e:
710 syncbuf.fail(self, e)
711 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700712 self._CopyFiles()
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700713 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700714
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700715 upstream_gain = self._revlist(not_rev(HEAD), revid)
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700716 pub = self.WasPublished(branch.name, all)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700717 if pub:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700718 not_merged = self._revlist(not_rev(revid), pub)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700719 if not_merged:
720 if upstream_gain:
721 # The user has published this branch and some of those
722 # commits are not yet merged upstream. We do not want
723 # to rewrite the published commits so we punt.
724 #
Daniel Sandler4c50dee2010-03-02 15:38:03 -0500725 syncbuf.fail(self,
726 "branch %s is published (but not merged) and is now %d commits behind"
727 % (branch.name, len(upstream_gain)))
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700728 return
Shawn O. Pearce05f66b62009-04-21 08:26:32 -0700729 elif pub == head:
730 # All published commits are merged, and thus we are a
731 # strict subset. We can fast-forward safely.
Shawn O. Pearcea54c5272008-10-30 11:03:00 -0700732 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700733 def _doff():
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700734 self._FastForward(revid)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700735 self._CopyFiles()
736 syncbuf.later1(self, _doff)
737 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700738
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700739 # Examine the local commits not in the remote. Find the
740 # last one attributed to this user, if any.
741 #
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700742 local_changes = self._revlist(not_rev(revid), HEAD, format='%H %ce')
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700743 last_mine = None
744 cnt_mine = 0
745 for commit in local_changes:
Shawn O. Pearceaa4982e2009-12-30 18:38:27 -0800746 commit_id, committer_email = commit.split(' ', 1)
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700747 if committer_email == self.UserEmail:
748 last_mine = commit_id
749 cnt_mine += 1
750
Shawn O. Pearceda88ff42009-06-03 11:09:12 -0700751 if not upstream_gain and cnt_mine == len(local_changes):
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700752 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700753
754 if self.IsDirty(consider_untracked=False):
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700755 syncbuf.fail(self, _DirtyError())
756 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700757
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700758 # If the upstream switched on us, warn the user.
759 #
760 if branch.merge != self.revisionExpr:
761 if branch.merge and self.revisionExpr:
762 syncbuf.info(self,
763 'manifest switched %s...%s',
764 branch.merge,
765 self.revisionExpr)
766 elif branch.merge:
767 syncbuf.info(self,
768 'manifest no longer tracks %s',
769 branch.merge)
770
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700771 if cnt_mine < len(local_changes):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700772 # Upstream rebased. Not everything in HEAD
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700773 # was created by this user.
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700774 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700775 syncbuf.info(self,
776 "discarding %d commits removed from upstream",
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700777 len(local_changes) - cnt_mine)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700778
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700779 branch.remote = self.GetRemote(self.remote.name)
780 branch.merge = self.revisionExpr
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700781 branch.Save()
782
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700783 if cnt_mine > 0:
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700784 def _dorebase():
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700785 self._Rebase(upstream = '%s^1' % last_mine, onto = revid)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700786 self._CopyFiles()
787 syncbuf.later2(self, _dorebase)
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700788 elif local_changes:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700789 try:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700790 self._ResetHard(revid)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700791 self._CopyFiles()
792 except GitError, e:
793 syncbuf.fail(self, e)
794 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700795 else:
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700796 def _doff():
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700797 self._FastForward(revid)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700798 self._CopyFiles()
799 syncbuf.later1(self, _doff)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700800
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800801 def AddCopyFile(self, src, dest, absdest):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700802 # dest should already be an absolute path, but src is project relative
803 # make src an absolute path
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800804 abssrc = os.path.join(self.worktree, src)
805 self.copyfiles.append(_CopyFile(src, dest, abssrc, absdest))
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700806
Shawn O. Pearce632768b2008-10-23 11:58:52 -0700807 def DownloadPatchSet(self, change_id, patch_id):
808 """Download a single patch set of a single change to FETCH_HEAD.
809 """
810 remote = self.GetRemote(self.remote.name)
811
812 cmd = ['fetch', remote.name]
813 cmd.append('refs/changes/%2.2d/%d/%d' \
814 % (change_id % 100, change_id, patch_id))
815 cmd.extend(map(lambda x: str(x), remote.fetch))
816 if GitCommand(self, cmd, bare=True).Wait() != 0:
817 return None
818 return DownloadedChange(self,
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700819 self.GetRevisionId(),
Shawn O. Pearce632768b2008-10-23 11:58:52 -0700820 change_id,
821 patch_id,
822 self.bare_git.rev_parse('FETCH_HEAD'))
823
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700824
825## Branch Management ##
826
827 def StartBranch(self, name):
828 """Create a new branch off the manifest's revision.
829 """
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700830 head = self.work_git.GetHead()
831 if head == (R_HEADS + name):
832 return True
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700833
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700834 all = self.bare_ref.all
835 if (R_HEADS + name) in all:
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700836 return GitCommand(self,
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700837 ['checkout', name, '--'],
Shawn O. Pearce0f0dfa32009-04-18 14:53:39 -0700838 capture_stdout = True,
839 capture_stderr = True).Wait() == 0
Shawn O. Pearce0a389e92009-04-10 16:21:18 -0700840
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700841 branch = self.GetBranch(name)
842 branch.remote = self.GetRemote(self.remote.name)
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700843 branch.merge = self.revisionExpr
844 revid = self.GetRevisionId(all)
Shawn O. Pearce0a389e92009-04-10 16:21:18 -0700845
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700846 if head.startswith(R_HEADS):
847 try:
848 head = all[head]
849 except KeyError:
850 head = None
851
852 if revid and head and revid == head:
853 ref = os.path.join(self.gitdir, R_HEADS + name)
854 try:
855 os.makedirs(os.path.dirname(ref))
856 except OSError:
857 pass
858 _lwrite(ref, '%s\n' % revid)
859 _lwrite(os.path.join(self.worktree, '.git', HEAD),
860 'ref: %s%s\n' % (R_HEADS, name))
861 branch.Save()
862 return True
863
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700864 if GitCommand(self,
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700865 ['checkout', '-b', branch.name, revid],
Shawn O. Pearce0f0dfa32009-04-18 14:53:39 -0700866 capture_stdout = True,
867 capture_stderr = True).Wait() == 0:
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700868 branch.Save()
869 return True
870 return False
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700871
Wink Saville02d79452009-04-10 13:01:24 -0700872 def CheckoutBranch(self, name):
873 """Checkout a local topic branch.
874 """
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700875 rev = R_HEADS + name
876 head = self.work_git.GetHead()
877 if head == rev:
878 # Already on the branch
879 #
880 return True
Wink Saville02d79452009-04-10 13:01:24 -0700881
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700882 all = self.bare_ref.all
Wink Saville02d79452009-04-10 13:01:24 -0700883 try:
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700884 revid = all[rev]
885 except KeyError:
886 # Branch does not exist in this project
887 #
888 return False
Wink Saville02d79452009-04-10 13:01:24 -0700889
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700890 if head.startswith(R_HEADS):
891 try:
892 head = all[head]
893 except KeyError:
894 head = None
895
896 if head == revid:
897 # Same revision; just update HEAD to point to the new
898 # target branch, but otherwise take no other action.
899 #
900 _lwrite(os.path.join(self.worktree, '.git', HEAD),
901 'ref: %s%s\n' % (R_HEADS, name))
902 return True
903
904 return GitCommand(self,
905 ['checkout', name, '--'],
906 capture_stdout = True,
907 capture_stderr = True).Wait() == 0
Wink Saville02d79452009-04-10 13:01:24 -0700908
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800909 def AbandonBranch(self, name):
910 """Destroy a local topic branch.
911 """
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700912 rev = R_HEADS + name
913 all = self.bare_ref.all
914 if rev not in all:
915 # Doesn't exist; assume already abandoned.
916 #
917 return True
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800918
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700919 head = self.work_git.GetHead()
920 if head == rev:
921 # We can't destroy the branch while we are sitting
922 # on it. Switch to a detached HEAD.
923 #
924 head = all[head]
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800925
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700926 revid = self.GetRevisionId(all)
927 if head == revid:
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700928 _lwrite(os.path.join(self.worktree, '.git', HEAD),
929 '%s\n' % revid)
930 else:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700931 self._Checkout(revid, quiet=True)
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700932
933 return GitCommand(self,
934 ['branch', '-D', name],
935 capture_stdout = True,
936 capture_stderr = True).Wait() == 0
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800937
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700938 def PruneHeads(self):
939 """Prune any topic branches already merged into upstream.
940 """
941 cb = self.CurrentBranch
942 kill = []
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -0800943 left = self._allrefs
944 for name in left.keys():
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700945 if name.startswith(R_HEADS):
946 name = name[len(R_HEADS):]
947 if cb is None or name != cb:
948 kill.append(name)
949
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700950 rev = self.GetRevisionId(left)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700951 if cb is not None \
952 and not self._revlist(HEAD + '...' + rev) \
953 and not self.IsDirty(consider_untracked = False):
954 self.work_git.DetachHead(HEAD)
955 kill.append(cb)
956
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700957 if kill:
Shawn O. Pearce5b23f242009-04-17 18:43:33 -0700958 old = self.bare_git.GetHead()
959 if old is None:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700960 old = 'refs/heads/please_never_use_this_as_a_branch_name'
961
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700962 try:
963 self.bare_git.DetachHead(rev)
964
965 b = ['branch', '-d']
966 b.extend(kill)
967 b = GitCommand(self, b, bare=True,
968 capture_stdout=True,
969 capture_stderr=True)
970 b.Wait()
971 finally:
972 self.bare_git.SetHead(old)
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -0800973 left = self._allrefs
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700974
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -0800975 for branch in kill:
976 if (R_HEADS + branch) not in left:
977 self.CleanPublishedCache()
978 break
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700979
980 if cb and cb not in kill:
981 kill.append(cb)
Shawn O. Pearce7c6c64d2009-03-02 12:38:13 -0800982 kill.sort()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700983
984 kept = []
985 for branch in kill:
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -0800986 if (R_HEADS + branch) in left:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700987 branch = self.GetBranch(branch)
988 base = branch.LocalMerge
989 if not base:
990 base = rev
991 kept.append(ReviewableBranch(self, branch, base))
992 return kept
993
994
995## Direct Git Commands ##
996
Julius Gustavsson0cb1b3f2010-06-17 17:55:02 +0200997 def _RemoteFetch(self, name=None, tag=None):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700998 if not name:
999 name = self.remote.name
Shawn O. Pearcefb231612009-04-10 18:53:46 -07001000
1001 ssh_proxy = False
1002 if self.GetRemote(name).PreConnectFetch():
1003 ssh_proxy = True
1004
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001005 cmd = ['fetch']
1006 if not self.worktree:
1007 cmd.append('--update-head-ok')
1008 cmd.append(name)
Julius Gustavsson0cb1b3f2010-06-17 17:55:02 +02001009 if tag is not None:
1010 cmd.append('tag')
1011 cmd.append(tag)
Shawn O. Pearcefb231612009-04-10 18:53:46 -07001012 return GitCommand(self,
1013 cmd,
1014 bare = True,
1015 ssh_proxy = ssh_proxy).Wait() == 0
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001016
1017 def _Checkout(self, rev, quiet=False):
1018 cmd = ['checkout']
1019 if quiet:
1020 cmd.append('-q')
1021 cmd.append(rev)
1022 cmd.append('--')
1023 if GitCommand(self, cmd).Wait() != 0:
1024 if self._allrefs:
1025 raise GitError('%s checkout %s ' % (self.name, rev))
1026
1027 def _ResetHard(self, rev, quiet=True):
1028 cmd = ['reset', '--hard']
1029 if quiet:
1030 cmd.append('-q')
1031 cmd.append(rev)
1032 if GitCommand(self, cmd).Wait() != 0:
1033 raise GitError('%s reset --hard %s ' % (self.name, rev))
1034
1035 def _Rebase(self, upstream, onto = None):
Shawn O. Pearce19a83d82009-04-16 08:14:26 -07001036 cmd = ['rebase']
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001037 if onto is not None:
1038 cmd.extend(['--onto', onto])
1039 cmd.append(upstream)
Shawn O. Pearce19a83d82009-04-16 08:14:26 -07001040 if GitCommand(self, cmd).Wait() != 0:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001041 raise GitError('%s rebase %s ' % (self.name, upstream))
1042
1043 def _FastForward(self, head):
1044 cmd = ['merge', head]
1045 if GitCommand(self, cmd).Wait() != 0:
1046 raise GitError('%s merge %s ' % (self.name, head))
1047
1048 def _InitGitDir(self):
1049 if not os.path.exists(self.gitdir):
1050 os.makedirs(self.gitdir)
1051 self.bare_git.init()
Shawn O. Pearce2816d4f2009-03-03 17:53:18 -08001052
1053 if self.manifest.IsMirror:
1054 self.config.SetString('core.bare', 'true')
1055 else:
1056 self.config.SetString('core.bare', None)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001057
1058 hooks = self._gitdir_path('hooks')
Shawn O. Pearcede646812008-10-29 14:38:12 -07001059 try:
1060 to_rm = os.listdir(hooks)
1061 except OSError:
1062 to_rm = []
1063 for old_hook in to_rm:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001064 os.remove(os.path.join(hooks, old_hook))
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001065 self._InitHooks()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001066
1067 m = self.manifest.manifestProject.config
1068 for key in ['user.name', 'user.email']:
1069 if m.Has(key, include_defaults = False):
1070 self.config.SetString(key, m.GetString(key))
1071
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001072 def _InitHooks(self):
1073 hooks = self._gitdir_path('hooks')
1074 if not os.path.exists(hooks):
1075 os.makedirs(hooks)
1076 for stock_hook in repo_hooks():
Shawn O. Pearce9452e4e2009-08-22 18:17:46 -07001077 name = os.path.basename(stock_hook)
1078
1079 if name in ('commit-msg') and not self.remote.review:
1080 # Don't install a Gerrit Code Review hook if this
1081 # project does not appear to use it for reviews.
1082 #
1083 continue
1084
1085 dst = os.path.join(hooks, name)
1086 if os.path.islink(dst):
1087 continue
1088 if os.path.exists(dst):
1089 if filecmp.cmp(stock_hook, dst, shallow=False):
1090 os.remove(dst)
1091 else:
1092 _error("%s: Not replacing %s hook", self.relpath, name)
1093 continue
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001094 try:
1095 os.symlink(relpath(stock_hook, dst), dst)
1096 except OSError, e:
Shawn O. Pearce9452e4e2009-08-22 18:17:46 -07001097 if e.errno == errno.EPERM:
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001098 raise GitError('filesystem must support symlinks')
1099 else:
1100 raise
1101
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001102 def _InitRemote(self):
Shawn O. Pearced1f70d92009-05-19 14:58:02 -07001103 if self.remote.url:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001104 remote = self.GetRemote(self.remote.name)
Shawn O. Pearced1f70d92009-05-19 14:58:02 -07001105 remote.url = self.remote.url
1106 remote.review = self.remote.review
1107 remote.projectname = self.name
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001108
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001109 if self.worktree:
1110 remote.ResetFetch(mirror=False)
1111 else:
1112 remote.ResetFetch(mirror=True)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001113 remote.Save()
1114
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001115 def _InitMRef(self):
1116 if self.manifest.branch:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001117 self._InitAnyMRef(R_M + self.manifest.branch)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001118
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001119 def _InitMirrorHead(self):
Shawn O. Pearcefe200ee2009-06-01 15:28:21 -07001120 self._InitAnyMRef(HEAD)
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001121
1122 def _InitAnyMRef(self, ref):
1123 cur = self.bare_ref.symref(ref)
1124
1125 if self.revisionId:
1126 if cur != '' or self.bare_ref.get(ref) != self.revisionId:
1127 msg = 'manifest set to %s' % self.revisionId
1128 dst = self.revisionId + '^0'
1129 self.bare_git.UpdateRef(ref, dst, message = msg, detach = True)
1130 else:
1131 remote = self.GetRemote(self.remote.name)
1132 dst = remote.ToLocal(self.revisionExpr)
1133 if cur != dst:
1134 msg = 'manifest set to %s' % self.revisionExpr
1135 self.bare_git.symbolic_ref('-m', msg, ref, dst)
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001136
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001137 def _InitWorkTree(self):
1138 dotgit = os.path.join(self.worktree, '.git')
1139 if not os.path.exists(dotgit):
1140 os.makedirs(dotgit)
1141
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001142 for name in ['config',
1143 'description',
1144 'hooks',
1145 'info',
1146 'logs',
1147 'objects',
1148 'packed-refs',
1149 'refs',
1150 'rr-cache',
1151 'svn']:
Shawn O. Pearce438ee1c2008-11-03 09:59:36 -08001152 try:
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001153 src = os.path.join(self.gitdir, name)
1154 dst = os.path.join(dotgit, name)
Nico Sallembiend63060f2010-01-20 10:27:50 -08001155 if os.path.islink(dst) or not os.path.exists(dst):
1156 os.symlink(relpath(src, dst), dst)
1157 else:
1158 raise GitError('cannot overwrite a local work tree')
Shawn O. Pearce438ee1c2008-11-03 09:59:36 -08001159 except OSError, e:
1160 if e.errno == errno.EPERM:
1161 raise GitError('filesystem must support symlinks')
1162 else:
1163 raise
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001164
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001165 _lwrite(os.path.join(dotgit, HEAD), '%s\n' % self.GetRevisionId())
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001166
1167 cmd = ['read-tree', '--reset', '-u']
1168 cmd.append('-v')
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001169 cmd.append(HEAD)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001170 if GitCommand(self, cmd).Wait() != 0:
1171 raise GitError("cannot initialize work tree")
Shawn O. Pearce93609662009-04-21 10:50:33 -07001172 self._CopyFiles()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001173
1174 def _gitdir_path(self, path):
1175 return os.path.join(self.gitdir, path)
1176
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001177 def _revlist(self, *args, **kw):
1178 a = []
1179 a.extend(args)
1180 a.append('--')
1181 return self.work_git.rev_list(*a, **kw)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001182
1183 @property
1184 def _allrefs(self):
Shawn O. Pearced237b692009-04-17 18:49:50 -07001185 return self.bare_ref.all
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001186
1187 class _GitGetByExec(object):
1188 def __init__(self, project, bare):
1189 self._project = project
1190 self._bare = bare
1191
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001192 def LsOthers(self):
1193 p = GitCommand(self._project,
1194 ['ls-files',
1195 '-z',
1196 '--others',
1197 '--exclude-standard'],
1198 bare = False,
1199 capture_stdout = True,
1200 capture_stderr = True)
1201 if p.Wait() == 0:
1202 out = p.stdout
1203 if out:
1204 return out[:-1].split("\0")
1205 return []
1206
1207 def DiffZ(self, name, *args):
1208 cmd = [name]
1209 cmd.append('-z')
1210 cmd.extend(args)
1211 p = GitCommand(self._project,
1212 cmd,
1213 bare = False,
1214 capture_stdout = True,
1215 capture_stderr = True)
1216 try:
1217 out = p.process.stdout.read()
1218 r = {}
1219 if out:
1220 out = iter(out[:-1].split('\0'))
1221 while out:
Shawn O. Pearce02dbb6d2008-10-21 13:59:08 -07001222 try:
1223 info = out.next()
1224 path = out.next()
1225 except StopIteration:
1226 break
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001227
1228 class _Info(object):
1229 def __init__(self, path, omode, nmode, oid, nid, state):
1230 self.path = path
1231 self.src_path = None
1232 self.old_mode = omode
1233 self.new_mode = nmode
1234 self.old_id = oid
1235 self.new_id = nid
1236
1237 if len(state) == 1:
1238 self.status = state
1239 self.level = None
1240 else:
1241 self.status = state[:1]
1242 self.level = state[1:]
1243 while self.level.startswith('0'):
1244 self.level = self.level[1:]
1245
1246 info = info[1:].split(' ')
1247 info =_Info(path, *info)
1248 if info.status in ('R', 'C'):
1249 info.src_path = info.path
1250 info.path = out.next()
1251 r[info.path] = info
1252 return r
1253 finally:
1254 p.Wait()
1255
1256 def GetHead(self):
Shawn O. Pearce5b23f242009-04-17 18:43:33 -07001257 if self._bare:
1258 path = os.path.join(self._project.gitdir, HEAD)
1259 else:
1260 path = os.path.join(self._project.worktree, '.git', HEAD)
Shawn O. Pearce76ca9f82009-04-18 14:48:03 -07001261 fd = open(path, 'rb')
1262 try:
1263 line = fd.read()
1264 finally:
1265 fd.close()
Shawn O. Pearce5b23f242009-04-17 18:43:33 -07001266 if line.startswith('ref: '):
1267 return line[5:-1]
1268 return line[:-1]
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001269
1270 def SetHead(self, ref, message=None):
1271 cmdv = []
1272 if message is not None:
1273 cmdv.extend(['-m', message])
1274 cmdv.append(HEAD)
1275 cmdv.append(ref)
1276 self.symbolic_ref(*cmdv)
1277
1278 def DetachHead(self, new, message=None):
1279 cmdv = ['--no-deref']
1280 if message is not None:
1281 cmdv.extend(['-m', message])
1282 cmdv.append(HEAD)
1283 cmdv.append(new)
1284 self.update_ref(*cmdv)
1285
1286 def UpdateRef(self, name, new, old=None,
1287 message=None,
1288 detach=False):
1289 cmdv = []
1290 if message is not None:
1291 cmdv.extend(['-m', message])
1292 if detach:
1293 cmdv.append('--no-deref')
1294 cmdv.append(name)
1295 cmdv.append(new)
1296 if old is not None:
1297 cmdv.append(old)
1298 self.update_ref(*cmdv)
1299
1300 def DeleteRef(self, name, old=None):
1301 if not old:
1302 old = self.rev_parse(name)
1303 self.update_ref('-d', name, old)
Shawn O. Pearcefbcde472009-04-17 20:58:02 -07001304 self._project.bare_ref.deleted(name)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001305
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001306 def rev_list(self, *args, **kw):
1307 if 'format' in kw:
1308 cmdv = ['log', '--pretty=format:%s' % kw['format']]
1309 else:
1310 cmdv = ['rev-list']
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001311 cmdv.extend(args)
1312 p = GitCommand(self._project,
1313 cmdv,
1314 bare = self._bare,
1315 capture_stdout = True,
1316 capture_stderr = True)
1317 r = []
1318 for line in p.process.stdout:
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001319 if line[-1] == '\n':
1320 line = line[:-1]
1321 r.append(line)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001322 if p.Wait() != 0:
1323 raise GitError('%s rev-list %s: %s' % (
1324 self._project.name,
1325 str(args),
1326 p.stderr))
1327 return r
1328
1329 def __getattr__(self, name):
1330 name = name.replace('_', '-')
1331 def runner(*args):
1332 cmdv = [name]
1333 cmdv.extend(args)
1334 p = GitCommand(self._project,
1335 cmdv,
1336 bare = self._bare,
1337 capture_stdout = True,
1338 capture_stderr = True)
1339 if p.Wait() != 0:
1340 raise GitError('%s %s: %s' % (
1341 self._project.name,
1342 name,
1343 p.stderr))
1344 r = p.stdout
1345 if r.endswith('\n') and r.index('\n') == len(r) - 1:
1346 return r[:-1]
1347 return r
1348 return runner
1349
1350
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001351class _PriorSyncFailedError(Exception):
1352 def __str__(self):
1353 return 'prior sync failed; rebase still in progress'
1354
1355class _DirtyError(Exception):
1356 def __str__(self):
1357 return 'contains uncommitted changes'
1358
1359class _InfoMessage(object):
1360 def __init__(self, project, text):
1361 self.project = project
1362 self.text = text
1363
1364 def Print(self, syncbuf):
1365 syncbuf.out.info('%s/: %s', self.project.relpath, self.text)
1366 syncbuf.out.nl()
1367
1368class _Failure(object):
1369 def __init__(self, project, why):
1370 self.project = project
1371 self.why = why
1372
1373 def Print(self, syncbuf):
1374 syncbuf.out.fail('error: %s/: %s',
1375 self.project.relpath,
1376 str(self.why))
1377 syncbuf.out.nl()
1378
1379class _Later(object):
1380 def __init__(self, project, action):
1381 self.project = project
1382 self.action = action
1383
1384 def Run(self, syncbuf):
1385 out = syncbuf.out
1386 out.project('project %s/', self.project.relpath)
1387 out.nl()
1388 try:
1389 self.action()
1390 out.nl()
1391 return True
1392 except GitError, e:
1393 out.nl()
1394 return False
1395
1396class _SyncColoring(Coloring):
1397 def __init__(self, config):
1398 Coloring.__init__(self, config, 'reposync')
1399 self.project = self.printer('header', attr = 'bold')
1400 self.info = self.printer('info')
1401 self.fail = self.printer('fail', fg='red')
1402
1403class SyncBuffer(object):
1404 def __init__(self, config, detach_head=False):
1405 self._messages = []
1406 self._failures = []
1407 self._later_queue1 = []
1408 self._later_queue2 = []
1409
1410 self.out = _SyncColoring(config)
1411 self.out.redirect(sys.stderr)
1412
1413 self.detach_head = detach_head
1414 self.clean = True
1415
1416 def info(self, project, fmt, *args):
1417 self._messages.append(_InfoMessage(project, fmt % args))
1418
1419 def fail(self, project, err=None):
1420 self._failures.append(_Failure(project, err))
1421 self.clean = False
1422
1423 def later1(self, project, what):
1424 self._later_queue1.append(_Later(project, what))
1425
1426 def later2(self, project, what):
1427 self._later_queue2.append(_Later(project, what))
1428
1429 def Finish(self):
1430 self._PrintMessages()
1431 self._RunLater()
1432 self._PrintMessages()
1433 return self.clean
1434
1435 def _RunLater(self):
1436 for q in ['_later_queue1', '_later_queue2']:
1437 if not self._RunQueue(q):
1438 return
1439
1440 def _RunQueue(self, queue):
1441 for m in getattr(self, queue):
1442 if not m.Run(self):
1443 self.clean = False
1444 return False
1445 setattr(self, queue, [])
1446 return True
1447
1448 def _PrintMessages(self):
1449 for m in self._messages:
1450 m.Print(self)
1451 for m in self._failures:
1452 m.Print(self)
1453
1454 self._messages = []
1455 self._failures = []
1456
1457
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001458class MetaProject(Project):
1459 """A special project housed under .repo.
1460 """
1461 def __init__(self, manifest, name, gitdir, worktree):
1462 repodir = manifest.repodir
1463 Project.__init__(self,
1464 manifest = manifest,
1465 name = name,
1466 gitdir = gitdir,
1467 worktree = worktree,
Shawn O. Pearced1f70d92009-05-19 14:58:02 -07001468 remote = RemoteSpec('origin'),
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001469 relpath = '.repo/%s' % name,
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001470 revisionExpr = 'refs/heads/master',
1471 revisionId = None)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001472
1473 def PreSync(self):
1474 if self.Exists:
1475 cb = self.CurrentBranch
1476 if cb:
1477 base = self.GetBranch(cb).merge
1478 if base:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001479 self.revisionExpr = base
1480 self.revisionId = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001481
1482 @property
Shawn O. Pearcef6906872009-04-18 10:49:00 -07001483 def LastFetch(self):
1484 try:
1485 fh = os.path.join(self.gitdir, 'FETCH_HEAD')
1486 return os.path.getmtime(fh)
1487 except OSError:
1488 return 0
1489
1490 @property
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001491 def HasChanges(self):
1492 """Has the remote received new commits not yet checked out?
1493 """
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001494 if not self.remote or not self.revisionExpr:
Shawn O. Pearce336f7bd2009-04-18 10:39:28 -07001495 return False
1496
1497 all = self.bare_ref.all
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001498 revid = self.GetRevisionId(all)
Shawn O. Pearce336f7bd2009-04-18 10:39:28 -07001499 head = self.work_git.GetHead()
1500 if head.startswith(R_HEADS):
1501 try:
1502 head = all[head]
1503 except KeyError:
1504 head = None
1505
1506 if revid == head:
1507 return False
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001508 elif self._revlist(not_rev(HEAD), revid):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001509 return True
1510 return False