blob: 8ffed842ff1ed0008958f206f32bcaffcfbea5a2 [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
Shawn O. Pearcea5ece0e2010-07-15 16:52:42 -0700152 def UploadForReview(self, people, auto_topic=False):
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,
Shawn O. Pearcea5ece0e2010-07-15 16:52:42 -0700155 people,
156 auto_topic=auto_topic)
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)
Matthew Buckett2daf6672009-07-11 09:43:47 -0400207 else:
208 dir = os.path.dirname(dest)
209 if not os.path.isdir(dir):
210 os.makedirs(dir)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700211 shutil.copy(src, dest)
212 # make the file read-only
213 mode = os.stat(dest)[stat.ST_MODE]
214 mode = mode & ~(stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH)
215 os.chmod(dest, mode)
216 except IOError:
Shawn O. Pearce48244782009-04-16 08:25:57 -0700217 _error('Cannot copy file %s to %s', src, dest)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700218
Shawn O. Pearced1f70d92009-05-19 14:58:02 -0700219class RemoteSpec(object):
220 def __init__(self,
221 name,
222 url = None,
223 review = None):
224 self.name = name
225 self.url = url
226 self.review = review
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700227
228class Project(object):
229 def __init__(self,
230 manifest,
231 name,
232 remote,
233 gitdir,
234 worktree,
235 relpath,
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700236 revisionExpr,
237 revisionId):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700238 self.manifest = manifest
239 self.name = name
240 self.remote = remote
241 self.gitdir = gitdir
242 self.worktree = worktree
243 self.relpath = relpath
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700244 self.revisionExpr = revisionExpr
245
246 if revisionId is None \
247 and revisionExpr \
248 and IsId(revisionExpr):
249 self.revisionId = revisionExpr
250 else:
251 self.revisionId = revisionId
252
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700253 self.snapshots = {}
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700254 self.copyfiles = []
255 self.config = GitConfig.ForRepository(
256 gitdir = self.gitdir,
257 defaults = self.manifest.globalConfig)
258
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800259 if self.worktree:
260 self.work_git = self._GitGetByExec(self, bare=False)
261 else:
262 self.work_git = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700263 self.bare_git = self._GitGetByExec(self, bare=True)
Shawn O. Pearced237b692009-04-17 18:49:50 -0700264 self.bare_ref = GitRefs(gitdir)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700265
266 @property
267 def Exists(self):
268 return os.path.isdir(self.gitdir)
269
270 @property
271 def CurrentBranch(self):
272 """Obtain the name of the currently checked out branch.
273 The branch name omits the 'refs/heads/' prefix.
274 None is returned if the project is on a detached HEAD.
275 """
Shawn O. Pearce5b23f242009-04-17 18:43:33 -0700276 b = self.work_git.GetHead()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700277 if b.startswith(R_HEADS):
278 return b[len(R_HEADS):]
279 return None
280
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700281 def IsRebaseInProgress(self):
282 w = self.worktree
283 g = os.path.join(w, '.git')
284 return os.path.exists(os.path.join(g, 'rebase-apply')) \
285 or os.path.exists(os.path.join(g, 'rebase-merge')) \
286 or os.path.exists(os.path.join(w, '.dotest'))
Julius Gustavsson0cb1b3f2010-06-17 17:55:02 +0200287
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700288 def IsDirty(self, consider_untracked=True):
289 """Is the working directory modified in some way?
290 """
291 self.work_git.update_index('-q',
292 '--unmerged',
293 '--ignore-missing',
294 '--refresh')
295 if self.work_git.DiffZ('diff-index','-M','--cached',HEAD):
296 return True
297 if self.work_git.DiffZ('diff-files'):
298 return True
299 if consider_untracked and self.work_git.LsOthers():
300 return True
301 return False
302
303 _userident_name = None
304 _userident_email = None
305
306 @property
307 def UserName(self):
308 """Obtain the user's personal name.
309 """
310 if self._userident_name is None:
311 self._LoadUserIdentity()
312 return self._userident_name
313
314 @property
315 def UserEmail(self):
316 """Obtain the user's email address. This is very likely
317 to be their Gerrit login.
318 """
319 if self._userident_email is None:
320 self._LoadUserIdentity()
321 return self._userident_email
322
323 def _LoadUserIdentity(self):
324 u = self.bare_git.var('GIT_COMMITTER_IDENT')
325 m = re.compile("^(.*) <([^>]*)> ").match(u)
326 if m:
327 self._userident_name = m.group(1)
328 self._userident_email = m.group(2)
329 else:
330 self._userident_name = ''
331 self._userident_email = ''
332
333 def GetRemote(self, name):
334 """Get the configuration for a single remote.
335 """
336 return self.config.GetRemote(name)
337
338 def GetBranch(self, name):
339 """Get the configuration for a single branch.
340 """
341 return self.config.GetBranch(name)
342
Shawn O. Pearce27b07322009-04-10 16:02:48 -0700343 def GetBranches(self):
344 """Get all existing local branches.
345 """
346 current = self.CurrentBranch
Shawn O. Pearced237b692009-04-17 18:49:50 -0700347 all = self._allrefs
Shawn O. Pearce27b07322009-04-10 16:02:48 -0700348 heads = {}
349 pubd = {}
350
351 for name, id in all.iteritems():
352 if name.startswith(R_HEADS):
353 name = name[len(R_HEADS):]
354 b = self.GetBranch(name)
355 b.current = name == current
356 b.published = None
357 b.revision = id
358 heads[name] = b
359
360 for name, id in all.iteritems():
361 if name.startswith(R_PUB):
362 name = name[len(R_PUB):]
363 b = heads.get(name)
364 if b:
365 b.published = id
366
367 return heads
368
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700369
370## Status Display ##
371
Anthony Newnamcc50bac2010-04-08 10:28:59 -0500372 def HasChanges(self):
373 """Returns true if there are uncommitted changes.
374 """
375 self.work_git.update_index('-q',
376 '--unmerged',
377 '--ignore-missing',
378 '--refresh')
379 if self.IsRebaseInProgress():
380 return True
381
382 if self.work_git.DiffZ('diff-index', '--cached', HEAD):
383 return True
384
385 if self.work_git.DiffZ('diff-files'):
386 return True
387
388 if self.work_git.LsOthers():
389 return True
390
391 return False
392
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700393 def PrintWorkTreeStatus(self):
394 """Prints the status of the repository to stdout.
395 """
396 if not os.path.isdir(self.worktree):
397 print ''
398 print 'project %s/' % self.relpath
399 print ' missing (run "repo sync")'
400 return
401
402 self.work_git.update_index('-q',
403 '--unmerged',
404 '--ignore-missing',
405 '--refresh')
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700406 rb = self.IsRebaseInProgress()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700407 di = self.work_git.DiffZ('diff-index', '-M', '--cached', HEAD)
408 df = self.work_git.DiffZ('diff-files')
409 do = self.work_git.LsOthers()
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700410 if not rb and not di and not df and not do:
Shawn O. Pearce161f4452009-04-10 17:41:44 -0700411 return 'CLEAN'
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700412
413 out = StatusColoring(self.config)
414 out.project('project %-40s', self.relpath + '/')
415
416 branch = self.CurrentBranch
417 if branch is None:
418 out.nobranch('(*** NO BRANCH ***)')
419 else:
420 out.branch('branch %s', branch)
421 out.nl()
422
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700423 if rb:
424 out.important('prior sync failed; rebase still in progress')
425 out.nl()
426
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700427 paths = list()
428 paths.extend(di.keys())
429 paths.extend(df.keys())
430 paths.extend(do)
431
432 paths = list(set(paths))
433 paths.sort()
434
435 for p in paths:
436 try: i = di[p]
437 except KeyError: i = None
438
439 try: f = df[p]
440 except KeyError: f = None
Julius Gustavsson0cb1b3f2010-06-17 17:55:02 +0200441
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700442 if i: i_status = i.status.upper()
443 else: i_status = '-'
444
445 if f: f_status = f.status.lower()
446 else: f_status = '-'
447
448 if i and i.src_path:
Shawn O. Pearcefe086752009-03-03 13:49:48 -0800449 line = ' %s%s\t%s => %s (%s%%)' % (i_status, f_status,
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700450 i.src_path, p, i.level)
451 else:
452 line = ' %s%s\t%s' % (i_status, f_status, p)
453
454 if i and not f:
455 out.added('%s', line)
456 elif (i and f) or (not i and f):
457 out.changed('%s', line)
458 elif not i and not f:
459 out.untracked('%s', line)
460 else:
461 out.write('%s', line)
462 out.nl()
Shawn O. Pearce161f4452009-04-10 17:41:44 -0700463 return 'DIRTY'
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700464
465 def PrintWorkTreeDiff(self):
466 """Prints the status of the repository to stdout.
467 """
468 out = DiffColoring(self.config)
469 cmd = ['diff']
470 if out.is_on:
471 cmd.append('--color')
472 cmd.append(HEAD)
473 cmd.append('--')
474 p = GitCommand(self,
475 cmd,
476 capture_stdout = True,
477 capture_stderr = True)
478 has_diff = False
479 for line in p.process.stdout:
480 if not has_diff:
481 out.nl()
482 out.project('project %s/' % self.relpath)
483 out.nl()
484 has_diff = True
485 print line[:-1]
486 p.Wait()
487
488
489## Publish / Upload ##
490
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700491 def WasPublished(self, branch, all=None):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700492 """Was the branch published (uploaded) for code review?
493 If so, returns the SHA-1 hash of the last published
494 state for the branch.
495 """
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700496 key = R_PUB + branch
497 if all is None:
498 try:
499 return self.bare_git.rev_parse(key)
500 except GitError:
501 return None
502 else:
503 try:
504 return all[key]
505 except KeyError:
506 return None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700507
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700508 def CleanPublishedCache(self, all=None):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700509 """Prunes any stale published refs.
510 """
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700511 if all is None:
512 all = self._allrefs
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700513 heads = set()
514 canrm = {}
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700515 for name, id in all.iteritems():
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700516 if name.startswith(R_HEADS):
517 heads.add(name)
518 elif name.startswith(R_PUB):
519 canrm[name] = id
520
521 for name, id in canrm.iteritems():
522 n = name[len(R_PUB):]
523 if R_HEADS + n not in heads:
524 self.bare_git.DeleteRef(name, id)
525
526 def GetUploadableBranches(self):
527 """List any branches which can be uploaded for review.
528 """
529 heads = {}
530 pubed = {}
531
532 for name, id in self._allrefs.iteritems():
533 if name.startswith(R_HEADS):
534 heads[name[len(R_HEADS):]] = id
535 elif name.startswith(R_PUB):
536 pubed[name[len(R_PUB):]] = id
537
538 ready = []
539 for branch, id in heads.iteritems():
540 if branch in pubed and pubed[branch] == id:
541 continue
542
Shawn O. Pearce35f25962008-11-11 17:03:13 -0800543 rb = self.GetUploadableBranch(branch)
544 if rb:
545 ready.append(rb)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700546 return ready
547
Shawn O. Pearce35f25962008-11-11 17:03:13 -0800548 def GetUploadableBranch(self, branch_name):
549 """Get a single uploadable branch, or None.
550 """
551 branch = self.GetBranch(branch_name)
552 base = branch.LocalMerge
553 if branch.LocalMerge:
554 rb = ReviewableBranch(self, branch, base)
555 if rb.commits:
556 return rb
557 return None
558
Shawn O. Pearcea5ece0e2010-07-15 16:52:42 -0700559 def UploadForReview(self, branch=None,
560 replace_changes=None,
561 people=([],[]),
562 auto_topic=False):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700563 """Uploads the named branch for code review.
564 """
565 if branch is None:
566 branch = self.CurrentBranch
567 if branch is None:
568 raise GitError('not currently on a branch')
569
570 branch = self.GetBranch(branch)
571 if not branch.LocalMerge:
572 raise GitError('branch %s does not track a remote' % branch.name)
573 if not branch.remote.review:
574 raise GitError('remote %s has no review url' % branch.remote.name)
575
576 dest_branch = branch.merge
577 if not dest_branch.startswith(R_HEADS):
578 dest_branch = R_HEADS + dest_branch
579
Shawn O. Pearce339ba9f2008-11-06 09:52:51 -0800580 if not branch.remote.projectname:
581 branch.remote.projectname = self.name
582 branch.remote.Save()
583
Shawn O. Pearce370e3fa2009-01-26 10:55:39 -0800584 if branch.remote.ReviewProtocol == 'ssh':
Shawn O. Pearceb54a3922009-01-05 16:18:58 -0800585 if dest_branch.startswith(R_HEADS):
586 dest_branch = dest_branch[len(R_HEADS):]
587
588 rp = ['gerrit receive-pack']
589 for e in people[0]:
590 rp.append('--reviewer=%s' % sq(e))
591 for e in people[1]:
592 rp.append('--cc=%s' % sq(e))
593
Shawn O. Pearcea5ece0e2010-07-15 16:52:42 -0700594 ref_spec = '%s:refs/for/%s' % (R_HEADS + branch.name, dest_branch)
595 if auto_topic:
596 ref_spec = ref_spec + '/' + branch.name
597
Shawn O. Pearceb54a3922009-01-05 16:18:58 -0800598 cmd = ['push']
599 cmd.append('--receive-pack=%s' % " ".join(rp))
600 cmd.append(branch.remote.SshReviewUrl(self.UserEmail))
Shawn O. Pearcea5ece0e2010-07-15 16:52:42 -0700601 cmd.append(ref_spec)
602
Shawn O. Pearceb54a3922009-01-05 16:18:58 -0800603 if replace_changes:
604 for change_id,commit_id in replace_changes.iteritems():
605 cmd.append('%s:refs/changes/%s/new' % (commit_id, change_id))
606 if GitCommand(self, cmd, bare = True).Wait() != 0:
607 raise UploadError('Upload failed')
608
609 else:
610 raise UploadError('Unsupported protocol %s' \
611 % branch.remote.review)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700612
613 msg = "posted to %s for %s" % (branch.remote.review, dest_branch)
614 self.bare_git.UpdateRef(R_PUB + branch.name,
615 R_HEADS + branch.name,
616 message = msg)
617
618
619## Sync ##
620
621 def Sync_NetworkHalf(self):
622 """Perform only the network IO portion of the sync process.
623 Local working directory/branch state is not affected.
624 """
Shawn O. Pearce88443382010-10-08 10:02:09 +0200625 is_new = not self.Exists
626 if is_new:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700627 print >>sys.stderr
628 print >>sys.stderr, 'Initializing project %s ...' % self.name
629 self._InitGitDir()
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800630
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700631 self._InitRemote()
Shawn O. Pearce88443382010-10-08 10:02:09 +0200632 if not self._RemoteFetch(initial = is_new):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700633 return False
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800634
Julius Gustavsson0cb1b3f2010-06-17 17:55:02 +0200635 #Check that the requested ref was found after fetch
636 #
637 try:
638 self.GetRevisionId()
639 except ManifestInvalidRevisionError:
640 # if the ref is a tag. We can try fetching
641 # the tag manually as a last resort
642 #
643 rev = self.revisionExpr
644 if rev.startswith(R_TAGS):
645 self._RemoteFetch(None, rev[len(R_TAGS):])
646
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800647 if self.worktree:
Shawn O. Pearcee284ad12008-11-04 07:37:10 -0800648 self._InitMRef()
649 else:
650 self._InitMirrorHead()
651 try:
652 os.remove(os.path.join(self.gitdir, 'FETCH_HEAD'))
653 except OSError:
654 pass
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700655 return True
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -0800656
657 def PostRepoUpgrade(self):
658 self._InitHooks()
659
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700660 def _CopyFiles(self):
661 for file in self.copyfiles:
662 file._Copy()
663
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700664 def GetRevisionId(self, all=None):
665 if self.revisionId:
666 return self.revisionId
667
668 rem = self.GetRemote(self.remote.name)
669 rev = rem.ToLocal(self.revisionExpr)
670
671 if all is not None and rev in all:
672 return all[rev]
673
674 try:
675 return self.bare_git.rev_parse('--verify', '%s^0' % rev)
676 except GitError:
677 raise ManifestInvalidRevisionError(
678 'revision %s in %s not found' % (self.revisionExpr,
679 self.name))
680
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700681 def Sync_LocalHalf(self, syncbuf):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700682 """Perform only the local IO portion of the sync process.
683 Network access is not required.
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700684 """
685 self._InitWorkTree()
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700686 all = self.bare_ref.all
687 self.CleanPublishedCache(all)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700688
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700689 revid = self.GetRevisionId(all)
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700690 head = self.work_git.GetHead()
691 if head.startswith(R_HEADS):
692 branch = head[len(R_HEADS):]
693 try:
694 head = all[head]
695 except KeyError:
696 head = None
697 else:
698 branch = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700699
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700700 if branch is None or syncbuf.detach_head:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700701 # Currently on a detached HEAD. The user is assumed to
702 # not have any local modifications worth worrying about.
703 #
Shawn O. Pearce3d2cdd02009-04-18 15:26:10 -0700704 if self.IsRebaseInProgress():
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700705 syncbuf.fail(self, _PriorSyncFailedError())
706 return
707
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700708 if head == revid:
709 # No changes; don't do anything further.
710 #
711 return
712
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700713 lost = self._revlist(not_rev(revid), HEAD)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700714 if lost:
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700715 syncbuf.info(self, "discarding %d commits", len(lost))
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700716 try:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700717 self._Checkout(revid, quiet=True)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700718 except GitError, e:
719 syncbuf.fail(self, e)
720 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700721 self._CopyFiles()
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700722 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700723
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700724 if head == revid:
725 # No changes; don't do anything further.
726 #
727 return
728
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700729 branch = self.GetBranch(branch)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700730
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700731 if not branch.LocalMerge:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700732 # The current branch has no tracking configuration.
733 # Jump off it to a deatched HEAD.
734 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700735 syncbuf.info(self,
736 "leaving %s; does not track upstream",
737 branch.name)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700738 try:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700739 self._Checkout(revid, quiet=True)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700740 except GitError, e:
741 syncbuf.fail(self, e)
742 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700743 self._CopyFiles()
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700744 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700745
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700746 upstream_gain = self._revlist(not_rev(HEAD), revid)
Shawn O. Pearcefbcde472009-04-17 20:58:02 -0700747 pub = self.WasPublished(branch.name, all)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700748 if pub:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700749 not_merged = self._revlist(not_rev(revid), pub)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700750 if not_merged:
751 if upstream_gain:
752 # The user has published this branch and some of those
753 # commits are not yet merged upstream. We do not want
754 # to rewrite the published commits so we punt.
755 #
Daniel Sandler4c50dee2010-03-02 15:38:03 -0500756 syncbuf.fail(self,
757 "branch %s is published (but not merged) and is now %d commits behind"
758 % (branch.name, len(upstream_gain)))
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700759 return
Shawn O. Pearce05f66b62009-04-21 08:26:32 -0700760 elif pub == head:
761 # All published commits are merged, and thus we are a
762 # strict subset. We can fast-forward safely.
Shawn O. Pearcea54c5272008-10-30 11:03:00 -0700763 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700764 def _doff():
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700765 self._FastForward(revid)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700766 self._CopyFiles()
767 syncbuf.later1(self, _doff)
768 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700769
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700770 # Examine the local commits not in the remote. Find the
771 # last one attributed to this user, if any.
772 #
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700773 local_changes = self._revlist(not_rev(revid), HEAD, format='%H %ce')
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700774 last_mine = None
775 cnt_mine = 0
776 for commit in local_changes:
Shawn O. Pearceaa4982e2009-12-30 18:38:27 -0800777 commit_id, committer_email = commit.split(' ', 1)
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700778 if committer_email == self.UserEmail:
779 last_mine = commit_id
780 cnt_mine += 1
781
Shawn O. Pearceda88ff42009-06-03 11:09:12 -0700782 if not upstream_gain and cnt_mine == len(local_changes):
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700783 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700784
785 if self.IsDirty(consider_untracked=False):
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700786 syncbuf.fail(self, _DirtyError())
787 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700788
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700789 # If the upstream switched on us, warn the user.
790 #
791 if branch.merge != self.revisionExpr:
792 if branch.merge and self.revisionExpr:
793 syncbuf.info(self,
794 'manifest switched %s...%s',
795 branch.merge,
796 self.revisionExpr)
797 elif branch.merge:
798 syncbuf.info(self,
799 'manifest no longer tracks %s',
800 branch.merge)
801
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700802 if cnt_mine < len(local_changes):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700803 # Upstream rebased. Not everything in HEAD
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700804 # was created by this user.
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700805 #
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700806 syncbuf.info(self,
807 "discarding %d commits removed from upstream",
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700808 len(local_changes) - cnt_mine)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700809
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700810 branch.remote = self.GetRemote(self.remote.name)
811 branch.merge = self.revisionExpr
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700812 branch.Save()
813
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700814 if cnt_mine > 0:
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700815 def _dorebase():
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700816 self._Rebase(upstream = '%s^1' % last_mine, onto = revid)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700817 self._CopyFiles()
818 syncbuf.later2(self, _dorebase)
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -0700819 elif local_changes:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700820 try:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700821 self._ResetHard(revid)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700822 self._CopyFiles()
823 except GitError, e:
824 syncbuf.fail(self, e)
825 return
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700826 else:
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700827 def _doff():
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700828 self._FastForward(revid)
Shawn O. Pearce350cde42009-04-16 11:21:18 -0700829 self._CopyFiles()
830 syncbuf.later1(self, _doff)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700831
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800832 def AddCopyFile(self, src, dest, absdest):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700833 # dest should already be an absolute path, but src is project relative
834 # make src an absolute path
Shawn O. Pearcec7a4eef2009-03-05 10:32:38 -0800835 abssrc = os.path.join(self.worktree, src)
836 self.copyfiles.append(_CopyFile(src, dest, abssrc, absdest))
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700837
Shawn O. Pearce632768b2008-10-23 11:58:52 -0700838 def DownloadPatchSet(self, change_id, patch_id):
839 """Download a single patch set of a single change to FETCH_HEAD.
840 """
841 remote = self.GetRemote(self.remote.name)
842
843 cmd = ['fetch', remote.name]
844 cmd.append('refs/changes/%2.2d/%d/%d' \
845 % (change_id % 100, change_id, patch_id))
846 cmd.extend(map(lambda x: str(x), remote.fetch))
847 if GitCommand(self, cmd, bare=True).Wait() != 0:
848 return None
849 return DownloadedChange(self,
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700850 self.GetRevisionId(),
Shawn O. Pearce632768b2008-10-23 11:58:52 -0700851 change_id,
852 patch_id,
853 self.bare_git.rev_parse('FETCH_HEAD'))
854
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700855
856## Branch Management ##
857
858 def StartBranch(self, name):
859 """Create a new branch off the manifest's revision.
860 """
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700861 head = self.work_git.GetHead()
862 if head == (R_HEADS + name):
863 return True
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700864
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700865 all = self.bare_ref.all
866 if (R_HEADS + name) in all:
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700867 return GitCommand(self,
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700868 ['checkout', name, '--'],
Shawn O. Pearce0f0dfa32009-04-18 14:53:39 -0700869 capture_stdout = True,
870 capture_stderr = True).Wait() == 0
Shawn O. Pearce0a389e92009-04-10 16:21:18 -0700871
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700872 branch = self.GetBranch(name)
873 branch.remote = self.GetRemote(self.remote.name)
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700874 branch.merge = self.revisionExpr
875 revid = self.GetRevisionId(all)
Shawn O. Pearce0a389e92009-04-10 16:21:18 -0700876
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700877 if head.startswith(R_HEADS):
878 try:
879 head = all[head]
880 except KeyError:
881 head = None
882
883 if revid and head and revid == head:
884 ref = os.path.join(self.gitdir, R_HEADS + name)
885 try:
886 os.makedirs(os.path.dirname(ref))
887 except OSError:
888 pass
889 _lwrite(ref, '%s\n' % revid)
890 _lwrite(os.path.join(self.worktree, '.git', HEAD),
891 'ref: %s%s\n' % (R_HEADS, name))
892 branch.Save()
893 return True
894
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700895 if GitCommand(self,
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700896 ['checkout', '-b', branch.name, revid],
Shawn O. Pearce0f0dfa32009-04-18 14:53:39 -0700897 capture_stdout = True,
898 capture_stderr = True).Wait() == 0:
Shawn O. Pearceaccc56d2009-04-18 14:45:51 -0700899 branch.Save()
900 return True
901 return False
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700902
Wink Saville02d79452009-04-10 13:01:24 -0700903 def CheckoutBranch(self, name):
904 """Checkout a local topic branch.
905 """
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700906 rev = R_HEADS + name
907 head = self.work_git.GetHead()
908 if head == rev:
909 # Already on the branch
910 #
911 return True
Wink Saville02d79452009-04-10 13:01:24 -0700912
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700913 all = self.bare_ref.all
Wink Saville02d79452009-04-10 13:01:24 -0700914 try:
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700915 revid = all[rev]
916 except KeyError:
917 # Branch does not exist in this project
918 #
919 return False
Wink Saville02d79452009-04-10 13:01:24 -0700920
Shawn O. Pearce89e717d2009-04-18 15:04:41 -0700921 if head.startswith(R_HEADS):
922 try:
923 head = all[head]
924 except KeyError:
925 head = None
926
927 if head == revid:
928 # Same revision; just update HEAD to point to the new
929 # target branch, but otherwise take no other action.
930 #
931 _lwrite(os.path.join(self.worktree, '.git', HEAD),
932 'ref: %s%s\n' % (R_HEADS, name))
933 return True
934
935 return GitCommand(self,
936 ['checkout', name, '--'],
937 capture_stdout = True,
938 capture_stderr = True).Wait() == 0
Wink Saville02d79452009-04-10 13:01:24 -0700939
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800940 def AbandonBranch(self, name):
941 """Destroy a local topic branch.
942 """
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700943 rev = R_HEADS + name
944 all = self.bare_ref.all
945 if rev not in all:
946 # Doesn't exist; assume already abandoned.
947 #
948 return True
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800949
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700950 head = self.work_git.GetHead()
951 if head == rev:
952 # We can't destroy the branch while we are sitting
953 # on it. Switch to a detached HEAD.
954 #
955 head = all[head]
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800956
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700957 revid = self.GetRevisionId(all)
958 if head == revid:
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700959 _lwrite(os.path.join(self.worktree, '.git', HEAD),
960 '%s\n' % revid)
961 else:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700962 self._Checkout(revid, quiet=True)
Shawn O. Pearce552ac892009-04-18 15:15:24 -0700963
964 return GitCommand(self,
965 ['branch', '-D', name],
966 capture_stdout = True,
967 capture_stderr = True).Wait() == 0
Shawn O. Pearce9fa44db2008-11-03 11:24:59 -0800968
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700969 def PruneHeads(self):
970 """Prune any topic branches already merged into upstream.
971 """
972 cb = self.CurrentBranch
973 kill = []
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -0800974 left = self._allrefs
975 for name in left.keys():
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700976 if name.startswith(R_HEADS):
977 name = name[len(R_HEADS):]
978 if cb is None or name != cb:
979 kill.append(name)
980
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -0700981 rev = self.GetRevisionId(left)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700982 if cb is not None \
983 and not self._revlist(HEAD + '...' + rev) \
984 and not self.IsDirty(consider_untracked = False):
985 self.work_git.DetachHead(HEAD)
986 kill.append(cb)
987
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700988 if kill:
Shawn O. Pearce5b23f242009-04-17 18:43:33 -0700989 old = self.bare_git.GetHead()
990 if old is None:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700991 old = 'refs/heads/please_never_use_this_as_a_branch_name'
992
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700993 try:
994 self.bare_git.DetachHead(rev)
995
996 b = ['branch', '-d']
997 b.extend(kill)
998 b = GitCommand(self, b, bare=True,
999 capture_stdout=True,
1000 capture_stderr=True)
1001 b.Wait()
1002 finally:
1003 self.bare_git.SetHead(old)
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -08001004 left = self._allrefs
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001005
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -08001006 for branch in kill:
1007 if (R_HEADS + branch) not in left:
1008 self.CleanPublishedCache()
1009 break
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001010
1011 if cb and cb not in kill:
1012 kill.append(cb)
Shawn O. Pearce7c6c64d2009-03-02 12:38:13 -08001013 kill.sort()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001014
1015 kept = []
1016 for branch in kill:
Shawn O. Pearce3778f9d2009-03-02 12:30:50 -08001017 if (R_HEADS + branch) in left:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001018 branch = self.GetBranch(branch)
1019 base = branch.LocalMerge
1020 if not base:
1021 base = rev
1022 kept.append(ReviewableBranch(self, branch, base))
1023 return kept
1024
1025
1026## Direct Git Commands ##
1027
Shawn O. Pearce88443382010-10-08 10:02:09 +02001028 def _RemoteFetch(self, name=None, tag=None, initial=False):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001029 if not name:
1030 name = self.remote.name
Shawn O. Pearcefb231612009-04-10 18:53:46 -07001031
1032 ssh_proxy = False
1033 if self.GetRemote(name).PreConnectFetch():
1034 ssh_proxy = True
1035
Shawn O. Pearce88443382010-10-08 10:02:09 +02001036 if initial:
1037 alt = os.path.join(self.gitdir, 'objects/info/alternates')
1038 try:
1039 fd = open(alt, 'rb')
1040 try:
1041 ref_dir = fd.readline()
1042 if ref_dir and ref_dir.endswith('\n'):
1043 ref_dir = ref_dir[:-1]
1044 finally:
1045 fd.close()
1046 except IOError, e:
1047 ref_dir = None
1048
1049 if ref_dir and 'objects' == os.path.basename(ref_dir):
1050 ref_dir = os.path.dirname(ref_dir)
1051 packed_refs = os.path.join(self.gitdir, 'packed-refs')
1052 remote = self.GetRemote(name)
1053
1054 all = self.bare_ref.all
1055 ids = set(all.values())
1056 tmp = set()
1057
1058 for r, id in GitRefs(ref_dir).all.iteritems():
1059 if r not in all:
1060 if r.startswith(R_TAGS) or remote.WritesTo(r):
1061 all[r] = id
1062 ids.add(id)
1063 continue
1064
1065 if id in ids:
1066 continue
1067
1068 r = 'refs/_alt/%s' % id
1069 all[r] = id
1070 ids.add(id)
1071 tmp.add(r)
1072
1073 ref_names = list(all.keys())
1074 ref_names.sort()
1075
1076 tmp_packed = ''
1077 old_packed = ''
1078
1079 for r in ref_names:
1080 line = '%s %s\n' % (all[r], r)
1081 tmp_packed += line
1082 if r not in tmp:
1083 old_packed += line
1084
1085 _lwrite(packed_refs, tmp_packed)
1086
1087 else:
1088 ref_dir = None
1089
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001090 cmd = ['fetch']
1091 if not self.worktree:
1092 cmd.append('--update-head-ok')
1093 cmd.append(name)
Julius Gustavsson0cb1b3f2010-06-17 17:55:02 +02001094 if tag is not None:
1095 cmd.append('tag')
1096 cmd.append(tag)
Shawn O. Pearce88443382010-10-08 10:02:09 +02001097
1098 ok = GitCommand(self,
1099 cmd,
1100 bare = True,
1101 ssh_proxy = ssh_proxy).Wait() == 0
1102
1103 if initial:
1104 if ref_dir:
1105 if old_packed != '':
1106 _lwrite(packed_refs, old_packed)
1107 else:
1108 os.remove(packed_refs)
1109 self.bare_git.pack_refs('--all', '--prune')
1110
1111 return ok
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001112
1113 def _Checkout(self, rev, quiet=False):
1114 cmd = ['checkout']
1115 if quiet:
1116 cmd.append('-q')
1117 cmd.append(rev)
1118 cmd.append('--')
1119 if GitCommand(self, cmd).Wait() != 0:
1120 if self._allrefs:
1121 raise GitError('%s checkout %s ' % (self.name, rev))
1122
1123 def _ResetHard(self, rev, quiet=True):
1124 cmd = ['reset', '--hard']
1125 if quiet:
1126 cmd.append('-q')
1127 cmd.append(rev)
1128 if GitCommand(self, cmd).Wait() != 0:
1129 raise GitError('%s reset --hard %s ' % (self.name, rev))
1130
1131 def _Rebase(self, upstream, onto = None):
Shawn O. Pearce19a83d82009-04-16 08:14:26 -07001132 cmd = ['rebase']
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001133 if onto is not None:
1134 cmd.extend(['--onto', onto])
1135 cmd.append(upstream)
Shawn O. Pearce19a83d82009-04-16 08:14:26 -07001136 if GitCommand(self, cmd).Wait() != 0:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001137 raise GitError('%s rebase %s ' % (self.name, upstream))
1138
1139 def _FastForward(self, head):
1140 cmd = ['merge', head]
1141 if GitCommand(self, cmd).Wait() != 0:
1142 raise GitError('%s merge %s ' % (self.name, head))
1143
1144 def _InitGitDir(self):
1145 if not os.path.exists(self.gitdir):
1146 os.makedirs(self.gitdir)
1147 self.bare_git.init()
Shawn O. Pearce2816d4f2009-03-03 17:53:18 -08001148
Shawn O. Pearce88443382010-10-08 10:02:09 +02001149 mp = self.manifest.manifestProject
1150 ref_dir = mp.config.GetString('repo.reference')
1151
1152 if ref_dir:
1153 mirror_git = os.path.join(ref_dir, self.name + '.git')
1154 repo_git = os.path.join(ref_dir, '.repo', 'projects',
1155 self.relpath + '.git')
1156
1157 if os.path.exists(mirror_git):
1158 ref_dir = mirror_git
1159
1160 elif os.path.exists(repo_git):
1161 ref_dir = repo_git
1162
1163 else:
1164 ref_dir = None
1165
1166 if ref_dir:
1167 _lwrite(os.path.join(self.gitdir, 'objects/info/alternates'),
1168 os.path.join(ref_dir, 'objects') + '\n')
1169
Shawn O. Pearce2816d4f2009-03-03 17:53:18 -08001170 if self.manifest.IsMirror:
1171 self.config.SetString('core.bare', 'true')
1172 else:
1173 self.config.SetString('core.bare', None)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001174
1175 hooks = self._gitdir_path('hooks')
Shawn O. Pearcede646812008-10-29 14:38:12 -07001176 try:
1177 to_rm = os.listdir(hooks)
1178 except OSError:
1179 to_rm = []
1180 for old_hook in to_rm:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001181 os.remove(os.path.join(hooks, old_hook))
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001182 self._InitHooks()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001183
1184 m = self.manifest.manifestProject.config
1185 for key in ['user.name', 'user.email']:
1186 if m.Has(key, include_defaults = False):
1187 self.config.SetString(key, m.GetString(key))
1188
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001189 def _InitHooks(self):
1190 hooks = self._gitdir_path('hooks')
1191 if not os.path.exists(hooks):
1192 os.makedirs(hooks)
1193 for stock_hook in repo_hooks():
Shawn O. Pearce9452e4e2009-08-22 18:17:46 -07001194 name = os.path.basename(stock_hook)
1195
1196 if name in ('commit-msg') and not self.remote.review:
1197 # Don't install a Gerrit Code Review hook if this
1198 # project does not appear to use it for reviews.
1199 #
1200 continue
1201
1202 dst = os.path.join(hooks, name)
1203 if os.path.islink(dst):
1204 continue
1205 if os.path.exists(dst):
1206 if filecmp.cmp(stock_hook, dst, shallow=False):
1207 os.remove(dst)
1208 else:
1209 _error("%s: Not replacing %s hook", self.relpath, name)
1210 continue
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001211 try:
1212 os.symlink(relpath(stock_hook, dst), dst)
1213 except OSError, e:
Shawn O. Pearce9452e4e2009-08-22 18:17:46 -07001214 if e.errno == errno.EPERM:
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001215 raise GitError('filesystem must support symlinks')
1216 else:
1217 raise
1218
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001219 def _InitRemote(self):
Shawn O. Pearced1f70d92009-05-19 14:58:02 -07001220 if self.remote.url:
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001221 remote = self.GetRemote(self.remote.name)
Shawn O. Pearced1f70d92009-05-19 14:58:02 -07001222 remote.url = self.remote.url
1223 remote.review = self.remote.review
1224 remote.projectname = self.name
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001225
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001226 if self.worktree:
1227 remote.ResetFetch(mirror=False)
1228 else:
1229 remote.ResetFetch(mirror=True)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001230 remote.Save()
1231
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001232 def _InitMRef(self):
1233 if self.manifest.branch:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001234 self._InitAnyMRef(R_M + self.manifest.branch)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001235
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001236 def _InitMirrorHead(self):
Shawn O. Pearcefe200ee2009-06-01 15:28:21 -07001237 self._InitAnyMRef(HEAD)
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001238
1239 def _InitAnyMRef(self, ref):
1240 cur = self.bare_ref.symref(ref)
1241
1242 if self.revisionId:
1243 if cur != '' or self.bare_ref.get(ref) != self.revisionId:
1244 msg = 'manifest set to %s' % self.revisionId
1245 dst = self.revisionId + '^0'
1246 self.bare_git.UpdateRef(ref, dst, message = msg, detach = True)
1247 else:
1248 remote = self.GetRemote(self.remote.name)
1249 dst = remote.ToLocal(self.revisionExpr)
1250 if cur != dst:
1251 msg = 'manifest set to %s' % self.revisionExpr
1252 self.bare_git.symbolic_ref('-m', msg, ref, dst)
Shawn O. Pearcee284ad12008-11-04 07:37:10 -08001253
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001254 def _InitWorkTree(self):
1255 dotgit = os.path.join(self.worktree, '.git')
1256 if not os.path.exists(dotgit):
1257 os.makedirs(dotgit)
1258
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001259 for name in ['config',
1260 'description',
1261 'hooks',
1262 'info',
1263 'logs',
1264 'objects',
1265 'packed-refs',
1266 'refs',
1267 'rr-cache',
1268 'svn']:
Shawn O. Pearce438ee1c2008-11-03 09:59:36 -08001269 try:
Shawn O. Pearcec9ef7442008-11-03 10:32:09 -08001270 src = os.path.join(self.gitdir, name)
1271 dst = os.path.join(dotgit, name)
Nico Sallembiend63060f2010-01-20 10:27:50 -08001272 if os.path.islink(dst) or not os.path.exists(dst):
1273 os.symlink(relpath(src, dst), dst)
1274 else:
1275 raise GitError('cannot overwrite a local work tree')
Shawn O. Pearce438ee1c2008-11-03 09:59:36 -08001276 except OSError, e:
1277 if e.errno == errno.EPERM:
1278 raise GitError('filesystem must support symlinks')
1279 else:
1280 raise
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001281
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001282 _lwrite(os.path.join(dotgit, HEAD), '%s\n' % self.GetRevisionId())
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001283
1284 cmd = ['read-tree', '--reset', '-u']
1285 cmd.append('-v')
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001286 cmd.append(HEAD)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001287 if GitCommand(self, cmd).Wait() != 0:
1288 raise GitError("cannot initialize work tree")
Shawn O. Pearce93609662009-04-21 10:50:33 -07001289 self._CopyFiles()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001290
1291 def _gitdir_path(self, path):
1292 return os.path.join(self.gitdir, path)
1293
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001294 def _revlist(self, *args, **kw):
1295 a = []
1296 a.extend(args)
1297 a.append('--')
1298 return self.work_git.rev_list(*a, **kw)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001299
1300 @property
1301 def _allrefs(self):
Shawn O. Pearced237b692009-04-17 18:49:50 -07001302 return self.bare_ref.all
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001303
1304 class _GitGetByExec(object):
1305 def __init__(self, project, bare):
1306 self._project = project
1307 self._bare = bare
1308
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001309 def LsOthers(self):
1310 p = GitCommand(self._project,
1311 ['ls-files',
1312 '-z',
1313 '--others',
1314 '--exclude-standard'],
1315 bare = False,
1316 capture_stdout = True,
1317 capture_stderr = True)
1318 if p.Wait() == 0:
1319 out = p.stdout
1320 if out:
1321 return out[:-1].split("\0")
1322 return []
1323
1324 def DiffZ(self, name, *args):
1325 cmd = [name]
1326 cmd.append('-z')
1327 cmd.extend(args)
1328 p = GitCommand(self._project,
1329 cmd,
1330 bare = False,
1331 capture_stdout = True,
1332 capture_stderr = True)
1333 try:
1334 out = p.process.stdout.read()
1335 r = {}
1336 if out:
1337 out = iter(out[:-1].split('\0'))
1338 while out:
Shawn O. Pearce02dbb6d2008-10-21 13:59:08 -07001339 try:
1340 info = out.next()
1341 path = out.next()
1342 except StopIteration:
1343 break
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001344
1345 class _Info(object):
1346 def __init__(self, path, omode, nmode, oid, nid, state):
1347 self.path = path
1348 self.src_path = None
1349 self.old_mode = omode
1350 self.new_mode = nmode
1351 self.old_id = oid
1352 self.new_id = nid
1353
1354 if len(state) == 1:
1355 self.status = state
1356 self.level = None
1357 else:
1358 self.status = state[:1]
1359 self.level = state[1:]
1360 while self.level.startswith('0'):
1361 self.level = self.level[1:]
1362
1363 info = info[1:].split(' ')
1364 info =_Info(path, *info)
1365 if info.status in ('R', 'C'):
1366 info.src_path = info.path
1367 info.path = out.next()
1368 r[info.path] = info
1369 return r
1370 finally:
1371 p.Wait()
1372
1373 def GetHead(self):
Shawn O. Pearce5b23f242009-04-17 18:43:33 -07001374 if self._bare:
1375 path = os.path.join(self._project.gitdir, HEAD)
1376 else:
1377 path = os.path.join(self._project.worktree, '.git', HEAD)
Shawn O. Pearce76ca9f82009-04-18 14:48:03 -07001378 fd = open(path, 'rb')
1379 try:
1380 line = fd.read()
1381 finally:
1382 fd.close()
Shawn O. Pearce5b23f242009-04-17 18:43:33 -07001383 if line.startswith('ref: '):
1384 return line[5:-1]
1385 return line[:-1]
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001386
1387 def SetHead(self, ref, message=None):
1388 cmdv = []
1389 if message is not None:
1390 cmdv.extend(['-m', message])
1391 cmdv.append(HEAD)
1392 cmdv.append(ref)
1393 self.symbolic_ref(*cmdv)
1394
1395 def DetachHead(self, new, message=None):
1396 cmdv = ['--no-deref']
1397 if message is not None:
1398 cmdv.extend(['-m', message])
1399 cmdv.append(HEAD)
1400 cmdv.append(new)
1401 self.update_ref(*cmdv)
1402
1403 def UpdateRef(self, name, new, old=None,
1404 message=None,
1405 detach=False):
1406 cmdv = []
1407 if message is not None:
1408 cmdv.extend(['-m', message])
1409 if detach:
1410 cmdv.append('--no-deref')
1411 cmdv.append(name)
1412 cmdv.append(new)
1413 if old is not None:
1414 cmdv.append(old)
1415 self.update_ref(*cmdv)
1416
1417 def DeleteRef(self, name, old=None):
1418 if not old:
1419 old = self.rev_parse(name)
1420 self.update_ref('-d', name, old)
Shawn O. Pearcefbcde472009-04-17 20:58:02 -07001421 self._project.bare_ref.deleted(name)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001422
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001423 def rev_list(self, *args, **kw):
1424 if 'format' in kw:
1425 cmdv = ['log', '--pretty=format:%s' % kw['format']]
1426 else:
1427 cmdv = ['rev-list']
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001428 cmdv.extend(args)
1429 p = GitCommand(self._project,
1430 cmdv,
1431 bare = self._bare,
1432 capture_stdout = True,
1433 capture_stderr = True)
1434 r = []
1435 for line in p.process.stdout:
Shawn O. Pearce8ad8a0e2009-05-29 18:28:25 -07001436 if line[-1] == '\n':
1437 line = line[:-1]
1438 r.append(line)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001439 if p.Wait() != 0:
1440 raise GitError('%s rev-list %s: %s' % (
1441 self._project.name,
1442 str(args),
1443 p.stderr))
1444 return r
1445
1446 def __getattr__(self, name):
1447 name = name.replace('_', '-')
1448 def runner(*args):
1449 cmdv = [name]
1450 cmdv.extend(args)
1451 p = GitCommand(self._project,
1452 cmdv,
1453 bare = self._bare,
1454 capture_stdout = True,
1455 capture_stderr = True)
1456 if p.Wait() != 0:
1457 raise GitError('%s %s: %s' % (
1458 self._project.name,
1459 name,
1460 p.stderr))
1461 r = p.stdout
1462 if r.endswith('\n') and r.index('\n') == len(r) - 1:
1463 return r[:-1]
1464 return r
1465 return runner
1466
1467
Shawn O. Pearce350cde42009-04-16 11:21:18 -07001468class _PriorSyncFailedError(Exception):
1469 def __str__(self):
1470 return 'prior sync failed; rebase still in progress'
1471
1472class _DirtyError(Exception):
1473 def __str__(self):
1474 return 'contains uncommitted changes'
1475
1476class _InfoMessage(object):
1477 def __init__(self, project, text):
1478 self.project = project
1479 self.text = text
1480
1481 def Print(self, syncbuf):
1482 syncbuf.out.info('%s/: %s', self.project.relpath, self.text)
1483 syncbuf.out.nl()
1484
1485class _Failure(object):
1486 def __init__(self, project, why):
1487 self.project = project
1488 self.why = why
1489
1490 def Print(self, syncbuf):
1491 syncbuf.out.fail('error: %s/: %s',
1492 self.project.relpath,
1493 str(self.why))
1494 syncbuf.out.nl()
1495
1496class _Later(object):
1497 def __init__(self, project, action):
1498 self.project = project
1499 self.action = action
1500
1501 def Run(self, syncbuf):
1502 out = syncbuf.out
1503 out.project('project %s/', self.project.relpath)
1504 out.nl()
1505 try:
1506 self.action()
1507 out.nl()
1508 return True
1509 except GitError, e:
1510 out.nl()
1511 return False
1512
1513class _SyncColoring(Coloring):
1514 def __init__(self, config):
1515 Coloring.__init__(self, config, 'reposync')
1516 self.project = self.printer('header', attr = 'bold')
1517 self.info = self.printer('info')
1518 self.fail = self.printer('fail', fg='red')
1519
1520class SyncBuffer(object):
1521 def __init__(self, config, detach_head=False):
1522 self._messages = []
1523 self._failures = []
1524 self._later_queue1 = []
1525 self._later_queue2 = []
1526
1527 self.out = _SyncColoring(config)
1528 self.out.redirect(sys.stderr)
1529
1530 self.detach_head = detach_head
1531 self.clean = True
1532
1533 def info(self, project, fmt, *args):
1534 self._messages.append(_InfoMessage(project, fmt % args))
1535
1536 def fail(self, project, err=None):
1537 self._failures.append(_Failure(project, err))
1538 self.clean = False
1539
1540 def later1(self, project, what):
1541 self._later_queue1.append(_Later(project, what))
1542
1543 def later2(self, project, what):
1544 self._later_queue2.append(_Later(project, what))
1545
1546 def Finish(self):
1547 self._PrintMessages()
1548 self._RunLater()
1549 self._PrintMessages()
1550 return self.clean
1551
1552 def _RunLater(self):
1553 for q in ['_later_queue1', '_later_queue2']:
1554 if not self._RunQueue(q):
1555 return
1556
1557 def _RunQueue(self, queue):
1558 for m in getattr(self, queue):
1559 if not m.Run(self):
1560 self.clean = False
1561 return False
1562 setattr(self, queue, [])
1563 return True
1564
1565 def _PrintMessages(self):
1566 for m in self._messages:
1567 m.Print(self)
1568 for m in self._failures:
1569 m.Print(self)
1570
1571 self._messages = []
1572 self._failures = []
1573
1574
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001575class MetaProject(Project):
1576 """A special project housed under .repo.
1577 """
1578 def __init__(self, manifest, name, gitdir, worktree):
1579 repodir = manifest.repodir
1580 Project.__init__(self,
1581 manifest = manifest,
1582 name = name,
1583 gitdir = gitdir,
1584 worktree = worktree,
Shawn O. Pearced1f70d92009-05-19 14:58:02 -07001585 remote = RemoteSpec('origin'),
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001586 relpath = '.repo/%s' % name,
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001587 revisionExpr = 'refs/heads/master',
1588 revisionId = None)
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001589
1590 def PreSync(self):
1591 if self.Exists:
1592 cb = self.CurrentBranch
1593 if cb:
1594 base = self.GetBranch(cb).merge
1595 if base:
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001596 self.revisionExpr = base
1597 self.revisionId = None
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001598
1599 @property
Shawn O. Pearcef6906872009-04-18 10:49:00 -07001600 def LastFetch(self):
1601 try:
1602 fh = os.path.join(self.gitdir, 'FETCH_HEAD')
1603 return os.path.getmtime(fh)
1604 except OSError:
1605 return 0
1606
1607 @property
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001608 def HasChanges(self):
1609 """Has the remote received new commits not yet checked out?
1610 """
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001611 if not self.remote or not self.revisionExpr:
Shawn O. Pearce336f7bd2009-04-18 10:39:28 -07001612 return False
1613
1614 all = self.bare_ref.all
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001615 revid = self.GetRevisionId(all)
Shawn O. Pearce336f7bd2009-04-18 10:39:28 -07001616 head = self.work_git.GetHead()
1617 if head.startswith(R_HEADS):
1618 try:
1619 head = all[head]
1620 except KeyError:
1621 head = None
1622
1623 if revid == head:
1624 return False
Shawn O. Pearce3c8dea12009-05-29 18:38:17 -07001625 elif self._revlist(not_rev(HEAD), revid):
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -07001626 return True
1627 return False