project.py 34 KB

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