project.py 39 KB

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