project.py 39 KB

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