project.py 39 KB

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