project.py 39 KB

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