540
542
wt = WorkingTree.open_containing(directory)[0]
545
self.add_cleanup(wt.unlock)
543
546
except (errors.NoWorkingTree, errors.NotLocalUrl):
545
548
b = Branch.open_containing(directory)[0]
549
if revision is not None:
550
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
551
if revision_info_list is not None:
552
for rev_str in revision_info_list:
553
rev_spec = RevisionSpec.from_string(rev_str)
554
revision_ids.append(rev_spec.as_revision_id(b))
555
# No arguments supplied, default to the last revision
556
if len(revision_ids) == 0:
559
raise errors.NoWorkingTree(directory)
560
revision_ids.append(wt.last_revision())
562
revision_ids.append(b.last_revision())
566
for revision_id in revision_ids:
568
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
569
revno = '.'.join(str(i) for i in dotted_revno)
570
except errors.NoSuchRevision:
572
maxlen = max(maxlen, len(revno))
573
revinfos.append([revno, revision_id])
550
self.add_cleanup(b.unlock)
552
if revision is not None:
553
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
554
if revision_info_list is not None:
555
for rev_str in revision_info_list:
556
rev_spec = RevisionSpec.from_string(rev_str)
557
revision_ids.append(rev_spec.as_revision_id(b))
558
# No arguments supplied, default to the last revision
559
if len(revision_ids) == 0:
562
raise errors.NoWorkingTree(directory)
563
revision_ids.append(wt.last_revision())
565
revision_ids.append(b.last_revision())
569
for revision_id in revision_ids:
571
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
572
revno = '.'.join(str(i) for i in dotted_revno)
573
except errors.NoSuchRevision:
575
maxlen = max(maxlen, len(revno))
576
revinfos.append([revno, revision_id])
580
579
for ri in revinfos:
581
580
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
731
727
revision = _get_one_revision('inventory', revision)
732
728
work_tree, file_list = tree_files(file_list)
733
729
work_tree.lock_read()
735
if revision is not None:
736
tree = revision.as_tree(work_tree.branch)
738
extra_trees = [work_tree]
744
if file_list is not None:
745
file_ids = tree.paths2ids(file_list, trees=extra_trees,
746
require_versioned=True)
747
# find_ids_across_trees may include some paths that don't
749
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
750
for file_id in file_ids if file_id in tree)
752
entries = tree.inventory.entries()
755
if tree is not work_tree:
730
self.add_cleanup(work_tree.unlock)
731
if revision is not None:
732
tree = revision.as_tree(work_tree.branch)
734
extra_trees = [work_tree]
736
self.add_cleanup(tree.unlock)
741
if file_list is not None:
742
file_ids = tree.paths2ids(file_list, trees=extra_trees,
743
require_versioned=True)
744
# find_ids_across_trees may include some paths that don't
746
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
747
for file_id in file_ids if file_id in tree)
749
entries = tree.inventory.entries()
758
752
for path, entry in entries:
759
753
if kind and kind != entry.kind:
901
892
dest = osutils.pathjoin(dest_parent, dest_tail)
902
893
mutter("attempting to move %s => %s", src, dest)
903
894
tree.rename_one(src, dest, after=after)
904
self.outf.write("%s => %s\n" % (src, dest))
896
self.outf.write("%s => %s\n" % (src, dest))
907
899
class cmd_pull(Command):
908
900
"""Turn this branch into a mirror of another branch.
910
This command only works on branches that have not diverged. Branches are
911
considered diverged if the destination branch's most recent commit is one
912
that has not been merged (directly or indirectly) into the parent.
902
By default, this command only works on branches that have not diverged.
903
Branches are considered diverged if the destination branch's most recent
904
commit is one that has not been merged (directly or indirectly) into the
914
907
If branches have diverged, you can use 'bzr merge' to integrate the changes
915
908
from one into the other. Once one branch has merged, the other should
916
909
be able to pull it again.
918
If you want to forget your local changes and just update your branch to
919
match the remote one, use pull --overwrite.
911
If you want to replace your local changes and just want your branch to
912
match the remote one, use pull --overwrite. This will work even if the two
913
branches have diverged.
921
915
If there is no default location set, the first pull will set it. After
922
916
that, you can omit the location to use the default. To change the
1004
998
if branch_from is not branch_to:
1005
999
branch_from.lock_read()
1007
if revision is not None:
1008
revision_id = revision.as_revision_id(branch_from)
1010
branch_to.lock_write()
1012
if tree_to is not None:
1013
view_info = _get_view_info_for_change_reporter(tree_to)
1014
change_reporter = delta._ChangeReporter(
1015
unversioned_filter=tree_to.is_ignored,
1016
view_info=view_info)
1017
result = tree_to.pull(
1018
branch_from, overwrite, revision_id, change_reporter,
1019
possible_transports=possible_transports, local=local)
1021
result = branch_to.pull(
1022
branch_from, overwrite, revision_id, local=local)
1024
result.report(self.outf)
1025
if verbose and result.old_revid != result.new_revid:
1026
log.show_branch_change(
1027
branch_to, self.outf, result.old_revno,
1032
if branch_from is not branch_to:
1033
branch_from.unlock()
1000
self.add_cleanup(branch_from.unlock)
1001
if revision is not None:
1002
revision_id = revision.as_revision_id(branch_from)
1004
branch_to.lock_write()
1005
self.add_cleanup(branch_to.unlock)
1006
if tree_to is not None:
1007
view_info = _get_view_info_for_change_reporter(tree_to)
1008
change_reporter = delta._ChangeReporter(
1009
unversioned_filter=tree_to.is_ignored,
1010
view_info=view_info)
1011
result = tree_to.pull(
1012
branch_from, overwrite, revision_id, change_reporter,
1013
possible_transports=possible_transports, local=local)
1015
result = branch_to.pull(
1016
branch_from, overwrite, revision_id, local=local)
1018
result.report(self.outf)
1019
if verbose and result.old_revid != result.new_revid:
1020
log.show_branch_change(
1021
branch_to, self.outf, result.old_revno,
1036
1025
class cmd_push(Command):
1191
1180
' directory exists, but does not already'
1192
1181
' have a control directory. This flag will'
1193
1182
' allow branch to proceed.'),
1184
help="Bind new branch to from location."),
1195
1186
aliases = ['get', 'clone']
1197
1188
def run(self, from_location, to_location=None, revision=None,
1198
1189
hardlink=False, stacked=False, standalone=False, no_tree=False,
1199
use_existing_dir=False, switch=False):
1190
use_existing_dir=False, switch=False, bind=False):
1200
1191
from bzrlib import switch as _mod_switch
1201
1192
from bzrlib.tag import _merge_tags_if_possible
1202
1193
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1204
if (accelerator_tree is not None and
1205
accelerator_tree.supports_content_filtering()):
1206
accelerator_tree = None
1207
1195
revision = _get_one_revision('branch', revision)
1208
1196
br_from.lock_read()
1197
self.add_cleanup(br_from.unlock)
1198
if revision is not None:
1199
revision_id = revision.as_revision_id(br_from)
1201
# FIXME - wt.last_revision, fallback to branch, fall back to
1202
# None or perhaps NULL_REVISION to mean copy nothing
1204
revision_id = br_from.last_revision()
1205
if to_location is None:
1206
to_location = urlutils.derive_to_location(from_location)
1207
to_transport = transport.get_transport(to_location)
1210
if revision is not None:
1211
revision_id = revision.as_revision_id(br_from)
1209
to_transport.mkdir('.')
1210
except errors.FileExists:
1211
if not use_existing_dir:
1212
raise errors.BzrCommandError('Target directory "%s" '
1213
'already exists.' % to_location)
1213
# FIXME - wt.last_revision, fallback to branch, fall back to
1214
# None or perhaps NULL_REVISION to mean copy nothing
1216
revision_id = br_from.last_revision()
1217
if to_location is None:
1218
to_location = urlutils.derive_to_location(from_location)
1219
to_transport = transport.get_transport(to_location)
1221
to_transport.mkdir('.')
1222
except errors.FileExists:
1223
if not use_existing_dir:
1224
raise errors.BzrCommandError('Target directory "%s" '
1225
'already exists.' % to_location)
1216
bzrdir.BzrDir.open_from_transport(to_transport)
1217
except errors.NotBranchError:
1228
bzrdir.BzrDir.open_from_transport(to_transport)
1229
except errors.NotBranchError:
1232
raise errors.AlreadyBranchError(to_location)
1233
except errors.NoSuchFile:
1234
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1237
# preserve whatever source format we have.
1238
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1239
possible_transports=[to_transport],
1240
accelerator_tree=accelerator_tree,
1241
hardlink=hardlink, stacked=stacked,
1242
force_new_repo=standalone,
1243
create_tree_if_local=not no_tree,
1244
source_branch=br_from)
1245
branch = dir.open_branch()
1246
except errors.NoSuchRevision:
1247
to_transport.delete_tree('.')
1248
msg = "The branch %s has no revision %s." % (from_location,
1250
raise errors.BzrCommandError(msg)
1251
_merge_tags_if_possible(br_from, branch)
1252
# If the source branch is stacked, the new branch may
1253
# be stacked whether we asked for that explicitly or not.
1254
# We therefore need a try/except here and not just 'if stacked:'
1256
note('Created new stacked branch referring to %s.' %
1257
branch.get_stacked_on_url())
1258
except (errors.NotStacked, errors.UnstackableBranchFormat,
1259
errors.UnstackableRepositoryFormat), e:
1260
note('Branched %d revision(s).' % branch.revno())
1262
# Switch to the new branch
1263
wt, _ = WorkingTree.open_containing('.')
1264
_mod_switch.switch(wt.bzrdir, branch)
1265
note('Switched to branch: %s',
1266
urlutils.unescape_for_display(branch.base, 'utf-8'))
1220
raise errors.AlreadyBranchError(to_location)
1221
except errors.NoSuchFile:
1222
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1225
# preserve whatever source format we have.
1226
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1227
possible_transports=[to_transport],
1228
accelerator_tree=accelerator_tree,
1229
hardlink=hardlink, stacked=stacked,
1230
force_new_repo=standalone,
1231
create_tree_if_local=not no_tree,
1232
source_branch=br_from)
1233
branch = dir.open_branch()
1234
except errors.NoSuchRevision:
1235
to_transport.delete_tree('.')
1236
msg = "The branch %s has no revision %s." % (from_location,
1238
raise errors.BzrCommandError(msg)
1239
_merge_tags_if_possible(br_from, branch)
1240
# If the source branch is stacked, the new branch may
1241
# be stacked whether we asked for that explicitly or not.
1242
# We therefore need a try/except here and not just 'if stacked:'
1244
note('Created new stacked branch referring to %s.' %
1245
branch.get_stacked_on_url())
1246
except (errors.NotStacked, errors.UnstackableBranchFormat,
1247
errors.UnstackableRepositoryFormat), e:
1248
note('Branched %d revision(s).' % branch.revno())
1250
# Bind to the parent
1251
parent_branch = Branch.open(from_location)
1252
branch.bind(parent_branch)
1253
note('New branch bound to %s' % from_location)
1255
# Switch to the new branch
1256
wt, _ = WorkingTree.open_containing('.')
1257
_mod_switch.switch(wt.bzrdir, branch)
1258
note('Switched to branch: %s',
1259
urlutils.unescape_for_display(branch.base, 'utf-8'))
1271
1262
class cmd_checkout(Command):
1350
1341
def run(self, dir=u'.'):
1351
1342
tree = WorkingTree.open_containing(dir)[0]
1352
1343
tree.lock_read()
1354
new_inv = tree.inventory
1355
old_tree = tree.basis_tree()
1356
old_tree.lock_read()
1358
old_inv = old_tree.inventory
1360
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1361
for f, paths, c, v, p, n, k, e in iterator:
1362
if paths[0] == paths[1]:
1366
renames.append(paths)
1368
for old_name, new_name in renames:
1369
self.outf.write("%s => %s\n" % (old_name, new_name))
1344
self.add_cleanup(tree.unlock)
1345
new_inv = tree.inventory
1346
old_tree = tree.basis_tree()
1347
old_tree.lock_read()
1348
self.add_cleanup(old_tree.unlock)
1349
old_inv = old_tree.inventory
1351
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1352
for f, paths, c, v, p, n, k, e in iterator:
1353
if paths[0] == paths[1]:
1357
renames.append(paths)
1359
for old_name, new_name in renames:
1360
self.outf.write("%s => %s\n" % (old_name, new_name))
1376
1363
class cmd_update(Command):
1383
1370
If you want to discard your local changes, you can just do a
1384
1371
'bzr revert' instead of 'bzr commit' after the update.
1373
If the tree's branch is bound to a master branch, it will also update
1374
the branch from the master.
1387
1377
_see_also = ['pull', 'working-trees', 'status-flags']
1388
1378
takes_args = ['dir?']
1379
takes_options = ['revision']
1389
1380
aliases = ['up']
1391
def run(self, dir='.'):
1382
def run(self, dir='.', revision=None):
1383
if revision is not None and len(revision) != 1:
1384
raise errors.BzrCommandError(
1385
"bzr update --revision takes exactly one revision")
1392
1386
tree = WorkingTree.open_containing(dir)[0]
1387
branch = tree.branch
1393
1388
possible_transports = []
1394
master = tree.branch.get_master_branch(
1389
master = branch.get_master_branch(
1395
1390
possible_transports=possible_transports)
1396
1391
if master is not None:
1397
1392
tree.lock_write()
1393
branch_location = master.base
1399
1395
tree.lock_tree_write()
1396
branch_location = tree.branch.base
1397
self.add_cleanup(tree.unlock)
1398
# get rid of the final '/' and be ready for display
1399
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1401
existing_pending_merges = tree.get_parent_ids()[1:]
1405
# may need to fetch data into a heavyweight checkout
1406
# XXX: this may take some time, maybe we should display a
1408
old_tip = branch.update(possible_transports)
1409
if revision is not None:
1410
revision_id = revision[0].as_revision_id(branch)
1412
revision_id = branch.last_revision()
1413
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1414
revno = branch.revision_id_to_revno(revision_id)
1415
note("Tree is up to date at revision %d of branch %s" %
1416
(revno, branch_location))
1418
view_info = _get_view_info_for_change_reporter(tree)
1419
change_reporter = delta._ChangeReporter(
1420
unversioned_filter=tree.is_ignored,
1421
view_info=view_info)
1401
existing_pending_merges = tree.get_parent_ids()[1:]
1402
last_rev = _mod_revision.ensure_null(tree.last_revision())
1403
if last_rev == _mod_revision.ensure_null(
1404
tree.branch.last_revision()):
1405
# may be up to date, check master too.
1406
if master is None or last_rev == _mod_revision.ensure_null(
1407
master.last_revision()):
1408
revno = tree.branch.revision_id_to_revno(last_rev)
1409
note("Tree is up to date at revision %d." % (revno,))
1411
view_info = _get_view_info_for_change_reporter(tree)
1412
1423
conflicts = tree.update(
1413
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1414
view_info=view_info), possible_transports=possible_transports)
1415
revno = tree.branch.revision_id_to_revno(
1416
_mod_revision.ensure_null(tree.last_revision()))
1417
note('Updated to revision %d.' % (revno,))
1418
if tree.get_parent_ids()[1:] != existing_pending_merges:
1419
note('Your local commits will now show as pending merges with '
1420
"'bzr status', and can be committed with 'bzr commit'.")
1425
possible_transports=possible_transports,
1426
revision=revision_id,
1428
except errors.NoSuchRevision, e:
1429
raise errors.BzrCommandError(
1430
"branch has no revision %s\n"
1431
"bzr update --revision only works"
1432
" for a revision in the branch history"
1434
revno = tree.branch.revision_id_to_revno(
1435
_mod_revision.ensure_null(tree.last_revision()))
1436
note('Updated to revision %d of branch %s' %
1437
(revno, branch_location))
1438
if tree.get_parent_ids()[1:] != existing_pending_merges:
1439
note('Your local commits will now show as pending merges with '
1440
"'bzr status', and can be committed with 'bzr commit'.")
1429
1447
class cmd_info(Command):
1500
1518
file_list = [f for f in file_list]
1502
1520
tree.lock_write()
1504
# Heuristics should probably all move into tree.remove_smart or
1507
added = tree.changes_from(tree.basis_tree(),
1508
specific_files=file_list).added
1509
file_list = sorted([f[0] for f in added], reverse=True)
1510
if len(file_list) == 0:
1511
raise errors.BzrCommandError('No matching files.')
1512
elif file_list is None:
1513
# missing files show up in iter_changes(basis) as
1514
# versioned-with-no-kind.
1516
for change in tree.iter_changes(tree.basis_tree()):
1517
# Find paths in the working tree that have no kind:
1518
if change[1][1] is not None and change[6][1] is None:
1519
missing.append(change[1][1])
1520
file_list = sorted(missing, reverse=True)
1521
file_deletion_strategy = 'keep'
1522
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1523
keep_files=file_deletion_strategy=='keep',
1524
force=file_deletion_strategy=='force')
1521
self.add_cleanup(tree.unlock)
1522
# Heuristics should probably all move into tree.remove_smart or
1525
added = tree.changes_from(tree.basis_tree(),
1526
specific_files=file_list).added
1527
file_list = sorted([f[0] for f in added], reverse=True)
1528
if len(file_list) == 0:
1529
raise errors.BzrCommandError('No matching files.')
1530
elif file_list is None:
1531
# missing files show up in iter_changes(basis) as
1532
# versioned-with-no-kind.
1534
for change in tree.iter_changes(tree.basis_tree()):
1535
# Find paths in the working tree that have no kind:
1536
if change[1][1] is not None and change[6][1] is None:
1537
missing.append(change[1][1])
1538
file_list = sorted(missing, reverse=True)
1539
file_deletion_strategy = 'keep'
1540
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1541
keep_files=file_deletion_strategy=='keep',
1542
force=file_deletion_strategy=='force')
1529
1545
class cmd_file_id(Command):
1751
1767
class cmd_init_repository(Command):
1752
"""Create a shared repository to hold branches.
1768
"""Create a shared repository for branches to share storage space.
1754
1770
New branches created under the repository directory will store their
1755
revisions in the repository, not in the branch directory.
1771
revisions in the repository, not in the branch directory. For branches
1772
with shared history, this reduces the amount of storage needed and
1773
speeds up the creation of new branches.
1757
If the --no-trees option is used then the branches in the repository
1758
will not have working trees by default.
1775
If the --no-trees option is given then the branches in the repository
1776
will not have working trees by default. They will still exist as
1777
directories on disk, but they will not have separate copies of the
1778
files at a certain revision. This can be useful for repositories that
1779
store branches which are interacted with through checkouts or remote
1780
branches, such as on a server.
1761
Create a shared repositories holding just branches::
1783
Create a shared repository holding just branches::
1763
1785
bzr init-repo --no-trees repo
1764
1786
bzr init repo/trunk
2319
2350
diff_type = 'full'
2323
# Build the log formatter
2324
if log_format is None:
2325
log_format = log.log_formatter_registry.get_default(b)
2326
lf = log_format(show_ids=show_ids, to_file=self.outf,
2327
show_timezone=timezone,
2328
delta_format=get_verbosity_level(),
2330
show_advice=levels is None)
2332
# Choose the algorithm for doing the logging. It's annoying
2333
# having multiple code paths like this but necessary until
2334
# the underlying repository format is faster at generating
2335
# deltas or can provide everything we need from the indices.
2336
# The default algorithm - match-using-deltas - works for
2337
# multiple files and directories and is faster for small
2338
# amounts of history (200 revisions say). However, it's too
2339
# slow for logging a single file in a repository with deep
2340
# history, i.e. > 10K revisions. In the spirit of "do no
2341
# evil when adding features", we continue to use the
2342
# original algorithm - per-file-graph - for the "single
2343
# file that isn't a directory without showing a delta" case.
2344
partial_history = revision and b.repository._format.supports_chks
2345
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2346
or delta_type or partial_history)
2348
# Build the LogRequest and execute it
2349
if len(file_ids) == 0:
2351
rqst = make_log_request_dict(
2352
direction=direction, specific_fileids=file_ids,
2353
start_revision=rev1, end_revision=rev2, limit=limit,
2354
message_search=message, delta_type=delta_type,
2355
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2356
Logger(b, rqst).show(lf)
2352
# Build the log formatter
2353
if log_format is None:
2354
log_format = log.log_formatter_registry.get_default(b)
2355
# Make a non-encoding output to include the diffs - bug 328007
2356
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2357
lf = log_format(show_ids=show_ids, to_file=self.outf,
2358
to_exact_file=unencoded_output,
2359
show_timezone=timezone,
2360
delta_format=get_verbosity_level(),
2362
show_advice=levels is None)
2364
# Choose the algorithm for doing the logging. It's annoying
2365
# having multiple code paths like this but necessary until
2366
# the underlying repository format is faster at generating
2367
# deltas or can provide everything we need from the indices.
2368
# The default algorithm - match-using-deltas - works for
2369
# multiple files and directories and is faster for small
2370
# amounts of history (200 revisions say). However, it's too
2371
# slow for logging a single file in a repository with deep
2372
# history, i.e. > 10K revisions. In the spirit of "do no
2373
# evil when adding features", we continue to use the
2374
# original algorithm - per-file-graph - for the "single
2375
# file that isn't a directory without showing a delta" case.
2376
partial_history = revision and b.repository._format.supports_chks
2377
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2378
or delta_type or partial_history)
2380
# Build the LogRequest and execute it
2381
if len(file_ids) == 0:
2383
rqst = make_log_request_dict(
2384
direction=direction, specific_fileids=file_ids,
2385
start_revision=rev1, end_revision=rev2, limit=limit,
2386
message_search=message, delta_type=delta_type,
2387
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2388
Logger(b, rqst).show(lf)
2361
2391
def _get_revision_range(revisionspec_list, branch, command_name):
2501
2534
note("Ignoring files outside view. View is %s" % view_str)
2503
2536
tree.lock_read()
2505
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2506
from_dir=relpath, recursive=recursive):
2507
# Apply additional masking
2508
if not all and not selection[fc]:
2510
if kind is not None and fkind != kind:
2515
fullpath = osutils.pathjoin(relpath, fp)
2518
views.check_path_in_view(tree, fullpath)
2519
except errors.FileOutsideView:
2537
self.add_cleanup(tree.unlock)
2538
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2539
from_dir=relpath, recursive=recursive):
2540
# Apply additional masking
2541
if not all and not selection[fc]:
2543
if kind is not None and fkind != kind:
2548
fullpath = osutils.pathjoin(relpath, fp)
2551
views.check_path_in_view(tree, fullpath)
2552
except errors.FileOutsideView:
2524
fp = osutils.pathjoin(prefix, fp)
2525
kindch = entry.kind_character()
2526
outstring = fp + kindch
2527
ui.ui_factory.clear_term()
2529
outstring = '%-8s %s' % (fc, outstring)
2530
if show_ids and fid is not None:
2531
outstring = "%-50s %s" % (outstring, fid)
2557
fp = osutils.pathjoin(prefix, fp)
2558
kindch = entry.kind_character()
2559
outstring = fp + kindch
2560
ui.ui_factory.clear_term()
2562
outstring = '%-8s %s' % (fc, outstring)
2563
if show_ids and fid is not None:
2564
outstring = "%-50s %s" % (outstring, fid)
2565
self.outf.write(outstring + '\n')
2567
self.outf.write(fp + '\0')
2570
self.outf.write(fid)
2571
self.outf.write('\0')
2579
self.outf.write('%-50s %s\n' % (outstring, my_id))
2532
2581
self.outf.write(outstring + '\n')
2534
self.outf.write(fp + '\0')
2537
self.outf.write(fid)
2538
self.outf.write('\0')
2546
self.outf.write('%-50s %s\n' % (outstring, my_id))
2548
self.outf.write(outstring + '\n')
2553
2584
class cmd_unknowns(Command):
3465
3550
verbose = not is_quiet()
3466
3551
# TODO: should possibly lock the history file...
3467
3552
benchfile = open(".perf_history", "at", buffering=1)
3553
self.add_cleanup(benchfile.close)
3469
3555
test_suite_factory = None
3470
3556
benchfile = None
3472
selftest_kwargs = {"verbose": verbose,
3474
"stop_on_failure": one,
3475
"transport": transport,
3476
"test_suite_factory": test_suite_factory,
3477
"lsprof_timed": lsprof_timed,
3478
"lsprof_tests": lsprof_tests,
3479
"bench_history": benchfile,
3480
"matching_tests_first": first,
3481
"list_only": list_only,
3482
"random_seed": randomize,
3483
"exclude_pattern": exclude,
3485
"load_list": load_list,
3486
"debug_flags": debugflag,
3487
"starting_with": starting_with
3489
selftest_kwargs.update(self.additional_selftest_args)
3490
result = selftest(**selftest_kwargs)
3492
if benchfile is not None:
3557
selftest_kwargs = {"verbose": verbose,
3559
"stop_on_failure": one,
3560
"transport": transport,
3561
"test_suite_factory": test_suite_factory,
3562
"lsprof_timed": lsprof_timed,
3563
"lsprof_tests": lsprof_tests,
3564
"bench_history": benchfile,
3565
"matching_tests_first": first,
3566
"list_only": list_only,
3567
"random_seed": randomize,
3568
"exclude_pattern": exclude,
3570
"load_list": load_list,
3571
"debug_flags": debugflag,
3572
"starting_with": starting_with
3574
selftest_kwargs.update(self.additional_selftest_args)
3575
result = selftest(**selftest_kwargs)
3494
3576
return int(not result)
3671
3761
view_info = _get_view_info_for_change_reporter(tree)
3672
3762
change_reporter = delta._ChangeReporter(
3673
3763
unversioned_filter=tree.is_ignored, view_info=view_info)
3676
pb = ui.ui_factory.nested_progress_bar()
3677
cleanups.append(pb.finished)
3679
cleanups.append(tree.unlock)
3680
if location is not None:
3682
mergeable = bundle.read_mergeable_from_url(location,
3683
possible_transports=possible_transports)
3684
except errors.NotABundle:
3688
raise errors.BzrCommandError('Cannot use --uncommitted'
3689
' with bundles or merge directives.')
3691
if revision is not None:
3692
raise errors.BzrCommandError(
3693
'Cannot use -r with merge directives or bundles')
3694
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3697
if merger is None and uncommitted:
3698
if revision is not None and len(revision) > 0:
3699
raise errors.BzrCommandError('Cannot use --uncommitted and'
3700
' --revision at the same time.')
3701
merger = self.get_merger_from_uncommitted(tree, location, pb,
3703
allow_pending = False
3706
merger, allow_pending = self._get_merger_from_branch(tree,
3707
location, revision, remember, possible_transports, pb)
3709
merger.merge_type = merge_type
3710
merger.reprocess = reprocess
3711
merger.show_base = show_base
3712
self.sanity_check_merger(merger)
3713
if (merger.base_rev_id == merger.other_rev_id and
3714
merger.other_rev_id is not None):
3715
note('Nothing to do.')
3764
pb = ui.ui_factory.nested_progress_bar()
3765
self.add_cleanup(pb.finished)
3767
self.add_cleanup(tree.unlock)
3768
if location is not None:
3770
mergeable = bundle.read_mergeable_from_url(location,
3771
possible_transports=possible_transports)
3772
except errors.NotABundle:
3776
raise errors.BzrCommandError('Cannot use --uncommitted'
3777
' with bundles or merge directives.')
3779
if revision is not None:
3780
raise errors.BzrCommandError(
3781
'Cannot use -r with merge directives or bundles')
3782
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3785
if merger is None and uncommitted:
3786
if revision is not None and len(revision) > 0:
3787
raise errors.BzrCommandError('Cannot use --uncommitted and'
3788
' --revision at the same time.')
3789
merger = self.get_merger_from_uncommitted(tree, location, pb)
3790
allow_pending = False
3793
merger, allow_pending = self._get_merger_from_branch(tree,
3794
location, revision, remember, possible_transports, pb)
3796
merger.merge_type = merge_type
3797
merger.reprocess = reprocess
3798
merger.show_base = show_base
3799
self.sanity_check_merger(merger)
3800
if (merger.base_rev_id == merger.other_rev_id and
3801
merger.other_rev_id is not None):
3802
note('Nothing to do.')
3805
if merger.interesting_files is not None:
3806
raise errors.BzrCommandError('Cannot pull individual files')
3807
if (merger.base_rev_id == tree.last_revision()):
3808
result = tree.pull(merger.other_branch, False,
3809
merger.other_rev_id)
3810
result.report(self.outf)
3718
if merger.interesting_files is not None:
3719
raise errors.BzrCommandError('Cannot pull individual files')
3720
if (merger.base_rev_id == tree.last_revision()):
3721
result = tree.pull(merger.other_branch, False,
3722
merger.other_rev_id)
3723
result.report(self.outf)
3725
if merger.this_basis is None:
3726
raise errors.BzrCommandError(
3727
"This branch has no commits."
3728
" (perhaps you would prefer 'bzr pull')")
3730
return self._do_preview(merger, cleanups)
3732
return self._do_interactive(merger, cleanups)
3734
return self._do_merge(merger, change_reporter, allow_pending,
3737
for cleanup in reversed(cleanups):
3812
if merger.this_basis is None:
3813
raise errors.BzrCommandError(
3814
"This branch has no commits."
3815
" (perhaps you would prefer 'bzr pull')")
3817
return self._do_preview(merger)
3819
return self._do_interactive(merger)
3821
return self._do_merge(merger, change_reporter, allow_pending,
3740
def _get_preview(self, merger, cleanups):
3824
def _get_preview(self, merger):
3741
3825
tree_merger = merger.make_merger()
3742
3826
tt = tree_merger.make_preview_transform()
3743
cleanups.append(tt.finalize)
3827
self.add_cleanup(tt.finalize)
3744
3828
result_tree = tt.get_preview_tree()
3745
3829
return result_tree
3747
def _do_preview(self, merger, cleanups):
3831
def _do_preview(self, merger):
3748
3832
from bzrlib.diff import show_diff_trees
3749
result_tree = self._get_preview(merger, cleanups)
3833
result_tree = self._get_preview(merger)
3750
3834
show_diff_trees(merger.this_tree, result_tree, self.outf,
3751
3835
old_label='', new_label='')
3941
4026
merge_type = _mod_merge.Merge3Merger
3942
4027
tree, file_list = tree_files(file_list)
3943
4028
tree.lock_write()
3945
parents = tree.get_parent_ids()
3946
if len(parents) != 2:
3947
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3948
" merges. Not cherrypicking or"
3950
repository = tree.branch.repository
3951
interesting_ids = None
3953
conflicts = tree.conflicts()
3954
if file_list is not None:
3955
interesting_ids = set()
3956
for filename in file_list:
3957
file_id = tree.path2id(filename)
3959
raise errors.NotVersionedError(filename)
3960
interesting_ids.add(file_id)
3961
if tree.kind(file_id) != "directory":
4029
self.add_cleanup(tree.unlock)
4030
parents = tree.get_parent_ids()
4031
if len(parents) != 2:
4032
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4033
" merges. Not cherrypicking or"
4035
repository = tree.branch.repository
4036
interesting_ids = None
4038
conflicts = tree.conflicts()
4039
if file_list is not None:
4040
interesting_ids = set()
4041
for filename in file_list:
4042
file_id = tree.path2id(filename)
4044
raise errors.NotVersionedError(filename)
4045
interesting_ids.add(file_id)
4046
if tree.kind(file_id) != "directory":
3964
for name, ie in tree.inventory.iter_entries(file_id):
3965
interesting_ids.add(ie.file_id)
3966
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3968
# Remerge only supports resolving contents conflicts
3969
allowed_conflicts = ('text conflict', 'contents conflict')
3970
restore_files = [c.path for c in conflicts
3971
if c.typestring in allowed_conflicts]
3972
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3973
tree.set_conflicts(ConflictList(new_conflicts))
3974
if file_list is not None:
3975
restore_files = file_list
3976
for filename in restore_files:
3978
restore(tree.abspath(filename))
3979
except errors.NotConflicted:
3981
# Disable pending merges, because the file texts we are remerging
3982
# have not had those merges performed. If we use the wrong parents
3983
# list, we imply that the working tree text has seen and rejected
3984
# all the changes from the other tree, when in fact those changes
3985
# have not yet been seen.
3986
pb = ui.ui_factory.nested_progress_bar()
3987
tree.set_parent_ids(parents[:1])
4049
for name, ie in tree.inventory.iter_entries(file_id):
4050
interesting_ids.add(ie.file_id)
4051
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4053
# Remerge only supports resolving contents conflicts
4054
allowed_conflicts = ('text conflict', 'contents conflict')
4055
restore_files = [c.path for c in conflicts
4056
if c.typestring in allowed_conflicts]
4057
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4058
tree.set_conflicts(ConflictList(new_conflicts))
4059
if file_list is not None:
4060
restore_files = file_list
4061
for filename in restore_files:
3989
merger = _mod_merge.Merger.from_revision_ids(pb,
3991
merger.interesting_ids = interesting_ids
3992
merger.merge_type = merge_type
3993
merger.show_base = show_base
3994
merger.reprocess = reprocess
3995
conflicts = merger.do_merge()
3997
tree.set_parent_ids(parents)
4063
restore(tree.abspath(filename))
4064
except errors.NotConflicted:
4066
# Disable pending merges, because the file texts we are remerging
4067
# have not had those merges performed. If we use the wrong parents
4068
# list, we imply that the working tree text has seen and rejected
4069
# all the changes from the other tree, when in fact those changes
4070
# have not yet been seen.
4071
pb = ui.ui_factory.nested_progress_bar()
4072
tree.set_parent_ids(parents[:1])
4074
merger = _mod_merge.Merger.from_revision_ids(pb,
4076
merger.interesting_ids = interesting_ids
4077
merger.merge_type = merge_type
4078
merger.show_base = show_base
4079
merger.reprocess = reprocess
4080
conflicts = merger.do_merge()
4082
tree.set_parent_ids(parents)
4001
4084
if conflicts > 0:
4025
4108
name. If you name a directory, all the contents of that directory will be
4028
Any files that have been newly added since that revision will be deleted,
4029
with a backup kept if appropriate. Directories containing unknown files
4030
will not be deleted.
4111
If you have newly added files since the target revision, they will be
4112
removed. If the files to be removed have been changed, backups will be
4113
created as above. Directories containing unknown files will not be
4032
The working tree contains a list of pending merged revisions, which will
4033
be included as parents in the next commit. Normally, revert clears that
4034
list as well as reverting the files. If any files are specified, revert
4035
leaves the pending merge list alone and reverts only the files. Use "bzr
4036
revert ." in the tree root to revert all files but keep the merge record,
4037
and "bzr revert --forget-merges" to clear the pending merge list without
4116
The working tree contains a list of revisions that have been merged but
4117
not yet committed. These revisions will be included as additional parents
4118
of the next commit. Normally, using revert clears that list as well as
4119
reverting the files. If any files are specified, revert leaves the list
4120
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4121
.`` in the tree root to revert all files but keep the recorded merges,
4122
and ``bzr revert --forget-merges`` to clear the pending merge list without
4038
4123
reverting any files.
4125
Using "bzr revert --forget-merges", it is possible to apply all of the
4126
changes from a branch in a single revision. To do this, perform the merge
4127
as desired. Then doing revert with the "--forget-merges" option will keep
4128
the content of the tree as it was, but it will clear the list of pending
4129
merges. The next commit will then contain all of the changes that are
4130
present in the other branch, but without any other parent revisions.
4131
Because this technique forgets where these changes originated, it may
4132
cause additional conflicts on later merges involving the same source and
4041
4136
_see_also = ['cat', 'export']
4210
4307
if remote_branch.base == local_branch.base:
4211
4308
remote_branch = local_branch
4310
local_branch.lock_read()
4311
self.add_cleanup(local_branch.unlock)
4213
4312
local_revid_range = _revision_range_to_revid_range(
4214
4313
_get_revision_range(my_revision, local_branch,
4316
remote_branch.lock_read()
4317
self.add_cleanup(remote_branch.unlock)
4217
4318
remote_revid_range = _revision_range_to_revid_range(
4218
4319
_get_revision_range(revision,
4219
4320
remote_branch, self.name()))
4221
local_branch.lock_read()
4223
remote_branch.lock_read()
4225
local_extra, remote_extra = find_unmerged(
4226
local_branch, remote_branch, restrict,
4227
backward=not reverse,
4228
include_merges=include_merges,
4229
local_revid_range=local_revid_range,
4230
remote_revid_range=remote_revid_range)
4232
if log_format is None:
4233
registry = log.log_formatter_registry
4234
log_format = registry.get_default(local_branch)
4235
lf = log_format(to_file=self.outf,
4237
show_timezone='original')
4240
if local_extra and not theirs_only:
4241
message("You have %d extra revision(s):\n" %
4243
for revision in iter_log_revisions(local_extra,
4244
local_branch.repository,
4246
lf.log_revision(revision)
4247
printed_local = True
4250
printed_local = False
4252
if remote_extra and not mine_only:
4253
if printed_local is True:
4255
message("You are missing %d revision(s):\n" %
4257
for revision in iter_log_revisions(remote_extra,
4258
remote_branch.repository,
4260
lf.log_revision(revision)
4263
if mine_only and not local_extra:
4264
# We checked local, and found nothing extra
4265
message('This branch is up to date.\n')
4266
elif theirs_only and not remote_extra:
4267
# We checked remote, and found nothing extra
4268
message('Other branch is up to date.\n')
4269
elif not (mine_only or theirs_only or local_extra or
4271
# We checked both branches, and neither one had extra
4273
message("Branches are up to date.\n")
4275
remote_branch.unlock()
4277
local_branch.unlock()
4322
local_extra, remote_extra = find_unmerged(
4323
local_branch, remote_branch, restrict,
4324
backward=not reverse,
4325
include_merges=include_merges,
4326
local_revid_range=local_revid_range,
4327
remote_revid_range=remote_revid_range)
4329
if log_format is None:
4330
registry = log.log_formatter_registry
4331
log_format = registry.get_default(local_branch)
4332
lf = log_format(to_file=self.outf,
4334
show_timezone='original')
4337
if local_extra and not theirs_only:
4338
message("You have %d extra revision(s):\n" %
4340
for revision in iter_log_revisions(local_extra,
4341
local_branch.repository,
4343
lf.log_revision(revision)
4344
printed_local = True
4347
printed_local = False
4349
if remote_extra and not mine_only:
4350
if printed_local is True:
4352
message("You are missing %d revision(s):\n" %
4354
for revision in iter_log_revisions(remote_extra,
4355
remote_branch.repository,
4357
lf.log_revision(revision)
4360
if mine_only and not local_extra:
4361
# We checked local, and found nothing extra
4362
message('This branch is up to date.\n')
4363
elif theirs_only and not remote_extra:
4364
# We checked remote, and found nothing extra
4365
message('Other branch is up to date.\n')
4366
elif not (mine_only or theirs_only or local_extra or
4368
# We checked both branches, and neither one had extra
4370
message("Branches are up to date.\n")
4278
4372
if not status_code and parent is None and other_branch is not None:
4279
4373
local_branch.lock_write()
4281
# handle race conditions - a parent might be set while we run.
4282
if local_branch.get_parent() is None:
4283
local_branch.set_parent(remote_branch.base)
4285
local_branch.unlock()
4374
self.add_cleanup(local_branch.unlock)
4375
# handle race conditions - a parent might be set while we run.
4376
if local_branch.get_parent() is None:
4377
local_branch.set_parent(remote_branch.base)
4286
4378
return status_code
4410
4500
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4411
4501
if wt is not None:
4503
self.add_cleanup(wt.unlock)
4414
4505
branch.lock_read()
4416
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4418
file_id = wt.path2id(relpath)
4420
file_id = tree.path2id(relpath)
4422
raise errors.NotVersionedError(filename)
4423
file_version = tree.inventory[file_id].revision
4424
if wt is not None and revision is None:
4425
# If there is a tree and we're not annotating historical
4426
# versions, annotate the working tree's content.
4427
annotate_file_tree(wt, file_id, self.outf, long, all,
4430
annotate_file(branch, file_version, file_id, long, all, self.outf,
4506
self.add_cleanup(branch.unlock)
4507
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4509
self.add_cleanup(tree.unlock)
4511
file_id = wt.path2id(relpath)
4513
file_id = tree.path2id(relpath)
4515
raise errors.NotVersionedError(filename)
4516
file_version = tree.inventory[file_id].revision
4517
if wt is not None and revision is None:
4518
# If there is a tree and we're not annotating historical
4519
# versions, annotate the working tree's content.
4520
annotate_file_tree(wt, file_id, self.outf, long, all,
4523
annotate_file(branch, file_version, file_id, long, all, self.outf,
4439
4527
class cmd_re_sign(Command):
4955
5042
directly from the merge directive, without retrieving data from a
4958
If --no-bundle is specified, then public_branch is needed (and must be
4959
up-to-date), so that the receiver can perform the merge using the
4960
public_branch. The public_branch is always included if known, so that
4961
people can check it later.
4963
The submit branch defaults to the parent, but can be overridden. Both
4964
submit branch and public branch will be remembered if supplied.
4966
If a public_branch is known for the submit_branch, that public submit
4967
branch is used in the merge instructions. This means that a local mirror
4968
can be used as your actual submit branch, once you have set public_branch
5045
`bzr send` creates a compact data set that, when applied using bzr
5046
merge, has the same effect as merging from the source branch.
5048
By default the merge directive is self-contained and can be applied to any
5049
branch containing submit_branch in its ancestory without needing access to
5052
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5053
revisions, but only a structured request to merge from the
5054
public_location. In that case the public_branch is needed and it must be
5055
up-to-date and accessible to the recipient. The public_branch is always
5056
included if known, so that people can check it later.
5058
The submit branch defaults to the parent of the source branch, but can be
5059
overridden. Both submit branch and public branch will be remembered in
5060
branch.conf the first time they are used for a particular branch. The
5061
source branch defaults to that containing the working directory, but can
5062
be changed using --from.
5064
In order to calculate those changes, bzr must analyse the submit branch.
5065
Therefore it is most efficient for the submit branch to be a local mirror.
5066
If a public location is known for the submit_branch, that location is used
5067
in the merge directive.
5069
The default behaviour is to send the merge directive by mail, unless -o is
5070
given, in which case it is sent to a file.
4971
5072
Mail is sent using your preferred mail program. This should be transparent
4972
5073
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5157
5262
branch, relpath = Branch.open_containing(directory)
5158
5263
branch.lock_write()
5161
branch.tags.delete_tag(tag_name)
5162
self.outf.write('Deleted tag %s.\n' % tag_name)
5264
self.add_cleanup(branch.unlock)
5266
branch.tags.delete_tag(tag_name)
5267
self.outf.write('Deleted tag %s.\n' % tag_name)
5270
if len(revision) != 1:
5271
raise errors.BzrCommandError(
5272
"Tags can only be placed on a single revision, "
5274
revision_id = revision[0].as_revision_id(branch)
5165
if len(revision) != 1:
5166
raise errors.BzrCommandError(
5167
"Tags can only be placed on a single revision, "
5169
revision_id = revision[0].as_revision_id(branch)
5171
revision_id = branch.last_revision()
5172
if (not force) and branch.tags.has_tag(tag_name):
5173
raise errors.TagAlreadyExists(tag_name)
5174
branch.tags.set_tag(tag_name, revision_id)
5175
self.outf.write('Created tag %s.\n' % tag_name)
5276
revision_id = branch.last_revision()
5277
if (not force) and branch.tags.has_tag(tag_name):
5278
raise errors.TagAlreadyExists(tag_name)
5279
branch.tags.set_tag(tag_name, revision_id)
5280
self.outf.write('Created tag %s.\n' % tag_name)
5180
5283
class cmd_tags(Command):
5215
5318
branch.lock_read()
5218
graph = branch.repository.get_graph()
5219
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5220
revid1, revid2 = rev1.rev_id, rev2.rev_id
5221
# only show revisions between revid1 and revid2 (inclusive)
5222
tags = [(tag, revid) for tag, revid in tags if
5223
graph.is_between(revid, revid1, revid2)]
5226
elif sort == 'time':
5228
for tag, revid in tags:
5230
revobj = branch.repository.get_revision(revid)
5231
except errors.NoSuchRevision:
5232
timestamp = sys.maxint # place them at the end
5234
timestamp = revobj.timestamp
5235
timestamps[revid] = timestamp
5236
tags.sort(key=lambda x: timestamps[x[1]])
5238
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5239
for index, (tag, revid) in enumerate(tags):
5241
revno = branch.revision_id_to_dotted_revno(revid)
5242
if isinstance(revno, tuple):
5243
revno = '.'.join(map(str, revno))
5244
except errors.NoSuchRevision:
5245
# Bad tag data/merges can lead to tagged revisions
5246
# which are not in this branch. Fail gracefully ...
5248
tags[index] = (tag, revno)
5319
self.add_cleanup(branch.unlock)
5321
graph = branch.repository.get_graph()
5322
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5323
revid1, revid2 = rev1.rev_id, rev2.rev_id
5324
# only show revisions between revid1 and revid2 (inclusive)
5325
tags = [(tag, revid) for tag, revid in tags if
5326
graph.is_between(revid, revid1, revid2)]
5329
elif sort == 'time':
5331
for tag, revid in tags:
5333
revobj = branch.repository.get_revision(revid)
5334
except errors.NoSuchRevision:
5335
timestamp = sys.maxint # place them at the end
5337
timestamp = revobj.timestamp
5338
timestamps[revid] = timestamp
5339
tags.sort(key=lambda x: timestamps[x[1]])
5341
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5342
for index, (tag, revid) in enumerate(tags):
5344
revno = branch.revision_id_to_dotted_revno(revid)
5345
if isinstance(revno, tuple):
5346
revno = '.'.join(map(str, revno))
5347
except errors.NoSuchRevision:
5348
# Bad tag data/merges can lead to tagged revisions
5349
# which are not in this branch. Fail gracefully ...
5351
tags[index] = (tag, revno)
5251
5353
for tag, revspec in tags:
5252
5354
self.outf.write('%-20s %s\n' % (tag, revspec))
5362
5464
/path/to/newbranch.
5364
5466
Bound branches use the nickname of its master branch unless it is set
5365
locally, in which case switching will update the the local nickname to be
5467
locally, in which case switching will update the local nickname to be
5366
5468
that of the master.
5369
takes_args = ['to_location']
5471
takes_args = ['to_location?']
5370
5472
takes_options = [Option('force',
5371
5473
help='Switch even if local commits will be lost.'),
5372
5475
Option('create-branch', short_name='b',
5373
5476
help='Create the target branch from this one before'
5374
5477
' switching to it.'),
5377
def run(self, to_location, force=False, create_branch=False):
5480
def run(self, to_location=None, force=False, create_branch=False,
5378
5482
from bzrlib import switch
5379
5483
tree_location = '.'
5484
revision = _get_one_revision('switch', revision)
5380
5485
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5486
if to_location is None:
5487
if revision is None:
5488
raise errors.BzrCommandError('You must supply either a'
5489
' revision or a location')
5382
5492
branch = control_dir.open_branch()
5383
5493
had_explicit_nick = branch.get_config().has_explicit_nickname()
added
removed
bzrlib/builtins.py
