blob: 7a61b1c814ad8bab8a18ea2cb1e0d719a4c5e955 [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
15import filecmp
16import os
17import re
18import shutil
19import stat
20import sys
21import urllib2
22
23from color import Coloring
24from git_command import GitCommand
25from git_config import GitConfig, IsId
26from gerrit_upload import UploadBundle
27from error import GitError, ImportError, UploadError
28from remote import Remote
29from codereview import proto_client
30
31HEAD = 'HEAD'
32R_HEADS = 'refs/heads/'
33R_TAGS = 'refs/tags/'
34R_PUB = 'refs/published/'
35R_M = 'refs/remotes/m/'
36
37def _warn(fmt, *args):
38 msg = fmt % args
39 print >>sys.stderr, 'warn: %s' % msg
40
41def _info(fmt, *args):
42 msg = fmt % args
43 print >>sys.stderr, 'info: %s' % msg
44
45def not_rev(r):
46 return '^' + r
47
Shawn O. Pearce632768b2008-10-23 11:58:52 -070048class DownloadedChange(object):
49 _commit_cache = None
50
51 def __init__(self, project, base, change_id, ps_id, commit):
52 self.project = project
53 self.base = base
54 self.change_id = change_id
55 self.ps_id = ps_id
56 self.commit = commit
57
58 @property
59 def commits(self):
60 if self._commit_cache is None:
61 self._commit_cache = self.project.bare_git.rev_list(
62 '--abbrev=8',
63 '--abbrev-commit',
64 '--pretty=oneline',
65 '--reverse',
66 '--date-order',
67 not_rev(self.base),
68 self.commit,
69 '--')
70 return self._commit_cache
71
72
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -070073class ReviewableBranch(object):
74 _commit_cache = None
75
76 def __init__(self, project, branch, base):
77 self.project = project
78 self.branch = branch
79 self.base = base
80
81 @property
82 def name(self):
83 return self.branch.name
84
85 @property
86 def commits(self):
87 if self._commit_cache is None:
88 self._commit_cache = self.project.bare_git.rev_list(
89 '--abbrev=8',
90 '--abbrev-commit',
91 '--pretty=oneline',
92 '--reverse',
93 '--date-order',
94 not_rev(self.base),
95 R_HEADS + self.name,
96 '--')
97 return self._commit_cache
98
99 @property
100 def date(self):
101 return self.project.bare_git.log(
102 '--pretty=format:%cd',
103 '-n', '1',
104 R_HEADS + self.name,
105 '--')
106
107 def UploadForReview(self):
108 self.project.UploadForReview(self.name)
109
110 @property
111 def tip_url(self):
112 me = self.project.GetBranch(self.name)
113 commit = self.project.bare_git.rev_parse(R_HEADS + self.name)
114 return 'http://%s/r/%s' % (me.remote.review, commit[0:12])
115
Shawn O. Pearce0758d2f2008-10-22 13:13:40 -0700116 @property
117 def owner_email(self):
118 return self.project.UserEmail
119
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700120
121class StatusColoring(Coloring):
122 def __init__(self, config):
123 Coloring.__init__(self, config, 'status')
124 self.project = self.printer('header', attr = 'bold')
125 self.branch = self.printer('header', attr = 'bold')
126 self.nobranch = self.printer('nobranch', fg = 'red')
127
128 self.added = self.printer('added', fg = 'green')
129 self.changed = self.printer('changed', fg = 'red')
130 self.untracked = self.printer('untracked', fg = 'red')
131
132
133class DiffColoring(Coloring):
134 def __init__(self, config):
135 Coloring.__init__(self, config, 'diff')
136 self.project = self.printer('header', attr = 'bold')
137
138
139class _CopyFile:
140 def __init__(self, src, dest):
141 self.src = src
142 self.dest = dest
143
144 def _Copy(self):
145 src = self.src
146 dest = self.dest
147 # copy file if it does not exist or is out of date
148 if not os.path.exists(dest) or not filecmp.cmp(src, dest):
149 try:
150 # remove existing file first, since it might be read-only
151 if os.path.exists(dest):
152 os.remove(dest)
153 shutil.copy(src, dest)
154 # make the file read-only
155 mode = os.stat(dest)[stat.ST_MODE]
156 mode = mode & ~(stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH)
157 os.chmod(dest, mode)
158 except IOError:
159 print >>sys.stderr, \
160 'error: Cannot copy file %s to %s' \
161 % (src, dest)
162
163
164class Project(object):
165 def __init__(self,
166 manifest,
167 name,
168 remote,
169 gitdir,
170 worktree,
171 relpath,
172 revision):
173 self.manifest = manifest
174 self.name = name
175 self.remote = remote
176 self.gitdir = gitdir
177 self.worktree = worktree
178 self.relpath = relpath
179 self.revision = revision
180 self.snapshots = {}
181 self.extraRemotes = {}
182 self.copyfiles = []
183 self.config = GitConfig.ForRepository(
184 gitdir = self.gitdir,
185 defaults = self.manifest.globalConfig)
186
187 self.work_git = self._GitGetByExec(self, bare=False)
188 self.bare_git = self._GitGetByExec(self, bare=True)
189
190 @property
191 def Exists(self):
192 return os.path.isdir(self.gitdir)
193
194 @property
195 def CurrentBranch(self):
196 """Obtain the name of the currently checked out branch.
197 The branch name omits the 'refs/heads/' prefix.
198 None is returned if the project is on a detached HEAD.
199 """
200 try:
201 b = self.work_git.GetHead()
202 except GitError:
203 return None
204 if b.startswith(R_HEADS):
205 return b[len(R_HEADS):]
206 return None
207
208 def IsDirty(self, consider_untracked=True):
209 """Is the working directory modified in some way?
210 """
211 self.work_git.update_index('-q',
212 '--unmerged',
213 '--ignore-missing',
214 '--refresh')
215 if self.work_git.DiffZ('diff-index','-M','--cached',HEAD):
216 return True
217 if self.work_git.DiffZ('diff-files'):
218 return True
219 if consider_untracked and self.work_git.LsOthers():
220 return True
221 return False
222
223 _userident_name = None
224 _userident_email = None
225
226 @property
227 def UserName(self):
228 """Obtain the user's personal name.
229 """
230 if self._userident_name is None:
231 self._LoadUserIdentity()
232 return self._userident_name
233
234 @property
235 def UserEmail(self):
236 """Obtain the user's email address. This is very likely
237 to be their Gerrit login.
238 """
239 if self._userident_email is None:
240 self._LoadUserIdentity()
241 return self._userident_email
242
243 def _LoadUserIdentity(self):
244 u = self.bare_git.var('GIT_COMMITTER_IDENT')
245 m = re.compile("^(.*) <([^>]*)> ").match(u)
246 if m:
247 self._userident_name = m.group(1)
248 self._userident_email = m.group(2)
249 else:
250 self._userident_name = ''
251 self._userident_email = ''
252
253 def GetRemote(self, name):
254 """Get the configuration for a single remote.
255 """
256 return self.config.GetRemote(name)
257
258 def GetBranch(self, name):
259 """Get the configuration for a single branch.
260 """
261 return self.config.GetBranch(name)
262
263
264## Status Display ##
265
266 def PrintWorkTreeStatus(self):
267 """Prints the status of the repository to stdout.
268 """
269 if not os.path.isdir(self.worktree):
270 print ''
271 print 'project %s/' % self.relpath
272 print ' missing (run "repo sync")'
273 return
274
275 self.work_git.update_index('-q',
276 '--unmerged',
277 '--ignore-missing',
278 '--refresh')
279 di = self.work_git.DiffZ('diff-index', '-M', '--cached', HEAD)
280 df = self.work_git.DiffZ('diff-files')
281 do = self.work_git.LsOthers()
282 if not di and not df and not do:
283 return
284
285 out = StatusColoring(self.config)
286 out.project('project %-40s', self.relpath + '/')
287
288 branch = self.CurrentBranch
289 if branch is None:
290 out.nobranch('(*** NO BRANCH ***)')
291 else:
292 out.branch('branch %s', branch)
293 out.nl()
294
295 paths = list()
296 paths.extend(di.keys())
297 paths.extend(df.keys())
298 paths.extend(do)
299
300 paths = list(set(paths))
301 paths.sort()
302
303 for p in paths:
304 try: i = di[p]
305 except KeyError: i = None
306
307 try: f = df[p]
308 except KeyError: f = None
309
310 if i: i_status = i.status.upper()
311 else: i_status = '-'
312
313 if f: f_status = f.status.lower()
314 else: f_status = '-'
315
316 if i and i.src_path:
317 line = ' %s%s\t%s => (%s%%)' % (i_status, f_status,
318 i.src_path, p, i.level)
319 else:
320 line = ' %s%s\t%s' % (i_status, f_status, p)
321
322 if i and not f:
323 out.added('%s', line)
324 elif (i and f) or (not i and f):
325 out.changed('%s', line)
326 elif not i and not f:
327 out.untracked('%s', line)
328 else:
329 out.write('%s', line)
330 out.nl()
331
332 def PrintWorkTreeDiff(self):
333 """Prints the status of the repository to stdout.
334 """
335 out = DiffColoring(self.config)
336 cmd = ['diff']
337 if out.is_on:
338 cmd.append('--color')
339 cmd.append(HEAD)
340 cmd.append('--')
341 p = GitCommand(self,
342 cmd,
343 capture_stdout = True,
344 capture_stderr = True)
345 has_diff = False
346 for line in p.process.stdout:
347 if not has_diff:
348 out.nl()
349 out.project('project %s/' % self.relpath)
350 out.nl()
351 has_diff = True
352 print line[:-1]
353 p.Wait()
354
355
356## Publish / Upload ##
357
358 def WasPublished(self, branch):
359 """Was the branch published (uploaded) for code review?
360 If so, returns the SHA-1 hash of the last published
361 state for the branch.
362 """
363 try:
364 return self.bare_git.rev_parse(R_PUB + branch)
365 except GitError:
366 return None
367
368 def CleanPublishedCache(self):
369 """Prunes any stale published refs.
370 """
371 heads = set()
372 canrm = {}
373 for name, id in self._allrefs.iteritems():
374 if name.startswith(R_HEADS):
375 heads.add(name)
376 elif name.startswith(R_PUB):
377 canrm[name] = id
378
379 for name, id in canrm.iteritems():
380 n = name[len(R_PUB):]
381 if R_HEADS + n not in heads:
382 self.bare_git.DeleteRef(name, id)
383
384 def GetUploadableBranches(self):
385 """List any branches which can be uploaded for review.
386 """
387 heads = {}
388 pubed = {}
389
390 for name, id in self._allrefs.iteritems():
391 if name.startswith(R_HEADS):
392 heads[name[len(R_HEADS):]] = id
393 elif name.startswith(R_PUB):
394 pubed[name[len(R_PUB):]] = id
395
396 ready = []
397 for branch, id in heads.iteritems():
398 if branch in pubed and pubed[branch] == id:
399 continue
400
401 branch = self.GetBranch(branch)
402 base = branch.LocalMerge
403 if branch.LocalMerge:
404 rb = ReviewableBranch(self, branch, base)
405 if rb.commits:
406 ready.append(rb)
407 return ready
408
409 def UploadForReview(self, branch=None):
410 """Uploads the named branch for code review.
411 """
412 if branch is None:
413 branch = self.CurrentBranch
414 if branch is None:
415 raise GitError('not currently on a branch')
416
417 branch = self.GetBranch(branch)
418 if not branch.LocalMerge:
419 raise GitError('branch %s does not track a remote' % branch.name)
420 if not branch.remote.review:
421 raise GitError('remote %s has no review url' % branch.remote.name)
422
423 dest_branch = branch.merge
424 if not dest_branch.startswith(R_HEADS):
425 dest_branch = R_HEADS + dest_branch
426
427 base_list = []
428 for name, id in self._allrefs.iteritems():
429 if branch.remote.WritesTo(name):
430 base_list.append(not_rev(name))
431 if not base_list:
432 raise GitError('no base refs, cannot upload %s' % branch.name)
433
434 print >>sys.stderr, ''
435 _info("Uploading %s to %s:", branch.name, self.name)
436 try:
437 UploadBundle(project = self,
438 server = branch.remote.review,
439 email = self.UserEmail,
440 dest_project = self.name,
441 dest_branch = dest_branch,
442 src_branch = R_HEADS + branch.name,
443 bases = base_list)
444 except proto_client.ClientLoginError:
445 raise UploadError('Login failure')
446 except urllib2.HTTPError, e:
447 raise UploadError('HTTP error %d' % e.code)
448
449 msg = "posted to %s for %s" % (branch.remote.review, dest_branch)
450 self.bare_git.UpdateRef(R_PUB + branch.name,
451 R_HEADS + branch.name,
452 message = msg)
453
454
455## Sync ##
456
457 def Sync_NetworkHalf(self):
458 """Perform only the network IO portion of the sync process.
459 Local working directory/branch state is not affected.
460 """
461 if not self.Exists:
462 print >>sys.stderr
463 print >>sys.stderr, 'Initializing project %s ...' % self.name
464 self._InitGitDir()
465 self._InitRemote()
466 for r in self.extraRemotes.values():
467 if not self._RemoteFetch(r.name):
468 return False
469 if not self._SnapshotDownload():
470 return False
471 if not self._RemoteFetch():
472 return False
Shawn O. Pearce329c31d2008-10-24 09:17:25 -0700473 self._RepairAndroidImportErrors()
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700474 self._InitMRef()
475 return True
476
477 def _CopyFiles(self):
478 for file in self.copyfiles:
479 file._Copy()
480
Shawn O. Pearce329c31d2008-10-24 09:17:25 -0700481 def _RepairAndroidImportErrors(self):
482 if self.name in ['platform/external/iptables',
483 'platform/external/libpcap',
484 'platform/external/tcpdump',
485 'platform/external/webkit',
486 'platform/system/wlan/ti']:
487 # I hate myself for doing this...
488 #
489 # In the initial Android 1.0 release these projects were
490 # shipped, some users got them, and then the history had
491 # to be rewritten to correct problems with their imports.
492 # The 'android-1.0' tag may still be pointing at the old
493 # history, so we need to drop the tag and fetch it again.
494 #
495 try:
496 remote = self.GetRemote(self.remote.name)
497 relname = remote.ToLocal(R_HEADS + 'release-1.0')
498 tagname = R_TAGS + 'android-1.0'
499 if self._revlist(not_rev(relname), tagname):
500 cmd = ['fetch', remote.name, '+%s:%s' % (tagname, tagname)]
501 GitCommand(self, cmd, bare = True).Wait()
502 except GitError:
503 pass
504
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700505 def Sync_LocalHalf(self):
506 """Perform only the local IO portion of the sync process.
507 Network access is not required.
508
509 Return:
510 True: the sync was successful
511 False: the sync requires user input
512 """
513 self._InitWorkTree()
514 self.CleanPublishedCache()
515
516 rem = self.GetRemote(self.remote.name)
517 rev = rem.ToLocal(self.revision)
518 branch = self.CurrentBranch
519
520 if branch is None:
521 # Currently on a detached HEAD. The user is assumed to
522 # not have any local modifications worth worrying about.
523 #
524 lost = self._revlist(not_rev(rev), HEAD)
525 if lost:
526 _info("[%s] Discarding %d commits", self.name, len(lost))
527 try:
528 self._Checkout(rev, quiet=True)
529 except GitError:
530 return False
531 self._CopyFiles()
532 return True
533
534 branch = self.GetBranch(branch)
535 merge = branch.LocalMerge
536
537 if not merge:
538 # The current branch has no tracking configuration.
539 # Jump off it to a deatched HEAD.
540 #
541 _info("[%s] Leaving %s"
542 " (does not track any upstream)",
543 self.name,
544 branch.name)
545 try:
546 self._Checkout(rev, quiet=True)
547 except GitError:
548 return False
549 self._CopyFiles()
550 return True
551
552 upstream_gain = self._revlist(not_rev(HEAD), rev)
553 pub = self.WasPublished(branch.name)
554 if pub:
555 not_merged = self._revlist(not_rev(rev), pub)
556 if not_merged:
557 if upstream_gain:
558 # The user has published this branch and some of those
559 # commits are not yet merged upstream. We do not want
560 # to rewrite the published commits so we punt.
561 #
562 _info("[%s] Branch %s is published,"
563 " but is now %d commits behind.",
564 self.name, branch.name, len(upstream_gain))
565 _info("[%s] Consider merging or rebasing the"
566 " unpublished commits.", self.name)
567 return True
568
569 if merge == rev:
570 try:
571 old_merge = self.bare_git.rev_parse('%s@{1}' % merge)
572 except GitError:
573 old_merge = merge
Shawn O. Pearce07346002008-10-21 07:09:27 -0700574 if old_merge == '0000000000000000000000000000000000000000' \
575 or old_merge == '':
576 old_merge = merge
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700577 else:
578 # The upstream switched on us. Time to cross our fingers
579 # and pray that the old upstream also wasn't in the habit
580 # of rebasing itself.
581 #
582 _info("[%s] Manifest switched from %s to %s",
583 self.name, merge, rev)
584 old_merge = merge
585
586 if rev == old_merge:
587 upstream_lost = []
588 else:
589 upstream_lost = self._revlist(not_rev(rev), old_merge)
590
591 if not upstream_lost and not upstream_gain:
592 # Trivially no changes caused by the upstream.
593 #
594 return True
595
596 if self.IsDirty(consider_untracked=False):
597 _warn('[%s] commit (or discard) uncommitted changes'
598 ' before sync', self.name)
599 return False
600
601 if upstream_lost:
602 # Upstream rebased. Not everything in HEAD
603 # may have been caused by the user.
604 #
605 _info("[%s] Discarding %d commits removed from upstream",
606 self.name, len(upstream_lost))
607
608 branch.remote = rem
609 branch.merge = self.revision
610 branch.Save()
611
612 my_changes = self._revlist(not_rev(old_merge), HEAD)
613 if my_changes:
614 try:
615 self._Rebase(upstream = old_merge, onto = rev)
616 except GitError:
617 return False
618 elif upstream_lost:
619 try:
620 self._ResetHard(rev)
621 except GitError:
622 return False
623 else:
624 try:
625 self._FastForward(rev)
626 except GitError:
627 return False
628
629 self._CopyFiles()
630 return True
631
632 def _SnapshotDownload(self):
633 if self.snapshots:
634 have = set(self._allrefs.keys())
635 need = []
636
637 for tag, sn in self.snapshots.iteritems():
638 if tag not in have:
639 need.append(sn)
640
641 if need:
642 print >>sys.stderr, """
643 *** Downloading source(s) from a mirror site. ***
644 *** If the network hangs, kill and restart repo. ***
645"""
646 for sn in need:
647 try:
648 sn.Import()
649 except ImportError, e:
650 print >>sys.stderr, \
651 'error: Cannot import %s: %s' \
652 % (self.name, e)
653 return False
654 cmd = ['repack', '-a', '-d', '-f', '-l']
655 if GitCommand(self, cmd, bare = True).Wait() != 0:
656 return False
657 return True
658
659 def AddCopyFile(self, src, dest):
660 # dest should already be an absolute path, but src is project relative
661 # make src an absolute path
662 src = os.path.join(self.worktree, src)
663 self.copyfiles.append(_CopyFile(src, dest))
664
Shawn O. Pearce632768b2008-10-23 11:58:52 -0700665 def DownloadPatchSet(self, change_id, patch_id):
666 """Download a single patch set of a single change to FETCH_HEAD.
667 """
668 remote = self.GetRemote(self.remote.name)
669
670 cmd = ['fetch', remote.name]
671 cmd.append('refs/changes/%2.2d/%d/%d' \
672 % (change_id % 100, change_id, patch_id))
673 cmd.extend(map(lambda x: str(x), remote.fetch))
674 if GitCommand(self, cmd, bare=True).Wait() != 0:
675 return None
676 return DownloadedChange(self,
677 remote.ToLocal(self.revision),
678 change_id,
679 patch_id,
680 self.bare_git.rev_parse('FETCH_HEAD'))
681
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700682
683## Branch Management ##
684
685 def StartBranch(self, name):
686 """Create a new branch off the manifest's revision.
687 """
688 branch = self.GetBranch(name)
689 branch.remote = self.GetRemote(self.remote.name)
690 branch.merge = self.revision
691
692 rev = branch.LocalMerge
693 cmd = ['checkout', '-b', branch.name, rev]
694 if GitCommand(self, cmd).Wait() == 0:
695 branch.Save()
696 else:
697 raise GitError('%s checkout %s ' % (self.name, rev))
698
699 def PruneHeads(self):
700 """Prune any topic branches already merged into upstream.
701 """
702 cb = self.CurrentBranch
703 kill = []
704 for name in self._allrefs.keys():
705 if name.startswith(R_HEADS):
706 name = name[len(R_HEADS):]
707 if cb is None or name != cb:
708 kill.append(name)
709
710 rev = self.GetRemote(self.remote.name).ToLocal(self.revision)
711 if cb is not None \
712 and not self._revlist(HEAD + '...' + rev) \
713 and not self.IsDirty(consider_untracked = False):
714 self.work_git.DetachHead(HEAD)
715 kill.append(cb)
716
717 deleted = set()
718 if kill:
719 try:
720 old = self.bare_git.GetHead()
721 except GitError:
722 old = 'refs/heads/please_never_use_this_as_a_branch_name'
723
724 rm_re = re.compile(r"^Deleted branch (.*)\.$")
725 try:
726 self.bare_git.DetachHead(rev)
727
728 b = ['branch', '-d']
729 b.extend(kill)
730 b = GitCommand(self, b, bare=True,
731 capture_stdout=True,
732 capture_stderr=True)
733 b.Wait()
734 finally:
735 self.bare_git.SetHead(old)
736
737 for line in b.stdout.split("\n"):
738 m = rm_re.match(line)
739 if m:
740 deleted.add(m.group(1))
741
742 if deleted:
743 self.CleanPublishedCache()
744
745 if cb and cb not in kill:
746 kill.append(cb)
747 kill.sort()
748
749 kept = []
750 for branch in kill:
751 if branch not in deleted:
752 branch = self.GetBranch(branch)
753 base = branch.LocalMerge
754 if not base:
755 base = rev
756 kept.append(ReviewableBranch(self, branch, base))
757 return kept
758
759
760## Direct Git Commands ##
761
762 def _RemoteFetch(self, name=None):
763 if not name:
764 name = self.remote.name
765
766 hide_errors = False
767 if self.extraRemotes or self.snapshots:
768 hide_errors = True
769
770 proc = GitCommand(self,
771 ['fetch', name],
772 bare = True,
773 capture_stderr = hide_errors)
774 if hide_errors:
775 err = proc.process.stderr.fileno()
776 buf = ''
777 while True:
778 b = os.read(err, 256)
779 if b:
780 buf += b
781 while buf:
782 r = buf.find('remote: error: unable to find ')
783 if r >= 0:
784 lf = buf.find('\n')
785 if lf < 0:
786 break
787 buf = buf[lf + 1:]
788 continue
789
790 cr = buf.find('\r')
791 if cr < 0:
792 break
793 os.write(2, buf[0:cr + 1])
794 buf = buf[cr + 1:]
795 if not b:
796 if buf:
797 os.write(2, buf)
798 break
799 return proc.Wait() == 0
800
801 def _Checkout(self, rev, quiet=False):
802 cmd = ['checkout']
803 if quiet:
804 cmd.append('-q')
805 cmd.append(rev)
806 cmd.append('--')
807 if GitCommand(self, cmd).Wait() != 0:
808 if self._allrefs:
809 raise GitError('%s checkout %s ' % (self.name, rev))
810
811 def _ResetHard(self, rev, quiet=True):
812 cmd = ['reset', '--hard']
813 if quiet:
814 cmd.append('-q')
815 cmd.append(rev)
816 if GitCommand(self, cmd).Wait() != 0:
817 raise GitError('%s reset --hard %s ' % (self.name, rev))
818
819 def _Rebase(self, upstream, onto = None):
820 cmd = ['rebase', '-i']
821 if onto is not None:
822 cmd.extend(['--onto', onto])
823 cmd.append(upstream)
824 if GitCommand(self, cmd, disable_editor=True).Wait() != 0:
825 raise GitError('%s rebase %s ' % (self.name, upstream))
826
827 def _FastForward(self, head):
828 cmd = ['merge', head]
829 if GitCommand(self, cmd).Wait() != 0:
830 raise GitError('%s merge %s ' % (self.name, head))
831
832 def _InitGitDir(self):
833 if not os.path.exists(self.gitdir):
834 os.makedirs(self.gitdir)
835 self.bare_git.init()
836 self.config.SetString('core.bare', None)
837
838 hooks = self._gitdir_path('hooks')
839 for old_hook in os.listdir(hooks):
840 os.remove(os.path.join(hooks, old_hook))
841
842 # TODO(sop) install custom repo hooks
843
844 m = self.manifest.manifestProject.config
845 for key in ['user.name', 'user.email']:
846 if m.Has(key, include_defaults = False):
847 self.config.SetString(key, m.GetString(key))
848
849 def _InitRemote(self):
850 if self.remote.fetchUrl:
851 remote = self.GetRemote(self.remote.name)
852
853 url = self.remote.fetchUrl
854 while url.endswith('/'):
855 url = url[:-1]
856 url += '/%s.git' % self.name
857 remote.url = url
858 remote.review = self.remote.reviewUrl
859
860 remote.ResetFetch()
861 remote.Save()
862
863 for r in self.extraRemotes.values():
864 remote = self.GetRemote(r.name)
865 remote.url = r.fetchUrl
866 remote.review = r.reviewUrl
867 remote.ResetFetch()
868 remote.Save()
869
870 def _InitMRef(self):
871 if self.manifest.branch:
872 msg = 'manifest set to %s' % self.revision
873 ref = R_M + self.manifest.branch
874
875 if IsId(self.revision):
876 dst = self.revision + '^0',
877 self.bare_git.UpdateRef(ref, dst, message = msg, detach = True)
878 else:
879 remote = self.GetRemote(self.remote.name)
880 dst = remote.ToLocal(self.revision)
881 self.bare_git.symbolic_ref('-m', msg, ref, dst)
882
883 def _InitWorkTree(self):
884 dotgit = os.path.join(self.worktree, '.git')
885 if not os.path.exists(dotgit):
886 os.makedirs(dotgit)
887
888 topdir = os.path.commonprefix([self.gitdir, dotgit])
889 if topdir.endswith('/'):
890 topdir = topdir[:-1]
891 else:
892 topdir = os.path.dirname(topdir)
893
894 tmpdir = dotgit
895 relgit = ''
896 while topdir != tmpdir:
897 relgit += '../'
898 tmpdir = os.path.dirname(tmpdir)
899 relgit += self.gitdir[len(topdir) + 1:]
900
901 for name in ['config',
902 'description',
903 'hooks',
904 'info',
905 'logs',
906 'objects',
907 'packed-refs',
908 'refs',
909 'rr-cache',
910 'svn']:
911 os.symlink(os.path.join(relgit, name),
912 os.path.join(dotgit, name))
913
914 rev = self.GetRemote(self.remote.name).ToLocal(self.revision)
915 rev = self.bare_git.rev_parse('%s^0' % rev)
916
917 f = open(os.path.join(dotgit, HEAD), 'wb')
918 f.write("%s\n" % rev)
919 f.close()
920
921 cmd = ['read-tree', '--reset', '-u']
922 cmd.append('-v')
923 cmd.append('HEAD')
924 if GitCommand(self, cmd).Wait() != 0:
925 raise GitError("cannot initialize work tree")
926
927 def _gitdir_path(self, path):
928 return os.path.join(self.gitdir, path)
929
930 def _revlist(self, *args):
931 cmd = []
932 cmd.extend(args)
933 cmd.append('--')
934 return self.work_git.rev_list(*args)
935
936 @property
937 def _allrefs(self):
938 return self.bare_git.ListRefs()
939
940 class _GitGetByExec(object):
941 def __init__(self, project, bare):
942 self._project = project
943 self._bare = bare
944
945 def ListRefs(self, *args):
946 cmdv = ['for-each-ref', '--format=%(objectname) %(refname)']
947 cmdv.extend(args)
948 p = GitCommand(self._project,
949 cmdv,
950 bare = self._bare,
951 capture_stdout = True,
952 capture_stderr = True)
953 r = {}
954 for line in p.process.stdout:
955 id, name = line[:-1].split(' ', 2)
956 r[name] = id
957 if p.Wait() != 0:
958 raise GitError('%s for-each-ref %s: %s' % (
959 self._project.name,
960 str(args),
961 p.stderr))
962 return r
963
964 def LsOthers(self):
965 p = GitCommand(self._project,
966 ['ls-files',
967 '-z',
968 '--others',
969 '--exclude-standard'],
970 bare = False,
971 capture_stdout = True,
972 capture_stderr = True)
973 if p.Wait() == 0:
974 out = p.stdout
975 if out:
976 return out[:-1].split("\0")
977 return []
978
979 def DiffZ(self, name, *args):
980 cmd = [name]
981 cmd.append('-z')
982 cmd.extend(args)
983 p = GitCommand(self._project,
984 cmd,
985 bare = False,
986 capture_stdout = True,
987 capture_stderr = True)
988 try:
989 out = p.process.stdout.read()
990 r = {}
991 if out:
992 out = iter(out[:-1].split('\0'))
993 while out:
Shawn O. Pearce02dbb6d2008-10-21 13:59:08 -0700994 try:
995 info = out.next()
996 path = out.next()
997 except StopIteration:
998 break
The Android Open Source Projectcf31fe92008-10-21 07:00:00 -0700999
1000 class _Info(object):
1001 def __init__(self, path, omode, nmode, oid, nid, state):
1002 self.path = path
1003 self.src_path = None
1004 self.old_mode = omode
1005 self.new_mode = nmode
1006 self.old_id = oid
1007 self.new_id = nid
1008
1009 if len(state) == 1:
1010 self.status = state
1011 self.level = None
1012 else:
1013 self.status = state[:1]
1014 self.level = state[1:]
1015 while self.level.startswith('0'):
1016 self.level = self.level[1:]
1017
1018 info = info[1:].split(' ')
1019 info =_Info(path, *info)
1020 if info.status in ('R', 'C'):
1021 info.src_path = info.path
1022 info.path = out.next()
1023 r[info.path] = info
1024 return r
1025 finally:
1026 p.Wait()
1027
1028 def GetHead(self):
1029 return self.symbolic_ref(HEAD)
1030
1031 def SetHead(self, ref, message=None):
1032 cmdv = []
1033 if message is not None:
1034 cmdv.extend(['-m', message])
1035 cmdv.append(HEAD)
1036 cmdv.append(ref)
1037 self.symbolic_ref(*cmdv)
1038
1039 def DetachHead(self, new, message=None):
1040 cmdv = ['--no-deref']
1041 if message is not None:
1042 cmdv.extend(['-m', message])
1043 cmdv.append(HEAD)
1044 cmdv.append(new)
1045 self.update_ref(*cmdv)
1046
1047 def UpdateRef(self, name, new, old=None,
1048 message=None,
1049 detach=False):
1050 cmdv = []
1051 if message is not None:
1052 cmdv.extend(['-m', message])
1053 if detach:
1054 cmdv.append('--no-deref')
1055 cmdv.append(name)
1056 cmdv.append(new)
1057 if old is not None:
1058 cmdv.append(old)
1059 self.update_ref(*cmdv)
1060
1061 def DeleteRef(self, name, old=None):
1062 if not old:
1063 old = self.rev_parse(name)
1064 self.update_ref('-d', name, old)
1065
1066 def rev_list(self, *args):
1067 cmdv = ['rev-list']
1068 cmdv.extend(args)
1069 p = GitCommand(self._project,
1070 cmdv,
1071 bare = self._bare,
1072 capture_stdout = True,
1073 capture_stderr = True)
1074 r = []
1075 for line in p.process.stdout:
1076 r.append(line[:-1])
1077 if p.Wait() != 0:
1078 raise GitError('%s rev-list %s: %s' % (
1079 self._project.name,
1080 str(args),
1081 p.stderr))
1082 return r
1083
1084 def __getattr__(self, name):
1085 name = name.replace('_', '-')
1086 def runner(*args):
1087 cmdv = [name]
1088 cmdv.extend(args)
1089 p = GitCommand(self._project,
1090 cmdv,
1091 bare = self._bare,
1092 capture_stdout = True,
1093 capture_stderr = True)
1094 if p.Wait() != 0:
1095 raise GitError('%s %s: %s' % (
1096 self._project.name,
1097 name,
1098 p.stderr))
1099 r = p.stdout
1100 if r.endswith('\n') and r.index('\n') == len(r) - 1:
1101 return r[:-1]
1102 return r
1103 return runner
1104
1105
1106class MetaProject(Project):
1107 """A special project housed under .repo.
1108 """
1109 def __init__(self, manifest, name, gitdir, worktree):
1110 repodir = manifest.repodir
1111 Project.__init__(self,
1112 manifest = manifest,
1113 name = name,
1114 gitdir = gitdir,
1115 worktree = worktree,
1116 remote = Remote('origin'),
1117 relpath = '.repo/%s' % name,
1118 revision = 'refs/heads/master')
1119
1120 def PreSync(self):
1121 if self.Exists:
1122 cb = self.CurrentBranch
1123 if cb:
1124 base = self.GetBranch(cb).merge
1125 if base:
1126 self.revision = base
1127
1128 @property
1129 def HasChanges(self):
1130 """Has the remote received new commits not yet checked out?
1131 """
1132 rev = self.GetRemote(self.remote.name).ToLocal(self.revision)
1133 if self._revlist(not_rev(HEAD), rev):
1134 return True
1135 return False