project.py 37 KB

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