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/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