2008-10-21 14:00:00 +00:00
|
|
|
# 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.
|
|
|
|
|
2008-11-03 17:59:36 +00:00
|
|
|
import errno
|
2008-10-21 14:00:00 +00:00
|
|
|
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
|
2009-03-02 20:56:08 +00:00
|
|
|
from error import ManifestInvalidRevisionError
|
2008-10-21 14:00:00 +00:00
|
|
|
from remote import Remote
|
|
|
|
|
2009-04-18 01:49:50 +00:00
|
|
|
from git_refs import GitRefs, HEAD, R_HEADS, R_TAGS, R_PUB, R_M
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2009-04-18 21:45:51 +00:00
|
|
|
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
|
|
|
|
|
2009-04-16 15:25:57 +00:00
|
|
|
def _error(fmt, *args):
|
|
|
|
msg = fmt % args
|
|
|
|
print >>sys.stderr, 'error: %s' % msg
|
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
def not_rev(r):
|
|
|
|
return '^' + r
|
|
|
|
|
2009-01-06 00:18:58 +00:00
|
|
|
def sq(r):
|
|
|
|
return "'" + r.replace("'", "'\''") + "'"
|
2008-11-03 18:32:09 +00:00
|
|
|
|
|
|
|
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:]
|
|
|
|
|
|
|
|
|
2008-10-23 18:58:52 +00:00
|
|
|
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
|
|
|
|
|
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
class ReviewableBranch(object):
|
|
|
|
_commit_cache = None
|
|
|
|
|
|
|
|
def __init__(self, project, branch, base):
|
|
|
|
self.project = project
|
|
|
|
self.branch = branch
|
|
|
|
self.base = base
|
2008-11-12 01:12:43 +00:00
|
|
|
self.replace_changes = None
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
@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
|
|
|
|
|
2008-11-12 01:12:43 +00:00
|
|
|
@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
|
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
@property
|
|
|
|
def date(self):
|
|
|
|
return self.project.bare_git.log(
|
|
|
|
'--pretty=format:%cd',
|
|
|
|
'-n', '1',
|
|
|
|
R_HEADS + self.name,
|
|
|
|
'--')
|
|
|
|
|
2008-11-17 21:56:36 +00:00
|
|
|
def UploadForReview(self, people):
|
2008-11-12 01:12:43 +00:00
|
|
|
self.project.UploadForReview(self.name,
|
2008-11-17 21:56:36 +00:00
|
|
|
self.replace_changes,
|
|
|
|
people)
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2009-05-04 19:45:11 +00:00
|
|
|
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
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
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')
|
2009-04-18 22:26:10 +00:00
|
|
|
self.important = self.printer('important', fg = 'red')
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
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:
|
2009-03-05 18:32:38 +00:00
|
|
|
def __init__(self, src, dest, abssrc, absdest):
|
2008-10-21 14:00:00 +00:00
|
|
|
self.src = src
|
|
|
|
self.dest = dest
|
2009-03-05 18:32:38 +00:00
|
|
|
self.abs_src = abssrc
|
|
|
|
self.abs_dest = absdest
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
def _Copy(self):
|
2009-03-05 18:32:38 +00:00
|
|
|
src = self.abs_src
|
|
|
|
dest = self.abs_dest
|
2008-10-21 14:00:00 +00:00
|
|
|
# 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)
|
|
|
|
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:
|
2009-04-16 15:25:57 +00:00
|
|
|
_error('Cannot copy file %s to %s', src, dest)
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
|
|
|
|
class Project(object):
|
|
|
|
def __init__(self,
|
|
|
|
manifest,
|
|
|
|
name,
|
|
|
|
remote,
|
|
|
|
gitdir,
|
|
|
|
worktree,
|
|
|
|
relpath,
|
|
|
|
revision):
|
|
|
|
self.manifest = manifest
|
|
|
|
self.name = name
|
|
|
|
self.remote = remote
|
|
|
|
self.gitdir = gitdir
|
|
|
|
self.worktree = worktree
|
|
|
|
self.relpath = relpath
|
|
|
|
self.revision = revision
|
|
|
|
self.snapshots = {}
|
|
|
|
self.extraRemotes = {}
|
|
|
|
self.copyfiles = []
|
|
|
|
self.config = GitConfig.ForRepository(
|
|
|
|
gitdir = self.gitdir,
|
|
|
|
defaults = self.manifest.globalConfig)
|
|
|
|
|
2008-11-04 15:37:10 +00:00
|
|
|
if self.worktree:
|
|
|
|
self.work_git = self._GitGetByExec(self, bare=False)
|
|
|
|
else:
|
|
|
|
self.work_git = None
|
2008-10-21 14:00:00 +00:00
|
|
|
self.bare_git = self._GitGetByExec(self, bare=True)
|
2009-04-18 01:49:50 +00:00
|
|
|
self.bare_ref = GitRefs(gitdir)
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
@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.
|
|
|
|
"""
|
2009-04-18 01:43:33 +00:00
|
|
|
b = self.work_git.GetHead()
|
2008-10-21 14:00:00 +00:00
|
|
|
if b.startswith(R_HEADS):
|
|
|
|
return b[len(R_HEADS):]
|
|
|
|
return None
|
|
|
|
|
2009-04-18 22:26:10 +00:00
|
|
|
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'))
|
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
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)
|
|
|
|
|
2009-04-10 23:02:48 +00:00
|
|
|
def GetBranches(self):
|
|
|
|
"""Get all existing local branches.
|
|
|
|
"""
|
|
|
|
current = self.CurrentBranch
|
2009-04-18 01:49:50 +00:00
|
|
|
all = self._allrefs
|
2009-04-10 23:02:48 +00:00
|
|
|
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
|
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
## Status Display ##
|
|
|
|
|
|
|
|
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')
|
2009-04-18 22:26:10 +00:00
|
|
|
rb = self.IsRebaseInProgress()
|
2008-10-21 14:00:00 +00:00
|
|
|
di = self.work_git.DiffZ('diff-index', '-M', '--cached', HEAD)
|
|
|
|
df = self.work_git.DiffZ('diff-files')
|
|
|
|
do = self.work_git.LsOthers()
|
2009-04-18 22:26:10 +00:00
|
|
|
if not rb and not di and not df and not do:
|
2009-04-11 00:41:44 +00:00
|
|
|
return 'CLEAN'
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
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()
|
|
|
|
|
2009-04-18 22:26:10 +00:00
|
|
|
if rb:
|
|
|
|
out.important('prior sync failed; rebase still in progress')
|
|
|
|
out.nl()
|
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
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:
|
2009-03-03 21:49:48 +00:00
|
|
|
line = ' %s%s\t%s => %s (%s%%)' % (i_status, f_status,
|
2008-10-21 14:00:00 +00:00
|
|
|
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()
|
2009-04-11 00:41:44 +00:00
|
|
|
return 'DIRTY'
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
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 ##
|
|
|
|
|
2009-04-18 03:58:02 +00:00
|
|
|
def WasPublished(self, branch, all=None):
|
2008-10-21 14:00:00 +00:00
|
|
|
"""Was the branch published (uploaded) for code review?
|
|
|
|
If so, returns the SHA-1 hash of the last published
|
|
|
|
state for the branch.
|
|
|
|
"""
|
2009-04-18 03:58:02 +00:00
|
|
|
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
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2009-04-18 03:58:02 +00:00
|
|
|
def CleanPublishedCache(self, all=None):
|
2008-10-21 14:00:00 +00:00
|
|
|
"""Prunes any stale published refs.
|
|
|
|
"""
|
2009-04-18 03:58:02 +00:00
|
|
|
if all is None:
|
|
|
|
all = self._allrefs
|
2008-10-21 14:00:00 +00:00
|
|
|
heads = set()
|
|
|
|
canrm = {}
|
2009-04-18 03:58:02 +00:00
|
|
|
for name, id in all.iteritems():
|
2008-10-21 14:00:00 +00:00
|
|
|
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
|
|
|
|
|
2008-11-12 01:03:13 +00:00
|
|
|
rb = self.GetUploadableBranch(branch)
|
|
|
|
if rb:
|
|
|
|
ready.append(rb)
|
2008-10-21 14:00:00 +00:00
|
|
|
return ready
|
|
|
|
|
2008-11-12 01:03:13 +00:00
|
|
|
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
|
|
|
|
|
2008-11-17 21:56:36 +00:00
|
|
|
def UploadForReview(self, branch=None, replace_changes=None, people=([],[])):
|
2008-10-21 14:00:00 +00:00
|
|
|
"""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
|
|
|
|
|
2008-11-06 17:52:51 +00:00
|
|
|
if not branch.remote.projectname:
|
|
|
|
branch.remote.projectname = self.name
|
|
|
|
branch.remote.Save()
|
|
|
|
|
2009-01-26 18:55:39 +00:00
|
|
|
if branch.remote.ReviewProtocol == 'ssh':
|
2009-01-06 00:18:58 +00:00
|
|
|
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))
|
|
|
|
|
|
|
|
cmd = ['push']
|
|
|
|
cmd.append('--receive-pack=%s' % " ".join(rp))
|
|
|
|
cmd.append(branch.remote.SshReviewUrl(self.UserEmail))
|
|
|
|
cmd.append('%s:refs/for/%s' % (R_HEADS + branch.name, dest_branch))
|
|
|
|
if replace_changes:
|
|
|
|
for change_id,commit_id in replace_changes.iteritems():
|
|
|
|
cmd.append('%s:refs/changes/%s/new' % (commit_id, change_id))
|
|
|
|
if GitCommand(self, cmd, bare = True).Wait() != 0:
|
|
|
|
raise UploadError('Upload failed')
|
|
|
|
|
|
|
|
else:
|
|
|
|
raise UploadError('Unsupported protocol %s' \
|
|
|
|
% branch.remote.review)
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
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):
|
|
|
|
"""Perform only the network IO portion of the sync process.
|
|
|
|
Local working directory/branch state is not affected.
|
|
|
|
"""
|
|
|
|
if not self.Exists:
|
|
|
|
print >>sys.stderr
|
|
|
|
print >>sys.stderr, 'Initializing project %s ...' % self.name
|
|
|
|
self._InitGitDir()
|
2008-11-04 15:37:10 +00:00
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
self._InitRemote()
|
|
|
|
for r in self.extraRemotes.values():
|
|
|
|
if not self._RemoteFetch(r.name):
|
|
|
|
return False
|
|
|
|
if not self._RemoteFetch():
|
|
|
|
return False
|
2008-11-04 15:37:10 +00:00
|
|
|
|
|
|
|
if self.worktree:
|
|
|
|
self._InitMRef()
|
|
|
|
else:
|
|
|
|
self._InitMirrorHead()
|
|
|
|
try:
|
|
|
|
os.remove(os.path.join(self.gitdir, 'FETCH_HEAD'))
|
|
|
|
except OSError:
|
|
|
|
pass
|
2008-10-21 14:00:00 +00:00
|
|
|
return True
|
2008-11-03 18:32:09 +00:00
|
|
|
|
|
|
|
def PostRepoUpgrade(self):
|
|
|
|
self._InitHooks()
|
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
def _CopyFiles(self):
|
|
|
|
for file in self.copyfiles:
|
|
|
|
file._Copy()
|
|
|
|
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
def Sync_LocalHalf(self, syncbuf):
|
2008-10-21 14:00:00 +00:00
|
|
|
"""Perform only the local IO portion of the sync process.
|
|
|
|
Network access is not required.
|
|
|
|
"""
|
|
|
|
self._InitWorkTree()
|
2009-04-18 03:58:02 +00:00
|
|
|
all = self.bare_ref.all
|
|
|
|
self.CleanPublishedCache(all)
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
rem = self.GetRemote(self.remote.name)
|
|
|
|
rev = rem.ToLocal(self.revision)
|
2009-04-18 03:58:02 +00:00
|
|
|
if rev in all:
|
|
|
|
revid = all[rev]
|
|
|
|
elif IsId(rev):
|
|
|
|
revid = rev
|
|
|
|
else:
|
|
|
|
try:
|
|
|
|
revid = self.bare_git.rev_parse('--verify', '%s^0' % rev)
|
|
|
|
except GitError:
|
|
|
|
raise ManifestInvalidRevisionError(
|
|
|
|
'revision %s in %s not found' % (self.revision, self.name))
|
2009-03-02 20:56:08 +00:00
|
|
|
|
2009-04-18 03:58:02 +00:00
|
|
|
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
|
2008-10-21 14:00:00 +00:00
|
|
|
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
if branch is None or syncbuf.detach_head:
|
2008-10-21 14:00:00 +00:00
|
|
|
# Currently on a detached HEAD. The user is assumed to
|
|
|
|
# not have any local modifications worth worrying about.
|
|
|
|
#
|
2009-04-18 22:26:10 +00:00
|
|
|
if self.IsRebaseInProgress():
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
syncbuf.fail(self, _PriorSyncFailedError())
|
|
|
|
return
|
|
|
|
|
2009-04-18 03:58:02 +00:00
|
|
|
if head == revid:
|
|
|
|
# No changes; don't do anything further.
|
|
|
|
#
|
|
|
|
return
|
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
lost = self._revlist(not_rev(rev), HEAD)
|
|
|
|
if lost:
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
syncbuf.info(self, "discarding %d commits", len(lost))
|
2008-10-21 14:00:00 +00:00
|
|
|
try:
|
|
|
|
self._Checkout(rev, quiet=True)
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
except GitError, e:
|
|
|
|
syncbuf.fail(self, e)
|
|
|
|
return
|
2008-10-21 14:00:00 +00:00
|
|
|
self._CopyFiles()
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
return
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2009-04-18 03:58:02 +00:00
|
|
|
if head == revid:
|
|
|
|
# No changes; don't do anything further.
|
|
|
|
#
|
|
|
|
return
|
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
branch = self.GetBranch(branch)
|
|
|
|
merge = branch.LocalMerge
|
|
|
|
|
|
|
|
if not merge:
|
|
|
|
# The current branch has no tracking configuration.
|
|
|
|
# Jump off it to a deatched HEAD.
|
|
|
|
#
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
syncbuf.info(self,
|
|
|
|
"leaving %s; does not track upstream",
|
|
|
|
branch.name)
|
2008-10-21 14:00:00 +00:00
|
|
|
try:
|
|
|
|
self._Checkout(rev, quiet=True)
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
except GitError, e:
|
|
|
|
syncbuf.fail(self, e)
|
|
|
|
return
|
2008-10-21 14:00:00 +00:00
|
|
|
self._CopyFiles()
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
return
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
upstream_gain = self._revlist(not_rev(HEAD), rev)
|
2009-04-18 03:58:02 +00:00
|
|
|
pub = self.WasPublished(branch.name, all)
|
2008-10-21 14:00:00 +00:00
|
|
|
if pub:
|
|
|
|
not_merged = self._revlist(not_rev(rev), 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.
|
|
|
|
#
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
syncbuf.info(self,
|
|
|
|
"branch %s is published but is now %d commits behind",
|
|
|
|
branch.name,
|
|
|
|
len(upstream_gain))
|
|
|
|
return
|
2009-04-21 15:26:32 +00:00
|
|
|
elif pub == head:
|
|
|
|
# All published commits are merged, and thus we are a
|
|
|
|
# strict subset. We can fast-forward safely.
|
2008-10-30 18:03:00 +00:00
|
|
|
#
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
def _doff():
|
2008-10-30 18:03:00 +00:00
|
|
|
self._FastForward(rev)
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
self._CopyFiles()
|
|
|
|
syncbuf.later1(self, _doff)
|
|
|
|
return
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
if merge == rev:
|
|
|
|
try:
|
|
|
|
old_merge = self.bare_git.rev_parse('%s@{1}' % merge)
|
|
|
|
except GitError:
|
|
|
|
old_merge = merge
|
2008-10-21 14:09:27 +00:00
|
|
|
if old_merge == '0000000000000000000000000000000000000000' \
|
|
|
|
or old_merge == '':
|
|
|
|
old_merge = merge
|
2008-10-21 14:00:00 +00:00
|
|
|
else:
|
|
|
|
# The upstream switched on us. Time to cross our fingers
|
|
|
|
# and pray that the old upstream also wasn't in the habit
|
|
|
|
# of rebasing itself.
|
|
|
|
#
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
syncbuf.info(self, "manifest switched %s...%s", merge, rev)
|
2008-10-21 14:00:00 +00:00
|
|
|
old_merge = merge
|
|
|
|
|
|
|
|
if rev == old_merge:
|
|
|
|
upstream_lost = []
|
|
|
|
else:
|
|
|
|
upstream_lost = self._revlist(not_rev(rev), old_merge)
|
|
|
|
|
|
|
|
if not upstream_lost and not upstream_gain:
|
|
|
|
# Trivially no changes caused by the upstream.
|
|
|
|
#
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
return
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
if self.IsDirty(consider_untracked=False):
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
syncbuf.fail(self, _DirtyError())
|
|
|
|
return
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
if upstream_lost:
|
|
|
|
# Upstream rebased. Not everything in HEAD
|
|
|
|
# may have been caused by the user.
|
|
|
|
#
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
syncbuf.info(self,
|
|
|
|
"discarding %d commits removed from upstream",
|
|
|
|
len(upstream_lost))
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
branch.remote = rem
|
|
|
|
branch.merge = self.revision
|
|
|
|
branch.Save()
|
|
|
|
|
|
|
|
my_changes = self._revlist(not_rev(old_merge), HEAD)
|
|
|
|
if my_changes:
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
def _dorebase():
|
2008-10-21 14:00:00 +00:00
|
|
|
self._Rebase(upstream = old_merge, onto = rev)
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
self._CopyFiles()
|
|
|
|
syncbuf.later2(self, _dorebase)
|
2008-10-21 14:00:00 +00:00
|
|
|
elif upstream_lost:
|
|
|
|
try:
|
|
|
|
self._ResetHard(rev)
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
self._CopyFiles()
|
|
|
|
except GitError, e:
|
|
|
|
syncbuf.fail(self, e)
|
|
|
|
return
|
2008-10-21 14:00:00 +00:00
|
|
|
else:
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
def _doff():
|
2008-10-21 14:00:00 +00:00
|
|
|
self._FastForward(rev)
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
self._CopyFiles()
|
|
|
|
syncbuf.later1(self, _doff)
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2009-03-05 18:32:38 +00:00
|
|
|
def AddCopyFile(self, src, dest, absdest):
|
2008-10-21 14:00:00 +00:00
|
|
|
# dest should already be an absolute path, but src is project relative
|
|
|
|
# make src an absolute path
|
2009-03-05 18:32:38 +00:00
|
|
|
abssrc = os.path.join(self.worktree, src)
|
|
|
|
self.copyfiles.append(_CopyFile(src, dest, abssrc, absdest))
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2008-10-23 18:58:52 +00:00
|
|
|
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,
|
|
|
|
remote.ToLocal(self.revision),
|
|
|
|
change_id,
|
|
|
|
patch_id,
|
|
|
|
self.bare_git.rev_parse('FETCH_HEAD'))
|
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
## Branch Management ##
|
|
|
|
|
|
|
|
def StartBranch(self, name):
|
|
|
|
"""Create a new branch off the manifest's revision.
|
|
|
|
"""
|
2009-04-18 21:45:51 +00:00
|
|
|
head = self.work_git.GetHead()
|
|
|
|
if head == (R_HEADS + name):
|
|
|
|
return True
|
2009-04-10 23:21:18 +00:00
|
|
|
|
2009-04-18 21:45:51 +00:00
|
|
|
all = self.bare_ref.all
|
|
|
|
if (R_HEADS + name) in all:
|
|
|
|
return GitCommand(self,
|
2009-04-18 22:04:41 +00:00
|
|
|
['checkout', name, '--'],
|
2009-04-18 21:53:39 +00:00
|
|
|
capture_stdout = True,
|
|
|
|
capture_stderr = True).Wait() == 0
|
2009-04-18 21:45:51 +00:00
|
|
|
|
|
|
|
branch = self.GetBranch(name)
|
|
|
|
branch.remote = self.GetRemote(self.remote.name)
|
|
|
|
branch.merge = self.revision
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2009-04-18 21:45:51 +00:00
|
|
|
rev = branch.LocalMerge
|
|
|
|
if rev in all:
|
|
|
|
revid = all[rev]
|
|
|
|
elif IsId(rev):
|
|
|
|
revid = rev
|
2008-10-21 14:00:00 +00:00
|
|
|
else:
|
2009-04-18 21:45:51 +00:00
|
|
|
revid = None
|
|
|
|
|
|
|
|
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,
|
2009-04-18 22:04:41 +00:00
|
|
|
['checkout', '-b', branch.name, rev],
|
2009-04-18 21:53:39 +00:00
|
|
|
capture_stdout = True,
|
|
|
|
capture_stderr = True).Wait() == 0:
|
2009-04-18 21:45:51 +00:00
|
|
|
branch.Save()
|
|
|
|
return True
|
|
|
|
return False
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2009-04-10 20:01:24 +00:00
|
|
|
def CheckoutBranch(self, name):
|
|
|
|
"""Checkout a local topic branch.
|
|
|
|
"""
|
2009-04-18 22:04:41 +00:00
|
|
|
rev = R_HEADS + name
|
|
|
|
head = self.work_git.GetHead()
|
|
|
|
if head == rev:
|
|
|
|
# Already on the branch
|
|
|
|
#
|
|
|
|
return True
|
2009-04-10 20:01:24 +00:00
|
|
|
|
2009-04-18 22:04:41 +00:00
|
|
|
all = self.bare_ref.all
|
2009-04-10 20:01:24 +00:00
|
|
|
try:
|
2009-04-18 22:04:41 +00:00
|
|
|
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
|
2009-04-10 20:01:24 +00:00
|
|
|
|
2009-04-18 22:04:41 +00:00
|
|
|
return GitCommand(self,
|
|
|
|
['checkout', name, '--'],
|
|
|
|
capture_stdout = True,
|
|
|
|
capture_stderr = True).Wait() == 0
|
2009-04-10 20:01:24 +00:00
|
|
|
|
2008-11-03 19:24:59 +00:00
|
|
|
def AbandonBranch(self, name):
|
|
|
|
"""Destroy a local topic branch.
|
|
|
|
"""
|
2009-04-18 22:15:24 +00:00
|
|
|
rev = R_HEADS + name
|
|
|
|
all = self.bare_ref.all
|
|
|
|
if rev not in all:
|
|
|
|
# Doesn't exist; assume already abandoned.
|
|
|
|
#
|
|
|
|
return True
|
2008-11-03 19:24:59 +00:00
|
|
|
|
2009-04-18 22:15:24 +00:00
|
|
|
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]
|
2008-11-03 19:24:59 +00:00
|
|
|
|
2009-04-18 22:15:24 +00:00
|
|
|
rev = self.GetRemote(self.remote.name).ToLocal(self.revision)
|
|
|
|
if rev in all:
|
|
|
|
revid = all[rev]
|
|
|
|
elif IsId(rev):
|
|
|
|
revid = rev
|
|
|
|
else:
|
|
|
|
revid = None
|
|
|
|
|
|
|
|
if revid and head == revid:
|
|
|
|
_lwrite(os.path.join(self.worktree, '.git', HEAD),
|
|
|
|
'%s\n' % revid)
|
|
|
|
else:
|
|
|
|
self._Checkout(rev, quiet=True)
|
|
|
|
|
|
|
|
return GitCommand(self,
|
|
|
|
['branch', '-D', name],
|
|
|
|
capture_stdout = True,
|
|
|
|
capture_stderr = True).Wait() == 0
|
2008-11-03 19:24:59 +00:00
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
def PruneHeads(self):
|
|
|
|
"""Prune any topic branches already merged into upstream.
|
|
|
|
"""
|
|
|
|
cb = self.CurrentBranch
|
|
|
|
kill = []
|
2009-03-02 20:30:50 +00:00
|
|
|
left = self._allrefs
|
|
|
|
for name in left.keys():
|
2008-10-21 14:00:00 +00:00
|
|
|
if name.startswith(R_HEADS):
|
|
|
|
name = name[len(R_HEADS):]
|
|
|
|
if cb is None or name != cb:
|
|
|
|
kill.append(name)
|
|
|
|
|
|
|
|
rev = self.GetRemote(self.remote.name).ToLocal(self.revision)
|
|
|
|
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:
|
2009-04-18 01:43:33 +00:00
|
|
|
old = self.bare_git.GetHead()
|
|
|
|
if old is None:
|
2008-10-21 14:00:00 +00:00
|
|
|
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)
|
2009-03-02 20:30:50 +00:00
|
|
|
left = self._allrefs
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2009-03-02 20:30:50 +00:00
|
|
|
for branch in kill:
|
|
|
|
if (R_HEADS + branch) not in left:
|
|
|
|
self.CleanPublishedCache()
|
|
|
|
break
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
if cb and cb not in kill:
|
|
|
|
kill.append(cb)
|
2009-03-02 20:38:13 +00:00
|
|
|
kill.sort()
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
kept = []
|
|
|
|
for branch in kill:
|
2009-03-02 20:30:50 +00:00
|
|
|
if (R_HEADS + branch) in left:
|
2008-10-21 14:00:00 +00:00
|
|
|
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):
|
|
|
|
if not name:
|
|
|
|
name = self.remote.name
|
2009-04-11 01:53:46 +00:00
|
|
|
|
|
|
|
ssh_proxy = False
|
|
|
|
if self.GetRemote(name).PreConnectFetch():
|
|
|
|
ssh_proxy = True
|
|
|
|
|
2008-11-04 15:37:10 +00:00
|
|
|
cmd = ['fetch']
|
|
|
|
if not self.worktree:
|
|
|
|
cmd.append('--update-head-ok')
|
|
|
|
cmd.append(name)
|
2009-04-11 01:53:46 +00:00
|
|
|
return GitCommand(self,
|
|
|
|
cmd,
|
|
|
|
bare = True,
|
|
|
|
ssh_proxy = ssh_proxy).Wait() == 0
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
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):
|
2009-04-16 15:14:26 +00:00
|
|
|
cmd = ['rebase']
|
2008-10-21 14:00:00 +00:00
|
|
|
if onto is not None:
|
|
|
|
cmd.extend(['--onto', onto])
|
|
|
|
cmd.append(upstream)
|
2009-04-16 15:14:26 +00:00
|
|
|
if GitCommand(self, cmd).Wait() != 0:
|
2008-10-21 14:00:00 +00:00
|
|
|
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()
|
2009-03-04 01:53:18 +00:00
|
|
|
|
|
|
|
if self.manifest.IsMirror:
|
|
|
|
self.config.SetString('core.bare', 'true')
|
|
|
|
else:
|
|
|
|
self.config.SetString('core.bare', None)
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
hooks = self._gitdir_path('hooks')
|
2008-10-29 21:38:12 +00:00
|
|
|
try:
|
|
|
|
to_rm = os.listdir(hooks)
|
|
|
|
except OSError:
|
|
|
|
to_rm = []
|
|
|
|
for old_hook in to_rm:
|
2008-10-21 14:00:00 +00:00
|
|
|
os.remove(os.path.join(hooks, old_hook))
|
2008-11-03 18:32:09 +00:00
|
|
|
self._InitHooks()
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
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))
|
|
|
|
|
2008-11-03 18:32:09 +00:00
|
|
|
def _InitHooks(self):
|
|
|
|
hooks = self._gitdir_path('hooks')
|
|
|
|
if not os.path.exists(hooks):
|
|
|
|
os.makedirs(hooks)
|
|
|
|
for stock_hook in repo_hooks():
|
|
|
|
dst = os.path.join(hooks, os.path.basename(stock_hook))
|
|
|
|
try:
|
|
|
|
os.symlink(relpath(stock_hook, dst), dst)
|
|
|
|
except OSError, e:
|
|
|
|
if e.errno == errno.EEXIST:
|
|
|
|
pass
|
|
|
|
elif e.errno == errno.EPERM:
|
|
|
|
raise GitError('filesystem must support symlinks')
|
|
|
|
else:
|
|
|
|
raise
|
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
def _InitRemote(self):
|
|
|
|
if self.remote.fetchUrl:
|
|
|
|
remote = self.GetRemote(self.remote.name)
|
|
|
|
|
|
|
|
url = self.remote.fetchUrl
|
|
|
|
while url.endswith('/'):
|
|
|
|
url = url[:-1]
|
|
|
|
url += '/%s.git' % self.name
|
|
|
|
remote.url = url
|
|
|
|
remote.review = self.remote.reviewUrl
|
2008-11-06 17:52:51 +00:00
|
|
|
if remote.projectname is None:
|
|
|
|
remote.projectname = self.name
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2008-11-04 15:37:10 +00:00
|
|
|
if self.worktree:
|
|
|
|
remote.ResetFetch(mirror=False)
|
|
|
|
else:
|
|
|
|
remote.ResetFetch(mirror=True)
|
2008-10-21 14:00:00 +00:00
|
|
|
remote.Save()
|
|
|
|
|
|
|
|
for r in self.extraRemotes.values():
|
|
|
|
remote = self.GetRemote(r.name)
|
|
|
|
remote.url = r.fetchUrl
|
|
|
|
remote.review = r.reviewUrl
|
2008-11-06 18:25:35 +00:00
|
|
|
if r.projectName:
|
|
|
|
remote.projectname = r.projectName
|
|
|
|
elif remote.projectname is None:
|
2008-11-06 17:52:51 +00:00
|
|
|
remote.projectname = self.name
|
2008-10-21 14:00:00 +00:00
|
|
|
remote.ResetFetch()
|
|
|
|
remote.Save()
|
|
|
|
|
|
|
|
def _InitMRef(self):
|
|
|
|
if self.manifest.branch:
|
|
|
|
msg = 'manifest set to %s' % self.revision
|
|
|
|
ref = R_M + self.manifest.branch
|
2009-04-18 03:32:44 +00:00
|
|
|
cur = self.bare_ref.symref(ref)
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
if IsId(self.revision):
|
2009-04-18 03:32:44 +00:00
|
|
|
if cur != '' or self.bare_ref.get(ref) != self.revision:
|
|
|
|
dst = self.revision + '^0'
|
|
|
|
self.bare_git.UpdateRef(ref, dst, message = msg, detach = True)
|
2008-10-21 14:00:00 +00:00
|
|
|
else:
|
|
|
|
remote = self.GetRemote(self.remote.name)
|
|
|
|
dst = remote.ToLocal(self.revision)
|
2009-04-18 03:32:44 +00:00
|
|
|
if cur != dst:
|
|
|
|
self.bare_git.symbolic_ref('-m', msg, ref, dst)
|
2008-10-21 14:00:00 +00:00
|
|
|
|
2008-11-04 15:37:10 +00:00
|
|
|
def _InitMirrorHead(self):
|
|
|
|
dst = self.GetRemote(self.remote.name).ToLocal(self.revision)
|
|
|
|
msg = 'manifest set to %s' % self.revision
|
|
|
|
self.bare_git.SetHead(dst, message=msg)
|
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
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']:
|
2008-11-03 17:59:36 +00:00
|
|
|
try:
|
2008-11-03 18:32:09 +00:00
|
|
|
src = os.path.join(self.gitdir, name)
|
|
|
|
dst = os.path.join(dotgit, name)
|
|
|
|
os.symlink(relpath(src, dst), dst)
|
2008-11-03 17:59:36 +00:00
|
|
|
except OSError, e:
|
|
|
|
if e.errno == errno.EPERM:
|
|
|
|
raise GitError('filesystem must support symlinks')
|
|
|
|
else:
|
|
|
|
raise
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
rev = self.GetRemote(self.remote.name).ToLocal(self.revision)
|
|
|
|
rev = self.bare_git.rev_parse('%s^0' % rev)
|
|
|
|
|
2009-04-18 21:48:03 +00:00
|
|
|
_lwrite(os.path.join(dotgit, HEAD), '%s\n' % rev)
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
cmd = ['read-tree', '--reset', '-u']
|
|
|
|
cmd.append('-v')
|
|
|
|
cmd.append('HEAD')
|
|
|
|
if GitCommand(self, cmd).Wait() != 0:
|
|
|
|
raise GitError("cannot initialize work tree")
|
2009-04-21 17:50:33 +00:00
|
|
|
self._CopyFiles()
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
def _gitdir_path(self, path):
|
|
|
|
return os.path.join(self.gitdir, path)
|
|
|
|
|
|
|
|
def _revlist(self, *args):
|
|
|
|
cmd = []
|
|
|
|
cmd.extend(args)
|
|
|
|
cmd.append('--')
|
|
|
|
return self.work_git.rev_list(*args)
|
|
|
|
|
|
|
|
@property
|
|
|
|
def _allrefs(self):
|
2009-04-18 01:49:50 +00:00
|
|
|
return self.bare_ref.all
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
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:
|
2008-10-21 20:59:08 +00:00
|
|
|
try:
|
|
|
|
info = out.next()
|
|
|
|
path = out.next()
|
|
|
|
except StopIteration:
|
|
|
|
break
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
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):
|
2009-04-18 01:43:33 +00:00
|
|
|
if self._bare:
|
|
|
|
path = os.path.join(self._project.gitdir, HEAD)
|
|
|
|
else:
|
|
|
|
path = os.path.join(self._project.worktree, '.git', HEAD)
|
2009-04-18 21:48:03 +00:00
|
|
|
fd = open(path, 'rb')
|
|
|
|
try:
|
|
|
|
line = fd.read()
|
|
|
|
finally:
|
|
|
|
fd.close()
|
2009-04-18 01:43:33 +00:00
|
|
|
if line.startswith('ref: '):
|
|
|
|
return line[5:-1]
|
|
|
|
return line[:-1]
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
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)
|
2009-04-18 03:58:02 +00:00
|
|
|
self._project.bare_ref.deleted(name)
|
2008-10-21 14:00:00 +00:00
|
|
|
|
|
|
|
def rev_list(self, *args):
|
|
|
|
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:
|
|
|
|
r.append(line[:-1])
|
|
|
|
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
|
|
|
|
|
|
|
|
|
Change repo sync to be more friendly when updating the tree
We now try to sync all projects that can be done safely first, before
we start rebasing user commits over the upstream. This has the nice
effect of making the local tree as close to the upstream as possible
before the user has to start resolving merge conflicts, as that extra
information in other projects may aid in the conflict resolution.
Informational output is buffered and delayed until calculation for
all projects has been done, so that the user gets one concise list
of notice messages, rather than it interrupting the progress meter.
Fast-forward output is now prefixed with the project header, so the
user can see which project that update is taking place in, and make
some relation of the diffstat back to the project name.
Rebase output is now prefixed with the project header, so that if
the rebase fails, the user can see which project we were operating
on and can try to address the failure themselves.
Since rebase sits on a detached HEAD, we now look for an in-progress
rebase during sync, so we can alert the user that the given project
is in a state we cannot handle.
Signed-off-by: Shawn O. Pearce <sop@google.com>
2009-04-16 18:21:18 +00:00
|
|
|
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 = []
|
|
|
|
|
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
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 = Remote('origin'),
|
|
|
|
relpath = '.repo/%s' % name,
|
|
|
|
revision = 'refs/heads/master')
|
|
|
|
|
|
|
|
def PreSync(self):
|
|
|
|
if self.Exists:
|
|
|
|
cb = self.CurrentBranch
|
|
|
|
if cb:
|
|
|
|
base = self.GetBranch(cb).merge
|
|
|
|
if base:
|
|
|
|
self.revision = base
|
|
|
|
|
2009-04-18 17:49:00 +00:00
|
|
|
@property
|
|
|
|
def LastFetch(self):
|
|
|
|
try:
|
|
|
|
fh = os.path.join(self.gitdir, 'FETCH_HEAD')
|
|
|
|
return os.path.getmtime(fh)
|
|
|
|
except OSError:
|
|
|
|
return 0
|
|
|
|
|
2008-10-21 14:00:00 +00:00
|
|
|
@property
|
|
|
|
def HasChanges(self):
|
|
|
|
"""Has the remote received new commits not yet checked out?
|
|
|
|
"""
|
2009-04-18 17:39:28 +00:00
|
|
|
if not self.remote or not self.revision:
|
|
|
|
return False
|
|
|
|
|
|
|
|
all = self.bare_ref.all
|
2008-10-21 14:00:00 +00:00
|
|
|
rev = self.GetRemote(self.remote.name).ToLocal(self.revision)
|
2009-04-18 17:39:28 +00:00
|
|
|
if rev in all:
|
|
|
|
revid = all[rev]
|
|
|
|
else:
|
|
|
|
revid = rev
|
|
|
|
|
|
|
|
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), rev):
|
2008-10-21 14:00:00 +00:00
|
|
|
return True
|
|
|
|
return False
|