project.py 40 KB

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