project.py 31 KB

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