project.py 33 KB

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