project.py 33 KB

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