project.py 41 KB

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