1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
|
# Copyright (C) 2007 by Jelmer Vernooij <jelmer@samba.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Rebase support.
The Bazaar rebase plugin adds support for rebasing branches to Bazaar.
It adds the command 'rebase' to Bazaar. When conflicts occur when replaying
patches, the user can resolve the conflict and continue the rebase using the
'rebase-continue' command or abort using the 'rebase-abort' command.
"""
from bzrlib.commands import Command, Option, display_command, register_command
from bzrlib.errors import (BzrCommandError, ConflictsInTree, NoSuchFile,
UnrelatedBranches)
from bzrlib.trace import info
__version__ = '0.1'
__author__ = 'Jelmer Vernooij <jelmer@samba.org>'
class cmd_rebase(Command):
"""Re-base a branch.
Rebasing is the process of taking a branch and modifying the history so
that it appears to start from a different point. This can be useful
to clean up the history before submitting your changes. The tree at the
end of the process will be the same as if you had merged the other branch,
but the history will be different.
The command takes the location of another branch on to which the branch in
the current working directory will be rebased. If a branch is not specified
then the parent branch is used, and this is usually the desired result.
The first step identifies the revisions that are in the current branch that
are not in the parent branch. The current branch is then set to be at the
same revision as the target branch, and each revision is replayed on top
of the branch. At the end of the process it will appear as though your
current branch was branched off the current last revision of the target.
Each revision that is replayed may cause conflicts in the tree. If this
happens the command will stop and allow you to fix them up. Resolve the
commits as you would for a merge, and then run 'bzr resolve' to marked
them as resolved. Once you have resolved all the conflicts you should
run 'bzr rebase-continue' to continue the rebase operation.
If conflicts are encountered and you decide that you do not wish to continue
you can run 'bzr rebase-abort'.
The '--onto' option allows you to specify a different revision in the
target branch to start at when replaying the revisions. This means that
you can change the point at which the current branch will appear to be
branched from when the operation completes.
"""
takes_args = ['upstream_location?']
takes_options = ['revision', 'merge-type', 'verbose',
Option('dry-run',
help="Show what would be done, but don't actually do anything."),
Option('onto', help='Different revision to replay onto.',
type=str)]
@display_command
def run(self, upstream_location=None, onto=None, revision=None,
merge_type=None, verbose=False, dry_run=False):
from bzrlib.branch import Branch
from bzrlib.revisionspec import RevisionSpec
from bzrlib.workingtree import WorkingTree
from rebase import (generate_simple_plan, rebase, rebase_plan_exists,
read_rebase_plan, remove_rebase_plan,
workingtree_replay, write_rebase_plan,
rebase_todo)
wt = WorkingTree.open('.')
wt.lock_write()
if upstream_location is None:
upstream_location = wt.branch.get_parent()
upstream = Branch.open(upstream_location)
upstream_repository = upstream.repository
upstream_revision = upstream.last_revision()
try:
# Abort if there already is a plan file
if rebase_plan_exists(wt):
raise BzrCommandError("A rebase operation was interrupted. Continue using 'bzr rebase-continue' or abort using 'bzr rebase-abort'")
# Pull required revisions
wt.branch.repository.fetch(upstream_repository, upstream_revision)
if onto is None:
onto = upstream.last_revision()
else:
rev_spec = RevisionSpec.from_string(onto)
onto = rev_spec.in_history(upstream).rev_id
wt.branch.repository.fetch(upstream_repository, onto)
revhistory = wt.branch.revision_history()
revhistory.reverse()
common_revid = None
for revid in revhistory:
if revid in upstream.revision_history():
common_revid = revid
break
if common_revid is None:
raise UnrelatedBranches()
if common_revid == upstream.last_revision():
raise BzrCommandError("Already rebased on %s" % upstream)
start_revid = wt.branch.get_rev_id(
wt.branch.revision_id_to_revno(common_revid)+1)
# Create plan
replace_map = generate_simple_plan(
wt.branch.repository,
wt.branch.revision_history(), start_revid, onto)
if verbose:
todo = list(rebase_todo(wt.branch.repository, replace_map))
info('%d revisions will be rebased:' % len(todo))
for revid in todo:
info("%s" % revid)
if not dry_run:
# Write plan file
write_rebase_plan(wt, replace_map)
# Start executing plan
try:
rebase(wt.branch.repository, replace_map,
workingtree_replay(wt, merge_type=merge_type))
except ConflictsInTree:
raise BzrCommandError("A conflict occurred replaying a commit. Resolve the conflict and run 'bzr rebase-continue' or run 'bzr rebase-abort'.")
# Remove plan file
remove_rebase_plan(wt)
finally:
wt.unlock()
class cmd_rebase_abort(Command):
"""Abort an interrupted rebase
"""
@display_command
def run(self):
from rebase import read_rebase_plan, remove_rebase_plan, complete_revert
from bzrlib.workingtree import WorkingTree
wt = WorkingTree.open('.')
wt.lock_write()
try:
# Read plan file and set last revision
try:
last_rev_info = read_rebase_plan(wt)[0]
except NoSuchFile:
raise BzrCommandError("No rebase to abort")
complete_revert(wt, [last_rev_info[1]])
remove_rebase_plan(wt)
finally:
wt.unlock()
class cmd_rebase_continue(Command):
"""Continue an interrupted rebase after resolving conflicts
"""
takes_options = ['merge-type']
@display_command
def run(self, merge_type=None):
from rebase import (commit_rebase, rebase, rebase_plan_exists,
read_rebase_plan, read_active_rebase_revid,
remove_rebase_plan, workingtree_replay)
from bzrlib.workingtree import WorkingTree
wt = WorkingTree.open('.')
wt.lock_write()
try:
# Abort if there are any conflicts
if len(wt.conflicts()) != 0:
raise BzrCommandError("There are still conflicts present. "
"Resolve the conflicts and then run "
"'bzr resolve' and try again.")
# Read plan file
try:
replace_map = read_rebase_plan(wt)[1]
except NoSuchFile:
raise BzrCommandError("No rebase to continue")
oldrevid = read_active_rebase_revid(wt)
if oldrevid is not None:
oldrev = wt.branch.repository.get_revision(oldrevid)
commit_rebase(wt, oldrev, replace_map[oldrevid][0])
try:
# Start executing plan from current Branch.last_revision()
rebase(wt.branch.repository, replace_map,
workingtree_replay(wt, merge_type=merge_type))
except ConflictsInTree:
raise BzrCommandError("A conflict occurred replaying a commit. Resolve the conflict and run 'bzr rebase-continue' or run 'bzr rebase-abort'.")
# Remove plan file
remove_rebase_plan(wt)
finally:
wt.unlock()
class cmd_rebase_todo(Command):
"""Print list of revisions that still need to be replayed as part of the
current rebase operation.
"""
def run(self):
from rebase import (rebase_todo, read_rebase_plan,
read_active_rebase_revid)
from bzrlib.workingtree import WorkingTree
wt = WorkingTree.open('.')
wt.lock_read()
try:
try:
replace_map = read_rebase_plan(wt)[1]
except NoSuchFile:
raise BzrCommandError("No rebase in progress")
currentrevid = read_active_rebase_revid(wt)
if currentrevid is not None:
info("Currently replaying: %s" % currentrevid)
for revid in rebase_todo(wt.branch.repository, replace_map):
info("%s -> %s" % (revid, replace_map[revid][0]))
finally:
wt.unlock()
register_command(cmd_rebase)
register_command(cmd_rebase_abort)
register_command(cmd_rebase_continue)
register_command(cmd_rebase_todo)
def test_suite():
from unittest import TestSuite
from bzrlib.tests import TestUtil
loader = TestUtil.TestLoader()
suite = TestSuite()
testmod_names = ['test_blackbox', 'test_rebase', 'test_maptree']
suite.addTest(loader.loadTestsFromModuleNames(
["%s.%s" % (__name__, i) for i in testmod_names]))
return suite
|