blob: 1bcd9596ba3c04d52c8a0bba12afebc2e983d596 [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'))
286
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
419
420 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
604 if self.worktree:
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800605 self._InitMRef()
606 else:
607 self._InitMirrorHead()
608 try:
609 os.remove(os.path.join(self.gitdir, 'FETCH_HEAD'))
610 except OSError:
611 pass
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700612 return True
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -0800613
614 def PostRepoUpgrade(self):
615 self._InitHooks()
616
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700617 def _CopyFiles(self):
618 for file in self.copyfiles:
619 file._Copy()
620
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700621 def GetRevisionId(self, all=None):
622 if self.revisionId:
623 return self.revisionId
624
625 rem = self.GetRemote(self.remote.name)
626 rev = rem.ToLocal(self.revisionExpr)
627
628 if all is not None and rev in all:
629 return all[rev]
630
631 try:
632 return self.bare_git.rev_parse('--verify', '%s^0' % rev)
633 except GitError:
634 raise ManifestInvalidRevisionError(
635 'revision %s in %s not found' % (self.revisionExpr,
636 self.name))
637
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700638 def Sync_LocalHalf(self, syncbuf):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700639 """Perform only the local IO portion of the sync process.
640 Network access is not required.
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700641 """
642 self._InitWorkTree()
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700643 all = self.bare_ref.all
644 self.CleanPublishedCache(all)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700645
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700646 revid = self.GetRevisionId(all)
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700647 head = self.work_git.GetHead()
648 if head.startswith(R_HEADS):
649 branch = head[len(R_HEADS):]
650 try:
651 head = all[head]
652 except KeyError:
653 head = None
654 else:
655 branch = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700656
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700657 if branch is None or syncbuf.detach_head:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700658 # Currently on a detached HEAD. The user is assumed to
659 # not have any local modifications worth worrying about.
660 #
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700661 if self.IsRebaseInProgress():
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700662 syncbuf.fail(self, _PriorSyncFailedError())
663 return
664
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700665 if head == revid:
666 # No changes; don't do anything further.
667 #
668 return
669
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700670 lost = self._revlist(not_rev(revid), HEAD)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700671 if lost:
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700672 syncbuf.info(self, "discarding %d commits", len(lost))
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700673 try:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700674 self._Checkout(revid, quiet=True)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700675 except GitError, e:
676 syncbuf.fail(self, e)
677 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700678 self._CopyFiles()
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700679 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700680
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700681 if head == revid:
682 # No changes; don't do anything further.
683 #
684 return
685
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700686 branch = self.GetBranch(branch)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700687
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700688 if not branch.LocalMerge:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700689 # The current branch has no tracking configuration.
690 # Jump off it to a deatched HEAD.
691 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700692 syncbuf.info(self,
693 "leaving %s; does not track upstream",
694 branch.name)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700695 try:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700696 self._Checkout(revid, quiet=True)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700697 except GitError, e:
698 syncbuf.fail(self, e)
699 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700700 self._CopyFiles()
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700701 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700702
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700703 upstream_gain = self._revlist(not_rev(HEAD), revid)
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700704 pub = self.WasPublished(branch.name, all)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700705 if pub:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700706 not_merged = self._revlist(not_rev(revid), pub)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700707 if not_merged:
708 if upstream_gain:
709 # The user has published this branch and some of those
710 # commits are not yet merged upstream. We do not want
711 # to rewrite the published commits so we punt.
712 #
Daniel Sandler4c50dee2010-03-02 15:38:03 -0500713 syncbuf.fail(self,
714 "branch %s is published (but not merged) and is now %d commits behind"
715 % (branch.name, len(upstream_gain)))
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700716 return
Shawn O. Pearce05f66b62009-04-21 08:26:32 -0700717 elif pub == head:
718 # All published commits are merged, and thus we are a
719 # strict subset. We can fast-forward safely.
Shawn O. Pearcea54c5272008-10-30 11:03:00 -0700720 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700721 def _doff():
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700722 self._FastForward(revid)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700723 self._CopyFiles()
724 syncbuf.later1(self, _doff)
725 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700726
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700727 # Examine the local commits not in the remote. Find the
728 # last one attributed to this user, if any.
729 #
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700730 local_changes = self._revlist(not_rev(revid), HEAD, format='%H %ce')
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700731 last_mine = None
732 cnt_mine = 0
733 for commit in local_changes:
Shawn O. Pearceaa4982e2009-12-30 18:38:27 -0800734 commit_id, committer_email = commit.split(' ', 1)
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700735 if committer_email == self.UserEmail:
736 last_mine = commit_id
737 cnt_mine += 1
738
Shawn O. Pearceda88ff42009-06-03 11:09:12 -0700739 if not upstream_gain and cnt_mine == len(local_changes):
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700740 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700741
742 if self.IsDirty(consider_untracked=False):
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700743 syncbuf.fail(self, _DirtyError())
744 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700745
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700746 # If the upstream switched on us, warn the user.
747 #
748 if branch.merge != self.revisionExpr:
749 if branch.merge and self.revisionExpr:
750 syncbuf.info(self,
751 'manifest switched %s...%s',
752 branch.merge,
753 self.revisionExpr)
754 elif branch.merge:
755 syncbuf.info(self,
756 'manifest no longer tracks %s',
757 branch.merge)
758
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700759 if cnt_mine < len(local_changes):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700760 # Upstream rebased. Not everything in HEAD
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700761 # was created by this user.
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700762 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700763 syncbuf.info(self,
764 "discarding %d commits removed from upstream",
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700765 len(local_changes) - cnt_mine)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700766
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700767 branch.remote = self.GetRemote(self.remote.name)
768 branch.merge = self.revisionExpr
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700769 branch.Save()
770
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700771 if cnt_mine > 0:
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700772 def _dorebase():
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700773 self._Rebase(upstream = '%s^1' % last_mine, onto = revid)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700774 self._CopyFiles()
775 syncbuf.later2(self, _dorebase)
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700776 elif local_changes:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700777 try:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700778 self._ResetHard(revid)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700779 self._CopyFiles()
780 except GitError, e:
781 syncbuf.fail(self, e)
782 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700783 else:
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700784 def _doff():
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700785 self._FastForward(revid)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700786 self._CopyFiles()
787 syncbuf.later1(self, _doff)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700788
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800789 def AddCopyFile(self, src, dest, absdest):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700790 # dest should already be an absolute path, but src is project relative
791 # make src an absolute path
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800792 abssrc = os.path.join(self.worktree, src)
793 self.copyfiles.append(_CopyFile(src, dest, abssrc, absdest))
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700794
Shawn O. Pearce632768b2008-10-23 11:58:52 -0700795 def DownloadPatchSet(self, change_id, patch_id):
796 """Download a single patch set of a single change to FETCH_HEAD.
797 """
798 remote = self.GetRemote(self.remote.name)
799
800 cmd = ['fetch', remote.name]
801 cmd.append('refs/changes/%2.2d/%d/%d' \
802 % (change_id % 100, change_id, patch_id))
803 cmd.extend(map(lambda x: str(x), remote.fetch))
804 if GitCommand(self, cmd, bare=True).Wait() != 0:
805 return None
806 return DownloadedChange(self,
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700807 self.GetRevisionId(),
Shawn O. Pearce632768b2008-10-23 11:58:52 -0700808 change_id,
809 patch_id,
810 self.bare_git.rev_parse('FETCH_HEAD'))
811
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700812
813## Branch Management ##
814
815 def StartBranch(self, name):
816 """Create a new branch off the manifest's revision.
817 """
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700818 head = self.work_git.GetHead()
819 if head == (R_HEADS + name):
820 return True
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700821
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700822 all = self.bare_ref.all
823 if (R_HEADS + name) in all:
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700824 return GitCommand(self,
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700825 ['checkout', name, '--'],
Shawn O. Pearce0f0dfa32009-04-18 14:53:39 -0700826 capture_stdout = True,
827 capture_stderr = True).Wait() == 0
Shawn O. Pearce0a389e92009-04-10 16:21:18 -0700828
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700829 branch = self.GetBranch(name)
830 branch.remote = self.GetRemote(self.remote.name)
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700831 branch.merge = self.revisionExpr
832 revid = self.GetRevisionId(all)
Shawn O. Pearce0a389e92009-04-10 16:21:18 -0700833
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700834 if head.startswith(R_HEADS):
835 try:
836 head = all[head]
837 except KeyError:
838 head = None
839
840 if revid and head and revid == head:
841 ref = os.path.join(self.gitdir, R_HEADS + name)
842 try:
843 os.makedirs(os.path.dirname(ref))
844 except OSError:
845 pass
846 _lwrite(ref, '%s\n' % revid)
847 _lwrite(os.path.join(self.worktree, '.git', HEAD),
848 'ref: %s%s\n' % (R_HEADS, name))
849 branch.Save()
850 return True
851
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700852 if GitCommand(self,
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700853 ['checkout', '-b', branch.name, revid],
Shawn O. Pearce0f0dfa32009-04-18 14:53:39 -0700854 capture_stdout = True,
855 capture_stderr = True).Wait() == 0:
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700856 branch.Save()
857 return True
858 return False
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700859
Wink Saville02d79452009-04-10 13:01:24 -0700860 def CheckoutBranch(self, name):
861 """Checkout a local topic branch.
862 """
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700863 rev = R_HEADS + name
864 head = self.work_git.GetHead()
865 if head == rev:
866 # Already on the branch
867 #
868 return True
Wink Saville02d79452009-04-10 13:01:24 -0700869
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700870 all = self.bare_ref.all
Wink Saville02d79452009-04-10 13:01:24 -0700871 try:
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700872 revid = all[rev]
873 except KeyError:
874 # Branch does not exist in this project
875 #
876 return False
Wink Saville02d79452009-04-10 13:01:24 -0700877
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700878 if head.startswith(R_HEADS):
879 try:
880 head = all[head]
881 except KeyError:
882 head = None
883
884 if head == revid:
885 # Same revision; just update HEAD to point to the new
886 # target branch, but otherwise take no other action.
887 #
888 _lwrite(os.path.join(self.worktree, '.git', HEAD),
889 'ref: %s%s\n' % (R_HEADS, name))
890 return True
891
892 return GitCommand(self,
893 ['checkout', name, '--'],
894 capture_stdout = True,
895 capture_stderr = True).Wait() == 0
Wink Saville02d79452009-04-10 13:01:24 -0700896
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800897 def AbandonBranch(self, name):
898 """Destroy a local topic branch.
899 """
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700900 rev = R_HEADS + name
901 all = self.bare_ref.all
902 if rev not in all:
903 # Doesn't exist; assume already abandoned.
904 #
905 return True
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800906
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700907 head = self.work_git.GetHead()
908 if head == rev:
909 # We can't destroy the branch while we are sitting
910 # on it. Switch to a detached HEAD.
911 #
912 head = all[head]
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800913
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700914 revid = self.GetRevisionId(all)
915 if head == revid:
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700916 _lwrite(os.path.join(self.worktree, '.git', HEAD),
917 '%s\n' % revid)
918 else:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700919 self._Checkout(revid, quiet=True)
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700920
921 return GitCommand(self,
922 ['branch', '-D', name],
923 capture_stdout = True,
924 capture_stderr = True).Wait() == 0
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800925
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700926 def PruneHeads(self):
927 """Prune any topic branches already merged into upstream.
928 """
929 cb = self.CurrentBranch
930 kill = []
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -0800931 left = self._allrefs
932 for name in left.keys():
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700933 if name.startswith(R_HEADS):
934 name = name[len(R_HEADS):]
935 if cb is None or name != cb:
936 kill.append(name)
937
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700938 rev = self.GetRevisionId(left)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700939 if cb is not None \
940 and not self._revlist(HEAD + '...' + rev) \
941 and not self.IsDirty(consider_untracked = False):
942 self.work_git.DetachHead(HEAD)
943 kill.append(cb)
944
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700945 if kill:
Shawn O. Pearce5b23f242009-04-17 18:43:33 -0700946 old = self.bare_git.GetHead()
947 if old is None:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700948 old = 'refs/heads/please_never_use_this_as_a_branch_name'
949
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700950 try:
951 self.bare_git.DetachHead(rev)
952
953 b = ['branch', '-d']
954 b.extend(kill)
955 b = GitCommand(self, b, bare=True,
956 capture_stdout=True,
957 capture_stderr=True)
958 b.Wait()
959 finally:
960 self.bare_git.SetHead(old)
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -0800961 left = self._allrefs
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700962
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -0800963 for branch in kill:
964 if (R_HEADS + branch) not in left:
965 self.CleanPublishedCache()
966 break
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700967
968 if cb and cb not in kill:
969 kill.append(cb)
Shawn O. Pearce7c6c64d2009-03-02 12:38:13 -0800970 kill.sort()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700971
972 kept = []
973 for branch in kill:
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -0800974 if (R_HEADS + branch) in left:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700975 branch = self.GetBranch(branch)
976 base = branch.LocalMerge
977 if not base:
978 base = rev
979 kept.append(ReviewableBranch(self, branch, base))
980 return kept
981
982
983## Direct Git Commands ##
984
985 def _RemoteFetch(self, name=None):
986 if not name:
987 name = self.remote.name
Shawn O. Pearcefb231612009-04-10 18:53:46 -0700988
989 ssh_proxy = False
990 if self.GetRemote(name).PreConnectFetch():
991 ssh_proxy = True
992
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800993 cmd = ['fetch']
994 if not self.worktree:
995 cmd.append('--update-head-ok')
996 cmd.append(name)
Shawn O. Pearcefb231612009-04-10 18:53:46 -0700997 return GitCommand(self,
998 cmd,
999 bare = True,
1000 ssh_proxy = ssh_proxy).Wait() == 0
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001001
1002 def _Checkout(self, rev, quiet=False):
1003 cmd = ['checkout']
1004 if quiet:
1005 cmd.append('-q')
1006 cmd.append(rev)
1007 cmd.append('--')
1008 if GitCommand(self, cmd).Wait() != 0:
1009 if self._allrefs:
1010 raise GitError('%s checkout %s ' % (self.name, rev))
1011
1012 def _ResetHard(self, rev, quiet=True):
1013 cmd = ['reset', '--hard']
1014 if quiet:
1015 cmd.append('-q')
1016 cmd.append(rev)
1017 if GitCommand(self, cmd).Wait() != 0:
1018 raise GitError('%s reset --hard %s ' % (self.name, rev))
1019
1020 def _Rebase(self, upstream, onto = None):
Shawn O. Pearce19a83d82009-04-16 08:14:26 -07001021 cmd = ['rebase']
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001022 if onto is not None:
1023 cmd.extend(['--onto', onto])
1024 cmd.append(upstream)
Shawn O. Pearce19a83d82009-04-16 08:14:26 -07001025 if GitCommand(self, cmd).Wait() != 0:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001026 raise GitError('%s rebase %s ' % (self.name, upstream))
1027
1028 def _FastForward(self, head):
1029 cmd = ['merge', head]
1030 if GitCommand(self, cmd).Wait() != 0:
1031 raise GitError('%s merge %s ' % (self.name, head))
1032
1033 def _InitGitDir(self):
1034 if not os.path.exists(self.gitdir):
1035 os.makedirs(self.gitdir)
1036 self.bare_git.init()
Shawn O. Pearce2816d4f2009-03-03 17:53:18 -08001037
1038 if self.manifest.IsMirror:
1039 self.config.SetString('core.bare', 'true')
1040 else:
1041 self.config.SetString('core.bare', None)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001042
1043 hooks = self._gitdir_path('hooks')
Shawn O. Pearcede646812008-10-29 14:38:12 -07001044 try:
1045 to_rm = os.listdir(hooks)
1046 except OSError:
1047 to_rm = []
1048 for old_hook in to_rm:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001049 os.remove(os.path.join(hooks, old_hook))
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001050 self._InitHooks()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001051
1052 m = self.manifest.manifestProject.config
1053 for key in ['user.name', 'user.email']:
1054 if m.Has(key, include_defaults = False):
1055 self.config.SetString(key, m.GetString(key))
1056
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001057 def _InitHooks(self):
1058 hooks = self._gitdir_path('hooks')
1059 if not os.path.exists(hooks):
1060 os.makedirs(hooks)
1061 for stock_hook in repo_hooks():
Shawn O. Pearce9452e4e2009-08-22 18:17:46 -07001062 name = os.path.basename(stock_hook)
1063
1064 if name in ('commit-msg') and not self.remote.review:
1065 # Don't install a Gerrit Code Review hook if this
1066 # project does not appear to use it for reviews.
1067 #
1068 continue
1069
1070 dst = os.path.join(hooks, name)
1071 if os.path.islink(dst):
1072 continue
1073 if os.path.exists(dst):
1074 if filecmp.cmp(stock_hook, dst, shallow=False):
1075 os.remove(dst)
1076 else:
1077 _error("%s: Not replacing %s hook", self.relpath, name)
1078 continue
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001079 try:
1080 os.symlink(relpath(stock_hook, dst), dst)
1081 except OSError, e:
Shawn O. Pearce9452e4e2009-08-22 18:17:46 -07001082 if e.errno == errno.EPERM:
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001083 raise GitError('filesystem must support symlinks')
1084 else:
1085 raise
1086
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001087 def _InitRemote(self):
Shawn O. Pearced1f70d92009-05-19 14:58:02 -07001088 if self.remote.url:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001089 remote = self.GetRemote(self.remote.name)
Shawn O. Pearced1f70d92009-05-19 14:58:02 -07001090 remote.url = self.remote.url
1091 remote.review = self.remote.review
1092 remote.projectname = self.name
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001093
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001094 if self.worktree:
1095 remote.ResetFetch(mirror=False)
1096 else:
1097 remote.ResetFetch(mirror=True)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001098 remote.Save()
1099
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001100 def _InitMRef(self):
1101 if self.manifest.branch:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001102 self._InitAnyMRef(R_M + self.manifest.branch)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001103
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001104 def _InitMirrorHead(self):
Shawn O. Pearcefe200ee2009-06-01 15:28:21 -07001105 self._InitAnyMRef(HEAD)
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001106
1107 def _InitAnyMRef(self, ref):
1108 cur = self.bare_ref.symref(ref)
1109
1110 if self.revisionId:
1111 if cur != '' or self.bare_ref.get(ref) != self.revisionId:
1112 msg = 'manifest set to %s' % self.revisionId
1113 dst = self.revisionId + '^0'
1114 self.bare_git.UpdateRef(ref, dst, message = msg, detach = True)
1115 else:
1116 remote = self.GetRemote(self.remote.name)
1117 dst = remote.ToLocal(self.revisionExpr)
1118 if cur != dst:
1119 msg = 'manifest set to %s' % self.revisionExpr
1120 self.bare_git.symbolic_ref('-m', msg, ref, dst)
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001121
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001122 def _InitWorkTree(self):
1123 dotgit = os.path.join(self.worktree, '.git')
1124 if not os.path.exists(dotgit):
1125 os.makedirs(dotgit)
1126
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001127 for name in ['config',
1128 'description',
1129 'hooks',
1130 'info',
1131 'logs',
1132 'objects',
1133 'packed-refs',
1134 'refs',
1135 'rr-cache',
1136 'svn']:
Shawn O. Pearce438ee1c2008-11-03 09:59:36 -08001137 try:
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001138 src = os.path.join(self.gitdir, name)
1139 dst = os.path.join(dotgit, name)
Nico Sallembiend63060f2010-01-20 10:27:50 -08001140 if os.path.islink(dst) or not os.path.exists(dst):
1141 os.symlink(relpath(src, dst), dst)
1142 else:
1143 raise GitError('cannot overwrite a local work tree')
Shawn O. Pearce438ee1c2008-11-03 09:59:36 -08001144 except OSError, e:
1145 if e.errno == errno.EPERM:
1146 raise GitError('filesystem must support symlinks')
1147 else:
1148 raise
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001149
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001150 _lwrite(os.path.join(dotgit, HEAD), '%s\n' % self.GetRevisionId())
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001151
1152 cmd = ['read-tree', '--reset', '-u']
1153 cmd.append('-v')
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001154 cmd.append(HEAD)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001155 if GitCommand(self, cmd).Wait() != 0:
1156 raise GitError("cannot initialize work tree")
Shawn O. Pearce93609662009-04-21 10:50:33 -07001157 self._CopyFiles()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001158
1159 def _gitdir_path(self, path):
1160 return os.path.join(self.gitdir, path)
1161
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001162 def _revlist(self, *args, **kw):
1163 a = []
1164 a.extend(args)
1165 a.append('--')
1166 return self.work_git.rev_list(*a, **kw)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001167
1168 @property
1169 def _allrefs(self):
Shawn O. Pearced237b692009-04-17 18:49:50 -07001170 return self.bare_ref.all
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001171
1172 class _GitGetByExec(object):
1173 def __init__(self, project, bare):
1174 self._project = project
1175 self._bare = bare
1176
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001177 def LsOthers(self):
1178 p = GitCommand(self._project,
1179 ['ls-files',
1180 '-z',
1181 '--others',
1182 '--exclude-standard'],
1183 bare = False,
1184 capture_stdout = True,
1185 capture_stderr = True)
1186 if p.Wait() == 0:
1187 out = p.stdout
1188 if out:
1189 return out[:-1].split("\0")
1190 return []
1191
1192 def DiffZ(self, name, *args):
1193 cmd = [name]
1194 cmd.append('-z')
1195 cmd.extend(args)
1196 p = GitCommand(self._project,
1197 cmd,
1198 bare = False,
1199 capture_stdout = True,
1200 capture_stderr = True)
1201 try:
1202 out = p.process.stdout.read()
1203 r = {}
1204 if out:
1205 out = iter(out[:-1].split('\0'))
1206 while out:
Shawn O. Pearce02dbb6d2008-10-21 13:59:08 -07001207 try:
1208 info = out.next()
1209 path = out.next()
1210 except StopIteration:
1211 break
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001212
1213 class _Info(object):
1214 def __init__(self, path, omode, nmode, oid, nid, state):
1215 self.path = path
1216 self.src_path = None
1217 self.old_mode = omode
1218 self.new_mode = nmode
1219 self.old_id = oid
1220 self.new_id = nid
1221
1222 if len(state) == 1:
1223 self.status = state
1224 self.level = None
1225 else:
1226 self.status = state[:1]
1227 self.level = state[1:]
1228 while self.level.startswith('0'):
1229 self.level = self.level[1:]
1230
1231 info = info[1:].split(' ')
1232 info =_Info(path, *info)
1233 if info.status in ('R', 'C'):
1234 info.src_path = info.path
1235 info.path = out.next()
1236 r[info.path] = info
1237 return r
1238 finally:
1239 p.Wait()
1240
1241 def GetHead(self):
Shawn O. Pearce5b23f242009-04-17 18:43:33 -07001242 if self._bare:
1243 path = os.path.join(self._project.gitdir, HEAD)
1244 else:
1245 path = os.path.join(self._project.worktree, '.git', HEAD)
Shawn O. Pearce76ca9f82009-04-18 14:48:03 -07001246 fd = open(path, 'rb')
1247 try:
1248 line = fd.read()
1249 finally:
1250 fd.close()
Shawn O. Pearce5b23f242009-04-17 18:43:33 -07001251 if line.startswith('ref: '):
1252 return line[5:-1]
1253 return line[:-1]
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001254
1255 def SetHead(self, ref, message=None):
1256 cmdv = []
1257 if message is not None:
1258 cmdv.extend(['-m', message])
1259 cmdv.append(HEAD)
1260 cmdv.append(ref)
1261 self.symbolic_ref(*cmdv)
1262
1263 def DetachHead(self, new, message=None):
1264 cmdv = ['--no-deref']
1265 if message is not None:
1266 cmdv.extend(['-m', message])
1267 cmdv.append(HEAD)
1268 cmdv.append(new)
1269 self.update_ref(*cmdv)
1270
1271 def UpdateRef(self, name, new, old=None,
1272 message=None,
1273 detach=False):
1274 cmdv = []
1275 if message is not None:
1276 cmdv.extend(['-m', message])
1277 if detach:
1278 cmdv.append('--no-deref')
1279 cmdv.append(name)
1280 cmdv.append(new)
1281 if old is not None:
1282 cmdv.append(old)
1283 self.update_ref(*cmdv)
1284
1285 def DeleteRef(self, name, old=None):
1286 if not old:
1287 old = self.rev_parse(name)
1288 self.update_ref('-d', name, old)
Shawn O. Pearcefbcde472009-04-17 20:58:02 -07001289 self._project.bare_ref.deleted(name)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001290
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001291 def rev_list(self, *args, **kw):
1292 if 'format' in kw:
1293 cmdv = ['log', '--pretty=format:%s' % kw['format']]
1294 else:
1295 cmdv = ['rev-list']
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001296 cmdv.extend(args)
1297 p = GitCommand(self._project,
1298 cmdv,
1299 bare = self._bare,
1300 capture_stdout = True,
1301 capture_stderr = True)
1302 r = []
1303 for line in p.process.stdout:
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001304 if line[-1] == '\n':
1305 line = line[:-1]
1306 r.append(line)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001307 if p.Wait() != 0:
1308 raise GitError('%s rev-list %s: %s' % (
1309 self._project.name,
1310 str(args),
1311 p.stderr))
1312 return r
1313
1314 def __getattr__(self, name):
1315 name = name.replace('_', '-')
1316 def runner(*args):
1317 cmdv = [name]
1318 cmdv.extend(args)
1319 p = GitCommand(self._project,
1320 cmdv,
1321 bare = self._bare,
1322 capture_stdout = True,
1323 capture_stderr = True)
1324 if p.Wait() != 0:
1325 raise GitError('%s %s: %s' % (
1326 self._project.name,
1327 name,
1328 p.stderr))
1329 r = p.stdout
1330 if r.endswith('\n') and r.index('\n') == len(r) - 1:
1331 return r[:-1]
1332 return r
1333 return runner
1334
1335
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001336class _PriorSyncFailedError(Exception):
1337 def __str__(self):
1338 return 'prior sync failed; rebase still in progress'
1339
1340class _DirtyError(Exception):
1341 def __str__(self):
1342 return 'contains uncommitted changes'
1343
1344class _InfoMessage(object):
1345 def __init__(self, project, text):
1346 self.project = project
1347 self.text = text
1348
1349 def Print(self, syncbuf):
1350 syncbuf.out.info('%s/: %s', self.project.relpath, self.text)
1351 syncbuf.out.nl()
1352
1353class _Failure(object):
1354 def __init__(self, project, why):
1355 self.project = project
1356 self.why = why
1357
1358 def Print(self, syncbuf):
1359 syncbuf.out.fail('error: %s/: %s',
1360 self.project.relpath,
1361 str(self.why))
1362 syncbuf.out.nl()
1363
1364class _Later(object):
1365 def __init__(self, project, action):
1366 self.project = project
1367 self.action = action
1368
1369 def Run(self, syncbuf):
1370 out = syncbuf.out
1371 out.project('project %s/', self.project.relpath)
1372 out.nl()
1373 try:
1374 self.action()
1375 out.nl()
1376 return True
1377 except GitError, e:
1378 out.nl()
1379 return False
1380
1381class _SyncColoring(Coloring):
1382 def __init__(self, config):
1383 Coloring.__init__(self, config, 'reposync')
1384 self.project = self.printer('header', attr = 'bold')
1385 self.info = self.printer('info')
1386 self.fail = self.printer('fail', fg='red')
1387
1388class SyncBuffer(object):
1389 def __init__(self, config, detach_head=False):
1390 self._messages = []
1391 self._failures = []
1392 self._later_queue1 = []
1393 self._later_queue2 = []
1394
1395 self.out = _SyncColoring(config)
1396 self.out.redirect(sys.stderr)
1397
1398 self.detach_head = detach_head
1399 self.clean = True
1400
1401 def info(self, project, fmt, *args):
1402 self._messages.append(_InfoMessage(project, fmt % args))
1403
1404 def fail(self, project, err=None):
1405 self._failures.append(_Failure(project, err))
1406 self.clean = False
1407
1408 def later1(self, project, what):
1409 self._later_queue1.append(_Later(project, what))
1410
1411 def later2(self, project, what):
1412 self._later_queue2.append(_Later(project, what))
1413
1414 def Finish(self):
1415 self._PrintMessages()
1416 self._RunLater()
1417 self._PrintMessages()
1418 return self.clean
1419
1420 def _RunLater(self):
1421 for q in ['_later_queue1', '_later_queue2']:
1422 if not self._RunQueue(q):
1423 return
1424
1425 def _RunQueue(self, queue):
1426 for m in getattr(self, queue):
1427 if not m.Run(self):
1428 self.clean = False
1429 return False
1430 setattr(self, queue, [])
1431 return True
1432
1433 def _PrintMessages(self):
1434 for m in self._messages:
1435 m.Print(self)
1436 for m in self._failures:
1437 m.Print(self)
1438
1439 self._messages = []
1440 self._failures = []
1441
1442
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001443class MetaProject(Project):
1444 """A special project housed under .repo.
1445 """
1446 def __init__(self, manifest, name, gitdir, worktree):
1447 repodir = manifest.repodir
1448 Project.__init__(self,
1449 manifest = manifest,
1450 name = name,
1451 gitdir = gitdir,
1452 worktree = worktree,
Shawn O. Pearced1f70d92009-05-19 14:58:02 -07001453 remote = RemoteSpec('origin'),
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001454 relpath = '.repo/%s' % name,
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001455 revisionExpr = 'refs/heads/master',
1456 revisionId = None)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001457
1458 def PreSync(self):
1459 if self.Exists:
1460 cb = self.CurrentBranch
1461 if cb:
1462 base = self.GetBranch(cb).merge
1463 if base:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001464 self.revisionExpr = base
1465 self.revisionId = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001466
1467 @property
Shawn O. Pearcef6906872009-04-18 10:49:00 -07001468 def LastFetch(self):
1469 try:
1470 fh = os.path.join(self.gitdir, 'FETCH_HEAD')
1471 return os.path.getmtime(fh)
1472 except OSError:
1473 return 0
1474
1475 @property
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001476 def HasChanges(self):
1477 """Has the remote received new commits not yet checked out?
1478 """
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001479 if not self.remote or not self.revisionExpr:
Shawn O. Pearce336f7bd2009-04-18 10:39:28 -07001480 return False
1481
1482 all = self.bare_ref.all
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001483 revid = self.GetRevisionId(all)
Shawn O. Pearce336f7bd2009-04-18 10:39:28 -07001484 head = self.work_git.GetHead()
1485 if head.startswith(R_HEADS):
1486 try:
1487 head = all[head]
1488 except KeyError:
1489 head = None
1490
1491 if revid == head:
1492 return False
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001493 elif self._revlist(not_rev(HEAD), revid):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001494 return True
1495 return False