blob: 45229e544f64e08dcca0fdf9b22e75a5bd394c9c [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)
206 shutil.copy(src, dest)
207 # make the file read-only
208 mode = os.stat(dest)[stat.ST_MODE]
209 mode = mode & ~(stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH)
210 os.chmod(dest, mode)
211 except IOError:
Shawn O. Pearce48244782009-04-16 08:25:57 -0700212 _error('Cannot copy file %s to %s', src, dest)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700213
Shawn O. Pearced1f70d92009-05-19 14:58:02 -0700214class RemoteSpec(object):
215 def __init__(self,
216 name,
217 url = None,
218 review = None):
219 self.name = name
220 self.url = url
221 self.review = review
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700222
223class Project(object):
224 def __init__(self,
225 manifest,
226 name,
227 remote,
228 gitdir,
229 worktree,
230 relpath,
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700231 revisionExpr,
232 revisionId):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700233 self.manifest = manifest
234 self.name = name
235 self.remote = remote
236 self.gitdir = gitdir
237 self.worktree = worktree
238 self.relpath = relpath
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700239 self.revisionExpr = revisionExpr
240
241 if revisionId is None \
242 and revisionExpr \
243 and IsId(revisionExpr):
244 self.revisionId = revisionExpr
245 else:
246 self.revisionId = revisionId
247
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700248 self.snapshots = {}
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700249 self.copyfiles = []
250 self.config = GitConfig.ForRepository(
251 gitdir = self.gitdir,
252 defaults = self.manifest.globalConfig)
253
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800254 if self.worktree:
255 self.work_git = self._GitGetByExec(self, bare=False)
256 else:
257 self.work_git = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700258 self.bare_git = self._GitGetByExec(self, bare=True)
Shawn O. Pearced237b692009-04-17 18:49:50 -0700259 self.bare_ref = GitRefs(gitdir)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700260
261 @property
262 def Exists(self):
263 return os.path.isdir(self.gitdir)
264
265 @property
266 def CurrentBranch(self):
267 """Obtain the name of the currently checked out branch.
268 The branch name omits the 'refs/heads/' prefix.
269 None is returned if the project is on a detached HEAD.
270 """
Shawn O. Pearce5b23f242009-04-17 18:43:33 -0700271 b = self.work_git.GetHead()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700272 if b.startswith(R_HEADS):
273 return b[len(R_HEADS):]
274 return None
275
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700276 def IsRebaseInProgress(self):
277 w = self.worktree
278 g = os.path.join(w, '.git')
279 return os.path.exists(os.path.join(g, 'rebase-apply')) \
280 or os.path.exists(os.path.join(g, 'rebase-merge')) \
281 or os.path.exists(os.path.join(w, '.dotest'))
282
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700283 def IsDirty(self, consider_untracked=True):
284 """Is the working directory modified in some way?
285 """
286 self.work_git.update_index('-q',
287 '--unmerged',
288 '--ignore-missing',
289 '--refresh')
290 if self.work_git.DiffZ('diff-index','-M','--cached',HEAD):
291 return True
292 if self.work_git.DiffZ('diff-files'):
293 return True
294 if consider_untracked and self.work_git.LsOthers():
295 return True
296 return False
297
298 _userident_name = None
299 _userident_email = None
300
301 @property
302 def UserName(self):
303 """Obtain the user's personal name.
304 """
305 if self._userident_name is None:
306 self._LoadUserIdentity()
307 return self._userident_name
308
309 @property
310 def UserEmail(self):
311 """Obtain the user's email address. This is very likely
312 to be their Gerrit login.
313 """
314 if self._userident_email is None:
315 self._LoadUserIdentity()
316 return self._userident_email
317
318 def _LoadUserIdentity(self):
319 u = self.bare_git.var('GIT_COMMITTER_IDENT')
320 m = re.compile("^(.*) <([^>]*)> ").match(u)
321 if m:
322 self._userident_name = m.group(1)
323 self._userident_email = m.group(2)
324 else:
325 self._userident_name = ''
326 self._userident_email = ''
327
328 def GetRemote(self, name):
329 """Get the configuration for a single remote.
330 """
331 return self.config.GetRemote(name)
332
333 def GetBranch(self, name):
334 """Get the configuration for a single branch.
335 """
336 return self.config.GetBranch(name)
337
Shawn O. Pearce27b07322009-04-10 16:02:48 -0700338 def GetBranches(self):
339 """Get all existing local branches.
340 """
341 current = self.CurrentBranch
Shawn O. Pearced237b692009-04-17 18:49:50 -0700342 all = self._allrefs
Shawn O. Pearce27b07322009-04-10 16:02:48 -0700343 heads = {}
344 pubd = {}
345
346 for name, id in all.iteritems():
347 if name.startswith(R_HEADS):
348 name = name[len(R_HEADS):]
349 b = self.GetBranch(name)
350 b.current = name == current
351 b.published = None
352 b.revision = id
353 heads[name] = b
354
355 for name, id in all.iteritems():
356 if name.startswith(R_PUB):
357 name = name[len(R_PUB):]
358 b = heads.get(name)
359 if b:
360 b.published = id
361
362 return heads
363
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700364
365## Status Display ##
366
367 def PrintWorkTreeStatus(self):
368 """Prints the status of the repository to stdout.
369 """
370 if not os.path.isdir(self.worktree):
371 print ''
372 print 'project %s/' % self.relpath
373 print ' missing (run "repo sync")'
374 return
375
376 self.work_git.update_index('-q',
377 '--unmerged',
378 '--ignore-missing',
379 '--refresh')
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700380 rb = self.IsRebaseInProgress()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700381 di = self.work_git.DiffZ('diff-index', '-M', '--cached', HEAD)
382 df = self.work_git.DiffZ('diff-files')
383 do = self.work_git.LsOthers()
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700384 if not rb and not di and not df and not do:
Shawn O. Pearce161f4452009-04-10 17:41:44 -0700385 return 'CLEAN'
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700386
387 out = StatusColoring(self.config)
388 out.project('project %-40s', self.relpath + '/')
389
390 branch = self.CurrentBranch
391 if branch is None:
392 out.nobranch('(*** NO BRANCH ***)')
393 else:
394 out.branch('branch %s', branch)
395 out.nl()
396
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700397 if rb:
398 out.important('prior sync failed; rebase still in progress')
399 out.nl()
400
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700401 paths = list()
402 paths.extend(di.keys())
403 paths.extend(df.keys())
404 paths.extend(do)
405
406 paths = list(set(paths))
407 paths.sort()
408
409 for p in paths:
410 try: i = di[p]
411 except KeyError: i = None
412
413 try: f = df[p]
414 except KeyError: f = None
415
416 if i: i_status = i.status.upper()
417 else: i_status = '-'
418
419 if f: f_status = f.status.lower()
420 else: f_status = '-'
421
422 if i and i.src_path:
Shawn O. Pearcefe086752009-03-03 13:49:48 -0800423 line = ' %s%s\t%s => %s (%s%%)' % (i_status, f_status,
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700424 i.src_path, p, i.level)
425 else:
426 line = ' %s%s\t%s' % (i_status, f_status, p)
427
428 if i and not f:
429 out.added('%s', line)
430 elif (i and f) or (not i and f):
431 out.changed('%s', line)
432 elif not i and not f:
433 out.untracked('%s', line)
434 else:
435 out.write('%s', line)
436 out.nl()
Shawn O. Pearce161f4452009-04-10 17:41:44 -0700437 return 'DIRTY'
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700438
439 def PrintWorkTreeDiff(self):
440 """Prints the status of the repository to stdout.
441 """
442 out = DiffColoring(self.config)
443 cmd = ['diff']
444 if out.is_on:
445 cmd.append('--color')
446 cmd.append(HEAD)
447 cmd.append('--')
448 p = GitCommand(self,
449 cmd,
450 capture_stdout = True,
451 capture_stderr = True)
452 has_diff = False
453 for line in p.process.stdout:
454 if not has_diff:
455 out.nl()
456 out.project('project %s/' % self.relpath)
457 out.nl()
458 has_diff = True
459 print line[:-1]
460 p.Wait()
461
462
463## Publish / Upload ##
464
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700465 def WasPublished(self, branch, all=None):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700466 """Was the branch published (uploaded) for code review?
467 If so, returns the SHA-1 hash of the last published
468 state for the branch.
469 """
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700470 key = R_PUB + branch
471 if all is None:
472 try:
473 return self.bare_git.rev_parse(key)
474 except GitError:
475 return None
476 else:
477 try:
478 return all[key]
479 except KeyError:
480 return None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700481
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700482 def CleanPublishedCache(self, all=None):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700483 """Prunes any stale published refs.
484 """
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700485 if all is None:
486 all = self._allrefs
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700487 heads = set()
488 canrm = {}
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700489 for name, id in all.iteritems():
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700490 if name.startswith(R_HEADS):
491 heads.add(name)
492 elif name.startswith(R_PUB):
493 canrm[name] = id
494
495 for name, id in canrm.iteritems():
496 n = name[len(R_PUB):]
497 if R_HEADS + n not in heads:
498 self.bare_git.DeleteRef(name, id)
499
500 def GetUploadableBranches(self):
501 """List any branches which can be uploaded for review.
502 """
503 heads = {}
504 pubed = {}
505
506 for name, id in self._allrefs.iteritems():
507 if name.startswith(R_HEADS):
508 heads[name[len(R_HEADS):]] = id
509 elif name.startswith(R_PUB):
510 pubed[name[len(R_PUB):]] = id
511
512 ready = []
513 for branch, id in heads.iteritems():
514 if branch in pubed and pubed[branch] == id:
515 continue
516
Shawn O. Pearce35f25962008-11-11 17:03:13 -0800517 rb = self.GetUploadableBranch(branch)
518 if rb:
519 ready.append(rb)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700520 return ready
521
Shawn O. Pearce35f25962008-11-11 17:03:13 -0800522 def GetUploadableBranch(self, branch_name):
523 """Get a single uploadable branch, or None.
524 """
525 branch = self.GetBranch(branch_name)
526 base = branch.LocalMerge
527 if branch.LocalMerge:
528 rb = ReviewableBranch(self, branch, base)
529 if rb.commits:
530 return rb
531 return None
532
Joe Onorato2896a792008-11-17 16:56:36 -0500533 def UploadForReview(self, branch=None, replace_changes=None, people=([],[])):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700534 """Uploads the named branch for code review.
535 """
536 if branch is None:
537 branch = self.CurrentBranch
538 if branch is None:
539 raise GitError('not currently on a branch')
540
541 branch = self.GetBranch(branch)
542 if not branch.LocalMerge:
543 raise GitError('branch %s does not track a remote' % branch.name)
544 if not branch.remote.review:
545 raise GitError('remote %s has no review url' % branch.remote.name)
546
547 dest_branch = branch.merge
548 if not dest_branch.startswith(R_HEADS):
549 dest_branch = R_HEADS + dest_branch
550
Shawn O. Pearce339ba9f2008-11-06 09:52:51 -0800551 if not branch.remote.projectname:
552 branch.remote.projectname = self.name
553 branch.remote.Save()
554
Shawn O. Pearce370e3fa2009-01-26 10:55:39 -0800555 if branch.remote.ReviewProtocol == 'ssh':
Shawn O. Pearceb54a3922009-01-05 16:18:58 -0800556 if dest_branch.startswith(R_HEADS):
557 dest_branch = dest_branch[len(R_HEADS):]
558
559 rp = ['gerrit receive-pack']
560 for e in people[0]:
561 rp.append('--reviewer=%s' % sq(e))
562 for e in people[1]:
563 rp.append('--cc=%s' % sq(e))
564
565 cmd = ['push']
566 cmd.append('--receive-pack=%s' % " ".join(rp))
567 cmd.append(branch.remote.SshReviewUrl(self.UserEmail))
568 cmd.append('%s:refs/for/%s' % (R_HEADS + branch.name, dest_branch))
569 if replace_changes:
570 for change_id,commit_id in replace_changes.iteritems():
571 cmd.append('%s:refs/changes/%s/new' % (commit_id, change_id))
572 if GitCommand(self, cmd, bare = True).Wait() != 0:
573 raise UploadError('Upload failed')
574
575 else:
576 raise UploadError('Unsupported protocol %s' \
577 % branch.remote.review)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700578
579 msg = "posted to %s for %s" % (branch.remote.review, dest_branch)
580 self.bare_git.UpdateRef(R_PUB + branch.name,
581 R_HEADS + branch.name,
582 message = msg)
583
584
585## Sync ##
586
587 def Sync_NetworkHalf(self):
588 """Perform only the network IO portion of the sync process.
589 Local working directory/branch state is not affected.
590 """
591 if not self.Exists:
592 print >>sys.stderr
593 print >>sys.stderr, 'Initializing project %s ...' % self.name
594 self._InitGitDir()
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800595
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700596 self._InitRemote()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700597 if not self._RemoteFetch():
598 return False
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800599
600 if self.worktree:
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800601 self._InitMRef()
602 else:
603 self._InitMirrorHead()
604 try:
605 os.remove(os.path.join(self.gitdir, 'FETCH_HEAD'))
606 except OSError:
607 pass
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700608 return True
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -0800609
610 def PostRepoUpgrade(self):
611 self._InitHooks()
612
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700613 def _CopyFiles(self):
614 for file in self.copyfiles:
615 file._Copy()
616
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700617 def GetRevisionId(self, all=None):
618 if self.revisionId:
619 return self.revisionId
620
621 rem = self.GetRemote(self.remote.name)
622 rev = rem.ToLocal(self.revisionExpr)
623
624 if all is not None and rev in all:
625 return all[rev]
626
627 try:
628 return self.bare_git.rev_parse('--verify', '%s^0' % rev)
629 except GitError:
630 raise ManifestInvalidRevisionError(
631 'revision %s in %s not found' % (self.revisionExpr,
632 self.name))
633
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700634 def Sync_LocalHalf(self, syncbuf):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700635 """Perform only the local IO portion of the sync process.
636 Network access is not required.
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700637 """
638 self._InitWorkTree()
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700639 all = self.bare_ref.all
640 self.CleanPublishedCache(all)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700641
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700642 revid = self.GetRevisionId(all)
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700643 head = self.work_git.GetHead()
644 if head.startswith(R_HEADS):
645 branch = head[len(R_HEADS):]
646 try:
647 head = all[head]
648 except KeyError:
649 head = None
650 else:
651 branch = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700652
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700653 if branch is None or syncbuf.detach_head:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700654 # Currently on a detached HEAD. The user is assumed to
655 # not have any local modifications worth worrying about.
656 #
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700657 if self.IsRebaseInProgress():
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700658 syncbuf.fail(self, _PriorSyncFailedError())
659 return
660
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700661 if head == revid:
662 # No changes; don't do anything further.
663 #
664 return
665
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700666 lost = self._revlist(not_rev(revid), HEAD)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700667 if lost:
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700668 syncbuf.info(self, "discarding %d commits", len(lost))
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700669 try:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700670 self._Checkout(revid, quiet=True)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700671 except GitError, e:
672 syncbuf.fail(self, e)
673 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700674 self._CopyFiles()
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700675 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700676
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700677 if head == revid:
678 # No changes; don't do anything further.
679 #
680 return
681
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700682 branch = self.GetBranch(branch)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700683
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700684 if not branch.LocalMerge:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700685 # The current branch has no tracking configuration.
686 # Jump off it to a deatched HEAD.
687 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700688 syncbuf.info(self,
689 "leaving %s; does not track upstream",
690 branch.name)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700691 try:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700692 self._Checkout(revid, quiet=True)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700693 except GitError, e:
694 syncbuf.fail(self, e)
695 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700696 self._CopyFiles()
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700697 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700698
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700699 upstream_gain = self._revlist(not_rev(HEAD), revid)
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700700 pub = self.WasPublished(branch.name, all)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700701 if pub:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700702 not_merged = self._revlist(not_rev(revid), pub)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700703 if not_merged:
704 if upstream_gain:
705 # The user has published this branch and some of those
706 # commits are not yet merged upstream. We do not want
707 # to rewrite the published commits so we punt.
708 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700709 syncbuf.info(self,
710 "branch %s is published but is now %d commits behind",
711 branch.name,
712 len(upstream_gain))
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700713 return
Shawn O. Pearce05f66b62009-04-21 08:26:32 -0700714 elif pub == head:
715 # All published commits are merged, and thus we are a
716 # strict subset. We can fast-forward safely.
Shawn O. Pearcea54c5272008-10-30 11:03:00 -0700717 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700718 def _doff():
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700719 self._FastForward(revid)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700720 self._CopyFiles()
721 syncbuf.later1(self, _doff)
722 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700723
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700724 # Examine the local commits not in the remote. Find the
725 # last one attributed to this user, if any.
726 #
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700727 local_changes = self._revlist(not_rev(revid), HEAD, format='%H %ce')
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700728 last_mine = None
729 cnt_mine = 0
730 for commit in local_changes:
731 commit_id, committer_email = commit.split(' ', 2)
732 if committer_email == self.UserEmail:
733 last_mine = commit_id
734 cnt_mine += 1
735
736 if not local_changes and not upstream_gain:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700737 # Trivially no changes caused by the upstream.
738 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700739 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700740
741 if self.IsDirty(consider_untracked=False):
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700742 syncbuf.fail(self, _DirtyError())
743 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700744
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700745 # If the upstream switched on us, warn the user.
746 #
747 if branch.merge != self.revisionExpr:
748 if branch.merge and self.revisionExpr:
749 syncbuf.info(self,
750 'manifest switched %s...%s',
751 branch.merge,
752 self.revisionExpr)
753 elif branch.merge:
754 syncbuf.info(self,
755 'manifest no longer tracks %s',
756 branch.merge)
757
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700758 if cnt_mine < len(local_changes):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700759 # Upstream rebased. Not everything in HEAD
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700760 # was created by this user.
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700761 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700762 syncbuf.info(self,
763 "discarding %d commits removed from upstream",
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700764 len(local_changes) - cnt_mine)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700765
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700766 branch.remote = self.GetRemote(self.remote.name)
767 branch.merge = self.revisionExpr
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700768 branch.Save()
769
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700770 if cnt_mine > 0:
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700771 def _dorebase():
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700772 self._Rebase(upstream = '%s^1' % last_mine, onto = revid)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700773 self._CopyFiles()
774 syncbuf.later2(self, _dorebase)
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700775 elif local_changes:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700776 try:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700777 self._ResetHard(revid)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700778 self._CopyFiles()
779 except GitError, e:
780 syncbuf.fail(self, e)
781 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700782 else:
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700783 def _doff():
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700784 self._FastForward(revid)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700785 self._CopyFiles()
786 syncbuf.later1(self, _doff)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700787
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800788 def AddCopyFile(self, src, dest, absdest):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700789 # dest should already be an absolute path, but src is project relative
790 # make src an absolute path
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800791 abssrc = os.path.join(self.worktree, src)
792 self.copyfiles.append(_CopyFile(src, dest, abssrc, absdest))
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700793
Shawn O. Pearce632768b2008-10-23 11:58:52 -0700794 def DownloadPatchSet(self, change_id, patch_id):
795 """Download a single patch set of a single change to FETCH_HEAD.
796 """
797 remote = self.GetRemote(self.remote.name)
798
799 cmd = ['fetch', remote.name]
800 cmd.append('refs/changes/%2.2d/%d/%d' \
801 % (change_id % 100, change_id, patch_id))
802 cmd.extend(map(lambda x: str(x), remote.fetch))
803 if GitCommand(self, cmd, bare=True).Wait() != 0:
804 return None
805 return DownloadedChange(self,
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700806 self.GetRevisionId(),
Shawn O. Pearce632768b2008-10-23 11:58:52 -0700807 change_id,
808 patch_id,
809 self.bare_git.rev_parse('FETCH_HEAD'))
810
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700811
812## Branch Management ##
813
814 def StartBranch(self, name):
815 """Create a new branch off the manifest's revision.
816 """
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700817 head = self.work_git.GetHead()
818 if head == (R_HEADS + name):
819 return True
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700820
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700821 all = self.bare_ref.all
822 if (R_HEADS + name) in all:
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700823 return GitCommand(self,
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700824 ['checkout', name, '--'],
Shawn O. Pearce0f0dfa32009-04-18 14:53:39 -0700825 capture_stdout = True,
826 capture_stderr = True).Wait() == 0
Shawn O. Pearce0a389e92009-04-10 16:21:18 -0700827
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700828 branch = self.GetBranch(name)
829 branch.remote = self.GetRemote(self.remote.name)
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700830 branch.merge = self.revisionExpr
831 revid = self.GetRevisionId(all)
Shawn O. Pearce0a389e92009-04-10 16:21:18 -0700832
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700833 if head.startswith(R_HEADS):
834 try:
835 head = all[head]
836 except KeyError:
837 head = None
838
839 if revid and head and revid == head:
840 ref = os.path.join(self.gitdir, R_HEADS + name)
841 try:
842 os.makedirs(os.path.dirname(ref))
843 except OSError:
844 pass
845 _lwrite(ref, '%s\n' % revid)
846 _lwrite(os.path.join(self.worktree, '.git', HEAD),
847 'ref: %s%s\n' % (R_HEADS, name))
848 branch.Save()
849 return True
850
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700851 if GitCommand(self,
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700852 ['checkout', '-b', branch.name, revid],
Shawn O. Pearce0f0dfa32009-04-18 14:53:39 -0700853 capture_stdout = True,
854 capture_stderr = True).Wait() == 0:
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700855 branch.Save()
856 return True
857 return False
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700858
Wink Saville02d79452009-04-10 13:01:24 -0700859 def CheckoutBranch(self, name):
860 """Checkout a local topic branch.
861 """
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700862 rev = R_HEADS + name
863 head = self.work_git.GetHead()
864 if head == rev:
865 # Already on the branch
866 #
867 return True
Wink Saville02d79452009-04-10 13:01:24 -0700868
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700869 all = self.bare_ref.all
Wink Saville02d79452009-04-10 13:01:24 -0700870 try:
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700871 revid = all[rev]
872 except KeyError:
873 # Branch does not exist in this project
874 #
875 return False
876
877 if head.startswith(R_HEADS):
878 try:
879 head = all[head]
880 except KeyError:
881 head = None
882
883 if head == revid:
884 # Same revision; just update HEAD to point to the new
885 # target branch, but otherwise take no other action.
886 #
887 _lwrite(os.path.join(self.worktree, '.git', HEAD),
888 'ref: %s%s\n' % (R_HEADS, name))
889 return True
Wink Saville02d79452009-04-10 13:01:24 -0700890
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700891 return GitCommand(self,
892 ['checkout', name, '--'],
893 capture_stdout = True,
894 capture_stderr = True).Wait() == 0
Wink Saville02d79452009-04-10 13:01:24 -0700895
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800896 def AbandonBranch(self, name):
897 """Destroy a local topic branch.
898 """
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700899 rev = R_HEADS + name
900 all = self.bare_ref.all
901 if rev not in all:
902 # Doesn't exist; assume already abandoned.
903 #
904 return True
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800905
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700906 head = self.work_git.GetHead()
907 if head == rev:
908 # We can't destroy the branch while we are sitting
909 # on it. Switch to a detached HEAD.
910 #
911 head = all[head]
912
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700913 revid = self.GetRevisionId(all)
914 if head == revid:
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700915 _lwrite(os.path.join(self.worktree, '.git', HEAD),
916 '%s\n' % revid)
917 else:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700918 self._Checkout(revid, quiet=True)
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800919
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700920 return GitCommand(self,
921 ['branch', '-D', name],
922 capture_stdout = True,
923 capture_stderr = True).Wait() == 0
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800924
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700925 def PruneHeads(self):
926 """Prune any topic branches already merged into upstream.
927 """
928 cb = self.CurrentBranch
929 kill = []
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -0800930 left = self._allrefs
931 for name in left.keys():
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700932 if name.startswith(R_HEADS):
933 name = name[len(R_HEADS):]
934 if cb is None or name != cb:
935 kill.append(name)
936
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700937 rev = self.GetRevisionId(left)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700938 if cb is not None \
939 and not self._revlist(HEAD + '...' + rev) \
940 and not self.IsDirty(consider_untracked = False):
941 self.work_git.DetachHead(HEAD)
942 kill.append(cb)
943
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700944 if kill:
Shawn O. Pearce5b23f242009-04-17 18:43:33 -0700945 old = self.bare_git.GetHead()
946 if old is None:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700947 old = 'refs/heads/please_never_use_this_as_a_branch_name'
948
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700949 try:
950 self.bare_git.DetachHead(rev)
951
952 b = ['branch', '-d']
953 b.extend(kill)
954 b = GitCommand(self, b, bare=True,
955 capture_stdout=True,
956 capture_stderr=True)
957 b.Wait()
958 finally:
959 self.bare_git.SetHead(old)
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -0800960 left = self._allrefs
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700961
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -0800962 for branch in kill:
963 if (R_HEADS + branch) not in left:
964 self.CleanPublishedCache()
965 break
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700966
967 if cb and cb not in kill:
968 kill.append(cb)
Shawn O. Pearce7c6c64d2009-03-02 12:38:13 -0800969 kill.sort()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700970
971 kept = []
972 for branch in kill:
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -0800973 if (R_HEADS + branch) in left:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700974 branch = self.GetBranch(branch)
975 base = branch.LocalMerge
976 if not base:
977 base = rev
978 kept.append(ReviewableBranch(self, branch, base))
979 return kept
980
981
982## Direct Git Commands ##
983
984 def _RemoteFetch(self, name=None):
985 if not name:
986 name = self.remote.name
Shawn O. Pearcefb231612009-04-10 18:53:46 -0700987
988 ssh_proxy = False
989 if self.GetRemote(name).PreConnectFetch():
990 ssh_proxy = True
991
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800992 cmd = ['fetch']
993 if not self.worktree:
994 cmd.append('--update-head-ok')
995 cmd.append(name)
Shawn O. Pearcefb231612009-04-10 18:53:46 -0700996 return GitCommand(self,
997 cmd,
998 bare = True,
999 ssh_proxy = ssh_proxy).Wait() == 0
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001000
1001 def _Checkout(self, rev, quiet=False):
1002 cmd = ['checkout']
1003 if quiet:
1004 cmd.append('-q')
1005 cmd.append(rev)
1006 cmd.append('--')
1007 if GitCommand(self, cmd).Wait() != 0:
1008 if self._allrefs:
1009 raise GitError('%s checkout %s ' % (self.name, rev))
1010
1011 def _ResetHard(self, rev, quiet=True):
1012 cmd = ['reset', '--hard']
1013 if quiet:
1014 cmd.append('-q')
1015 cmd.append(rev)
1016 if GitCommand(self, cmd).Wait() != 0:
1017 raise GitError('%s reset --hard %s ' % (self.name, rev))
1018
1019 def _Rebase(self, upstream, onto = None):
Shawn O. Pearce19a83d82009-04-16 08:14:26 -07001020 cmd = ['rebase']
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001021 if onto is not None:
1022 cmd.extend(['--onto', onto])
1023 cmd.append(upstream)
Shawn O. Pearce19a83d82009-04-16 08:14:26 -07001024 if GitCommand(self, cmd).Wait() != 0:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001025 raise GitError('%s rebase %s ' % (self.name, upstream))
1026
1027 def _FastForward(self, head):
1028 cmd = ['merge', head]
1029 if GitCommand(self, cmd).Wait() != 0:
1030 raise GitError('%s merge %s ' % (self.name, head))
1031
1032 def _InitGitDir(self):
1033 if not os.path.exists(self.gitdir):
1034 os.makedirs(self.gitdir)
1035 self.bare_git.init()
Shawn O. Pearce2816d4f2009-03-03 17:53:18 -08001036
1037 if self.manifest.IsMirror:
1038 self.config.SetString('core.bare', 'true')
1039 else:
1040 self.config.SetString('core.bare', None)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001041
1042 hooks = self._gitdir_path('hooks')
Shawn O. Pearcede646812008-10-29 14:38:12 -07001043 try:
1044 to_rm = os.listdir(hooks)
1045 except OSError:
1046 to_rm = []
1047 for old_hook in to_rm:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001048 os.remove(os.path.join(hooks, old_hook))
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001049 self._InitHooks()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001050
1051 m = self.manifest.manifestProject.config
1052 for key in ['user.name', 'user.email']:
1053 if m.Has(key, include_defaults = False):
1054 self.config.SetString(key, m.GetString(key))
1055
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001056 def _InitHooks(self):
1057 hooks = self._gitdir_path('hooks')
1058 if not os.path.exists(hooks):
1059 os.makedirs(hooks)
1060 for stock_hook in repo_hooks():
1061 dst = os.path.join(hooks, os.path.basename(stock_hook))
1062 try:
1063 os.symlink(relpath(stock_hook, dst), dst)
1064 except OSError, e:
1065 if e.errno == errno.EEXIST:
1066 pass
1067 elif e.errno == errno.EPERM:
1068 raise GitError('filesystem must support symlinks')
1069 else:
1070 raise
1071
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001072 def _InitRemote(self):
Shawn O. Pearced1f70d92009-05-19 14:58:02 -07001073 if self.remote.url:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001074 remote = self.GetRemote(self.remote.name)
Shawn O. Pearced1f70d92009-05-19 14:58:02 -07001075 remote.url = self.remote.url
1076 remote.review = self.remote.review
1077 remote.projectname = self.name
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001078
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001079 if self.worktree:
1080 remote.ResetFetch(mirror=False)
1081 else:
1082 remote.ResetFetch(mirror=True)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001083 remote.Save()
1084
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001085 def _InitMRef(self):
1086 if self.manifest.branch:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001087 self._InitAnyMRef(R_M + self.manifest.branch)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001088
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001089 def _InitMirrorHead(self):
Shawn O. Pearcefe200ee2009-06-01 15:28:21 -07001090 self._InitAnyMRef(HEAD)
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001091
1092 def _InitAnyMRef(self, ref):
1093 cur = self.bare_ref.symref(ref)
1094
1095 if self.revisionId:
1096 if cur != '' or self.bare_ref.get(ref) != self.revisionId:
1097 msg = 'manifest set to %s' % self.revisionId
1098 dst = self.revisionId + '^0'
1099 self.bare_git.UpdateRef(ref, dst, message = msg, detach = True)
1100 else:
1101 remote = self.GetRemote(self.remote.name)
1102 dst = remote.ToLocal(self.revisionExpr)
1103 if cur != dst:
1104 msg = 'manifest set to %s' % self.revisionExpr
1105 self.bare_git.symbolic_ref('-m', msg, ref, dst)
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001106
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001107 def _InitWorkTree(self):
1108 dotgit = os.path.join(self.worktree, '.git')
1109 if not os.path.exists(dotgit):
1110 os.makedirs(dotgit)
1111
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001112 for name in ['config',
1113 'description',
1114 'hooks',
1115 'info',
1116 'logs',
1117 'objects',
1118 'packed-refs',
1119 'refs',
1120 'rr-cache',
1121 'svn']:
Shawn O. Pearce438ee1c2008-11-03 09:59:36 -08001122 try:
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001123 src = os.path.join(self.gitdir, name)
1124 dst = os.path.join(dotgit, name)
1125 os.symlink(relpath(src, dst), dst)
Shawn O. Pearce438ee1c2008-11-03 09:59:36 -08001126 except OSError, e:
1127 if e.errno == errno.EPERM:
1128 raise GitError('filesystem must support symlinks')
1129 else:
1130 raise
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001131
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001132 _lwrite(os.path.join(dotgit, HEAD), '%s\n' % self.GetRevisionId())
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001133
1134 cmd = ['read-tree', '--reset', '-u']
1135 cmd.append('-v')
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001136 cmd.append(HEAD)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001137 if GitCommand(self, cmd).Wait() != 0:
1138 raise GitError("cannot initialize work tree")
Shawn O. Pearce93609662009-04-21 10:50:33 -07001139 self._CopyFiles()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001140
1141 def _gitdir_path(self, path):
1142 return os.path.join(self.gitdir, path)
1143
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001144 def _revlist(self, *args, **kw):
1145 a = []
1146 a.extend(args)
1147 a.append('--')
1148 return self.work_git.rev_list(*a, **kw)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001149
1150 @property
1151 def _allrefs(self):
Shawn O. Pearced237b692009-04-17 18:49:50 -07001152 return self.bare_ref.all
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001153
1154 class _GitGetByExec(object):
1155 def __init__(self, project, bare):
1156 self._project = project
1157 self._bare = bare
1158
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001159 def LsOthers(self):
1160 p = GitCommand(self._project,
1161 ['ls-files',
1162 '-z',
1163 '--others',
1164 '--exclude-standard'],
1165 bare = False,
1166 capture_stdout = True,
1167 capture_stderr = True)
1168 if p.Wait() == 0:
1169 out = p.stdout
1170 if out:
1171 return out[:-1].split("\0")
1172 return []
1173
1174 def DiffZ(self, name, *args):
1175 cmd = [name]
1176 cmd.append('-z')
1177 cmd.extend(args)
1178 p = GitCommand(self._project,
1179 cmd,
1180 bare = False,
1181 capture_stdout = True,
1182 capture_stderr = True)
1183 try:
1184 out = p.process.stdout.read()
1185 r = {}
1186 if out:
1187 out = iter(out[:-1].split('\0'))
1188 while out:
Shawn O. Pearce02dbb6d2008-10-21 13:59:08 -07001189 try:
1190 info = out.next()
1191 path = out.next()
1192 except StopIteration:
1193 break
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001194
1195 class _Info(object):
1196 def __init__(self, path, omode, nmode, oid, nid, state):
1197 self.path = path
1198 self.src_path = None
1199 self.old_mode = omode
1200 self.new_mode = nmode
1201 self.old_id = oid
1202 self.new_id = nid
1203
1204 if len(state) == 1:
1205 self.status = state
1206 self.level = None
1207 else:
1208 self.status = state[:1]
1209 self.level = state[1:]
1210 while self.level.startswith('0'):
1211 self.level = self.level[1:]
1212
1213 info = info[1:].split(' ')
1214 info =_Info(path, *info)
1215 if info.status in ('R', 'C'):
1216 info.src_path = info.path
1217 info.path = out.next()
1218 r[info.path] = info
1219 return r
1220 finally:
1221 p.Wait()
1222
1223 def GetHead(self):
Shawn O. Pearce5b23f242009-04-17 18:43:33 -07001224 if self._bare:
1225 path = os.path.join(self._project.gitdir, HEAD)
1226 else:
1227 path = os.path.join(self._project.worktree, '.git', HEAD)
Shawn O. Pearce76ca9f82009-04-18 14:48:03 -07001228 fd = open(path, 'rb')
1229 try:
1230 line = fd.read()
1231 finally:
1232 fd.close()
Shawn O. Pearce5b23f242009-04-17 18:43:33 -07001233 if line.startswith('ref: '):
1234 return line[5:-1]
1235 return line[:-1]
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001236
1237 def SetHead(self, ref, message=None):
1238 cmdv = []
1239 if message is not None:
1240 cmdv.extend(['-m', message])
1241 cmdv.append(HEAD)
1242 cmdv.append(ref)
1243 self.symbolic_ref(*cmdv)
1244
1245 def DetachHead(self, new, message=None):
1246 cmdv = ['--no-deref']
1247 if message is not None:
1248 cmdv.extend(['-m', message])
1249 cmdv.append(HEAD)
1250 cmdv.append(new)
1251 self.update_ref(*cmdv)
1252
1253 def UpdateRef(self, name, new, old=None,
1254 message=None,
1255 detach=False):
1256 cmdv = []
1257 if message is not None:
1258 cmdv.extend(['-m', message])
1259 if detach:
1260 cmdv.append('--no-deref')
1261 cmdv.append(name)
1262 cmdv.append(new)
1263 if old is not None:
1264 cmdv.append(old)
1265 self.update_ref(*cmdv)
1266
1267 def DeleteRef(self, name, old=None):
1268 if not old:
1269 old = self.rev_parse(name)
1270 self.update_ref('-d', name, old)
Shawn O. Pearcefbcde472009-04-17 20:58:02 -07001271 self._project.bare_ref.deleted(name)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001272
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001273 def rev_list(self, *args, **kw):
1274 if 'format' in kw:
1275 cmdv = ['log', '--pretty=format:%s' % kw['format']]
1276 else:
1277 cmdv = ['rev-list']
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001278 cmdv.extend(args)
1279 p = GitCommand(self._project,
1280 cmdv,
1281 bare = self._bare,
1282 capture_stdout = True,
1283 capture_stderr = True)
1284 r = []
1285 for line in p.process.stdout:
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001286 if line[-1] == '\n':
1287 line = line[:-1]
1288 r.append(line)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001289 if p.Wait() != 0:
1290 raise GitError('%s rev-list %s: %s' % (
1291 self._project.name,
1292 str(args),
1293 p.stderr))
1294 return r
1295
1296 def __getattr__(self, name):
1297 name = name.replace('_', '-')
1298 def runner(*args):
1299 cmdv = [name]
1300 cmdv.extend(args)
1301 p = GitCommand(self._project,
1302 cmdv,
1303 bare = self._bare,
1304 capture_stdout = True,
1305 capture_stderr = True)
1306 if p.Wait() != 0:
1307 raise GitError('%s %s: %s' % (
1308 self._project.name,
1309 name,
1310 p.stderr))
1311 r = p.stdout
1312 if r.endswith('\n') and r.index('\n') == len(r) - 1:
1313 return r[:-1]
1314 return r
1315 return runner
1316
1317
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001318class _PriorSyncFailedError(Exception):
1319 def __str__(self):
1320 return 'prior sync failed; rebase still in progress'
1321
1322class _DirtyError(Exception):
1323 def __str__(self):
1324 return 'contains uncommitted changes'
1325
1326class _InfoMessage(object):
1327 def __init__(self, project, text):
1328 self.project = project
1329 self.text = text
1330
1331 def Print(self, syncbuf):
1332 syncbuf.out.info('%s/: %s', self.project.relpath, self.text)
1333 syncbuf.out.nl()
1334
1335class _Failure(object):
1336 def __init__(self, project, why):
1337 self.project = project
1338 self.why = why
1339
1340 def Print(self, syncbuf):
1341 syncbuf.out.fail('error: %s/: %s',
1342 self.project.relpath,
1343 str(self.why))
1344 syncbuf.out.nl()
1345
1346class _Later(object):
1347 def __init__(self, project, action):
1348 self.project = project
1349 self.action = action
1350
1351 def Run(self, syncbuf):
1352 out = syncbuf.out
1353 out.project('project %s/', self.project.relpath)
1354 out.nl()
1355 try:
1356 self.action()
1357 out.nl()
1358 return True
1359 except GitError, e:
1360 out.nl()
1361 return False
1362
1363class _SyncColoring(Coloring):
1364 def __init__(self, config):
1365 Coloring.__init__(self, config, 'reposync')
1366 self.project = self.printer('header', attr = 'bold')
1367 self.info = self.printer('info')
1368 self.fail = self.printer('fail', fg='red')
1369
1370class SyncBuffer(object):
1371 def __init__(self, config, detach_head=False):
1372 self._messages = []
1373 self._failures = []
1374 self._later_queue1 = []
1375 self._later_queue2 = []
1376
1377 self.out = _SyncColoring(config)
1378 self.out.redirect(sys.stderr)
1379
1380 self.detach_head = detach_head
1381 self.clean = True
1382
1383 def info(self, project, fmt, *args):
1384 self._messages.append(_InfoMessage(project, fmt % args))
1385
1386 def fail(self, project, err=None):
1387 self._failures.append(_Failure(project, err))
1388 self.clean = False
1389
1390 def later1(self, project, what):
1391 self._later_queue1.append(_Later(project, what))
1392
1393 def later2(self, project, what):
1394 self._later_queue2.append(_Later(project, what))
1395
1396 def Finish(self):
1397 self._PrintMessages()
1398 self._RunLater()
1399 self._PrintMessages()
1400 return self.clean
1401
1402 def _RunLater(self):
1403 for q in ['_later_queue1', '_later_queue2']:
1404 if not self._RunQueue(q):
1405 return
1406
1407 def _RunQueue(self, queue):
1408 for m in getattr(self, queue):
1409 if not m.Run(self):
1410 self.clean = False
1411 return False
1412 setattr(self, queue, [])
1413 return True
1414
1415 def _PrintMessages(self):
1416 for m in self._messages:
1417 m.Print(self)
1418 for m in self._failures:
1419 m.Print(self)
1420
1421 self._messages = []
1422 self._failures = []
1423
1424
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001425class MetaProject(Project):
1426 """A special project housed under .repo.
1427 """
1428 def __init__(self, manifest, name, gitdir, worktree):
1429 repodir = manifest.repodir
1430 Project.__init__(self,
1431 manifest = manifest,
1432 name = name,
1433 gitdir = gitdir,
1434 worktree = worktree,
Shawn O. Pearced1f70d92009-05-19 14:58:02 -07001435 remote = RemoteSpec('origin'),
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001436 relpath = '.repo/%s' % name,
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001437 revisionExpr = 'refs/heads/master',
1438 revisionId = None)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001439
1440 def PreSync(self):
1441 if self.Exists:
1442 cb = self.CurrentBranch
1443 if cb:
1444 base = self.GetBranch(cb).merge
1445 if base:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001446 self.revisionExpr = base
1447 self.revisionId = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001448
1449 @property
Shawn O. Pearcef6906872009-04-18 10:49:00 -07001450 def LastFetch(self):
1451 try:
1452 fh = os.path.join(self.gitdir, 'FETCH_HEAD')
1453 return os.path.getmtime(fh)
1454 except OSError:
1455 return 0
1456
1457 @property
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001458 def HasChanges(self):
1459 """Has the remote received new commits not yet checked out?
1460 """
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001461 if not self.remote or not self.revisionExpr:
Shawn O. Pearce336f7bd2009-04-18 10:39:28 -07001462 return False
1463
1464 all = self.bare_ref.all
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001465 revid = self.GetRevisionId(all)
Shawn O. Pearce336f7bd2009-04-18 10:39:28 -07001466 head = self.work_git.GetHead()
1467 if head.startswith(R_HEADS):
1468 try:
1469 head = all[head]
1470 except KeyError:
1471 head = None
1472
1473 if revid == head:
1474 return False
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001475 elif self._revlist(not_rev(HEAD), revid):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001476 return True
1477 return False