blob: 1d908e7f0af463b4fa41a5d1a9dce308ef225adf [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 -070029from remote import Remote
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070030
Shawn O. Pearced237b692009-04-17 18:49:50 -070031from git_refs import GitRefs, HEAD, R_HEADS, R_TAGS, R_PUB, R_M
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070032
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -070033def _lwrite(path, content):
34 lock = '%s.lock' % path
35
36 fd = open(lock, 'wb')
37 try:
38 fd.write(content)
39 finally:
40 fd.close()
41
42 try:
43 os.rename(lock, path)
44 except OSError:
45 os.remove(lock)
46 raise
47
Shawn O. Pearce48244782009-04-16 08:25:57 -070048def _error(fmt, *args):
49 msg = fmt % args
50 print >>sys.stderr, 'error: %s' % msg
51
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070052def not_rev(r):
53 return '^' + r
54
Shawn O. Pearceb54a3922009-01-05 16:18:58 -080055def sq(r):
56 return "'" + r.replace("'", "'\''") + "'"
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -080057
58hook_list = None
59def repo_hooks():
60 global hook_list
61 if hook_list is None:
62 d = os.path.abspath(os.path.dirname(__file__))
63 d = os.path.join(d , 'hooks')
64 hook_list = map(lambda x: os.path.join(d, x), os.listdir(d))
65 return hook_list
66
67def relpath(dst, src):
68 src = os.path.dirname(src)
69 top = os.path.commonprefix([dst, src])
70 if top.endswith('/'):
71 top = top[:-1]
72 else:
73 top = os.path.dirname(top)
74
75 tmp = src
76 rel = ''
77 while top != tmp:
78 rel += '../'
79 tmp = os.path.dirname(tmp)
80 return rel + dst[len(top) + 1:]
81
82
Shawn O. Pearce632768b2008-10-23 11:58:52 -070083class DownloadedChange(object):
84 _commit_cache = None
85
86 def __init__(self, project, base, change_id, ps_id, commit):
87 self.project = project
88 self.base = base
89 self.change_id = change_id
90 self.ps_id = ps_id
91 self.commit = commit
92
93 @property
94 def commits(self):
95 if self._commit_cache is None:
96 self._commit_cache = self.project.bare_git.rev_list(
97 '--abbrev=8',
98 '--abbrev-commit',
99 '--pretty=oneline',
100 '--reverse',
101 '--date-order',
102 not_rev(self.base),
103 self.commit,
104 '--')
105 return self._commit_cache
106
107
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700108class ReviewableBranch(object):
109 _commit_cache = None
110
111 def __init__(self, project, branch, base):
112 self.project = project
113 self.branch = branch
114 self.base = base
Shawn O. Pearcec99883f2008-11-11 17:12:43 -0800115 self.replace_changes = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700116
117 @property
118 def name(self):
119 return self.branch.name
120
121 @property
122 def commits(self):
123 if self._commit_cache is None:
124 self._commit_cache = self.project.bare_git.rev_list(
125 '--abbrev=8',
126 '--abbrev-commit',
127 '--pretty=oneline',
128 '--reverse',
129 '--date-order',
130 not_rev(self.base),
131 R_HEADS + self.name,
132 '--')
133 return self._commit_cache
134
135 @property
Shawn O. Pearcec99883f2008-11-11 17:12:43 -0800136 def unabbrev_commits(self):
137 r = dict()
138 for commit in self.project.bare_git.rev_list(
139 not_rev(self.base),
140 R_HEADS + self.name,
141 '--'):
142 r[commit[0:8]] = commit
143 return r
144
145 @property
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700146 def date(self):
147 return self.project.bare_git.log(
148 '--pretty=format:%cd',
149 '-n', '1',
150 R_HEADS + self.name,
151 '--')
152
Joe Onorato2896a792008-11-17 16:56:36 -0500153 def UploadForReview(self, people):
Shawn O. Pearcec99883f2008-11-11 17:12:43 -0800154 self.project.UploadForReview(self.name,
Joe Onorato2896a792008-11-17 16:56:36 -0500155 self.replace_changes,
156 people)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700157
Ficus Kirkpatrickbc7ef672009-05-04 12:45:11 -0700158 def GetPublishedRefs(self):
159 refs = {}
160 output = self.project.bare_git.ls_remote(
161 self.branch.remote.SshReviewUrl(self.project.UserEmail),
162 'refs/changes/*')
163 for line in output.split('\n'):
164 try:
165 (sha, ref) = line.split()
166 refs[sha] = ref
167 except ValueError:
168 pass
169
170 return refs
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700171
172class StatusColoring(Coloring):
173 def __init__(self, config):
174 Coloring.__init__(self, config, 'status')
175 self.project = self.printer('header', attr = 'bold')
176 self.branch = self.printer('header', attr = 'bold')
177 self.nobranch = self.printer('nobranch', fg = 'red')
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700178 self.important = self.printer('important', fg = 'red')
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700179
180 self.added = self.printer('added', fg = 'green')
181 self.changed = self.printer('changed', fg = 'red')
182 self.untracked = self.printer('untracked', fg = 'red')
183
184
185class DiffColoring(Coloring):
186 def __init__(self, config):
187 Coloring.__init__(self, config, 'diff')
188 self.project = self.printer('header', attr = 'bold')
189
190
191class _CopyFile:
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800192 def __init__(self, src, dest, abssrc, absdest):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700193 self.src = src
194 self.dest = dest
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800195 self.abs_src = abssrc
196 self.abs_dest = absdest
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700197
198 def _Copy(self):
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800199 src = self.abs_src
200 dest = self.abs_dest
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700201 # copy file if it does not exist or is out of date
202 if not os.path.exists(dest) or not filecmp.cmp(src, dest):
203 try:
204 # remove existing file first, since it might be read-only
205 if os.path.exists(dest):
206 os.remove(dest)
207 shutil.copy(src, dest)
208 # make the file read-only
209 mode = os.stat(dest)[stat.ST_MODE]
210 mode = mode & ~(stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH)
211 os.chmod(dest, mode)
212 except IOError:
Shawn O. Pearce48244782009-04-16 08:25:57 -0700213 _error('Cannot copy file %s to %s', src, dest)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700214
215
216class Project(object):
217 def __init__(self,
218 manifest,
219 name,
220 remote,
221 gitdir,
222 worktree,
223 relpath,
224 revision):
225 self.manifest = manifest
226 self.name = name
227 self.remote = remote
228 self.gitdir = gitdir
229 self.worktree = worktree
230 self.relpath = relpath
231 self.revision = revision
232 self.snapshots = {}
233 self.extraRemotes = {}
234 self.copyfiles = []
235 self.config = GitConfig.ForRepository(
236 gitdir = self.gitdir,
237 defaults = self.manifest.globalConfig)
238
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800239 if self.worktree:
240 self.work_git = self._GitGetByExec(self, bare=False)
241 else:
242 self.work_git = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700243 self.bare_git = self._GitGetByExec(self, bare=True)
Shawn O. Pearced237b692009-04-17 18:49:50 -0700244 self.bare_ref = GitRefs(gitdir)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700245
246 @property
247 def Exists(self):
248 return os.path.isdir(self.gitdir)
249
250 @property
251 def CurrentBranch(self):
252 """Obtain the name of the currently checked out branch.
253 The branch name omits the 'refs/heads/' prefix.
254 None is returned if the project is on a detached HEAD.
255 """
Shawn O. Pearce5b23f242009-04-17 18:43:33 -0700256 b = self.work_git.GetHead()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700257 if b.startswith(R_HEADS):
258 return b[len(R_HEADS):]
259 return None
260
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700261 def IsRebaseInProgress(self):
262 w = self.worktree
263 g = os.path.join(w, '.git')
264 return os.path.exists(os.path.join(g, 'rebase-apply')) \
265 or os.path.exists(os.path.join(g, 'rebase-merge')) \
266 or os.path.exists(os.path.join(w, '.dotest'))
267
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700268 def IsDirty(self, consider_untracked=True):
269 """Is the working directory modified in some way?
270 """
271 self.work_git.update_index('-q',
272 '--unmerged',
273 '--ignore-missing',
274 '--refresh')
275 if self.work_git.DiffZ('diff-index','-M','--cached',HEAD):
276 return True
277 if self.work_git.DiffZ('diff-files'):
278 return True
279 if consider_untracked and self.work_git.LsOthers():
280 return True
281 return False
282
283 _userident_name = None
284 _userident_email = None
285
286 @property
287 def UserName(self):
288 """Obtain the user's personal name.
289 """
290 if self._userident_name is None:
291 self._LoadUserIdentity()
292 return self._userident_name
293
294 @property
295 def UserEmail(self):
296 """Obtain the user's email address. This is very likely
297 to be their Gerrit login.
298 """
299 if self._userident_email is None:
300 self._LoadUserIdentity()
301 return self._userident_email
302
303 def _LoadUserIdentity(self):
304 u = self.bare_git.var('GIT_COMMITTER_IDENT')
305 m = re.compile("^(.*) <([^>]*)> ").match(u)
306 if m:
307 self._userident_name = m.group(1)
308 self._userident_email = m.group(2)
309 else:
310 self._userident_name = ''
311 self._userident_email = ''
312
313 def GetRemote(self, name):
314 """Get the configuration for a single remote.
315 """
316 return self.config.GetRemote(name)
317
318 def GetBranch(self, name):
319 """Get the configuration for a single branch.
320 """
321 return self.config.GetBranch(name)
322
Shawn O. Pearce27b07322009-04-10 16:02:48 -0700323 def GetBranches(self):
324 """Get all existing local branches.
325 """
326 current = self.CurrentBranch
Shawn O. Pearced237b692009-04-17 18:49:50 -0700327 all = self._allrefs
Shawn O. Pearce27b07322009-04-10 16:02:48 -0700328 heads = {}
329 pubd = {}
330
331 for name, id in all.iteritems():
332 if name.startswith(R_HEADS):
333 name = name[len(R_HEADS):]
334 b = self.GetBranch(name)
335 b.current = name == current
336 b.published = None
337 b.revision = id
338 heads[name] = b
339
340 for name, id in all.iteritems():
341 if name.startswith(R_PUB):
342 name = name[len(R_PUB):]
343 b = heads.get(name)
344 if b:
345 b.published = id
346
347 return heads
348
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700349
350## Status Display ##
351
352 def PrintWorkTreeStatus(self):
353 """Prints the status of the repository to stdout.
354 """
355 if not os.path.isdir(self.worktree):
356 print ''
357 print 'project %s/' % self.relpath
358 print ' missing (run "repo sync")'
359 return
360
361 self.work_git.update_index('-q',
362 '--unmerged',
363 '--ignore-missing',
364 '--refresh')
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700365 rb = self.IsRebaseInProgress()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700366 di = self.work_git.DiffZ('diff-index', '-M', '--cached', HEAD)
367 df = self.work_git.DiffZ('diff-files')
368 do = self.work_git.LsOthers()
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700369 if not rb and not di and not df and not do:
Shawn O. Pearce161f4452009-04-10 17:41:44 -0700370 return 'CLEAN'
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700371
372 out = StatusColoring(self.config)
373 out.project('project %-40s', self.relpath + '/')
374
375 branch = self.CurrentBranch
376 if branch is None:
377 out.nobranch('(*** NO BRANCH ***)')
378 else:
379 out.branch('branch %s', branch)
380 out.nl()
381
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700382 if rb:
383 out.important('prior sync failed; rebase still in progress')
384 out.nl()
385
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700386 paths = list()
387 paths.extend(di.keys())
388 paths.extend(df.keys())
389 paths.extend(do)
390
391 paths = list(set(paths))
392 paths.sort()
393
394 for p in paths:
395 try: i = di[p]
396 except KeyError: i = None
397
398 try: f = df[p]
399 except KeyError: f = None
400
401 if i: i_status = i.status.upper()
402 else: i_status = '-'
403
404 if f: f_status = f.status.lower()
405 else: f_status = '-'
406
407 if i and i.src_path:
Shawn O. Pearcefe086752009-03-03 13:49:48 -0800408 line = ' %s%s\t%s => %s (%s%%)' % (i_status, f_status,
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700409 i.src_path, p, i.level)
410 else:
411 line = ' %s%s\t%s' % (i_status, f_status, p)
412
413 if i and not f:
414 out.added('%s', line)
415 elif (i and f) or (not i and f):
416 out.changed('%s', line)
417 elif not i and not f:
418 out.untracked('%s', line)
419 else:
420 out.write('%s', line)
421 out.nl()
Shawn O. Pearce161f4452009-04-10 17:41:44 -0700422 return 'DIRTY'
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700423
424 def PrintWorkTreeDiff(self):
425 """Prints the status of the repository to stdout.
426 """
427 out = DiffColoring(self.config)
428 cmd = ['diff']
429 if out.is_on:
430 cmd.append('--color')
431 cmd.append(HEAD)
432 cmd.append('--')
433 p = GitCommand(self,
434 cmd,
435 capture_stdout = True,
436 capture_stderr = True)
437 has_diff = False
438 for line in p.process.stdout:
439 if not has_diff:
440 out.nl()
441 out.project('project %s/' % self.relpath)
442 out.nl()
443 has_diff = True
444 print line[:-1]
445 p.Wait()
446
447
448## Publish / Upload ##
449
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700450 def WasPublished(self, branch, all=None):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700451 """Was the branch published (uploaded) for code review?
452 If so, returns the SHA-1 hash of the last published
453 state for the branch.
454 """
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700455 key = R_PUB + branch
456 if all is None:
457 try:
458 return self.bare_git.rev_parse(key)
459 except GitError:
460 return None
461 else:
462 try:
463 return all[key]
464 except KeyError:
465 return None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700466
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700467 def CleanPublishedCache(self, all=None):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700468 """Prunes any stale published refs.
469 """
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700470 if all is None:
471 all = self._allrefs
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700472 heads = set()
473 canrm = {}
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700474 for name, id in all.iteritems():
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700475 if name.startswith(R_HEADS):
476 heads.add(name)
477 elif name.startswith(R_PUB):
478 canrm[name] = id
479
480 for name, id in canrm.iteritems():
481 n = name[len(R_PUB):]
482 if R_HEADS + n not in heads:
483 self.bare_git.DeleteRef(name, id)
484
485 def GetUploadableBranches(self):
486 """List any branches which can be uploaded for review.
487 """
488 heads = {}
489 pubed = {}
490
491 for name, id in self._allrefs.iteritems():
492 if name.startswith(R_HEADS):
493 heads[name[len(R_HEADS):]] = id
494 elif name.startswith(R_PUB):
495 pubed[name[len(R_PUB):]] = id
496
497 ready = []
498 for branch, id in heads.iteritems():
499 if branch in pubed and pubed[branch] == id:
500 continue
501
Shawn O. Pearce35f25962008-11-11 17:03:13 -0800502 rb = self.GetUploadableBranch(branch)
503 if rb:
504 ready.append(rb)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700505 return ready
506
Shawn O. Pearce35f25962008-11-11 17:03:13 -0800507 def GetUploadableBranch(self, branch_name):
508 """Get a single uploadable branch, or None.
509 """
510 branch = self.GetBranch(branch_name)
511 base = branch.LocalMerge
512 if branch.LocalMerge:
513 rb = ReviewableBranch(self, branch, base)
514 if rb.commits:
515 return rb
516 return None
517
Joe Onorato2896a792008-11-17 16:56:36 -0500518 def UploadForReview(self, branch=None, replace_changes=None, people=([],[])):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700519 """Uploads the named branch for code review.
520 """
521 if branch is None:
522 branch = self.CurrentBranch
523 if branch is None:
524 raise GitError('not currently on a branch')
525
526 branch = self.GetBranch(branch)
527 if not branch.LocalMerge:
528 raise GitError('branch %s does not track a remote' % branch.name)
529 if not branch.remote.review:
530 raise GitError('remote %s has no review url' % branch.remote.name)
531
532 dest_branch = branch.merge
533 if not dest_branch.startswith(R_HEADS):
534 dest_branch = R_HEADS + dest_branch
535
Shawn O. Pearce339ba9f2008-11-06 09:52:51 -0800536 if not branch.remote.projectname:
537 branch.remote.projectname = self.name
538 branch.remote.Save()
539
Shawn O. Pearce370e3fa2009-01-26 10:55:39 -0800540 if branch.remote.ReviewProtocol == 'ssh':
Shawn O. Pearceb54a3922009-01-05 16:18:58 -0800541 if dest_branch.startswith(R_HEADS):
542 dest_branch = dest_branch[len(R_HEADS):]
543
544 rp = ['gerrit receive-pack']
545 for e in people[0]:
546 rp.append('--reviewer=%s' % sq(e))
547 for e in people[1]:
548 rp.append('--cc=%s' % sq(e))
549
550 cmd = ['push']
551 cmd.append('--receive-pack=%s' % " ".join(rp))
552 cmd.append(branch.remote.SshReviewUrl(self.UserEmail))
553 cmd.append('%s:refs/for/%s' % (R_HEADS + branch.name, dest_branch))
554 if replace_changes:
555 for change_id,commit_id in replace_changes.iteritems():
556 cmd.append('%s:refs/changes/%s/new' % (commit_id, change_id))
557 if GitCommand(self, cmd, bare = True).Wait() != 0:
558 raise UploadError('Upload failed')
559
560 else:
561 raise UploadError('Unsupported protocol %s' \
562 % branch.remote.review)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700563
564 msg = "posted to %s for %s" % (branch.remote.review, dest_branch)
565 self.bare_git.UpdateRef(R_PUB + branch.name,
566 R_HEADS + branch.name,
567 message = msg)
568
569
570## Sync ##
571
572 def Sync_NetworkHalf(self):
573 """Perform only the network IO portion of the sync process.
574 Local working directory/branch state is not affected.
575 """
576 if not self.Exists:
577 print >>sys.stderr
578 print >>sys.stderr, 'Initializing project %s ...' % self.name
579 self._InitGitDir()
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800580
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700581 self._InitRemote()
582 for r in self.extraRemotes.values():
583 if not self._RemoteFetch(r.name):
584 return False
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700585 if not self._RemoteFetch():
586 return False
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800587
588 if self.worktree:
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800589 self._InitMRef()
590 else:
591 self._InitMirrorHead()
592 try:
593 os.remove(os.path.join(self.gitdir, 'FETCH_HEAD'))
594 except OSError:
595 pass
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700596 return True
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -0800597
598 def PostRepoUpgrade(self):
599 self._InitHooks()
600
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700601 def _CopyFiles(self):
602 for file in self.copyfiles:
603 file._Copy()
604
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700605 def Sync_LocalHalf(self, syncbuf):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700606 """Perform only the local IO portion of the sync process.
607 Network access is not required.
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700608 """
609 self._InitWorkTree()
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700610 all = self.bare_ref.all
611 self.CleanPublishedCache(all)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700612
613 rem = self.GetRemote(self.remote.name)
614 rev = rem.ToLocal(self.revision)
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700615 if rev in all:
616 revid = all[rev]
617 elif IsId(rev):
618 revid = rev
619 else:
620 try:
621 revid = self.bare_git.rev_parse('--verify', '%s^0' % rev)
622 except GitError:
623 raise ManifestInvalidRevisionError(
624 'revision %s in %s not found' % (self.revision, self.name))
Shawn O. Pearce559b8462009-03-02 12:56:08 -0800625
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700626 head = self.work_git.GetHead()
627 if head.startswith(R_HEADS):
628 branch = head[len(R_HEADS):]
629 try:
630 head = all[head]
631 except KeyError:
632 head = None
633 else:
634 branch = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700635
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700636 if branch is None or syncbuf.detach_head:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700637 # Currently on a detached HEAD. The user is assumed to
638 # not have any local modifications worth worrying about.
639 #
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700640 if self.IsRebaseInProgress():
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700641 syncbuf.fail(self, _PriorSyncFailedError())
642 return
643
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700644 if head == revid:
645 # No changes; don't do anything further.
646 #
647 return
648
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700649 lost = self._revlist(not_rev(rev), HEAD)
650 if lost:
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700651 syncbuf.info(self, "discarding %d commits", len(lost))
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700652 try:
653 self._Checkout(rev, quiet=True)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700654 except GitError, e:
655 syncbuf.fail(self, e)
656 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700657 self._CopyFiles()
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700658 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700659
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700660 if head == revid:
661 # No changes; don't do anything further.
662 #
663 return
664
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700665 branch = self.GetBranch(branch)
666 merge = branch.LocalMerge
667
668 if not merge:
669 # The current branch has no tracking configuration.
670 # Jump off it to a deatched HEAD.
671 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700672 syncbuf.info(self,
673 "leaving %s; does not track upstream",
674 branch.name)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700675 try:
676 self._Checkout(rev, quiet=True)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700677 except GitError, e:
678 syncbuf.fail(self, e)
679 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700680 self._CopyFiles()
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700681 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700682
683 upstream_gain = self._revlist(not_rev(HEAD), rev)
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700684 pub = self.WasPublished(branch.name, all)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700685 if pub:
686 not_merged = self._revlist(not_rev(rev), pub)
687 if not_merged:
688 if upstream_gain:
689 # The user has published this branch and some of those
690 # commits are not yet merged upstream. We do not want
691 # to rewrite the published commits so we punt.
692 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700693 syncbuf.info(self,
694 "branch %s is published but is now %d commits behind",
695 branch.name,
696 len(upstream_gain))
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700697 return
Shawn O. Pearce05f66b62009-04-21 08:26:32 -0700698 elif pub == head:
699 # All published commits are merged, and thus we are a
700 # strict subset. We can fast-forward safely.
Shawn O. Pearcea54c5272008-10-30 11:03:00 -0700701 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700702 def _doff():
Shawn O. Pearcea54c5272008-10-30 11:03:00 -0700703 self._FastForward(rev)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700704 self._CopyFiles()
705 syncbuf.later1(self, _doff)
706 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700707
708 if merge == rev:
709 try:
710 old_merge = self.bare_git.rev_parse('%s@{1}' % merge)
711 except GitError:
712 old_merge = merge
Shawn O. Pearce07346002008-10-21 07:09:27 -0700713 if old_merge == '0000000000000000000000000000000000000000' \
714 or old_merge == '':
715 old_merge = merge
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700716 else:
717 # The upstream switched on us. Time to cross our fingers
718 # and pray that the old upstream also wasn't in the habit
719 # of rebasing itself.
720 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700721 syncbuf.info(self, "manifest switched %s...%s", merge, rev)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700722 old_merge = merge
723
724 if rev == old_merge:
725 upstream_lost = []
726 else:
727 upstream_lost = self._revlist(not_rev(rev), old_merge)
728
729 if not upstream_lost and not upstream_gain:
730 # Trivially no changes caused by the upstream.
731 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700732 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700733
734 if self.IsDirty(consider_untracked=False):
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700735 syncbuf.fail(self, _DirtyError())
736 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700737
738 if upstream_lost:
739 # Upstream rebased. Not everything in HEAD
740 # may have been caused by the user.
741 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700742 syncbuf.info(self,
743 "discarding %d commits removed from upstream",
744 len(upstream_lost))
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700745
746 branch.remote = rem
747 branch.merge = self.revision
748 branch.Save()
749
750 my_changes = self._revlist(not_rev(old_merge), HEAD)
751 if my_changes:
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700752 def _dorebase():
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700753 self._Rebase(upstream = old_merge, onto = rev)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700754 self._CopyFiles()
755 syncbuf.later2(self, _dorebase)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700756 elif upstream_lost:
757 try:
758 self._ResetHard(rev)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700759 self._CopyFiles()
760 except GitError, e:
761 syncbuf.fail(self, e)
762 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700763 else:
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700764 def _doff():
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700765 self._FastForward(rev)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700766 self._CopyFiles()
767 syncbuf.later1(self, _doff)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700768
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800769 def AddCopyFile(self, src, dest, absdest):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700770 # dest should already be an absolute path, but src is project relative
771 # make src an absolute path
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800772 abssrc = os.path.join(self.worktree, src)
773 self.copyfiles.append(_CopyFile(src, dest, abssrc, absdest))
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700774
Shawn O. Pearce632768b2008-10-23 11:58:52 -0700775 def DownloadPatchSet(self, change_id, patch_id):
776 """Download a single patch set of a single change to FETCH_HEAD.
777 """
778 remote = self.GetRemote(self.remote.name)
779
780 cmd = ['fetch', remote.name]
781 cmd.append('refs/changes/%2.2d/%d/%d' \
782 % (change_id % 100, change_id, patch_id))
783 cmd.extend(map(lambda x: str(x), remote.fetch))
784 if GitCommand(self, cmd, bare=True).Wait() != 0:
785 return None
786 return DownloadedChange(self,
787 remote.ToLocal(self.revision),
788 change_id,
789 patch_id,
790 self.bare_git.rev_parse('FETCH_HEAD'))
791
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700792
793## Branch Management ##
794
795 def StartBranch(self, name):
796 """Create a new branch off the manifest's revision.
797 """
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700798 head = self.work_git.GetHead()
799 if head == (R_HEADS + name):
800 return True
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700801
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700802 all = self.bare_ref.all
803 if (R_HEADS + name) in all:
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700804 return GitCommand(self,
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700805 ['checkout', name, '--'],
Shawn O. Pearce0f0dfa32009-04-18 14:53:39 -0700806 capture_stdout = True,
807 capture_stderr = True).Wait() == 0
Shawn O. Pearce0a389e92009-04-10 16:21:18 -0700808
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700809 branch = self.GetBranch(name)
810 branch.remote = self.GetRemote(self.remote.name)
811 branch.merge = self.revision
812
813 rev = branch.LocalMerge
814 if rev in all:
815 revid = all[rev]
816 elif IsId(rev):
817 revid = rev
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700818 else:
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700819 revid = None
Shawn O. Pearce0a389e92009-04-10 16:21:18 -0700820
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700821 if head.startswith(R_HEADS):
822 try:
823 head = all[head]
824 except KeyError:
825 head = None
826
827 if revid and head and revid == head:
828 ref = os.path.join(self.gitdir, R_HEADS + name)
829 try:
830 os.makedirs(os.path.dirname(ref))
831 except OSError:
832 pass
833 _lwrite(ref, '%s\n' % revid)
834 _lwrite(os.path.join(self.worktree, '.git', HEAD),
835 'ref: %s%s\n' % (R_HEADS, name))
836 branch.Save()
837 return True
838
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700839 if GitCommand(self,
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700840 ['checkout', '-b', branch.name, rev],
Shawn O. Pearce0f0dfa32009-04-18 14:53:39 -0700841 capture_stdout = True,
842 capture_stderr = True).Wait() == 0:
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700843 branch.Save()
844 return True
845 return False
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700846
Wink Saville02d79452009-04-10 13:01:24 -0700847 def CheckoutBranch(self, name):
848 """Checkout a local topic branch.
849 """
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700850 rev = R_HEADS + name
851 head = self.work_git.GetHead()
852 if head == rev:
853 # Already on the branch
854 #
855 return True
Wink Saville02d79452009-04-10 13:01:24 -0700856
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700857 all = self.bare_ref.all
Wink Saville02d79452009-04-10 13:01:24 -0700858 try:
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700859 revid = all[rev]
860 except KeyError:
861 # Branch does not exist in this project
862 #
863 return False
Wink Saville02d79452009-04-10 13:01:24 -0700864
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700865 if head.startswith(R_HEADS):
866 try:
867 head = all[head]
868 except KeyError:
869 head = None
870
871 if head == revid:
872 # Same revision; just update HEAD to point to the new
873 # target branch, but otherwise take no other action.
874 #
875 _lwrite(os.path.join(self.worktree, '.git', HEAD),
876 'ref: %s%s\n' % (R_HEADS, name))
877 return True
878
879 return GitCommand(self,
880 ['checkout', name, '--'],
881 capture_stdout = True,
882 capture_stderr = True).Wait() == 0
Wink Saville02d79452009-04-10 13:01:24 -0700883
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800884 def AbandonBranch(self, name):
885 """Destroy a local topic branch.
886 """
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700887 rev = R_HEADS + name
888 all = self.bare_ref.all
889 if rev not in all:
890 # Doesn't exist; assume already abandoned.
891 #
892 return True
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800893
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700894 head = self.work_git.GetHead()
895 if head == rev:
896 # We can't destroy the branch while we are sitting
897 # on it. Switch to a detached HEAD.
898 #
899 head = all[head]
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800900
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700901 rev = self.GetRemote(self.remote.name).ToLocal(self.revision)
902 if rev in all:
903 revid = all[rev]
904 elif IsId(rev):
905 revid = rev
906 else:
907 revid = None
908
909 if revid and head == revid:
910 _lwrite(os.path.join(self.worktree, '.git', HEAD),
911 '%s\n' % revid)
912 else:
913 self._Checkout(rev, quiet=True)
914
915 return GitCommand(self,
916 ['branch', '-D', name],
917 capture_stdout = True,
918 capture_stderr = True).Wait() == 0
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800919
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700920 def PruneHeads(self):
921 """Prune any topic branches already merged into upstream.
922 """
923 cb = self.CurrentBranch
924 kill = []
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -0800925 left = self._allrefs
926 for name in left.keys():
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700927 if name.startswith(R_HEADS):
928 name = name[len(R_HEADS):]
929 if cb is None or name != cb:
930 kill.append(name)
931
932 rev = self.GetRemote(self.remote.name).ToLocal(self.revision)
933 if cb is not None \
934 and not self._revlist(HEAD + '...' + rev) \
935 and not self.IsDirty(consider_untracked = False):
936 self.work_git.DetachHead(HEAD)
937 kill.append(cb)
938
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700939 if kill:
Shawn O. Pearce5b23f242009-04-17 18:43:33 -0700940 old = self.bare_git.GetHead()
941 if old is None:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700942 old = 'refs/heads/please_never_use_this_as_a_branch_name'
943
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700944 try:
945 self.bare_git.DetachHead(rev)
946
947 b = ['branch', '-d']
948 b.extend(kill)
949 b = GitCommand(self, b, bare=True,
950 capture_stdout=True,
951 capture_stderr=True)
952 b.Wait()
953 finally:
954 self.bare_git.SetHead(old)
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -0800955 left = self._allrefs
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700956
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -0800957 for branch in kill:
958 if (R_HEADS + branch) not in left:
959 self.CleanPublishedCache()
960 break
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700961
962 if cb and cb not in kill:
963 kill.append(cb)
Shawn O. Pearce7c6c64d2009-03-02 12:38:13 -0800964 kill.sort()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700965
966 kept = []
967 for branch in kill:
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -0800968 if (R_HEADS + branch) in left:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700969 branch = self.GetBranch(branch)
970 base = branch.LocalMerge
971 if not base:
972 base = rev
973 kept.append(ReviewableBranch(self, branch, base))
974 return kept
975
976
977## Direct Git Commands ##
978
979 def _RemoteFetch(self, name=None):
980 if not name:
981 name = self.remote.name
Shawn O. Pearcefb231612009-04-10 18:53:46 -0700982
983 ssh_proxy = False
984 if self.GetRemote(name).PreConnectFetch():
985 ssh_proxy = True
986
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800987 cmd = ['fetch']
988 if not self.worktree:
989 cmd.append('--update-head-ok')
990 cmd.append(name)
Shawn O. Pearcefb231612009-04-10 18:53:46 -0700991 return GitCommand(self,
992 cmd,
993 bare = True,
994 ssh_proxy = ssh_proxy).Wait() == 0
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700995
996 def _Checkout(self, rev, quiet=False):
997 cmd = ['checkout']
998 if quiet:
999 cmd.append('-q')
1000 cmd.append(rev)
1001 cmd.append('--')
1002 if GitCommand(self, cmd).Wait() != 0:
1003 if self._allrefs:
1004 raise GitError('%s checkout %s ' % (self.name, rev))
1005
1006 def _ResetHard(self, rev, quiet=True):
1007 cmd = ['reset', '--hard']
1008 if quiet:
1009 cmd.append('-q')
1010 cmd.append(rev)
1011 if GitCommand(self, cmd).Wait() != 0:
1012 raise GitError('%s reset --hard %s ' % (self.name, rev))
1013
1014 def _Rebase(self, upstream, onto = None):
Shawn O. Pearce19a83d82009-04-16 08:14:26 -07001015 cmd = ['rebase']
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001016 if onto is not None:
1017 cmd.extend(['--onto', onto])
1018 cmd.append(upstream)
Shawn O. Pearce19a83d82009-04-16 08:14:26 -07001019 if GitCommand(self, cmd).Wait() != 0:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001020 raise GitError('%s rebase %s ' % (self.name, upstream))
1021
1022 def _FastForward(self, head):
1023 cmd = ['merge', head]
1024 if GitCommand(self, cmd).Wait() != 0:
1025 raise GitError('%s merge %s ' % (self.name, head))
1026
1027 def _InitGitDir(self):
1028 if not os.path.exists(self.gitdir):
1029 os.makedirs(self.gitdir)
1030 self.bare_git.init()
Shawn O. Pearce2816d4f2009-03-03 17:53:18 -08001031
1032 if self.manifest.IsMirror:
1033 self.config.SetString('core.bare', 'true')
1034 else:
1035 self.config.SetString('core.bare', None)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001036
1037 hooks = self._gitdir_path('hooks')
Shawn O. Pearcede646812008-10-29 14:38:12 -07001038 try:
1039 to_rm = os.listdir(hooks)
1040 except OSError:
1041 to_rm = []
1042 for old_hook in to_rm:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001043 os.remove(os.path.join(hooks, old_hook))
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001044 self._InitHooks()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001045
1046 m = self.manifest.manifestProject.config
1047 for key in ['user.name', 'user.email']:
1048 if m.Has(key, include_defaults = False):
1049 self.config.SetString(key, m.GetString(key))
1050
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001051 def _InitHooks(self):
1052 hooks = self._gitdir_path('hooks')
1053 if not os.path.exists(hooks):
1054 os.makedirs(hooks)
1055 for stock_hook in repo_hooks():
1056 dst = os.path.join(hooks, os.path.basename(stock_hook))
1057 try:
1058 os.symlink(relpath(stock_hook, dst), dst)
1059 except OSError, e:
1060 if e.errno == errno.EEXIST:
1061 pass
1062 elif e.errno == errno.EPERM:
1063 raise GitError('filesystem must support symlinks')
1064 else:
1065 raise
1066
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001067 def _InitRemote(self):
1068 if self.remote.fetchUrl:
1069 remote = self.GetRemote(self.remote.name)
1070
1071 url = self.remote.fetchUrl
1072 while url.endswith('/'):
1073 url = url[:-1]
1074 url += '/%s.git' % self.name
1075 remote.url = url
1076 remote.review = self.remote.reviewUrl
Shawn O. Pearce339ba9f2008-11-06 09:52:51 -08001077 if remote.projectname is None:
1078 remote.projectname = self.name
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001079
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001080 if self.worktree:
1081 remote.ResetFetch(mirror=False)
1082 else:
1083 remote.ResetFetch(mirror=True)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001084 remote.Save()
1085
1086 for r in self.extraRemotes.values():
1087 remote = self.GetRemote(r.name)
1088 remote.url = r.fetchUrl
1089 remote.review = r.reviewUrl
Shawn O. Pearceae6e0942008-11-06 10:25:35 -08001090 if r.projectName:
1091 remote.projectname = r.projectName
1092 elif remote.projectname is None:
Shawn O. Pearce339ba9f2008-11-06 09:52:51 -08001093 remote.projectname = self.name
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001094 remote.ResetFetch()
1095 remote.Save()
1096
1097 def _InitMRef(self):
1098 if self.manifest.branch:
1099 msg = 'manifest set to %s' % self.revision
1100 ref = R_M + self.manifest.branch
Shawn O. Pearce0f3dd232009-04-17 20:32:44 -07001101 cur = self.bare_ref.symref(ref)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001102
1103 if IsId(self.revision):
Shawn O. Pearce0f3dd232009-04-17 20:32:44 -07001104 if cur != '' or self.bare_ref.get(ref) != self.revision:
1105 dst = self.revision + '^0'
1106 self.bare_git.UpdateRef(ref, dst, message = msg, detach = True)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001107 else:
1108 remote = self.GetRemote(self.remote.name)
1109 dst = remote.ToLocal(self.revision)
Shawn O. Pearce0f3dd232009-04-17 20:32:44 -07001110 if cur != dst:
1111 self.bare_git.symbolic_ref('-m', msg, ref, dst)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001112
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001113 def _InitMirrorHead(self):
1114 dst = self.GetRemote(self.remote.name).ToLocal(self.revision)
1115 msg = 'manifest set to %s' % self.revision
1116 self.bare_git.SetHead(dst, message=msg)
1117
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001118 def _InitWorkTree(self):
1119 dotgit = os.path.join(self.worktree, '.git')
1120 if not os.path.exists(dotgit):
1121 os.makedirs(dotgit)
1122
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001123 for name in ['config',
1124 'description',
1125 'hooks',
1126 'info',
1127 'logs',
1128 'objects',
1129 'packed-refs',
1130 'refs',
1131 'rr-cache',
1132 'svn']:
Shawn O. Pearce438ee1c2008-11-03 09:59:36 -08001133 try:
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001134 src = os.path.join(self.gitdir, name)
1135 dst = os.path.join(dotgit, name)
1136 os.symlink(relpath(src, dst), dst)
Shawn O. Pearce438ee1c2008-11-03 09:59:36 -08001137 except OSError, e:
1138 if e.errno == errno.EPERM:
1139 raise GitError('filesystem must support symlinks')
1140 else:
1141 raise
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001142
1143 rev = self.GetRemote(self.remote.name).ToLocal(self.revision)
1144 rev = self.bare_git.rev_parse('%s^0' % rev)
1145
Shawn O. Pearce76ca9f82009-04-18 14:48:03 -07001146 _lwrite(os.path.join(dotgit, HEAD), '%s\n' % rev)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001147
1148 cmd = ['read-tree', '--reset', '-u']
1149 cmd.append('-v')
1150 cmd.append('HEAD')
1151 if GitCommand(self, cmd).Wait() != 0:
1152 raise GitError("cannot initialize work tree")
Shawn O. Pearce93609662009-04-21 10:50:33 -07001153 self._CopyFiles()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001154
1155 def _gitdir_path(self, path):
1156 return os.path.join(self.gitdir, path)
1157
1158 def _revlist(self, *args):
1159 cmd = []
1160 cmd.extend(args)
1161 cmd.append('--')
1162 return self.work_git.rev_list(*args)
1163
1164 @property
1165 def _allrefs(self):
Shawn O. Pearced237b692009-04-17 18:49:50 -07001166 return self.bare_ref.all
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001167
1168 class _GitGetByExec(object):
1169 def __init__(self, project, bare):
1170 self._project = project
1171 self._bare = bare
1172
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001173 def LsOthers(self):
1174 p = GitCommand(self._project,
1175 ['ls-files',
1176 '-z',
1177 '--others',
1178 '--exclude-standard'],
1179 bare = False,
1180 capture_stdout = True,
1181 capture_stderr = True)
1182 if p.Wait() == 0:
1183 out = p.stdout
1184 if out:
1185 return out[:-1].split("\0")
1186 return []
1187
1188 def DiffZ(self, name, *args):
1189 cmd = [name]
1190 cmd.append('-z')
1191 cmd.extend(args)
1192 p = GitCommand(self._project,
1193 cmd,
1194 bare = False,
1195 capture_stdout = True,
1196 capture_stderr = True)
1197 try:
1198 out = p.process.stdout.read()
1199 r = {}
1200 if out:
1201 out = iter(out[:-1].split('\0'))
1202 while out:
Shawn O. Pearce02dbb6d2008-10-21 13:59:08 -07001203 try:
1204 info = out.next()
1205 path = out.next()
1206 except StopIteration:
1207 break
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001208
1209 class _Info(object):
1210 def __init__(self, path, omode, nmode, oid, nid, state):
1211 self.path = path
1212 self.src_path = None
1213 self.old_mode = omode
1214 self.new_mode = nmode
1215 self.old_id = oid
1216 self.new_id = nid
1217
1218 if len(state) == 1:
1219 self.status = state
1220 self.level = None
1221 else:
1222 self.status = state[:1]
1223 self.level = state[1:]
1224 while self.level.startswith('0'):
1225 self.level = self.level[1:]
1226
1227 info = info[1:].split(' ')
1228 info =_Info(path, *info)
1229 if info.status in ('R', 'C'):
1230 info.src_path = info.path
1231 info.path = out.next()
1232 r[info.path] = info
1233 return r
1234 finally:
1235 p.Wait()
1236
1237 def GetHead(self):
Shawn O. Pearce5b23f242009-04-17 18:43:33 -07001238 if self._bare:
1239 path = os.path.join(self._project.gitdir, HEAD)
1240 else:
1241 path = os.path.join(self._project.worktree, '.git', HEAD)
Shawn O. Pearce76ca9f82009-04-18 14:48:03 -07001242 fd = open(path, 'rb')
1243 try:
1244 line = fd.read()
1245 finally:
1246 fd.close()
Shawn O. Pearce5b23f242009-04-17 18:43:33 -07001247 if line.startswith('ref: '):
1248 return line[5:-1]
1249 return line[:-1]
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001250
1251 def SetHead(self, ref, message=None):
1252 cmdv = []
1253 if message is not None:
1254 cmdv.extend(['-m', message])
1255 cmdv.append(HEAD)
1256 cmdv.append(ref)
1257 self.symbolic_ref(*cmdv)
1258
1259 def DetachHead(self, new, message=None):
1260 cmdv = ['--no-deref']
1261 if message is not None:
1262 cmdv.extend(['-m', message])
1263 cmdv.append(HEAD)
1264 cmdv.append(new)
1265 self.update_ref(*cmdv)
1266
1267 def UpdateRef(self, name, new, old=None,
1268 message=None,
1269 detach=False):
1270 cmdv = []
1271 if message is not None:
1272 cmdv.extend(['-m', message])
1273 if detach:
1274 cmdv.append('--no-deref')
1275 cmdv.append(name)
1276 cmdv.append(new)
1277 if old is not None:
1278 cmdv.append(old)
1279 self.update_ref(*cmdv)
1280
1281 def DeleteRef(self, name, old=None):
1282 if not old:
1283 old = self.rev_parse(name)
1284 self.update_ref('-d', name, old)
Shawn O. Pearcefbcde472009-04-17 20:58:02 -07001285 self._project.bare_ref.deleted(name)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001286
1287 def rev_list(self, *args):
1288 cmdv = ['rev-list']
1289 cmdv.extend(args)
1290 p = GitCommand(self._project,
1291 cmdv,
1292 bare = self._bare,
1293 capture_stdout = True,
1294 capture_stderr = True)
1295 r = []
1296 for line in p.process.stdout:
1297 r.append(line[:-1])
1298 if p.Wait() != 0:
1299 raise GitError('%s rev-list %s: %s' % (
1300 self._project.name,
1301 str(args),
1302 p.stderr))
1303 return r
1304
1305 def __getattr__(self, name):
1306 name = name.replace('_', '-')
1307 def runner(*args):
1308 cmdv = [name]
1309 cmdv.extend(args)
1310 p = GitCommand(self._project,
1311 cmdv,
1312 bare = self._bare,
1313 capture_stdout = True,
1314 capture_stderr = True)
1315 if p.Wait() != 0:
1316 raise GitError('%s %s: %s' % (
1317 self._project.name,
1318 name,
1319 p.stderr))
1320 r = p.stdout
1321 if r.endswith('\n') and r.index('\n') == len(r) - 1:
1322 return r[:-1]
1323 return r
1324 return runner
1325
1326
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001327class _PriorSyncFailedError(Exception):
1328 def __str__(self):
1329 return 'prior sync failed; rebase still in progress'
1330
1331class _DirtyError(Exception):
1332 def __str__(self):
1333 return 'contains uncommitted changes'
1334
1335class _InfoMessage(object):
1336 def __init__(self, project, text):
1337 self.project = project
1338 self.text = text
1339
1340 def Print(self, syncbuf):
1341 syncbuf.out.info('%s/: %s', self.project.relpath, self.text)
1342 syncbuf.out.nl()
1343
1344class _Failure(object):
1345 def __init__(self, project, why):
1346 self.project = project
1347 self.why = why
1348
1349 def Print(self, syncbuf):
1350 syncbuf.out.fail('error: %s/: %s',
1351 self.project.relpath,
1352 str(self.why))
1353 syncbuf.out.nl()
1354
1355class _Later(object):
1356 def __init__(self, project, action):
1357 self.project = project
1358 self.action = action
1359
1360 def Run(self, syncbuf):
1361 out = syncbuf.out
1362 out.project('project %s/', self.project.relpath)
1363 out.nl()
1364 try:
1365 self.action()
1366 out.nl()
1367 return True
1368 except GitError, e:
1369 out.nl()
1370 return False
1371
1372class _SyncColoring(Coloring):
1373 def __init__(self, config):
1374 Coloring.__init__(self, config, 'reposync')
1375 self.project = self.printer('header', attr = 'bold')
1376 self.info = self.printer('info')
1377 self.fail = self.printer('fail', fg='red')
1378
1379class SyncBuffer(object):
1380 def __init__(self, config, detach_head=False):
1381 self._messages = []
1382 self._failures = []
1383 self._later_queue1 = []
1384 self._later_queue2 = []
1385
1386 self.out = _SyncColoring(config)
1387 self.out.redirect(sys.stderr)
1388
1389 self.detach_head = detach_head
1390 self.clean = True
1391
1392 def info(self, project, fmt, *args):
1393 self._messages.append(_InfoMessage(project, fmt % args))
1394
1395 def fail(self, project, err=None):
1396 self._failures.append(_Failure(project, err))
1397 self.clean = False
1398
1399 def later1(self, project, what):
1400 self._later_queue1.append(_Later(project, what))
1401
1402 def later2(self, project, what):
1403 self._later_queue2.append(_Later(project, what))
1404
1405 def Finish(self):
1406 self._PrintMessages()
1407 self._RunLater()
1408 self._PrintMessages()
1409 return self.clean
1410
1411 def _RunLater(self):
1412 for q in ['_later_queue1', '_later_queue2']:
1413 if not self._RunQueue(q):
1414 return
1415
1416 def _RunQueue(self, queue):
1417 for m in getattr(self, queue):
1418 if not m.Run(self):
1419 self.clean = False
1420 return False
1421 setattr(self, queue, [])
1422 return True
1423
1424 def _PrintMessages(self):
1425 for m in self._messages:
1426 m.Print(self)
1427 for m in self._failures:
1428 m.Print(self)
1429
1430 self._messages = []
1431 self._failures = []
1432
1433
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001434class MetaProject(Project):
1435 """A special project housed under .repo.
1436 """
1437 def __init__(self, manifest, name, gitdir, worktree):
1438 repodir = manifest.repodir
1439 Project.__init__(self,
1440 manifest = manifest,
1441 name = name,
1442 gitdir = gitdir,
1443 worktree = worktree,
1444 remote = Remote('origin'),
1445 relpath = '.repo/%s' % name,
1446 revision = 'refs/heads/master')
1447
1448 def PreSync(self):
1449 if self.Exists:
1450 cb = self.CurrentBranch
1451 if cb:
1452 base = self.GetBranch(cb).merge
1453 if base:
1454 self.revision = base
1455
1456 @property
Shawn O. Pearcef6906872009-04-18 10:49:00 -07001457 def LastFetch(self):
1458 try:
1459 fh = os.path.join(self.gitdir, 'FETCH_HEAD')
1460 return os.path.getmtime(fh)
1461 except OSError:
1462 return 0
1463
1464 @property
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001465 def HasChanges(self):
1466 """Has the remote received new commits not yet checked out?
1467 """
Shawn O. Pearce336f7bd2009-04-18 10:39:28 -07001468 if not self.remote or not self.revision:
1469 return False
1470
1471 all = self.bare_ref.all
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001472 rev = self.GetRemote(self.remote.name).ToLocal(self.revision)
Shawn O. Pearce336f7bd2009-04-18 10:39:28 -07001473 if rev in all:
1474 revid = all[rev]
1475 else:
1476 revid = rev
1477
1478 head = self.work_git.GetHead()
1479 if head.startswith(R_HEADS):
1480 try:
1481 head = all[head]
1482 except KeyError:
1483 head = None
1484
1485 if revid == head:
1486 return False
1487 elif self._revlist(not_rev(HEAD), rev):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001488 return True
1489 return False