542
537
wt = WorkingTree.open_containing(directory)[0]
545
self.add_cleanup(wt.unlock)
546
540
except (errors.NoWorkingTree, errors.NotLocalUrl):
548
542
b = Branch.open_containing(directory)[0]
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())
546
if revision is not None:
547
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
548
if revision_info_list is not None:
549
for rev_str in revision_info_list:
550
rev_spec = RevisionSpec.from_string(rev_str)
551
revision_ids.append(rev_spec.as_revision_id(b))
552
# No arguments supplied, default to the last revision
553
if len(revision_ids) == 0:
556
raise errors.NoWorkingTree(directory)
557
revision_ids.append(wt.last_revision())
559
revision_ids.append(b.last_revision())
563
for revision_id in revision_ids:
565
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
566
revno = '.'.join(str(i) for i in dotted_revno)
567
except errors.NoSuchRevision:
569
maxlen = max(maxlen, len(revno))
570
revinfos.append([revno, revision_id])
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])
579
577
for ri in revinfos:
580
578
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
727
728
revision = _get_one_revision('inventory', revision)
728
729
work_tree, file_list = tree_files(file_list)
729
730
work_tree.lock_read()
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()
732
if revision is not None:
733
tree = revision.as_tree(work_tree.branch)
735
extra_trees = [work_tree]
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()
752
if tree is not work_tree:
752
755
for path, entry in entries:
753
756
if kind and kind != entry.kind:
892
898
dest = osutils.pathjoin(dest_parent, dest_tail)
893
899
mutter("attempting to move %s => %s", src, dest)
894
900
tree.rename_one(src, dest, after=after)
896
self.outf.write("%s => %s\n" % (src, dest))
901
self.outf.write("%s => %s\n" % (src, dest))
899
904
class cmd_pull(Command):
900
905
"""Turn this branch into a mirror of another branch.
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
907
This command only works on branches that have not diverged. Branches are
908
considered diverged if the destination branch's most recent commit is one
909
that has not been merged (directly or indirectly) into the parent.
907
911
If branches have diverged, you can use 'bzr merge' to integrate the changes
908
912
from one into the other. Once one branch has merged, the other should
909
913
be able to pull it again.
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.
915
If you want to forget your local changes and just update your branch to
916
match the remote one, use pull --overwrite.
915
918
If there is no default location set, the first pull will set it. After
916
919
that, you can omit the location to use the default. To change the
998
1001
if branch_from is not branch_to:
999
1002
branch_from.lock_read()
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,
1004
if revision is not None:
1005
revision_id = revision.as_revision_id(branch_from)
1007
branch_to.lock_write()
1009
if tree_to is not None:
1010
view_info = _get_view_info_for_change_reporter(tree_to)
1011
change_reporter = delta._ChangeReporter(
1012
unversioned_filter=tree_to.is_ignored,
1013
view_info=view_info)
1014
result = tree_to.pull(
1015
branch_from, overwrite, revision_id, change_reporter,
1016
possible_transports=possible_transports, local=local)
1018
result = branch_to.pull(
1019
branch_from, overwrite, revision_id, local=local)
1021
result.report(self.outf)
1022
if verbose and result.old_revid != result.new_revid:
1023
log.show_branch_change(
1024
branch_to, self.outf, result.old_revno,
1029
if branch_from is not branch_to:
1030
branch_from.unlock()
1025
1033
class cmd_push(Command):
1180
1188
' directory exists, but does not already'
1181
1189
' have a control directory. This flag will'
1182
1190
' allow branch to proceed.'),
1184
help="Bind new branch to from location."),
1186
1192
aliases = ['get', 'clone']
1188
1194
def run(self, from_location, to_location=None, revision=None,
1189
1195
hardlink=False, stacked=False, standalone=False, no_tree=False,
1190
use_existing_dir=False, switch=False, bind=False):
1196
use_existing_dir=False, switch=False):
1191
1197
from bzrlib import switch as _mod_switch
1192
1198
from bzrlib.tag import _merge_tags_if_possible
1193
1199
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1201
if (accelerator_tree is not None and
1202
accelerator_tree.supports_content_filtering()):
1203
accelerator_tree = None
1195
1204
revision = _get_one_revision('branch', revision)
1196
1205
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)
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)
1207
if revision is not None:
1208
revision_id = revision.as_revision_id(br_from)
1216
bzrdir.BzrDir.open_from_transport(to_transport)
1217
except errors.NotBranchError:
1210
# FIXME - wt.last_revision, fallback to branch, fall back to
1211
# None or perhaps NULL_REVISION to mean copy nothing
1213
revision_id = br_from.last_revision()
1214
if to_location is None:
1215
to_location = urlutils.derive_to_location(from_location)
1216
to_transport = transport.get_transport(to_location)
1218
to_transport.mkdir('.')
1219
except errors.FileExists:
1220
if not use_existing_dir:
1221
raise errors.BzrCommandError('Target directory "%s" '
1222
'already exists.' % to_location)
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'))
1225
bzrdir.BzrDir.open_from_transport(to_transport)
1226
except errors.NotBranchError:
1229
raise errors.AlreadyBranchError(to_location)
1230
except errors.NoSuchFile:
1231
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1234
# preserve whatever source format we have.
1235
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1236
possible_transports=[to_transport],
1237
accelerator_tree=accelerator_tree,
1238
hardlink=hardlink, stacked=stacked,
1239
force_new_repo=standalone,
1240
create_tree_if_local=not no_tree,
1241
source_branch=br_from)
1242
branch = dir.open_branch()
1243
except errors.NoSuchRevision:
1244
to_transport.delete_tree('.')
1245
msg = "The branch %s has no revision %s." % (from_location,
1247
raise errors.BzrCommandError(msg)
1248
_merge_tags_if_possible(br_from, branch)
1249
# If the source branch is stacked, the new branch may
1250
# be stacked whether we asked for that explicitly or not.
1251
# We therefore need a try/except here and not just 'if stacked:'
1253
note('Created new stacked branch referring to %s.' %
1254
branch.get_stacked_on_url())
1255
except (errors.NotStacked, errors.UnstackableBranchFormat,
1256
errors.UnstackableRepositoryFormat), e:
1257
note('Branched %d revision(s).' % branch.revno())
1259
# Switch to the new branch
1260
wt, _ = WorkingTree.open_containing('.')
1261
_mod_switch.switch(wt.bzrdir, branch)
1262
note('Switched to branch: %s',
1263
urlutils.unescape_for_display(branch.base, 'utf-8'))
1262
1268
class cmd_checkout(Command):
1341
1347
def run(self, dir=u'.'):
1342
1348
tree = WorkingTree.open_containing(dir)[0]
1343
1349
tree.lock_read()
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))
1351
new_inv = tree.inventory
1352
old_tree = tree.basis_tree()
1353
old_tree.lock_read()
1355
old_inv = old_tree.inventory
1357
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1358
for f, paths, c, v, p, n, k, e in iterator:
1359
if paths[0] == paths[1]:
1363
renames.append(paths)
1365
for old_name, new_name in renames:
1366
self.outf.write("%s => %s\n" % (old_name, new_name))
1363
1373
class cmd_update(Command):
1370
1380
If you want to discard your local changes, you can just do a
1371
1381
'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.
1377
1384
_see_also = ['pull', 'working-trees', 'status-flags']
1378
1385
takes_args = ['dir?']
1379
takes_options = ['revision']
1380
1386
aliases = ['up']
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")
1388
def run(self, dir='.'):
1386
1389
tree = WorkingTree.open_containing(dir)[0]
1387
branch = tree.branch
1388
1390
possible_transports = []
1389
master = branch.get_master_branch(
1391
master = tree.branch.get_master_branch(
1390
1392
possible_transports=possible_transports)
1391
1393
if master is not None:
1392
1394
tree.lock_write()
1393
branch_location = master.base
1395
1396
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)
1398
existing_pending_merges = tree.get_parent_ids()[1:]
1399
last_rev = _mod_revision.ensure_null(tree.last_revision())
1400
if last_rev == _mod_revision.ensure_null(
1401
tree.branch.last_revision()):
1402
# may be up to date, check master too.
1403
if master is None or last_rev == _mod_revision.ensure_null(
1404
master.last_revision()):
1405
revno = tree.branch.revision_id_to_revno(last_rev)
1406
note("Tree is up to date at revision %d." % (revno,))
1408
view_info = _get_view_info_for_change_reporter(tree)
1423
1409
conflicts = tree.update(
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'.")
1410
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1411
view_info=view_info), possible_transports=possible_transports)
1412
revno = tree.branch.revision_id_to_revno(
1413
_mod_revision.ensure_null(tree.last_revision()))
1414
note('Updated to revision %d.' % (revno,))
1415
if tree.get_parent_ids()[1:] != existing_pending_merges:
1416
note('Your local commits will now show as pending merges with '
1417
"'bzr status', and can be committed with 'bzr commit'.")
1447
1426
class cmd_info(Command):
1518
1497
file_list = [f for f in file_list]
1520
1499
tree.lock_write()
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')
1501
# Heuristics should probably all move into tree.remove_smart or
1504
added = tree.changes_from(tree.basis_tree(),
1505
specific_files=file_list).added
1506
file_list = sorted([f[0] for f in added], reverse=True)
1507
if len(file_list) == 0:
1508
raise errors.BzrCommandError('No matching files.')
1509
elif file_list is None:
1510
# missing files show up in iter_changes(basis) as
1511
# versioned-with-no-kind.
1513
for change in tree.iter_changes(tree.basis_tree()):
1514
# Find paths in the working tree that have no kind:
1515
if change[1][1] is not None and change[6][1] is None:
1516
missing.append(change[1][1])
1517
file_list = sorted(missing, reverse=True)
1518
file_deletion_strategy = 'keep'
1519
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1520
keep_files=file_deletion_strategy=='keep',
1521
force=file_deletion_strategy=='force')
1545
1526
class cmd_file_id(Command):
1767
1748
class cmd_init_repository(Command):
1768
"""Create a shared repository for branches to share storage space.
1749
"""Create a shared repository to hold branches.
1770
1751
New branches created under the repository directory will store their
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.
1752
revisions in the repository, not in the branch directory.
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.
1754
If the --no-trees option is used then the branches in the repository
1755
will not have working trees by default.
1783
Create a shared repository holding just branches::
1758
Create a shared repositories holding just branches::
1785
1760
bzr init-repo --no-trees repo
1786
1761
bzr init repo/trunk
2347
2316
diff_type = 'full'
2349
# Build the log formatter
2350
if log_format is None:
2351
log_format = log.log_formatter_registry.get_default(b)
2352
# Make a non-encoding output to include the diffs - bug 328007
2353
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2354
lf = log_format(show_ids=show_ids, to_file=self.outf,
2355
to_exact_file=unencoded_output,
2356
show_timezone=timezone,
2357
delta_format=get_verbosity_level(),
2359
show_advice=levels is None)
2361
# Choose the algorithm for doing the logging. It's annoying
2362
# having multiple code paths like this but necessary until
2363
# the underlying repository format is faster at generating
2364
# deltas or can provide everything we need from the indices.
2365
# The default algorithm - match-using-deltas - works for
2366
# multiple files and directories and is faster for small
2367
# amounts of history (200 revisions say). However, it's too
2368
# slow for logging a single file in a repository with deep
2369
# history, i.e. > 10K revisions. In the spirit of "do no
2370
# evil when adding features", we continue to use the
2371
# original algorithm - per-file-graph - for the "single
2372
# file that isn't a directory without showing a delta" case.
2373
partial_history = revision and b.repository._format.supports_chks
2374
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2375
or delta_type or partial_history)
2377
# Build the LogRequest and execute it
2378
if len(file_ids) == 0:
2380
rqst = make_log_request_dict(
2381
direction=direction, specific_fileids=file_ids,
2382
start_revision=rev1, end_revision=rev2, limit=limit,
2383
message_search=message, delta_type=delta_type,
2384
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2385
Logger(b, rqst).show(lf)
2320
# Build the log formatter
2321
if log_format is None:
2322
log_format = log.log_formatter_registry.get_default(b)
2323
lf = log_format(show_ids=show_ids, to_file=self.outf,
2324
show_timezone=timezone,
2325
delta_format=get_verbosity_level(),
2327
show_advice=levels is None)
2329
# Choose the algorithm for doing the logging. It's annoying
2330
# having multiple code paths like this but necessary until
2331
# the underlying repository format is faster at generating
2332
# deltas or can provide everything we need from the indices.
2333
# The default algorithm - match-using-deltas - works for
2334
# multiple files and directories and is faster for small
2335
# amounts of history (200 revisions say). However, it's too
2336
# slow for logging a single file in a repository with deep
2337
# history, i.e. > 10K revisions. In the spirit of "do no
2338
# evil when adding features", we continue to use the
2339
# original algorithm - per-file-graph - for the "single
2340
# file that isn't a directory without showing a delta" case.
2341
partial_history = revision and b.repository._format.supports_chks
2342
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2343
or delta_type or partial_history)
2345
# Build the LogRequest and execute it
2346
if len(file_ids) == 0:
2348
rqst = make_log_request_dict(
2349
direction=direction, specific_fileids=file_ids,
2350
start_revision=rev1, end_revision=rev2, limit=limit,
2351
message_search=message, delta_type=delta_type,
2352
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2353
Logger(b, rqst).show(lf)
2388
2358
def _get_revision_range(revisionspec_list, branch, command_name):
2531
2498
note("Ignoring files outside view. View is %s" % view_str)
2533
2500
tree.lock_read()
2534
self.add_cleanup(tree.unlock)
2535
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2536
from_dir=relpath, recursive=recursive):
2537
# Apply additional masking
2538
if not all and not selection[fc]:
2540
if kind is not None and fkind != kind:
2545
fullpath = osutils.pathjoin(relpath, fp)
2548
views.check_path_in_view(tree, fullpath)
2549
except errors.FileOutsideView:
2502
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2503
from_dir=relpath, recursive=recursive):
2504
# Apply additional masking
2505
if not all and not selection[fc]:
2507
if kind is not None and fkind != kind:
2512
fullpath = osutils.pathjoin(relpath, fp)
2515
views.check_path_in_view(tree, fullpath)
2516
except errors.FileOutsideView:
2554
fp = osutils.pathjoin(prefix, fp)
2555
kindch = entry.kind_character()
2556
outstring = fp + kindch
2557
ui.ui_factory.clear_term()
2559
outstring = '%-8s %s' % (fc, outstring)
2560
if show_ids and fid is not None:
2561
outstring = "%-50s %s" % (outstring, fid)
2562
self.outf.write(outstring + '\n')
2564
self.outf.write(fp + '\0')
2567
self.outf.write(fid)
2568
self.outf.write('\0')
2576
self.outf.write('%-50s %s\n' % (outstring, my_id))
2521
fp = osutils.pathjoin(prefix, fp)
2522
kindch = entry.kind_character()
2523
outstring = fp + kindch
2524
ui.ui_factory.clear_term()
2526
outstring = '%-8s %s' % (fc, outstring)
2527
if show_ids and fid is not None:
2528
outstring = "%-50s %s" % (outstring, fid)
2578
2529
self.outf.write(outstring + '\n')
2531
self.outf.write(fp + '\0')
2534
self.outf.write(fid)
2535
self.outf.write('\0')
2543
self.outf.write('%-50s %s\n' % (outstring, my_id))
2545
self.outf.write(outstring + '\n')
2581
2550
class cmd_unknowns(Command):
3547
3462
verbose = not is_quiet()
3548
3463
# TODO: should possibly lock the history file...
3549
3464
benchfile = open(".perf_history", "at", buffering=1)
3550
self.add_cleanup(benchfile.close)
3552
3466
test_suite_factory = None
3553
3467
benchfile = None
3554
selftest_kwargs = {"verbose": verbose,
3556
"stop_on_failure": one,
3557
"transport": transport,
3558
"test_suite_factory": test_suite_factory,
3559
"lsprof_timed": lsprof_timed,
3560
"lsprof_tests": lsprof_tests,
3561
"bench_history": benchfile,
3562
"matching_tests_first": first,
3563
"list_only": list_only,
3564
"random_seed": randomize,
3565
"exclude_pattern": exclude,
3567
"load_list": load_list,
3568
"debug_flags": debugflag,
3569
"starting_with": starting_with
3571
selftest_kwargs.update(self.additional_selftest_args)
3572
result = selftest(**selftest_kwargs)
3469
selftest_kwargs = {"verbose": verbose,
3471
"stop_on_failure": one,
3472
"transport": transport,
3473
"test_suite_factory": test_suite_factory,
3474
"lsprof_timed": lsprof_timed,
3475
"lsprof_tests": lsprof_tests,
3476
"bench_history": benchfile,
3477
"matching_tests_first": first,
3478
"list_only": list_only,
3479
"random_seed": randomize,
3480
"exclude_pattern": exclude,
3482
"load_list": load_list,
3483
"debug_flags": debugflag,
3484
"starting_with": starting_with
3486
selftest_kwargs.update(self.additional_selftest_args)
3487
result = selftest(**selftest_kwargs)
3489
if benchfile is not None:
3573
3491
return int(not result)
3758
3668
view_info = _get_view_info_for_change_reporter(tree)
3759
3669
change_reporter = delta._ChangeReporter(
3760
3670
unversioned_filter=tree.is_ignored, view_info=view_info)
3761
pb = ui.ui_factory.nested_progress_bar()
3762
self.add_cleanup(pb.finished)
3764
self.add_cleanup(tree.unlock)
3765
if location is not None:
3767
mergeable = bundle.read_mergeable_from_url(location,
3768
possible_transports=possible_transports)
3769
except errors.NotABundle:
3673
pb = ui.ui_factory.nested_progress_bar()
3674
cleanups.append(pb.finished)
3676
cleanups.append(tree.unlock)
3677
if location is not None:
3679
mergeable = bundle.read_mergeable_from_url(location,
3680
possible_transports=possible_transports)
3681
except errors.NotABundle:
3685
raise errors.BzrCommandError('Cannot use --uncommitted'
3686
' with bundles or merge directives.')
3688
if revision is not None:
3689
raise errors.BzrCommandError(
3690
'Cannot use -r with merge directives or bundles')
3691
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3694
if merger is None and uncommitted:
3695
if revision is not None and len(revision) > 0:
3696
raise errors.BzrCommandError('Cannot use --uncommitted and'
3697
' --revision at the same time.')
3698
merger = self.get_merger_from_uncommitted(tree, location, pb,
3700
allow_pending = False
3703
merger, allow_pending = self._get_merger_from_branch(tree,
3704
location, revision, remember, possible_transports, pb)
3706
merger.merge_type = merge_type
3707
merger.reprocess = reprocess
3708
merger.show_base = show_base
3709
self.sanity_check_merger(merger)
3710
if (merger.base_rev_id == merger.other_rev_id and
3711
merger.other_rev_id is not None):
3712
note('Nothing to do.')
3715
if merger.interesting_files is not None:
3716
raise errors.BzrCommandError('Cannot pull individual files')
3717
if (merger.base_rev_id == tree.last_revision()):
3718
result = tree.pull(merger.other_branch, False,
3719
merger.other_rev_id)
3720
result.report(self.outf)
3722
if merger.this_basis is None:
3723
raise errors.BzrCommandError(
3724
"This branch has no commits."
3725
" (perhaps you would prefer 'bzr pull')")
3727
return self._do_preview(merger, cleanups)
3729
return self._do_interactive(merger, cleanups)
3773
raise errors.BzrCommandError('Cannot use --uncommitted'
3774
' with bundles or merge directives.')
3776
if revision is not None:
3777
raise errors.BzrCommandError(
3778
'Cannot use -r with merge directives or bundles')
3779
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3782
if merger is None and uncommitted:
3783
if revision is not None and len(revision) > 0:
3784
raise errors.BzrCommandError('Cannot use --uncommitted and'
3785
' --revision at the same time.')
3786
merger = self.get_merger_from_uncommitted(tree, location, pb)
3787
allow_pending = False
3790
merger, allow_pending = self._get_merger_from_branch(tree,
3791
location, revision, remember, possible_transports, pb)
3793
merger.merge_type = merge_type
3794
merger.reprocess = reprocess
3795
merger.show_base = show_base
3796
self.sanity_check_merger(merger)
3797
if (merger.base_rev_id == merger.other_rev_id and
3798
merger.other_rev_id is not None):
3799
note('Nothing to do.')
3802
if merger.interesting_files is not None:
3803
raise errors.BzrCommandError('Cannot pull individual files')
3804
if (merger.base_rev_id == tree.last_revision()):
3805
result = tree.pull(merger.other_branch, False,
3806
merger.other_rev_id)
3807
result.report(self.outf)
3809
if merger.this_basis is None:
3810
raise errors.BzrCommandError(
3811
"This branch has no commits."
3812
" (perhaps you would prefer 'bzr pull')")
3814
return self._do_preview(merger)
3816
return self._do_interactive(merger)
3818
return self._do_merge(merger, change_reporter, allow_pending,
3821
def _get_preview(self, merger):
3731
return self._do_merge(merger, change_reporter, allow_pending,
3734
for cleanup in reversed(cleanups):
3737
def _get_preview(self, merger, cleanups):
3822
3738
tree_merger = merger.make_merger()
3823
3739
tt = tree_merger.make_preview_transform()
3824
self.add_cleanup(tt.finalize)
3740
cleanups.append(tt.finalize)
3825
3741
result_tree = tt.get_preview_tree()
3826
3742
return result_tree
3828
def _do_preview(self, merger):
3744
def _do_preview(self, merger, cleanups):
3829
3745
from bzrlib.diff import show_diff_trees
3830
result_tree = self._get_preview(merger)
3746
result_tree = self._get_preview(merger, cleanups)
3831
3747
show_diff_trees(merger.this_tree, result_tree, self.outf,
3832
3748
old_label='', new_label='')
4023
3938
merge_type = _mod_merge.Merge3Merger
4024
3939
tree, file_list = tree_files(file_list)
4025
3940
tree.lock_write()
4026
self.add_cleanup(tree.unlock)
4027
parents = tree.get_parent_ids()
4028
if len(parents) != 2:
4029
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4030
" merges. Not cherrypicking or"
4032
repository = tree.branch.repository
4033
interesting_ids = None
4035
conflicts = tree.conflicts()
4036
if file_list is not None:
4037
interesting_ids = set()
4038
for filename in file_list:
4039
file_id = tree.path2id(filename)
4041
raise errors.NotVersionedError(filename)
4042
interesting_ids.add(file_id)
4043
if tree.kind(file_id) != "directory":
3942
parents = tree.get_parent_ids()
3943
if len(parents) != 2:
3944
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3945
" merges. Not cherrypicking or"
3947
repository = tree.branch.repository
3948
interesting_ids = None
3950
conflicts = tree.conflicts()
3951
if file_list is not None:
3952
interesting_ids = set()
3953
for filename in file_list:
3954
file_id = tree.path2id(filename)
3956
raise errors.NotVersionedError(filename)
3957
interesting_ids.add(file_id)
3958
if tree.kind(file_id) != "directory":
4046
for name, ie in tree.inventory.iter_entries(file_id):
4047
interesting_ids.add(ie.file_id)
4048
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4050
# Remerge only supports resolving contents conflicts
4051
allowed_conflicts = ('text conflict', 'contents conflict')
4052
restore_files = [c.path for c in conflicts
4053
if c.typestring in allowed_conflicts]
4054
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4055
tree.set_conflicts(ConflictList(new_conflicts))
4056
if file_list is not None:
4057
restore_files = file_list
4058
for filename in restore_files:
3961
for name, ie in tree.inventory.iter_entries(file_id):
3962
interesting_ids.add(ie.file_id)
3963
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3965
# Remerge only supports resolving contents conflicts
3966
allowed_conflicts = ('text conflict', 'contents conflict')
3967
restore_files = [c.path for c in conflicts
3968
if c.typestring in allowed_conflicts]
3969
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3970
tree.set_conflicts(ConflictList(new_conflicts))
3971
if file_list is not None:
3972
restore_files = file_list
3973
for filename in restore_files:
3975
restore(tree.abspath(filename))
3976
except errors.NotConflicted:
3978
# Disable pending merges, because the file texts we are remerging
3979
# have not had those merges performed. If we use the wrong parents
3980
# list, we imply that the working tree text has seen and rejected
3981
# all the changes from the other tree, when in fact those changes
3982
# have not yet been seen.
3983
pb = ui.ui_factory.nested_progress_bar()
3984
tree.set_parent_ids(parents[:1])
4060
restore(tree.abspath(filename))
4061
except errors.NotConflicted:
4063
# Disable pending merges, because the file texts we are remerging
4064
# have not had those merges performed. If we use the wrong parents
4065
# list, we imply that the working tree text has seen and rejected
4066
# all the changes from the other tree, when in fact those changes
4067
# have not yet been seen.
4068
pb = ui.ui_factory.nested_progress_bar()
4069
tree.set_parent_ids(parents[:1])
4071
merger = _mod_merge.Merger.from_revision_ids(pb,
4073
merger.interesting_ids = interesting_ids
4074
merger.merge_type = merge_type
4075
merger.show_base = show_base
4076
merger.reprocess = reprocess
4077
conflicts = merger.do_merge()
3986
merger = _mod_merge.Merger.from_revision_ids(pb,
3988
merger.interesting_ids = interesting_ids
3989
merger.merge_type = merge_type
3990
merger.show_base = show_base
3991
merger.reprocess = reprocess
3992
conflicts = merger.do_merge()
3994
tree.set_parent_ids(parents)
4079
tree.set_parent_ids(parents)
4081
3998
if conflicts > 0:
4105
4022
name. If you name a directory, all the contents of that directory will be
4108
If you have newly added files since the target revision, they will be
4109
removed. If the files to be removed have been changed, backups will be
4110
created as above. Directories containing unknown files will not be
4025
Any files that have been newly added since that revision will be deleted,
4026
with a backup kept if appropriate. Directories containing unknown files
4027
will not be deleted.
4113
The working tree contains a list of revisions that have been merged but
4114
not yet committed. These revisions will be included as additional parents
4115
of the next commit. Normally, using revert clears that list as well as
4116
reverting the files. If any files are specified, revert leaves the list
4117
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4118
.`` in the tree root to revert all files but keep the recorded merges,
4119
and ``bzr revert --forget-merges`` to clear the pending merge list without
4029
The working tree contains a list of pending merged revisions, which will
4030
be included as parents in the next commit. Normally, revert clears that
4031
list as well as reverting the files. If any files are specified, revert
4032
leaves the pending merge list alone and reverts only the files. Use "bzr
4033
revert ." in the tree root to revert all files but keep the merge record,
4034
and "bzr revert --forget-merges" to clear the pending merge list without
4120
4035
reverting any files.
4122
Using "bzr revert --forget-merges", it is possible to apply all of the
4123
changes from a branch in a single revision. To do this, perform the merge
4124
as desired. Then doing revert with the "--forget-merges" option will keep
4125
the content of the tree as it was, but it will clear the list of pending
4126
merges. The next commit will then contain all of the changes that are
4127
present in the other branch, but without any other parent revisions.
4128
Because this technique forgets where these changes originated, it may
4129
cause additional conflicts on later merges involving the same source and
4133
4038
_see_also = ['cat', 'export']
4304
4207
if remote_branch.base == local_branch.base:
4305
4208
remote_branch = local_branch
4307
local_branch.lock_read()
4308
self.add_cleanup(local_branch.unlock)
4309
4210
local_revid_range = _revision_range_to_revid_range(
4310
4211
_get_revision_range(my_revision, local_branch,
4313
remote_branch.lock_read()
4314
self.add_cleanup(remote_branch.unlock)
4315
4214
remote_revid_range = _revision_range_to_revid_range(
4316
4215
_get_revision_range(revision,
4317
4216
remote_branch, self.name()))
4319
local_extra, remote_extra = find_unmerged(
4320
local_branch, remote_branch, restrict,
4321
backward=not reverse,
4322
include_merges=include_merges,
4323
local_revid_range=local_revid_range,
4324
remote_revid_range=remote_revid_range)
4326
if log_format is None:
4327
registry = log.log_formatter_registry
4328
log_format = registry.get_default(local_branch)
4329
lf = log_format(to_file=self.outf,
4331
show_timezone='original')
4334
if local_extra and not theirs_only:
4335
message("You have %d extra revision(s):\n" %
4337
for revision in iter_log_revisions(local_extra,
4338
local_branch.repository,
4340
lf.log_revision(revision)
4341
printed_local = True
4344
printed_local = False
4346
if remote_extra and not mine_only:
4347
if printed_local is True:
4349
message("You are missing %d revision(s):\n" %
4351
for revision in iter_log_revisions(remote_extra,
4352
remote_branch.repository,
4354
lf.log_revision(revision)
4357
if mine_only and not local_extra:
4358
# We checked local, and found nothing extra
4359
message('This branch is up to date.\n')
4360
elif theirs_only and not remote_extra:
4361
# We checked remote, and found nothing extra
4362
message('Other branch is up to date.\n')
4363
elif not (mine_only or theirs_only or local_extra or
4365
# We checked both branches, and neither one had extra
4367
message("Branches are up to date.\n")
4218
local_branch.lock_read()
4220
remote_branch.lock_read()
4222
local_extra, remote_extra = find_unmerged(
4223
local_branch, remote_branch, restrict,
4224
backward=not reverse,
4225
include_merges=include_merges,
4226
local_revid_range=local_revid_range,
4227
remote_revid_range=remote_revid_range)
4229
if log_format is None:
4230
registry = log.log_formatter_registry
4231
log_format = registry.get_default(local_branch)
4232
lf = log_format(to_file=self.outf,
4234
show_timezone='original')
4237
if local_extra and not theirs_only:
4238
message("You have %d extra revision(s):\n" %
4240
for revision in iter_log_revisions(local_extra,
4241
local_branch.repository,
4243
lf.log_revision(revision)
4244
printed_local = True
4247
printed_local = False
4249
if remote_extra and not mine_only:
4250
if printed_local is True:
4252
message("You are missing %d revision(s):\n" %
4254
for revision in iter_log_revisions(remote_extra,
4255
remote_branch.repository,
4257
lf.log_revision(revision)
4260
if mine_only and not local_extra:
4261
# We checked local, and found nothing extra
4262
message('This branch is up to date.\n')
4263
elif theirs_only and not remote_extra:
4264
# We checked remote, and found nothing extra
4265
message('Other branch is up to date.\n')
4266
elif not (mine_only or theirs_only or local_extra or
4268
# We checked both branches, and neither one had extra
4270
message("Branches are up to date.\n")
4272
remote_branch.unlock()
4274
local_branch.unlock()
4369
4275
if not status_code and parent is None and other_branch is not None:
4370
4276
local_branch.lock_write()
4371
self.add_cleanup(local_branch.unlock)
4372
# handle race conditions - a parent might be set while we run.
4373
if local_branch.get_parent() is None:
4374
local_branch.set_parent(remote_branch.base)
4278
# handle race conditions - a parent might be set while we run.
4279
if local_branch.get_parent() is None:
4280
local_branch.set_parent(remote_branch.base)
4282
local_branch.unlock()
4375
4283
return status_code
4497
4407
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4498
4408
if wt is not None:
4500
self.add_cleanup(wt.unlock)
4502
4411
branch.lock_read()
4503
self.add_cleanup(branch.unlock)
4504
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4506
self.add_cleanup(tree.unlock)
4508
file_id = wt.path2id(relpath)
4510
file_id = tree.path2id(relpath)
4512
raise errors.NotVersionedError(filename)
4513
file_version = tree.inventory[file_id].revision
4514
if wt is not None and revision is None:
4515
# If there is a tree and we're not annotating historical
4516
# versions, annotate the working tree's content.
4517
annotate_file_tree(wt, file_id, self.outf, long, all,
4520
annotate_file(branch, file_version, file_id, long, all, self.outf,
4413
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4415
file_id = wt.path2id(relpath)
4417
file_id = tree.path2id(relpath)
4419
raise errors.NotVersionedError(filename)
4420
file_version = tree.inventory[file_id].revision
4421
if wt is not None and revision is None:
4422
# If there is a tree and we're not annotating historical
4423
# versions, annotate the working tree's content.
4424
annotate_file_tree(wt, file_id, self.outf, long, all,
4427
annotate_file(branch, file_version, file_id, long, all, self.outf,
4524
4436
class cmd_re_sign(Command):
5039
4952
directly from the merge directive, without retrieving data from a
5042
`bzr send` creates a compact data set that, when applied using bzr
5043
merge, has the same effect as merging from the source branch.
5045
By default the merge directive is self-contained and can be applied to any
5046
branch containing submit_branch in its ancestory without needing access to
5049
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5050
revisions, but only a structured request to merge from the
5051
public_location. In that case the public_branch is needed and it must be
5052
up-to-date and accessible to the recipient. The public_branch is always
5053
included if known, so that people can check it later.
5055
The submit branch defaults to the parent of the source branch, but can be
5056
overridden. Both submit branch and public branch will be remembered in
5057
branch.conf the first time they are used for a particular branch. The
5058
source branch defaults to that containing the working directory, but can
5059
be changed using --from.
5061
In order to calculate those changes, bzr must analyse the submit branch.
5062
Therefore it is most efficient for the submit branch to be a local mirror.
5063
If a public location is known for the submit_branch, that location is used
5064
in the merge directive.
5066
The default behaviour is to send the merge directive by mail, unless -o is
5067
given, in which case it is sent to a file.
4955
If --no-bundle is specified, then public_branch is needed (and must be
4956
up-to-date), so that the receiver can perform the merge using the
4957
public_branch. The public_branch is always included if known, so that
4958
people can check it later.
4960
The submit branch defaults to the parent, but can be overridden. Both
4961
submit branch and public branch will be remembered if supplied.
4963
If a public_branch is known for the submit_branch, that public submit
4964
branch is used in the merge instructions. This means that a local mirror
4965
can be used as your actual submit branch, once you have set public_branch
5069
4968
Mail is sent using your preferred mail program. This should be transparent
5070
4969
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5259
5154
branch, relpath = Branch.open_containing(directory)
5260
5155
branch.lock_write()
5261
self.add_cleanup(branch.unlock)
5263
branch.tags.delete_tag(tag_name)
5264
self.outf.write('Deleted tag %s.\n' % tag_name)
5267
if len(revision) != 1:
5268
raise errors.BzrCommandError(
5269
"Tags can only be placed on a single revision, "
5271
revision_id = revision[0].as_revision_id(branch)
5158
branch.tags.delete_tag(tag_name)
5159
self.outf.write('Deleted tag %s.\n' % tag_name)
5273
revision_id = branch.last_revision()
5274
if (not force) and branch.tags.has_tag(tag_name):
5275
raise errors.TagAlreadyExists(tag_name)
5276
branch.tags.set_tag(tag_name, revision_id)
5277
self.outf.write('Created tag %s.\n' % tag_name)
5162
if len(revision) != 1:
5163
raise errors.BzrCommandError(
5164
"Tags can only be placed on a single revision, "
5166
revision_id = revision[0].as_revision_id(branch)
5168
revision_id = branch.last_revision()
5169
if (not force) and branch.tags.has_tag(tag_name):
5170
raise errors.TagAlreadyExists(tag_name)
5171
branch.tags.set_tag(tag_name, revision_id)
5172
self.outf.write('Created tag %s.\n' % tag_name)
5280
5177
class cmd_tags(Command):
5315
5212
branch.lock_read()
5316
self.add_cleanup(branch.unlock)
5318
graph = branch.repository.get_graph()
5319
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5320
revid1, revid2 = rev1.rev_id, rev2.rev_id
5321
# only show revisions between revid1 and revid2 (inclusive)
5322
tags = [(tag, revid) for tag, revid in tags if
5323
graph.is_between(revid, revid1, revid2)]
5326
elif sort == 'time':
5328
for tag, revid in tags:
5330
revobj = branch.repository.get_revision(revid)
5331
except errors.NoSuchRevision:
5332
timestamp = sys.maxint # place them at the end
5334
timestamp = revobj.timestamp
5335
timestamps[revid] = timestamp
5336
tags.sort(key=lambda x: timestamps[x[1]])
5338
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5339
for index, (tag, revid) in enumerate(tags):
5341
revno = branch.revision_id_to_dotted_revno(revid)
5342
if isinstance(revno, tuple):
5343
revno = '.'.join(map(str, revno))
5344
except errors.NoSuchRevision:
5345
# Bad tag data/merges can lead to tagged revisions
5346
# which are not in this branch. Fail gracefully ...
5348
tags[index] = (tag, revno)
5215
graph = branch.repository.get_graph()
5216
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5217
revid1, revid2 = rev1.rev_id, rev2.rev_id
5218
# only show revisions between revid1 and revid2 (inclusive)
5219
tags = [(tag, revid) for tag, revid in tags if
5220
graph.is_between(revid, revid1, revid2)]
5223
elif sort == 'time':
5225
for tag, revid in tags:
5227
revobj = branch.repository.get_revision(revid)
5228
except errors.NoSuchRevision:
5229
timestamp = sys.maxint # place them at the end
5231
timestamp = revobj.timestamp
5232
timestamps[revid] = timestamp
5233
tags.sort(key=lambda x: timestamps[x[1]])
5235
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5236
for index, (tag, revid) in enumerate(tags):
5238
revno = branch.revision_id_to_dotted_revno(revid)
5239
if isinstance(revno, tuple):
5240
revno = '.'.join(map(str, revno))
5241
except errors.NoSuchRevision:
5242
# Bad tag data/merges can lead to tagged revisions
5243
# which are not in this branch. Fail gracefully ...
5245
tags[index] = (tag, revno)
5350
5248
for tag, revspec in tags:
5351
5249
self.outf.write('%-20s %s\n' % (tag, revspec))
5461
5359
/path/to/newbranch.
5463
5361
Bound branches use the nickname of its master branch unless it is set
5464
locally, in which case switching will update the local nickname to be
5362
locally, in which case switching will update the the local nickname to be
5465
5363
that of the master.
5468
takes_args = ['to_location?']
5366
takes_args = ['to_location']
5469
5367
takes_options = [Option('force',
5470
5368
help='Switch even if local commits will be lost.'),
5472
5369
Option('create-branch', short_name='b',
5473
5370
help='Create the target branch from this one before'
5474
5371
' switching to it.'),
5477
def run(self, to_location=None, force=False, create_branch=False,
5374
def run(self, to_location, force=False, create_branch=False):
5479
5375
from bzrlib import switch
5480
5376
tree_location = '.'
5481
revision = _get_one_revision('switch', revision)
5482
5377
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5483
if to_location is None:
5484
if revision is None:
5485
raise errors.BzrCommandError('You must supply either a'
5486
' revision or a location')
5489
5379
branch = control_dir.open_branch()
5490
5380
had_explicit_nick = branch.get_config().has_explicit_nickname()
added
removed
bzrlib/builtins.py
