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