blob: b9a7774d6fc761395f4ce691640121de8df64127 [file] [log] [blame]
Daniel Sandler9e426aa2010-04-01 10:42:33 -04001#
2# Copyright (C) 2010 The Android Open Source Project
3#
4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License.
6# You may obtain a copy of the License at
7#
8# http://www.apache.org/licenses/LICENSE-2.0
9#
10# Unless required by applicable law or agreed to in writing, software
11# distributed under the License is distributed on an "AS IS" BASIS,
12# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13# See the License for the specific language governing permissions and
14# limitations under the License.
15
Sarah Owenscecd1d82012-11-01 22:59:27 -070016from __future__ import print_function
Daniel Sandler9e426aa2010-04-01 10:42:33 -040017import sys
18
19from command import Command
20from git_command import GitCommand
Daniel Sandler9e426aa2010-04-01 10:42:33 -040021
22class Rebase(Command):
23 common = True
24 helpSummary = "Rebase local branches on upstream branch"
25 helpUsage = """
26%prog {[<project>...] | -i <project>...}
27"""
28 helpDescription = """
29'%prog' uses git rebase to move local changes in the current topic branch to
30the HEAD of the upstream history, useful when you have made commits in a topic
31branch but need to incorporate new upstream changes "underneath" them.
32"""
33
34 def _Options(self, p):
35 p.add_option('-i', '--interactive',
36 dest="interactive", action="store_true",
37 help="interactive rebase (single project only)")
38
Shawn O. Pearcea22f99a2010-07-15 17:40:41 -070039 p.add_option('-f', '--force-rebase',
40 dest='force_rebase', action='store_true',
41 help='Pass --force-rebase to git rebase')
42 p.add_option('--no-ff',
43 dest='no_ff', action='store_true',
44 help='Pass --no-ff to git rebase')
45 p.add_option('-q', '--quiet',
46 dest='quiet', action='store_true',
47 help='Pass --quiet to git rebase')
48 p.add_option('--autosquash',
49 dest='autosquash', action='store_true',
50 help='Pass --autosquash to git rebase')
51 p.add_option('--whitespace',
52 dest='whitespace', action='store', metavar='WS',
53 help='Pass --whitespace to git rebase')
Joe Hansche5e572342012-03-05 11:41:19 -050054 p.add_option('--auto-stash',
55 dest='auto_stash', action='store_true',
56 help='Stash local modifications before starting')
Shawn O. Pearcea22f99a2010-07-15 17:40:41 -070057
Daniel Sandler9e426aa2010-04-01 10:42:33 -040058 def Execute(self, opt, args):
David Pursehouse8a68ff92012-09-24 12:15:13 +090059 all_projects = self.GetProjects(args)
60 one_project = len(all_projects) == 1
Daniel Sandler9e426aa2010-04-01 10:42:33 -040061
62 if opt.interactive and not one_project:
Sarah Owenscecd1d82012-11-01 22:59:27 -070063 print('error: interactive rebase not supported with multiple projects',
64 file=sys.stderr)
Daniel Sandler9e426aa2010-04-01 10:42:33 -040065 return -1
66
David Pursehouse8a68ff92012-09-24 12:15:13 +090067 for project in all_projects:
Daniel Sandler9e426aa2010-04-01 10:42:33 -040068 cb = project.CurrentBranch
69 if not cb:
70 if one_project:
David Pursehouse2f9e7e42013-03-05 17:26:46 +090071 print("error: project %s has a detached HEAD" % project.relpath,
Sarah Owenscecd1d82012-11-01 22:59:27 -070072 file=sys.stderr)
Daniel Sandler9e426aa2010-04-01 10:42:33 -040073 return -1
74 # ignore branches with detatched HEADs
75 continue
76
77 upbranch = project.GetBranch(cb)
78 if not upbranch.LocalMerge:
79 if one_project:
Sarah Owenscecd1d82012-11-01 22:59:27 -070080 print("error: project %s does not track any remote branches"
81 % project.relpath, file=sys.stderr)
Daniel Sandler9e426aa2010-04-01 10:42:33 -040082 return -1
83 # ignore branches without remotes
84 continue
85
Daniel Sandler9e426aa2010-04-01 10:42:33 -040086 args = ["rebase"]
Shawn O. Pearcea22f99a2010-07-15 17:40:41 -070087
88 if opt.whitespace:
89 args.append('--whitespace=%s' % opt.whitespace)
90
91 if opt.quiet:
92 args.append('--quiet')
93
94 if opt.force_rebase:
95 args.append('--force-rebase')
96
97 if opt.no_ff:
98 args.append('--no-ff')
99
100 if opt.autosquash:
101 args.append('--autosquash')
102
Daniel Sandler9e426aa2010-04-01 10:42:33 -0400103 if opt.interactive:
104 args.append("-i")
Daniel Sandler9e426aa2010-04-01 10:42:33 -0400105
Shawn O. Pearcea22f99a2010-07-15 17:40:41 -0700106 args.append(upbranch.LocalMerge)
107
Sarah Owenscecd1d82012-11-01 22:59:27 -0700108 print('# %s: rebasing %s -> %s'
109 % (project.relpath, cb, upbranch.LocalMerge), file=sys.stderr)
Shawn O. Pearcea22f99a2010-07-15 17:40:41 -0700110
Joe Hansche5e572342012-03-05 11:41:19 -0500111 needs_stash = False
112 if opt.auto_stash:
113 stash_args = ["update-index", "--refresh", "-q"]
114
115 if GitCommand(project, stash_args).Wait() != 0:
116 needs_stash = True
117 # Dirty index, requires stash...
118 stash_args = ["stash"]
119
120 if GitCommand(project, stash_args).Wait() != 0:
121 return -1
122
Daniel Sandler9e426aa2010-04-01 10:42:33 -0400123 if GitCommand(project, args).Wait() != 0:
124 return -1
Joe Hansche5e572342012-03-05 11:41:19 -0500125
126 if needs_stash:
127 stash_args.append('pop')
128 stash_args.append('--quiet')
129 if GitCommand(project, stash_args).Wait() != 0:
130 return -1