project.py 33 KB

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