Merge branch 'stable'
* stable: (33 commits)
Added feature to print a <notice> from manifest at the end of a sync.
sync: Use --force-broken to continue other projects
upload: Remove --replace option
sync --quiet: be more quiet
sync: Enable use of git clone --reference
Only delete corrupt pickle config files if they exist
Don't allow git fetch to start ControlMaster
Check for existing SSH ControlMaster
Fix for handling values of EDITOR which contain a space.
upload: Fix --replace flag
rebase: Pass through more options
upload: Allow review.HOST.username to override email
upload -t: Automatically include local branch name
Warn users before uploading if there are local changes
sync: Try fetching a tag as a last resort before giving up
rebase: Automatically rebase branch on upstrea
upload: Automatically --cc folks in review.URL.autocopy
Fix format string bugs in grep
Do not invoke ssh with -p argument when no port has been specified.
Allow files to be copied into new folders
...
Conflicts:
git_config.py
manifest_xml.py
subcmds/init.py
subcmds/sync.py
subcmds/upload.py
Change-Id: I4756a6908277e91505c35287a122a775b68f4df5
diff --git a/subcmds/branches.py b/subcmds/branches.py
index 0e3ab3c..a4f8d36 100644
--- a/subcmds/branches.py
+++ b/subcmds/branches.py
@@ -136,7 +136,7 @@
hdr('%c%c %-*s' % (current, published, width, name))
out.write(' |')
- if in_cnt < project_cnt and (in_cnt == 1):
+ if in_cnt < project_cnt:
fmt = out.write
paths = []
if in_cnt < project_cnt - in_cnt:
@@ -150,15 +150,17 @@
for b in i.projects:
have.add(b.project)
for p in projects:
- paths.append(p.relpath)
+ if not p in have:
+ paths.append(p.relpath)
s = ' %s %s' % (type, ', '.join(paths))
if width + 7 + len(s) < 80:
fmt(s)
else:
- out.nl()
- fmt(' %s:' % type)
+ fmt(' %s:' % type)
for p in paths:
out.nl()
- fmt(' %s' % p)
+ fmt(width*' ' + ' %s' % p)
+ else:
+ out.write(' in all projects')
out.nl()
diff --git a/subcmds/grep.py b/subcmds/grep.py
index 4f71427..1cb5650 100644
--- a/subcmds/grep.py
+++ b/subcmds/grep.py
@@ -204,7 +204,7 @@
else:
out.project('--- project %s ---' % project.relpath)
out.nl()
- out.write(p.stderr)
+ out.write("%s", p.stderr)
out.nl()
continue
have_match = True
@@ -217,17 +217,17 @@
if have_rev and full_name:
for line in r:
rev, line = line.split(':', 1)
- out.write(rev)
+ out.write("%s", rev)
out.write(':')
out.project(project.relpath)
out.write('/')
- out.write(line)
+ out.write("%s", line)
out.nl()
elif full_name:
for line in r:
out.project(project.relpath)
out.write('/')
- out.write(line)
+ out.write("%s", line)
out.nl()
else:
for line in r:
diff --git a/subcmds/init.py b/subcmds/init.py
index cdbbfdf..2ca4e16 100644
--- a/subcmds/init.py
+++ b/subcmds/init.py
@@ -40,6 +40,17 @@
The optional -b argument can be used to select the manifest branch
to checkout and use. If no branch is specified, master is assumed.
+The optional -m argument can be used to specify an alternate manifest
+to be used. If no manifest is specified, the manifest default.xml
+will be used.
+
+The --reference option can be used to point to a directory that
+has the content of a --mirror sync. This will make the working
+directory use as much data as possible from the local reference
+directory when fetching from the server. This will make the sync
+go a lot faster by reducing data traffic on the network.
+
+
Switching Manifest Branches
---------------------------
@@ -76,7 +87,9 @@
g.add_option('--mirror',
dest='mirror', action='store_true',
help='mirror the forrest')
-
+ g.add_option('--reference',
+ dest='reference',
+ help='location of mirror directory', metavar='DIR')
# Tool
g = p.add_option_group('repo Version options')
@@ -132,6 +145,9 @@
r.ResetFetch()
r.Save()
+ if opt.reference:
+ m.config.SetString('repo.reference', opt.reference)
+
if opt.mirror:
if is_new:
m.config.SetString('repo.mirror', 'true')
@@ -162,7 +178,11 @@
syncbuf = SyncBuffer(m.config)
m.Sync_LocalHalf(syncbuf)
syncbuf.Finish()
+
+ if isinstance(self.manifest, XmlManifest):
+ self._LinkManifest(opt.manifest_name)
_ReloadManifest(self)
+
self._ApplyOptions(opt, is_new)
if not self.manifest.InitBranch():
@@ -200,8 +220,9 @@
print ''
print 'Your identity is: %s <%s>' % (name, email)
- sys.stdout.write('is this correct [yes/no]? ')
- if 'yes' == sys.stdin.readline().strip():
+ sys.stdout.write('is this correct [y/n]? ')
+ a = sys.stdin.readline().strip()
+ if a in ('yes', 'y', 't', 'true'):
break
if name != mp.UserName:
@@ -249,8 +270,6 @@
def Execute(self, opt, args):
git_require(MIN_GIT_VERSION, fail=True)
self._SyncManifest(opt)
- if isinstance(self.manifest, XmlManifest):
- self._LinkManifest(opt.manifest_name)
if os.isatty(0) and os.isatty(1) and not self.manifest.IsMirror:
self._ConfigureUser()
diff --git a/subcmds/rebase.py b/subcmds/rebase.py
new file mode 100644
index 0000000..e341296
--- /dev/null
+++ b/subcmds/rebase.py
@@ -0,0 +1,107 @@
+#
+# Copyright (C) 2010 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 sys
+
+from command import Command
+from git_command import GitCommand
+from git_refs import GitRefs, HEAD, R_HEADS, R_TAGS, R_PUB
+from error import GitError
+
+class Rebase(Command):
+ common = True
+ helpSummary = "Rebase local branches on upstream branch"
+ helpUsage = """
+%prog {[<project>...] | -i <project>...}
+"""
+ helpDescription = """
+'%prog' uses git rebase to move local changes in the current topic branch to
+the HEAD of the upstream history, useful when you have made commits in a topic
+branch but need to incorporate new upstream changes "underneath" them.
+"""
+
+ def _Options(self, p):
+ p.add_option('-i', '--interactive',
+ dest="interactive", action="store_true",
+ help="interactive rebase (single project only)")
+
+ p.add_option('-f', '--force-rebase',
+ dest='force_rebase', action='store_true',
+ help='Pass --force-rebase to git rebase')
+ p.add_option('--no-ff',
+ dest='no_ff', action='store_true',
+ help='Pass --no-ff to git rebase')
+ p.add_option('-q', '--quiet',
+ dest='quiet', action='store_true',
+ help='Pass --quiet to git rebase')
+ p.add_option('--autosquash',
+ dest='autosquash', action='store_true',
+ help='Pass --autosquash to git rebase')
+ p.add_option('--whitespace',
+ dest='whitespace', action='store', metavar='WS',
+ help='Pass --whitespace to git rebase')
+
+ def Execute(self, opt, args):
+ all = self.GetProjects(args)
+ one_project = len(all) == 1
+
+ if opt.interactive and not one_project:
+ print >>sys.stderr, 'error: interactive rebase not supported with multiple projects'
+ return -1
+
+ for project in all:
+ cb = project.CurrentBranch
+ if not cb:
+ if one_project:
+ print >>sys.stderr, "error: project %s has a detatched HEAD" % project.relpath
+ return -1
+ # ignore branches with detatched HEADs
+ continue
+
+ upbranch = project.GetBranch(cb)
+ if not upbranch.LocalMerge:
+ if one_project:
+ print >>sys.stderr, "error: project %s does not track any remote branches" % project.relpath
+ return -1
+ # ignore branches without remotes
+ continue
+
+ args = ["rebase"]
+
+ if opt.whitespace:
+ args.append('--whitespace=%s' % opt.whitespace)
+
+ if opt.quiet:
+ args.append('--quiet')
+
+ if opt.force_rebase:
+ args.append('--force-rebase')
+
+ if opt.no_ff:
+ args.append('--no-ff')
+
+ if opt.autosquash:
+ args.append('--autosquash')
+
+ if opt.interactive:
+ args.append("-i")
+
+ args.append(upbranch.LocalMerge)
+
+ print >>sys.stderr, '# %s: rebasing %s -> %s' % \
+ (project.relpath, cb, upbranch.LocalMerge)
+
+ if GitCommand(project, args).Wait() != 0:
+ return -1
diff --git a/subcmds/smartsync.py b/subcmds/smartsync.py
new file mode 100644
index 0000000..1edbd35
--- /dev/null
+++ b/subcmds/smartsync.py
@@ -0,0 +1,33 @@
+#
+# Copyright (C) 2010 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.
+
+from sync import Sync
+
+class Smartsync(Sync):
+ common = True
+ helpSummary = "Update working tree to the latest known good revision"
+ helpUsage = """
+%prog [<project>...]
+"""
+ helpDescription = """
+The '%prog' command is a shortcut for sync -s.
+"""
+
+ def _Options(self, p):
+ Sync._Options(self, p, show_smart=False)
+
+ def Execute(self, opt, args):
+ opt.smart_sync = True
+ Sync.Execute(self, opt, args)
diff --git a/subcmds/sync.py b/subcmds/sync.py
index d89c2b8..7b77388 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -17,11 +17,19 @@
import os
import re
import shutil
+import socket
import subprocess
import sys
import time
+import xmlrpclib
+
+try:
+ import threading as _threading
+except ImportError:
+ import dummy_threading as _threading
from git_command import GIT
+from git_refs import R_HEADS
from project import HEAD
from project import Project
from project import RemoteSpec
@@ -32,6 +40,7 @@
from progress import Progress
class Sync(Command, MirrorSafeCommand):
+ jobs = 1
common = True
helpSummary = "Update working tree to the latest revision"
helpUsage = """
@@ -57,6 +66,13 @@
if the project is currently on a topic branch, but the manifest
revision is temporarily needed.
+The -s/--smart-sync option can be used to sync to a known good
+build as specified by the manifest-server element in the current
+manifest.
+
+The -f/--force-broken option can be used to proceed with syncing
+other projects if a project sync fails.
+
SSH Connections
---------------
@@ -87,7 +103,10 @@
"""
- def _Options(self, p):
+ def _Options(self, p, show_smart=True):
+ p.add_option('-f', '--force-broken',
+ dest='force_broken', action='store_true',
+ help="continue sync even if a project fails to sync")
p.add_option('-l','--local-only',
dest='local_only', action='store_true',
help="only update working tree, don't fetch")
@@ -97,6 +116,16 @@
p.add_option('-d','--detach',
dest='detach_head', action='store_true',
help='detach projects back to manifest revision')
+ p.add_option('-q','--quiet',
+ dest='quiet', action='store_true',
+ help='be more quiet')
+ p.add_option('-j','--jobs',
+ dest='jobs', action='store', type='int',
+ help="number of projects to fetch simultaneously")
+ if show_smart:
+ p.add_option('-s', '--smart-sync',
+ dest='smart_sync', action='store_true',
+ help='smart sync using manifest from a known good build')
g = p.add_option_group('repo Version options')
g.add_option('--no-repo-verify',
@@ -106,16 +135,55 @@
dest='repo_upgraded', action='store_true',
help=SUPPRESS_HELP)
- def _Fetch(self, projects):
+ def _FetchHelper(self, opt, project, lock, fetched, pm, sem):
+ if not project.Sync_NetworkHalf(quiet=opt.quiet):
+ print >>sys.stderr, 'error: Cannot fetch %s' % project.name
+ if opt.force_broken:
+ print >>sys.stderr, 'warn: --force-broken, continuing to sync'
+ else:
+ sem.release()
+ sys.exit(1)
+
+ lock.acquire()
+ fetched.add(project.gitdir)
+ pm.update()
+ lock.release()
+ sem.release()
+
+ def _Fetch(self, projects, opt):
fetched = set()
pm = Progress('Fetching projects', len(projects))
- for project in projects:
- pm.update()
- if project.Sync_NetworkHalf():
- fetched.add(project.gitdir)
- else:
- print >>sys.stderr, 'error: Cannot fetch %s' % project.name
- sys.exit(1)
+
+ if self.jobs == 1:
+ for project in projects:
+ pm.update()
+ if project.Sync_NetworkHalf(quiet=opt.quiet):
+ fetched.add(project.gitdir)
+ else:
+ print >>sys.stderr, 'error: Cannot fetch %s' % project.name
+ if opt.force_broken:
+ print >>sys.stderr, 'warn: --force-broken, continuing to sync'
+ else:
+ sys.exit(1)
+ else:
+ threads = set()
+ lock = _threading.Lock()
+ sem = _threading.Semaphore(self.jobs)
+ for project in projects:
+ sem.acquire()
+ t = _threading.Thread(target = self._FetchHelper,
+ args = (opt,
+ project,
+ lock,
+ fetched,
+ pm,
+ sem))
+ threads.add(t)
+ t.start()
+
+ for t in threads:
+ t.join()
+
pm.end()
for project in projects:
project.bare_git.gc('--auto')
@@ -140,32 +208,36 @@
if not path:
continue
if path not in new_project_paths:
- project = Project(
- manifest = self.manifest,
- name = path,
- remote = RemoteSpec('origin'),
- gitdir = os.path.join(self.manifest.topdir,
- path, '.git'),
- worktree = os.path.join(self.manifest.topdir, path),
- relpath = path,
- revisionExpr = 'HEAD',
- revisionId = None)
- if project.IsDirty():
- print >>sys.stderr, 'error: Cannot remove project "%s": \
+ """If the path has already been deleted, we don't need to do it
+ """
+ if os.path.exists(self.manifest.topdir + '/' + path):
+ project = Project(
+ manifest = self.manifest,
+ name = path,
+ remote = RemoteSpec('origin'),
+ gitdir = os.path.join(self.manifest.topdir,
+ path, '.git'),
+ worktree = os.path.join(self.manifest.topdir, path),
+ relpath = path,
+ revisionExpr = 'HEAD',
+ revisionId = None)
+
+ if project.IsDirty():
+ print >>sys.stderr, 'error: Cannot remove project "%s": \
uncommitted changes are present' % project.relpath
- print >>sys.stderr, ' commit changes, then run sync again'
- return -1
- else:
- print >>sys.stderr, 'Deleting obsolete path %s' % project.worktree
- shutil.rmtree(project.worktree)
- # Try deleting parent subdirs if they are empty
- dir = os.path.dirname(project.worktree)
- while dir != self.manifest.topdir:
- try:
- os.rmdir(dir)
- except OSError:
- break
- dir = os.path.dirname(dir)
+ print >>sys.stderr, ' commit changes, then run sync again'
+ return -1
+ else:
+ print >>sys.stderr, 'Deleting obsolete path %s' % project.worktree
+ shutil.rmtree(project.worktree)
+ # Try deleting parent subdirs if they are empty
+ dir = os.path.dirname(project.worktree)
+ while dir != self.manifest.topdir:
+ try:
+ os.rmdir(dir)
+ except OSError:
+ break
+ dir = os.path.dirname(dir)
new_project_paths.sort()
fd = open(file_path, 'w')
@@ -177,6 +249,8 @@
return 0
def Execute(self, opt, args):
+ if opt.jobs:
+ self.jobs = opt.jobs
if opt.network_only and opt.detach_head:
print >>sys.stderr, 'error: cannot combine -n and -d'
sys.exit(1)
@@ -184,6 +258,51 @@
print >>sys.stderr, 'error: cannot combine -n and -l'
sys.exit(1)
+ if opt.smart_sync:
+ if not self.manifest.manifest_server:
+ print >>sys.stderr, \
+ 'error: cannot smart sync: no manifest server defined in manifest'
+ sys.exit(1)
+ try:
+ server = xmlrpclib.Server(self.manifest.manifest_server)
+ p = self.manifest.manifestProject
+ b = p.GetBranch(p.CurrentBranch)
+ branch = b.merge
+ if branch.startswith(R_HEADS):
+ branch = branch[len(R_HEADS):]
+
+ env = dict(os.environ)
+ if (env.has_key('TARGET_PRODUCT') and
+ env.has_key('TARGET_BUILD_VARIANT')):
+ target = '%s-%s' % (env['TARGET_PRODUCT'],
+ env['TARGET_BUILD_VARIANT'])
+ [success, manifest_str] = server.GetApprovedManifest(branch, target)
+ else:
+ [success, manifest_str] = server.GetApprovedManifest(branch)
+
+ if success:
+ manifest_name = "smart_sync_override.xml"
+ manifest_path = os.path.join(self.manifest.manifestProject.worktree,
+ manifest_name)
+ try:
+ f = open(manifest_path, 'w')
+ try:
+ f.write(manifest_str)
+ finally:
+ f.close()
+ except IOError:
+ print >>sys.stderr, 'error: cannot write manifest to %s' % \
+ manifest_path
+ sys.exit(1)
+ self.manifest.Override(manifest_name)
+ else:
+ print >>sys.stderr, 'error: %s' % manifest_str
+ sys.exit(1)
+ except socket.error:
+ print >>sys.stderr, 'error: cannot connect to manifest server %s' % (
+ self.manifest.manifest_server)
+ sys.exit(1)
+
rp = self.manifest.repoProject
rp.PreSync()
@@ -194,7 +313,7 @@
_PostRepoUpgrade(self.manifest)
if not opt.local_only:
- mp.Sync_NetworkHalf()
+ mp.Sync_NetworkHalf(quiet=opt.quiet)
if mp.HasChanges:
syncbuf = SyncBuffer(mp.config)
@@ -211,7 +330,7 @@
to_fetch.append(rp)
to_fetch.extend(all)
- fetched = self._Fetch(to_fetch)
+ fetched = self._Fetch(to_fetch, opt)
_PostRepoFetch(rp, opt.no_repo_verify)
if opt.network_only:
# bail out now; the rest touches the working tree
@@ -230,7 +349,7 @@
for project in all:
if project.gitdir not in fetched:
missing.append(project)
- self._Fetch(missing)
+ self._Fetch(missing, opt)
if self.manifest.IsMirror:
# bail out now, we have no working tree
@@ -258,6 +377,9 @@
if old.__class__ != new.__class__:
print >>sys.stderr, 'NOTICE: manifest format has changed ***'
new.Upgrade_Local(old)
+ else:
+ if new.notice:
+ print new.notice
def _PostRepoUpgrade(manifest):
for project in manifest.projects.values():
diff --git a/subcmds/upload.py b/subcmds/upload.py
index 2ab6a48..2082209 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+import copy
import re
import sys
@@ -20,6 +21,17 @@
from editor import Editor
from error import UploadError
+UNUSUAL_COMMIT_THRESHOLD = 5
+
+def _ConfirmManyUploads(multiple_branches=False):
+ if multiple_branches:
+ print "ATTENTION: One or more branches has an unusually high number of commits."
+ else:
+ print "ATTENTION: You are uploading an unusually high number of commits."
+ print "YOU PROBABLY DO NOT MEAN TO DO THIS. (Did you rebase across branches?)"
+ answer = raw_input("If you are sure you intend to do this, type 'yes': ").strip()
+ return answer == "yes"
+
def _die(fmt, *args):
msg = fmt % args
print >>sys.stderr, 'error: %s' % msg
@@ -35,7 +47,7 @@
common = True
helpSummary = "Upload changes for code review"
helpUsage="""
-%prog [--re --cc] {[<project>]... | --replace <project>}
+%prog [--re --cc] [<project>]...
"""
helpDescription = """
The '%prog' command is used to send changes to the Gerrit Code
@@ -55,12 +67,6 @@
new users. Users passed as --reviewers must already be registered
with the code review system, or the upload will fail.
-If the --replace option (deprecated) is passed the user can designate
-which existing change(s) in Gerrit match up to the commits in the
-branch being uploaded. For each matched pair of change,commit the
-commit will be added as a new patch set, completely replacing the
-set of files and description associated with the change in Gerrit.
-
Configuration
-------------
@@ -72,6 +78,19 @@
and will not prompt you further. If it is set to "false" then repo
will assume you always answer "n", and will abort.
+review.URL.autocopy:
+
+To automatically copy a user or mailing list to all uploaded reviews,
+you can set a per-project or global Git option to do so. Specifically,
+review.URL.autocopy can be set to a comma separated list of reviewers
+who you always want copied on all uploads with a non-empty --re
+argument.
+
+review.URL.username:
+
+Override the username used to connect to Gerrit Code Review.
+By default the local part of the email address is used.
+
The URL must match the review URL listed in the manifest XML file,
or in the .git/config within the project. For example:
@@ -81,6 +100,7 @@
[review "http://review.example.com/"]
autoupload = true
+ autocopy = johndoe@company.com,my-team-alias@company.com
References
----------
@@ -90,9 +110,9 @@
"""
def _Options(self, p):
- p.add_option('--replace',
- dest='replace', action='store_true',
- help='Upload replacement patchsets from this branch (deprecated)')
+ p.add_option('-t',
+ dest='auto_topic', action='store_true',
+ help='Send local branch name to Gerrit Code Review')
p.add_option('--re', '--reviewers',
type='string', action='append', dest='reviewers',
help='Request reviews from these people.')
@@ -100,7 +120,7 @@
type='string', action='append', dest='cc',
help='Also send email to these email addresses.')
- def _SingleBranch(self, branch, people):
+ def _SingleBranch(self, opt, branch, people):
project = branch.project
name = branch.name
remote = project.GetBranch(name).remote
@@ -129,11 +149,15 @@
answer = answer in ('y', 'Y', 'yes', '1', 'true', 't')
if answer:
- self._UploadAndReport([branch], people)
+ if len(branch.commits) > UNUSUAL_COMMIT_THRESHOLD:
+ answer = _ConfirmManyUploads()
+
+ if answer:
+ self._UploadAndReport(opt, [branch], people)
else:
_die("upload aborted by user")
- def _MultipleBranches(self, pending, people):
+ def _MultipleBranches(self, opt, pending, people):
projects = {}
branches = {}
@@ -192,7 +216,30 @@
todo.append(branch)
if not todo:
_die("nothing uncommented for upload")
- self._UploadAndReport(todo, people)
+
+ many_commits = False
+ for branch in todo:
+ if len(branch.commits) > UNUSUAL_COMMIT_THRESHOLD:
+ many_commits = True
+ break
+ if many_commits:
+ if not _ConfirmManyUploads(multiple_branches=True):
+ _die("upload aborted by user")
+
+ self._UploadAndReport(opt, todo, people)
+
+ def _AppendAutoCcList(self, branch, people):
+ """
+ Appends the list of users in the CC list in the git project's config if a
+ non-empty reviewer list was found.
+ """
+
+ name = branch.name
+ project = branch.project
+ key = 'review.%s.autocopy' % project.GetBranch(name).remote.review
+ raw_list = project.config.GetString(key)
+ if not raw_list is None and len(people[0]) > 0:
+ people[1].extend([entry.strip() for entry in raw_list.split(',')])
def _FindGerritChange(self, branch):
last_pub = branch.project.WasPublished(branch.name)
@@ -206,66 +253,29 @@
except:
return ""
- def _ReplaceBranch(self, project, people):
- branch = project.CurrentBranch
- if not branch:
- print >>sys.stdout, "no branches ready for upload"
- return
- branch = project.GetUploadableBranch(branch)
- if not branch:
- print >>sys.stdout, "no branches ready for upload"
- return
-
- script = []
- script.append('# Replacing from branch %s' % branch.name)
-
- if len(branch.commits) == 1:
- change = self._FindGerritChange(branch)
- script.append('[%-6s] %s' % (change, branch.commits[0]))
- else:
- for commit in branch.commits:
- script.append('[ ] %s' % commit)
-
- script.append('')
- script.append('# Insert change numbers in the brackets to add a new patch set.')
- script.append('# To create a new change record, leave the brackets empty.')
-
- script = Editor.EditString("\n".join(script)).split("\n")
-
- change_re = re.compile(r'^\[\s*(\d{1,})\s*\]\s*([0-9a-f]{1,}) .*$')
- to_replace = dict()
- full_hashes = branch.unabbrev_commits
-
- for line in script:
- m = change_re.match(line)
- if m:
- c = m.group(1)
- f = m.group(2)
- try:
- f = full_hashes[f]
- except KeyError:
- print 'fh = %s' % full_hashes
- print >>sys.stderr, "error: commit %s not found" % f
- sys.exit(1)
- if c in to_replace:
- print >>sys.stderr,\
- "error: change %s cannot accept multiple commits" % c
- sys.exit(1)
- to_replace[c] = f
-
- if not to_replace:
- print >>sys.stderr, "error: no replacements specified"
- print >>sys.stderr, " use 'repo upload' without --replace"
- sys.exit(1)
-
- branch.replace_changes = to_replace
- self._UploadAndReport([branch], people)
-
- def _UploadAndReport(self, todo, people):
+ def _UploadAndReport(self, opt, todo, original_people):
have_errors = False
for branch in todo:
try:
- branch.UploadForReview(people)
+ people = copy.deepcopy(original_people)
+ self._AppendAutoCcList(branch, people)
+
+ # Check if there are local changes that may have been forgotten
+ if branch.project.HasChanges():
+ key = 'review.%s.autoupload' % branch.project.remote.review
+ answer = branch.project.config.GetBoolean(key)
+
+ # if they want to auto upload, let's not ask because it could be automated
+ if answer is None:
+ sys.stdout.write('Uncommitted changes in ' + branch.project.name + ' (did you forget to amend?). Continue uploading? (y/n) ')
+ a = sys.stdin.readline().strip().lower()
+ if a not in ('y', 'yes', 't', 'true', 'on'):
+ print >>sys.stderr, "skipping upload"
+ branch.uploaded = False
+ branch.error = 'User aborted'
+ continue
+
+ branch.UploadForReview(people, auto_topic=opt.auto_topic)
branch.uploaded = True
except UploadError, e:
branch.error = e
@@ -309,14 +319,6 @@
cc = _SplitEmails(opt.cc)
people = (reviewers,cc)
- if opt.replace:
- if len(project_list) != 1:
- print >>sys.stderr, \
- 'error: --replace requires exactly one project'
- sys.exit(1)
- self._ReplaceBranch(project_list[0], people)
- return
-
for project in project_list:
avail = project.GetUploadableBranches()
if avail:
@@ -325,6 +327,6 @@
if not pending:
print >>sys.stdout, "no branches ready for upload"
elif len(pending) == 1 and len(pending[0][1]) == 1:
- self._SingleBranch(pending[0][1][0], people)
+ self._SingleBranch(opt, pending[0][1][0], people)
else:
- self._MultipleBranches(pending, people)
+ self._MultipleBranches(opt, pending, people)