project.py 31 KB

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