project.py 33 KB

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