project.py 37 KB

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