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
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
|
# 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
"""Bazaar command-line subcommands."""
from bzrlib.commands import (
Command,
display_command,
)
from bzrlib.errors import (
BzrCommandError,
ConflictsInTree,
NoSuchFile,
NoSuchRevision,
NoWorkingTree,
UncommittedChanges,
UnrelatedBranches,
)
from bzrlib.option import (
Option,
)
from bzrlib.trace import (
info,
warning,
)
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('always-rebase-merges',
help="Don't skip revisions that merge already present revisions."),
Option('pending-merges',
help="Rebase pending merges onto local branch."),
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,
always_rebase_merges=False, pending_merges=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,
regenerate_default_revid,
rebase_todo)
if revision is not None and pending_merges:
raise BzrCommandError(
"--revision and --pending-merges are mutually exclusive")
wt = WorkingTree.open_containing(".")[0]
wt.lock_write()
if upstream_location is None:
if pending_merges:
upstream_location = "."
else:
upstream_location = wt.branch.get_parent()
info("Rebasing on %s" % upstream_location)
upstream = Branch.open_containing(upstream_location)[0]
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'")
start_revid = None
stop_revid = None
if revision is not None:
if len(revision) == 1:
if revision[0] is not None:
stop_revid = revision[0].as_revision_id(wt.branch)
elif len(revision) == 2:
if revision[0] is not None:
start_revid = revision[0].as_revision_id(wt.branch)
if revision[1] is not None:
stop_revid = revision[1].as_revision_id(wt.branch)
else:
raise BzrCommandError(
"--revision takes only one or two arguments")
if pending_merges:
wt_parents = wt.get_parent_ids()
if len(wt_parents) in (0, 1):
raise BzrCommandError("No pending merges present.")
elif len(wt_parents) > 2:
raise BzrCommandError(
"Rebasing more than one pending merge not supported")
stop_revid = wt_parents[1]
assert stop_revid is not None, "stop revid invalid"
# 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.as_revision_id(upstream)
wt.branch.repository.fetch(upstream_repository, onto)
if stop_revid is None:
stop_revid = wt.branch.last_revision()
elif not pending_merges:
stop_revid = wt.branch.repository.get_parent_map(
[stop_revid])[stop_revid][0]
repo_graph = wt.branch.repository.get_graph()
our_new, onto_unique = repo_graph.find_difference(stop_revid, onto)
if start_revid is None:
if not onto_unique:
self.outf.write("No revisions to rebase.\n")
return
if not our_new:
self.outf.write("Base branch is descendant of current "
"branch. Pulling instead.\n")
wt.pull(upstream, onto)
return
# else: include extra revisions needed to make start_revid mean
# something.
# Create plan
replace_map = generate_simple_plan(
our_new, start_revid, stop_revid,
onto, repo_graph,
lambda revid: regenerate_default_revid(
wt.branch.repository, revid),
not always_rebase_merges
)
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)
# Check for changes in the working tree.
if (not pending_merges and
wt.basis_tree().changes_from(wt).has_changed()):
raise UncommittedChanges(wt)
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_containing('.')[0]
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_containing('.')[0]
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_containing('.')[0]
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()
class cmd_replay(Command):
"""Replay commits from another branch on top of this one.
"""
takes_options = ['revision', 'merge-type']
takes_args = ['location']
hidden = True
def run(self, location, revision=None, merge_type=None):
from bzrlib.branch import Branch
from bzrlib.workingtree import WorkingTree
from bzrlib import ui
from rebase import regenerate_default_revid, replay_delta_workingtree
from_branch = Branch.open_containing(location)[0]
if revision is not None:
if len(revision) == 1:
if revision[0] is not None:
todo = [revision[0].as_revision_id(from_branch)]
elif len(revision) == 2:
from_revno, from_revid = revision[0].in_history(from_branch)
to_revno, to_revid = revision[1].in_history(from_branch)
if to_revid is None:
to_revno = from_branch.revno()
todo = []
for revno in range(from_revno, to_revno + 1):
todo.append(from_branch.get_rev_id(revno))
else:
raise BzrCommandError(
"--revision takes only one or two arguments")
else:
raise BzrCommandError("--revision is mandatory")
wt = WorkingTree.open(".")
wt.lock_write()
pb = ui.ui_factory.nested_progress_bar()
try:
for revid in todo:
pb.update("replaying commits", todo.index(revid), len(todo))
wt.branch.repository.fetch(from_branch.repository, revid)
newrevid = regenerate_default_revid(wt.branch.repository, revid)
replay_delta_workingtree(wt, revid, newrevid,
[wt.last_revision()],
merge_type=merge_type)
finally:
pb.finished()
wt.unlock()
class cmd_foreign_mapping_upgrade(Command):
"""Upgrade revisions mapped from a foreign version control system.
This will change the identity of revisions whose parents
were mapped from revisions in the other version control system.
You are recommended to run "bzr check" in the local repository
after running this command.
"""
aliases = ['svn-upgrade']
takes_args = ['from_repository?']
takes_options = ['verbose',
Option("idmap-file", help="Write map with old and new revision ids.", type=str)]
def run(self, from_repository=None, verbose=False, idmap_file=None):
from bzrlib import (
urlutils,
)
from bzrlib.branch import Branch
from bzrlib.repository import Repository
from bzrlib.workingtree import WorkingTree
from bzrlib.plugins.rebase.upgrade import (
upgrade_branch,
upgrade_workingtree,
)
try:
wt_to = WorkingTree.open(".")
branch_to = wt_to.branch
except NoWorkingTree:
wt_to = None
branch_to = Branch.open(".")
stored_loc = branch_to.get_parent()
if from_repository is None:
if stored_loc is None:
raise BzrCommandError("No pull location known or"
" specified.")
else:
display_url = urlutils.unescape_for_display(stored_loc,
self.outf.encoding)
self.outf.write("Using saved location: %s\n" % display_url)
from_repository = Branch.open(stored_loc).repository
else:
from_repository = Repository.open(from_repository)
vcs = getattr(from_repository, "vcs", None)
if vcs is None:
raise BzrCommandError("Repository at %s is not a foreign repository.a" % from_repository.base)
new_mapping = from_repository.get_mapping()
if wt_to is not None:
renames = upgrade_workingtree(wt_to, from_repository,
new_mapping=new_mapping,
allow_changes=True, verbose=verbose)
else:
renames = upgrade_branch(branch_to, from_repository,
new_mapping=new_mapping,
allow_changes=True, verbose=verbose)
if renames == {}:
info("Nothing to do.")
if idmap_file is not None:
f = open(idmap_file, 'w')
try:
for oldid, newid in renames.iteritems():
f.write("%s\t%s\n" % (oldid, newid))
finally:
f.close()
if wt_to is not None:
wt_to.set_last_revision(branch_to.last_revision())
|