| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865866867868869870871872873874875876877878879880881882883884885886887888889890891892893894895896897898899900901902903904905906907908909910911912913914915916917918919920921922923924925926927928929930931932933934935936937938939940941942943944945946947948949950951952953954955956957958959960961962963964965966967968969970971972973974975976977978979980981982983984985986987988989990991992993994995996997998999100010011002100310041005100610071008100910101011101210131014101510161017101810191020102110221023102410251026102710281029103010311032103310341035103610371038103910401041104210431044104510461047104810491050105110521053105410551056105710581059106010611062106310641065106610671068106910701071107210731074107510761077107810791080108110821083108410851086108710881089109010911092109310941095109610971098109911001101110211031104110511061107110811091110111111121113111411151116111711181119112011211122112311241125112611271128112911301131113211331134113511361137113811391140114111421143114411451146114711481149115011511152115311541155115611571158115911601161116211631164116511661167116811691170117111721173117411751176117711781179118011811182118311841185118611871188118911901191119211931194119511961197119811991200120112021203120412051206120712081209121012111212121312141215121612171218121912201221122212231224122512261227122812291230123112321233123412351236123712381239124012411242124312441245124612471248124912501251125212531254125512561257125812591260126112621263126412651266126712681269127012711272127312741275127612771278127912801281128212831284128512861287128812891290129112921293129412951296129712981299130013011302130313041305130613071308130913101311131213131314131513161317131813191320132113221323132413251326132713281329133013311332133313341335133613371338133913401341134213431344134513461347134813491350135113521353135413551356135713581359136013611362136313641365136613671368136913701371137213731374137513761377137813791380138113821383138413851386138713881389139013911392139313941395139613971398139914001401140214031404140514061407140814091410141114121413141414151416141714181419142014211422142314241425142614271428142914301431143214331434143514361437143814391440144114421443144414451446144714481449145014511452145314541455145614571458145914601461146214631464146514661467146814691470147114721473147414751476147714781479148014811482148314841485148614871488148914901491149214931494149514961497149814991500150115021503150415051506150715081509151015111512151315141515151615171518151915201521152215231524152515261527152815291530153115321533153415351536153715381539154015411542154315441545154615471548154915501551155215531554155515561557155815591560156115621563156415651566156715681569157015711572157315741575157615771578157915801581158215831584158515861587158815891590159115921593159415951596159715981599160016011602160316041605160616071608160916101611161216131614161516161617161816191620162116221623162416251626 |
- # Copyright (C) 2008 The Android Open Source Project
- #
- # Licensed under the Apache License, Version 2.0 (the "License");
- # you may not use this file except in compliance with the License.
- # You may obtain a copy of the License at
- #
- # http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing, software
- # distributed under the License is distributed on an "AS IS" BASIS,
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- # See the License for the specific language governing permissions and
- # limitations under the License.
- import errno
- import filecmp
- import os
- import re
- import shutil
- import stat
- import sys
- import urllib2
- from color import Coloring
- from git_command import GitCommand
- from git_config import GitConfig, IsId
- from error import GitError, ImportError, UploadError
- from error import ManifestInvalidRevisionError
- from git_refs import GitRefs, HEAD, R_HEADS, R_TAGS, R_PUB, R_M
- def _lwrite(path, content):
- lock = '%s.lock' % path
- fd = open(lock, 'wb')
- try:
- fd.write(content)
- finally:
- fd.close()
- try:
- os.rename(lock, path)
- except OSError:
- os.remove(lock)
- raise
- def _error(fmt, *args):
- msg = fmt % args
- print >>sys.stderr, 'error: %s' % msg
- def not_rev(r):
- return '^' + r
- def sq(r):
- return "'" + r.replace("'", "'\''") + "'"
- hook_list = None
- def repo_hooks():
- global hook_list
- if hook_list is None:
- d = os.path.abspath(os.path.dirname(__file__))
- d = os.path.join(d , 'hooks')
- hook_list = map(lambda x: os.path.join(d, x), os.listdir(d))
- return hook_list
- def relpath(dst, src):
- src = os.path.dirname(src)
- top = os.path.commonprefix([dst, src])
- if top.endswith('/'):
- top = top[:-1]
- else:
- top = os.path.dirname(top)
- tmp = src
- rel = ''
- while top != tmp:
- rel += '../'
- tmp = os.path.dirname(tmp)
- return rel + dst[len(top) + 1:]
- class DownloadedChange(object):
- _commit_cache = None
- def __init__(self, project, base, change_id, ps_id, commit):
- self.project = project
- self.base = base
- self.change_id = change_id
- self.ps_id = ps_id
- self.commit = commit
- @property
- def commits(self):
- if self._commit_cache is None:
- self._commit_cache = self.project.bare_git.rev_list(
- '--abbrev=8',
- '--abbrev-commit',
- '--pretty=oneline',
- '--reverse',
- '--date-order',
- not_rev(self.base),
- self.commit,
- '--')
- return self._commit_cache
- class ReviewableBranch(object):
- _commit_cache = None
- def __init__(self, project, branch, base):
- self.project = project
- self.branch = branch
- self.base = base
- @property
- def name(self):
- return self.branch.name
- @property
- def commits(self):
- if self._commit_cache is None:
- self._commit_cache = self.project.bare_git.rev_list(
- '--abbrev=8',
- '--abbrev-commit',
- '--pretty=oneline',
- '--reverse',
- '--date-order',
- not_rev(self.base),
- R_HEADS + self.name,
- '--')
- return self._commit_cache
- @property
- def unabbrev_commits(self):
- r = dict()
- for commit in self.project.bare_git.rev_list(
- not_rev(self.base),
- R_HEADS + self.name,
- '--'):
- r[commit[0:8]] = commit
- return r
- @property
- def date(self):
- return self.project.bare_git.log(
- '--pretty=format:%cd',
- '-n', '1',
- R_HEADS + self.name,
- '--')
- def UploadForReview(self, people, auto_topic=False):
- self.project.UploadForReview(self.name,
- people,
- auto_topic=auto_topic)
- def GetPublishedRefs(self):
- refs = {}
- output = self.project.bare_git.ls_remote(
- self.branch.remote.SshReviewUrl(self.project.UserEmail),
- 'refs/changes/*')
- for line in output.split('\n'):
- try:
- (sha, ref) = line.split()
- refs[sha] = ref
- except ValueError:
- pass
- return refs
- class StatusColoring(Coloring):
- def __init__(self, config):
- Coloring.__init__(self, config, 'status')
- self.project = self.printer('header', attr = 'bold')
- self.branch = self.printer('header', attr = 'bold')
- self.nobranch = self.printer('nobranch', fg = 'red')
- self.important = self.printer('important', fg = 'red')
- self.added = self.printer('added', fg = 'green')
- self.changed = self.printer('changed', fg = 'red')
- self.untracked = self.printer('untracked', fg = 'red')
- class DiffColoring(Coloring):
- def __init__(self, config):
- Coloring.__init__(self, config, 'diff')
- self.project = self.printer('header', attr = 'bold')
- class _CopyFile:
- def __init__(self, src, dest, abssrc, absdest):
- self.src = src
- self.dest = dest
- self.abs_src = abssrc
- self.abs_dest = absdest
- def _Copy(self):
- src = self.abs_src
- dest = self.abs_dest
- # copy file if it does not exist or is out of date
- if not os.path.exists(dest) or not filecmp.cmp(src, dest):
- try:
- # remove existing file first, since it might be read-only
- if os.path.exists(dest):
- os.remove(dest)
- else:
- dir = os.path.dirname(dest)
- if not os.path.isdir(dir):
- os.makedirs(dir)
- shutil.copy(src, dest)
- # make the file read-only
- mode = os.stat(dest)[stat.ST_MODE]
- mode = mode & ~(stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH)
- os.chmod(dest, mode)
- except IOError:
- _error('Cannot copy file %s to %s', src, dest)
- class RemoteSpec(object):
- def __init__(self,
- name,
- url = None,
- review = None):
- self.name = name
- self.url = url
- self.review = review
- class Project(object):
- def __init__(self,
- manifest,
- name,
- remote,
- gitdir,
- worktree,
- relpath,
- revisionExpr,
- revisionId):
- self.manifest = manifest
- self.name = name
- self.remote = remote
- self.gitdir = gitdir
- self.worktree = worktree
- self.relpath = relpath
- self.revisionExpr = revisionExpr
- if revisionId is None \
- and revisionExpr \
- and IsId(revisionExpr):
- self.revisionId = revisionExpr
- else:
- self.revisionId = revisionId
- self.snapshots = {}
- self.copyfiles = []
- self.config = GitConfig.ForRepository(
- gitdir = self.gitdir,
- defaults = self.manifest.globalConfig)
- if self.worktree:
- self.work_git = self._GitGetByExec(self, bare=False)
- else:
- self.work_git = None
- self.bare_git = self._GitGetByExec(self, bare=True)
- self.bare_ref = GitRefs(gitdir)
- @property
- def Exists(self):
- return os.path.isdir(self.gitdir)
- @property
- def CurrentBranch(self):
- """Obtain the name of the currently checked out branch.
- The branch name omits the 'refs/heads/' prefix.
- None is returned if the project is on a detached HEAD.
- """
- b = self.work_git.GetHead()
- if b.startswith(R_HEADS):
- return b[len(R_HEADS):]
- return None
- def IsRebaseInProgress(self):
- w = self.worktree
- g = os.path.join(w, '.git')
- return os.path.exists(os.path.join(g, 'rebase-apply')) \
- or os.path.exists(os.path.join(g, 'rebase-merge')) \
- or os.path.exists(os.path.join(w, '.dotest'))
- def IsDirty(self, consider_untracked=True):
- """Is the working directory modified in some way?
- """
- self.work_git.update_index('-q',
- '--unmerged',
- '--ignore-missing',
- '--refresh')
- if self.work_git.DiffZ('diff-index','-M','--cached',HEAD):
- return True
- if self.work_git.DiffZ('diff-files'):
- return True
- if consider_untracked and self.work_git.LsOthers():
- return True
- return False
- _userident_name = None
- _userident_email = None
- @property
- def UserName(self):
- """Obtain the user's personal name.
- """
- if self._userident_name is None:
- self._LoadUserIdentity()
- return self._userident_name
- @property
- def UserEmail(self):
- """Obtain the user's email address. This is very likely
- to be their Gerrit login.
- """
- if self._userident_email is None:
- self._LoadUserIdentity()
- return self._userident_email
- def _LoadUserIdentity(self):
- u = self.bare_git.var('GIT_COMMITTER_IDENT')
- m = re.compile("^(.*) <([^>]*)> ").match(u)
- if m:
- self._userident_name = m.group(1)
- self._userident_email = m.group(2)
- else:
- self._userident_name = ''
- self._userident_email = ''
- def GetRemote(self, name):
- """Get the configuration for a single remote.
- """
- return self.config.GetRemote(name)
- def GetBranch(self, name):
- """Get the configuration for a single branch.
- """
- return self.config.GetBranch(name)
- def GetBranches(self):
- """Get all existing local branches.
- """
- current = self.CurrentBranch
- all = self._allrefs
- heads = {}
- pubd = {}
- for name, id in all.iteritems():
- if name.startswith(R_HEADS):
- name = name[len(R_HEADS):]
- b = self.GetBranch(name)
- b.current = name == current
- b.published = None
- b.revision = id
- heads[name] = b
- for name, id in all.iteritems():
- if name.startswith(R_PUB):
- name = name[len(R_PUB):]
- b = heads.get(name)
- if b:
- b.published = id
- return heads
- ## Status Display ##
- def HasChanges(self):
- """Returns true if there are uncommitted changes.
- """
- self.work_git.update_index('-q',
- '--unmerged',
- '--ignore-missing',
- '--refresh')
- if self.IsRebaseInProgress():
- return True
- if self.work_git.DiffZ('diff-index', '--cached', HEAD):
- return True
- if self.work_git.DiffZ('diff-files'):
- return True
- if self.work_git.LsOthers():
- return True
- return False
- def PrintWorkTreeStatus(self):
- """Prints the status of the repository to stdout.
- """
- if not os.path.isdir(self.worktree):
- print ''
- print 'project %s/' % self.relpath
- print ' missing (run "repo sync")'
- return
- self.work_git.update_index('-q',
- '--unmerged',
- '--ignore-missing',
- '--refresh')
- rb = self.IsRebaseInProgress()
- di = self.work_git.DiffZ('diff-index', '-M', '--cached', HEAD)
- df = self.work_git.DiffZ('diff-files')
- do = self.work_git.LsOthers()
- if not rb and not di and not df and not do:
- return 'CLEAN'
- out = StatusColoring(self.config)
- out.project('project %-40s', self.relpath + '/')
- branch = self.CurrentBranch
- if branch is None:
- out.nobranch('(*** NO BRANCH ***)')
- else:
- out.branch('branch %s', branch)
- out.nl()
- if rb:
- out.important('prior sync failed; rebase still in progress')
- out.nl()
- paths = list()
- paths.extend(di.keys())
- paths.extend(df.keys())
- paths.extend(do)
- paths = list(set(paths))
- paths.sort()
- for p in paths:
- try: i = di[p]
- except KeyError: i = None
- try: f = df[p]
- except KeyError: f = None
- if i: i_status = i.status.upper()
- else: i_status = '-'
- if f: f_status = f.status.lower()
- else: f_status = '-'
- if i and i.src_path:
- line = ' %s%s\t%s => %s (%s%%)' % (i_status, f_status,
- i.src_path, p, i.level)
- else:
- line = ' %s%s\t%s' % (i_status, f_status, p)
- if i and not f:
- out.added('%s', line)
- elif (i and f) or (not i and f):
- out.changed('%s', line)
- elif not i and not f:
- out.untracked('%s', line)
- else:
- out.write('%s', line)
- out.nl()
- return 'DIRTY'
- def PrintWorkTreeDiff(self):
- """Prints the status of the repository to stdout.
- """
- out = DiffColoring(self.config)
- cmd = ['diff']
- if out.is_on:
- cmd.append('--color')
- cmd.append(HEAD)
- cmd.append('--')
- p = GitCommand(self,
- cmd,
- capture_stdout = True,
- capture_stderr = True)
- has_diff = False
- for line in p.process.stdout:
- if not has_diff:
- out.nl()
- out.project('project %s/' % self.relpath)
- out.nl()
- has_diff = True
- print line[:-1]
- p.Wait()
- ## Publish / Upload ##
- def WasPublished(self, branch, all=None):
- """Was the branch published (uploaded) for code review?
- If so, returns the SHA-1 hash of the last published
- state for the branch.
- """
- key = R_PUB + branch
- if all is None:
- try:
- return self.bare_git.rev_parse(key)
- except GitError:
- return None
- else:
- try:
- return all[key]
- except KeyError:
- return None
- def CleanPublishedCache(self, all=None):
- """Prunes any stale published refs.
- """
- if all is None:
- all = self._allrefs
- heads = set()
- canrm = {}
- for name, id in all.iteritems():
- if name.startswith(R_HEADS):
- heads.add(name)
- elif name.startswith(R_PUB):
- canrm[name] = id
- for name, id in canrm.iteritems():
- n = name[len(R_PUB):]
- if R_HEADS + n not in heads:
- self.bare_git.DeleteRef(name, id)
- def GetUploadableBranches(self):
- """List any branches which can be uploaded for review.
- """
- heads = {}
- pubed = {}
- for name, id in self._allrefs.iteritems():
- if name.startswith(R_HEADS):
- heads[name[len(R_HEADS):]] = id
- elif name.startswith(R_PUB):
- pubed[name[len(R_PUB):]] = id
- ready = []
- for branch, id in heads.iteritems():
- if branch in pubed and pubed[branch] == id:
- continue
- rb = self.GetUploadableBranch(branch)
- if rb:
- ready.append(rb)
- return ready
- def GetUploadableBranch(self, branch_name):
- """Get a single uploadable branch, or None.
- """
- branch = self.GetBranch(branch_name)
- base = branch.LocalMerge
- if branch.LocalMerge:
- rb = ReviewableBranch(self, branch, base)
- if rb.commits:
- return rb
- return None
- def UploadForReview(self, branch=None,
- people=([],[]),
- auto_topic=False):
- """Uploads the named branch for code review.
- """
- if branch is None:
- branch = self.CurrentBranch
- if branch is None:
- raise GitError('not currently on a branch')
- branch = self.GetBranch(branch)
- if not branch.LocalMerge:
- raise GitError('branch %s does not track a remote' % branch.name)
- if not branch.remote.review:
- raise GitError('remote %s has no review url' % branch.remote.name)
- dest_branch = branch.merge
- if not dest_branch.startswith(R_HEADS):
- dest_branch = R_HEADS + dest_branch
- if not branch.remote.projectname:
- branch.remote.projectname = self.name
- branch.remote.Save()
- if branch.remote.ReviewProtocol == 'ssh':
- if dest_branch.startswith(R_HEADS):
- dest_branch = dest_branch[len(R_HEADS):]
- rp = ['gerrit receive-pack']
- for e in people[0]:
- rp.append('--reviewer=%s' % sq(e))
- for e in people[1]:
- rp.append('--cc=%s' % sq(e))
- ref_spec = '%s:refs/for/%s' % (R_HEADS + branch.name, dest_branch)
- if auto_topic:
- ref_spec = ref_spec + '/' + branch.name
- cmd = ['push']
- cmd.append('--receive-pack=%s' % " ".join(rp))
- cmd.append(branch.remote.SshReviewUrl(self.UserEmail))
- cmd.append(ref_spec)
- if GitCommand(self, cmd, bare = True).Wait() != 0:
- raise UploadError('Upload failed')
- else:
- raise UploadError('Unsupported protocol %s' \
- % branch.remote.review)
- msg = "posted to %s for %s" % (branch.remote.review, dest_branch)
- self.bare_git.UpdateRef(R_PUB + branch.name,
- R_HEADS + branch.name,
- message = msg)
- ## Sync ##
- def Sync_NetworkHalf(self, quiet=False):
- """Perform only the network IO portion of the sync process.
- Local working directory/branch state is not affected.
- """
- is_new = not self.Exists
- if is_new:
- if not quiet:
- print >>sys.stderr
- print >>sys.stderr, 'Initializing project %s ...' % self.name
- self._InitGitDir()
- self._InitRemote()
- if not self._RemoteFetch(initial=is_new, quiet=quiet):
- return False
- #Check that the requested ref was found after fetch
- #
- try:
- self.GetRevisionId()
- except ManifestInvalidRevisionError:
- # if the ref is a tag. We can try fetching
- # the tag manually as a last resort
- #
- rev = self.revisionExpr
- if rev.startswith(R_TAGS):
- self._RemoteFetch(None, rev[len(R_TAGS):], quiet=quiet)
- if self.worktree:
- self._InitMRef()
- else:
- self._InitMirrorHead()
- try:
- os.remove(os.path.join(self.gitdir, 'FETCH_HEAD'))
- except OSError:
- pass
- return True
- def PostRepoUpgrade(self):
- self._InitHooks()
- def _CopyFiles(self):
- for file in self.copyfiles:
- file._Copy()
- def GetRevisionId(self, all=None):
- if self.revisionId:
- return self.revisionId
- rem = self.GetRemote(self.remote.name)
- rev = rem.ToLocal(self.revisionExpr)
- if all is not None and rev in all:
- return all[rev]
- try:
- return self.bare_git.rev_parse('--verify', '%s^0' % rev)
- except GitError:
- raise ManifestInvalidRevisionError(
- 'revision %s in %s not found' % (self.revisionExpr,
- self.name))
- def Sync_LocalHalf(self, syncbuf):
- """Perform only the local IO portion of the sync process.
- Network access is not required.
- """
- self._InitWorkTree()
- all = self.bare_ref.all
- self.CleanPublishedCache(all)
- revid = self.GetRevisionId(all)
- head = self.work_git.GetHead()
- if head.startswith(R_HEADS):
- branch = head[len(R_HEADS):]
- try:
- head = all[head]
- except KeyError:
- head = None
- else:
- branch = None
- if branch is None or syncbuf.detach_head:
- # Currently on a detached HEAD. The user is assumed to
- # not have any local modifications worth worrying about.
- #
- if self.IsRebaseInProgress():
- syncbuf.fail(self, _PriorSyncFailedError())
- return
- if head == revid:
- # No changes; don't do anything further.
- #
- return
- lost = self._revlist(not_rev(revid), HEAD)
- if lost:
- syncbuf.info(self, "discarding %d commits", len(lost))
- try:
- self._Checkout(revid, quiet=True)
- except GitError, e:
- syncbuf.fail(self, e)
- return
- self._CopyFiles()
- return
- if head == revid:
- # No changes; don't do anything further.
- #
- return
- branch = self.GetBranch(branch)
- if not branch.LocalMerge:
- # The current branch has no tracking configuration.
- # Jump off it to a deatched HEAD.
- #
- syncbuf.info(self,
- "leaving %s; does not track upstream",
- branch.name)
- try:
- self._Checkout(revid, quiet=True)
- except GitError, e:
- syncbuf.fail(self, e)
- return
- self._CopyFiles()
- return
- upstream_gain = self._revlist(not_rev(HEAD), revid)
- pub = self.WasPublished(branch.name, all)
- if pub:
- not_merged = self._revlist(not_rev(revid), pub)
- if not_merged:
- if upstream_gain:
- # The user has published this branch and some of those
- # commits are not yet merged upstream. We do not want
- # to rewrite the published commits so we punt.
- #
- syncbuf.fail(self,
- "branch %s is published (but not merged) and is now %d commits behind"
- % (branch.name, len(upstream_gain)))
- return
- elif pub == head:
- # All published commits are merged, and thus we are a
- # strict subset. We can fast-forward safely.
- #
- def _doff():
- self._FastForward(revid)
- self._CopyFiles()
- syncbuf.later1(self, _doff)
- return
- # Examine the local commits not in the remote. Find the
- # last one attributed to this user, if any.
- #
- local_changes = self._revlist(not_rev(revid), HEAD, format='%H %ce')
- last_mine = None
- cnt_mine = 0
- for commit in local_changes:
- commit_id, committer_email = commit.split(' ', 1)
- if committer_email == self.UserEmail:
- last_mine = commit_id
- cnt_mine += 1
- if not upstream_gain and cnt_mine == len(local_changes):
- return
- if self.IsDirty(consider_untracked=False):
- syncbuf.fail(self, _DirtyError())
- return
- # If the upstream switched on us, warn the user.
- #
- if branch.merge != self.revisionExpr:
- if branch.merge and self.revisionExpr:
- syncbuf.info(self,
- 'manifest switched %s...%s',
- branch.merge,
- self.revisionExpr)
- elif branch.merge:
- syncbuf.info(self,
- 'manifest no longer tracks %s',
- branch.merge)
- if cnt_mine < len(local_changes):
- # Upstream rebased. Not everything in HEAD
- # was created by this user.
- #
- syncbuf.info(self,
- "discarding %d commits removed from upstream",
- len(local_changes) - cnt_mine)
- branch.remote = self.GetRemote(self.remote.name)
- branch.merge = self.revisionExpr
- branch.Save()
- if cnt_mine > 0:
- def _dorebase():
- self._Rebase(upstream = '%s^1' % last_mine, onto = revid)
- self._CopyFiles()
- syncbuf.later2(self, _dorebase)
- elif local_changes:
- try:
- self._ResetHard(revid)
- self._CopyFiles()
- except GitError, e:
- syncbuf.fail(self, e)
- return
- else:
- def _doff():
- self._FastForward(revid)
- self._CopyFiles()
- syncbuf.later1(self, _doff)
- def AddCopyFile(self, src, dest, absdest):
- # dest should already be an absolute path, but src is project relative
- # make src an absolute path
- abssrc = os.path.join(self.worktree, src)
- self.copyfiles.append(_CopyFile(src, dest, abssrc, absdest))
- def DownloadPatchSet(self, change_id, patch_id):
- """Download a single patch set of a single change to FETCH_HEAD.
- """
- remote = self.GetRemote(self.remote.name)
- cmd = ['fetch', remote.name]
- cmd.append('refs/changes/%2.2d/%d/%d' \
- % (change_id % 100, change_id, patch_id))
- cmd.extend(map(lambda x: str(x), remote.fetch))
- if GitCommand(self, cmd, bare=True).Wait() != 0:
- return None
- return DownloadedChange(self,
- self.GetRevisionId(),
- change_id,
- patch_id,
- self.bare_git.rev_parse('FETCH_HEAD'))
- ## Branch Management ##
- def StartBranch(self, name):
- """Create a new branch off the manifest's revision.
- """
- head = self.work_git.GetHead()
- if head == (R_HEADS + name):
- return True
- all = self.bare_ref.all
- if (R_HEADS + name) in all:
- return GitCommand(self,
- ['checkout', name, '--'],
- capture_stdout = True,
- capture_stderr = True).Wait() == 0
- branch = self.GetBranch(name)
- branch.remote = self.GetRemote(self.remote.name)
- branch.merge = self.revisionExpr
- revid = self.GetRevisionId(all)
- if head.startswith(R_HEADS):
- try:
- head = all[head]
- except KeyError:
- head = None
- if revid and head and revid == head:
- ref = os.path.join(self.gitdir, R_HEADS + name)
- try:
- os.makedirs(os.path.dirname(ref))
- except OSError:
- pass
- _lwrite(ref, '%s\n' % revid)
- _lwrite(os.path.join(self.worktree, '.git', HEAD),
- 'ref: %s%s\n' % (R_HEADS, name))
- branch.Save()
- return True
- if GitCommand(self,
- ['checkout', '-b', branch.name, revid],
- capture_stdout = True,
- capture_stderr = True).Wait() == 0:
- branch.Save()
- return True
- return False
- def CheckoutBranch(self, name):
- """Checkout a local topic branch.
- """
- rev = R_HEADS + name
- head = self.work_git.GetHead()
- if head == rev:
- # Already on the branch
- #
- return True
- all = self.bare_ref.all
- try:
- revid = all[rev]
- except KeyError:
- # Branch does not exist in this project
- #
- return False
- if head.startswith(R_HEADS):
- try:
- head = all[head]
- except KeyError:
- head = None
- if head == revid:
- # Same revision; just update HEAD to point to the new
- # target branch, but otherwise take no other action.
- #
- _lwrite(os.path.join(self.worktree, '.git', HEAD),
- 'ref: %s%s\n' % (R_HEADS, name))
- return True
- return GitCommand(self,
- ['checkout', name, '--'],
- capture_stdout = True,
- capture_stderr = True).Wait() == 0
- def AbandonBranch(self, name):
- """Destroy a local topic branch.
- """
- rev = R_HEADS + name
- all = self.bare_ref.all
- if rev not in all:
- # Doesn't exist; assume already abandoned.
- #
- return True
- head = self.work_git.GetHead()
- if head == rev:
- # We can't destroy the branch while we are sitting
- # on it. Switch to a detached HEAD.
- #
- head = all[head]
- revid = self.GetRevisionId(all)
- if head == revid:
- _lwrite(os.path.join(self.worktree, '.git', HEAD),
- '%s\n' % revid)
- else:
- self._Checkout(revid, quiet=True)
- return GitCommand(self,
- ['branch', '-D', name],
- capture_stdout = True,
- capture_stderr = True).Wait() == 0
- def PruneHeads(self):
- """Prune any topic branches already merged into upstream.
- """
- cb = self.CurrentBranch
- kill = []
- left = self._allrefs
- for name in left.keys():
- if name.startswith(R_HEADS):
- name = name[len(R_HEADS):]
- if cb is None or name != cb:
- kill.append(name)
- rev = self.GetRevisionId(left)
- if cb is not None \
- and not self._revlist(HEAD + '...' + rev) \
- and not self.IsDirty(consider_untracked = False):
- self.work_git.DetachHead(HEAD)
- kill.append(cb)
- if kill:
- old = self.bare_git.GetHead()
- if old is None:
- old = 'refs/heads/please_never_use_this_as_a_branch_name'
- try:
- self.bare_git.DetachHead(rev)
- b = ['branch', '-d']
- b.extend(kill)
- b = GitCommand(self, b, bare=True,
- capture_stdout=True,
- capture_stderr=True)
- b.Wait()
- finally:
- self.bare_git.SetHead(old)
- left = self._allrefs
- for branch in kill:
- if (R_HEADS + branch) not in left:
- self.CleanPublishedCache()
- break
- if cb and cb not in kill:
- kill.append(cb)
- kill.sort()
- kept = []
- for branch in kill:
- if (R_HEADS + branch) in left:
- branch = self.GetBranch(branch)
- base = branch.LocalMerge
- if not base:
- base = rev
- kept.append(ReviewableBranch(self, branch, base))
- return kept
- ## Direct Git Commands ##
- def _RemoteFetch(self, name=None, tag=None,
- initial=False,
- quiet=False):
- if not name:
- name = self.remote.name
- ssh_proxy = False
- if self.GetRemote(name).PreConnectFetch():
- ssh_proxy = True
- if initial:
- alt = os.path.join(self.gitdir, 'objects/info/alternates')
- try:
- fd = open(alt, 'rb')
- try:
- ref_dir = fd.readline()
- if ref_dir and ref_dir.endswith('\n'):
- ref_dir = ref_dir[:-1]
- finally:
- fd.close()
- except IOError, e:
- ref_dir = None
- if ref_dir and 'objects' == os.path.basename(ref_dir):
- ref_dir = os.path.dirname(ref_dir)
- packed_refs = os.path.join(self.gitdir, 'packed-refs')
- remote = self.GetRemote(name)
- all = self.bare_ref.all
- ids = set(all.values())
- tmp = set()
- for r, id in GitRefs(ref_dir).all.iteritems():
- if r not in all:
- if r.startswith(R_TAGS) or remote.WritesTo(r):
- all[r] = id
- ids.add(id)
- continue
- if id in ids:
- continue
- r = 'refs/_alt/%s' % id
- all[r] = id
- ids.add(id)
- tmp.add(r)
- ref_names = list(all.keys())
- ref_names.sort()
- tmp_packed = ''
- old_packed = ''
- for r in ref_names:
- line = '%s %s\n' % (all[r], r)
- tmp_packed += line
- if r not in tmp:
- old_packed += line
- _lwrite(packed_refs, tmp_packed)
- else:
- ref_dir = None
- cmd = ['fetch']
- if quiet:
- cmd.append('--quiet')
- if not self.worktree:
- cmd.append('--update-head-ok')
- cmd.append(name)
- if tag is not None:
- cmd.append('tag')
- cmd.append(tag)
- ok = GitCommand(self,
- cmd,
- bare = True,
- ssh_proxy = ssh_proxy).Wait() == 0
- if initial:
- if ref_dir:
- if old_packed != '':
- _lwrite(packed_refs, old_packed)
- else:
- os.remove(packed_refs)
- self.bare_git.pack_refs('--all', '--prune')
- return ok
- def _Checkout(self, rev, quiet=False):
- cmd = ['checkout']
- if quiet:
- cmd.append('-q')
- cmd.append(rev)
- cmd.append('--')
- if GitCommand(self, cmd).Wait() != 0:
- if self._allrefs:
- raise GitError('%s checkout %s ' % (self.name, rev))
- def _ResetHard(self, rev, quiet=True):
- cmd = ['reset', '--hard']
- if quiet:
- cmd.append('-q')
- cmd.append(rev)
- if GitCommand(self, cmd).Wait() != 0:
- raise GitError('%s reset --hard %s ' % (self.name, rev))
- def _Rebase(self, upstream, onto = None):
- cmd = ['rebase']
- if onto is not None:
- cmd.extend(['--onto', onto])
- cmd.append(upstream)
- if GitCommand(self, cmd).Wait() != 0:
- raise GitError('%s rebase %s ' % (self.name, upstream))
- def _FastForward(self, head):
- cmd = ['merge', head]
- if GitCommand(self, cmd).Wait() != 0:
- raise GitError('%s merge %s ' % (self.name, head))
- def _InitGitDir(self):
- if not os.path.exists(self.gitdir):
- os.makedirs(self.gitdir)
- self.bare_git.init()
- mp = self.manifest.manifestProject
- ref_dir = mp.config.GetString('repo.reference')
- if ref_dir:
- mirror_git = os.path.join(ref_dir, self.name + '.git')
- repo_git = os.path.join(ref_dir, '.repo', 'projects',
- self.relpath + '.git')
- if os.path.exists(mirror_git):
- ref_dir = mirror_git
- elif os.path.exists(repo_git):
- ref_dir = repo_git
- else:
- ref_dir = None
- if ref_dir:
- _lwrite(os.path.join(self.gitdir, 'objects/info/alternates'),
- os.path.join(ref_dir, 'objects') + '\n')
- if self.manifest.IsMirror:
- self.config.SetString('core.bare', 'true')
- else:
- self.config.SetString('core.bare', None)
- hooks = self._gitdir_path('hooks')
- try:
- to_rm = os.listdir(hooks)
- except OSError:
- to_rm = []
- for old_hook in to_rm:
- os.remove(os.path.join(hooks, old_hook))
- self._InitHooks()
- m = self.manifest.manifestProject.config
- for key in ['user.name', 'user.email']:
- if m.Has(key, include_defaults = False):
- self.config.SetString(key, m.GetString(key))
- def _InitHooks(self):
- hooks = self._gitdir_path('hooks')
- if not os.path.exists(hooks):
- os.makedirs(hooks)
- for stock_hook in repo_hooks():
- name = os.path.basename(stock_hook)
- if name in ('commit-msg') and not self.remote.review:
- # Don't install a Gerrit Code Review hook if this
- # project does not appear to use it for reviews.
- #
- continue
- dst = os.path.join(hooks, name)
- if os.path.islink(dst):
- continue
- if os.path.exists(dst):
- if filecmp.cmp(stock_hook, dst, shallow=False):
- os.remove(dst)
- else:
- _error("%s: Not replacing %s hook", self.relpath, name)
- continue
- try:
- os.symlink(relpath(stock_hook, dst), dst)
- except OSError, e:
- if e.errno == errno.EPERM:
- raise GitError('filesystem must support symlinks')
- else:
- raise
- def _InitRemote(self):
- if self.remote.url:
- remote = self.GetRemote(self.remote.name)
- remote.url = self.remote.url
- remote.review = self.remote.review
- remote.projectname = self.name
- if self.worktree:
- remote.ResetFetch(mirror=False)
- else:
- remote.ResetFetch(mirror=True)
- remote.Save()
- def _InitMRef(self):
- if self.manifest.branch:
- self._InitAnyMRef(R_M + self.manifest.branch)
- def _InitMirrorHead(self):
- self._InitAnyMRef(HEAD)
- def _InitAnyMRef(self, ref):
- cur = self.bare_ref.symref(ref)
- if self.revisionId:
- if cur != '' or self.bare_ref.get(ref) != self.revisionId:
- msg = 'manifest set to %s' % self.revisionId
- dst = self.revisionId + '^0'
- self.bare_git.UpdateRef(ref, dst, message = msg, detach = True)
- else:
- remote = self.GetRemote(self.remote.name)
- dst = remote.ToLocal(self.revisionExpr)
- if cur != dst:
- msg = 'manifest set to %s' % self.revisionExpr
- self.bare_git.symbolic_ref('-m', msg, ref, dst)
- def _InitWorkTree(self):
- dotgit = os.path.join(self.worktree, '.git')
- if not os.path.exists(dotgit):
- os.makedirs(dotgit)
- for name in ['config',
- 'description',
- 'hooks',
- 'info',
- 'logs',
- 'objects',
- 'packed-refs',
- 'refs',
- 'rr-cache',
- 'svn']:
- try:
- src = os.path.join(self.gitdir, name)
- dst = os.path.join(dotgit, name)
- if os.path.islink(dst) or not os.path.exists(dst):
- os.symlink(relpath(src, dst), dst)
- else:
- raise GitError('cannot overwrite a local work tree')
- except OSError, e:
- if e.errno == errno.EPERM:
- raise GitError('filesystem must support symlinks')
- else:
- raise
- _lwrite(os.path.join(dotgit, HEAD), '%s\n' % self.GetRevisionId())
- cmd = ['read-tree', '--reset', '-u']
- cmd.append('-v')
- cmd.append(HEAD)
- if GitCommand(self, cmd).Wait() != 0:
- raise GitError("cannot initialize work tree")
- self._CopyFiles()
- def _gitdir_path(self, path):
- return os.path.join(self.gitdir, path)
- def _revlist(self, *args, **kw):
- a = []
- a.extend(args)
- a.append('--')
- return self.work_git.rev_list(*a, **kw)
- @property
- def _allrefs(self):
- return self.bare_ref.all
- class _GitGetByExec(object):
- def __init__(self, project, bare):
- self._project = project
- self._bare = bare
- def LsOthers(self):
- p = GitCommand(self._project,
- ['ls-files',
- '-z',
- '--others',
- '--exclude-standard'],
- bare = False,
- capture_stdout = True,
- capture_stderr = True)
- if p.Wait() == 0:
- out = p.stdout
- if out:
- return out[:-1].split("\0")
- return []
- def DiffZ(self, name, *args):
- cmd = [name]
- cmd.append('-z')
- cmd.extend(args)
- p = GitCommand(self._project,
- cmd,
- bare = False,
- capture_stdout = True,
- capture_stderr = True)
- try:
- out = p.process.stdout.read()
- r = {}
- if out:
- out = iter(out[:-1].split('\0'))
- while out:
- try:
- info = out.next()
- path = out.next()
- except StopIteration:
- break
- class _Info(object):
- def __init__(self, path, omode, nmode, oid, nid, state):
- self.path = path
- self.src_path = None
- self.old_mode = omode
- self.new_mode = nmode
- self.old_id = oid
- self.new_id = nid
- if len(state) == 1:
- self.status = state
- self.level = None
- else:
- self.status = state[:1]
- self.level = state[1:]
- while self.level.startswith('0'):
- self.level = self.level[1:]
- info = info[1:].split(' ')
- info =_Info(path, *info)
- if info.status in ('R', 'C'):
- info.src_path = info.path
- info.path = out.next()
- r[info.path] = info
- return r
- finally:
- p.Wait()
- def GetHead(self):
- if self._bare:
- path = os.path.join(self._project.gitdir, HEAD)
- else:
- path = os.path.join(self._project.worktree, '.git', HEAD)
- fd = open(path, 'rb')
- try:
- line = fd.read()
- finally:
- fd.close()
- if line.startswith('ref: '):
- return line[5:-1]
- return line[:-1]
- def SetHead(self, ref, message=None):
- cmdv = []
- if message is not None:
- cmdv.extend(['-m', message])
- cmdv.append(HEAD)
- cmdv.append(ref)
- self.symbolic_ref(*cmdv)
- def DetachHead(self, new, message=None):
- cmdv = ['--no-deref']
- if message is not None:
- cmdv.extend(['-m', message])
- cmdv.append(HEAD)
- cmdv.append(new)
- self.update_ref(*cmdv)
- def UpdateRef(self, name, new, old=None,
- message=None,
- detach=False):
- cmdv = []
- if message is not None:
- cmdv.extend(['-m', message])
- if detach:
- cmdv.append('--no-deref')
- cmdv.append(name)
- cmdv.append(new)
- if old is not None:
- cmdv.append(old)
- self.update_ref(*cmdv)
- def DeleteRef(self, name, old=None):
- if not old:
- old = self.rev_parse(name)
- self.update_ref('-d', name, old)
- self._project.bare_ref.deleted(name)
- def rev_list(self, *args, **kw):
- if 'format' in kw:
- cmdv = ['log', '--pretty=format:%s' % kw['format']]
- else:
- cmdv = ['rev-list']
- cmdv.extend(args)
- p = GitCommand(self._project,
- cmdv,
- bare = self._bare,
- capture_stdout = True,
- capture_stderr = True)
- r = []
- for line in p.process.stdout:
- if line[-1] == '\n':
- line = line[:-1]
- r.append(line)
- if p.Wait() != 0:
- raise GitError('%s rev-list %s: %s' % (
- self._project.name,
- str(args),
- p.stderr))
- return r
- def __getattr__(self, name):
- name = name.replace('_', '-')
- def runner(*args):
- cmdv = [name]
- cmdv.extend(args)
- p = GitCommand(self._project,
- cmdv,
- bare = self._bare,
- capture_stdout = True,
- capture_stderr = True)
- if p.Wait() != 0:
- raise GitError('%s %s: %s' % (
- self._project.name,
- name,
- p.stderr))
- r = p.stdout
- if r.endswith('\n') and r.index('\n') == len(r) - 1:
- return r[:-1]
- return r
- return runner
- class _PriorSyncFailedError(Exception):
- def __str__(self):
- return 'prior sync failed; rebase still in progress'
- class _DirtyError(Exception):
- def __str__(self):
- return 'contains uncommitted changes'
- class _InfoMessage(object):
- def __init__(self, project, text):
- self.project = project
- self.text = text
- def Print(self, syncbuf):
- syncbuf.out.info('%s/: %s', self.project.relpath, self.text)
- syncbuf.out.nl()
- class _Failure(object):
- def __init__(self, project, why):
- self.project = project
- self.why = why
- def Print(self, syncbuf):
- syncbuf.out.fail('error: %s/: %s',
- self.project.relpath,
- str(self.why))
- syncbuf.out.nl()
- class _Later(object):
- def __init__(self, project, action):
- self.project = project
- self.action = action
- def Run(self, syncbuf):
- out = syncbuf.out
- out.project('project %s/', self.project.relpath)
- out.nl()
- try:
- self.action()
- out.nl()
- return True
- except GitError, e:
- out.nl()
- return False
- class _SyncColoring(Coloring):
- def __init__(self, config):
- Coloring.__init__(self, config, 'reposync')
- self.project = self.printer('header', attr = 'bold')
- self.info = self.printer('info')
- self.fail = self.printer('fail', fg='red')
- class SyncBuffer(object):
- def __init__(self, config, detach_head=False):
- self._messages = []
- self._failures = []
- self._later_queue1 = []
- self._later_queue2 = []
- self.out = _SyncColoring(config)
- self.out.redirect(sys.stderr)
- self.detach_head = detach_head
- self.clean = True
- def info(self, project, fmt, *args):
- self._messages.append(_InfoMessage(project, fmt % args))
- def fail(self, project, err=None):
- self._failures.append(_Failure(project, err))
- self.clean = False
- def later1(self, project, what):
- self._later_queue1.append(_Later(project, what))
- def later2(self, project, what):
- self._later_queue2.append(_Later(project, what))
- def Finish(self):
- self._PrintMessages()
- self._RunLater()
- self._PrintMessages()
- return self.clean
- def _RunLater(self):
- for q in ['_later_queue1', '_later_queue2']:
- if not self._RunQueue(q):
- return
- def _RunQueue(self, queue):
- for m in getattr(self, queue):
- if not m.Run(self):
- self.clean = False
- return False
- setattr(self, queue, [])
- return True
- def _PrintMessages(self):
- for m in self._messages:
- m.Print(self)
- for m in self._failures:
- m.Print(self)
- self._messages = []
- self._failures = []
- class MetaProject(Project):
- """A special project housed under .repo.
- """
- def __init__(self, manifest, name, gitdir, worktree):
- repodir = manifest.repodir
- Project.__init__(self,
- manifest = manifest,
- name = name,
- gitdir = gitdir,
- worktree = worktree,
- remote = RemoteSpec('origin'),
- relpath = '.repo/%s' % name,
- revisionExpr = 'refs/heads/master',
- revisionId = None)
- def PreSync(self):
- if self.Exists:
- cb = self.CurrentBranch
- if cb:
- base = self.GetBranch(cb).merge
- if base:
- self.revisionExpr = base
- self.revisionId = None
- @property
- def LastFetch(self):
- try:
- fh = os.path.join(self.gitdir, 'FETCH_HEAD')
- return os.path.getmtime(fh)
- except OSError:
- return 0
- @property
- def HasChanges(self):
- """Has the remote received new commits not yet checked out?
- """
- if not self.remote or not self.revisionExpr:
- return False
- all = self.bare_ref.all
- revid = self.GetRevisionId(all)
- head = self.work_git.GetHead()
- if head.startswith(R_HEADS):
- try:
- head = all[head]
- except KeyError:
- head = None
- if revid == head:
- return False
- elif self._revlist(not_rev(HEAD), revid):
- return True
- return False
|