project.py 34 KB

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