project.py 40 KB

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