project.py 29 KB

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