453
443
To re-create the working tree, use "bzr checkout".
455
445
_see_also = ['checkout', 'working-trees']
456
takes_args = ['location*']
446
takes_args = ['location?']
457
447
takes_options = [
459
449
help='Remove the working tree even if it has '
460
450
'uncommitted changes.'),
463
def run(self, location_list, force=False):
464
if not location_list:
467
for location in location_list:
468
d = bzrdir.BzrDir.open(location)
471
working = d.open_workingtree()
472
except errors.NoWorkingTree:
473
raise errors.BzrCommandError("No working tree to remove")
474
except errors.NotLocalUrl:
475
raise errors.BzrCommandError("You cannot remove the working tree"
478
if (working.has_changes()):
479
raise errors.UncommittedChanges(working)
481
working_path = working.bzrdir.root_transport.base
482
branch_path = working.branch.bzrdir.root_transport.base
483
if working_path != branch_path:
484
raise errors.BzrCommandError("You cannot remove the working tree"
485
" from a lightweight checkout")
487
d.destroy_workingtree()
453
def run(self, location='.', force=False):
454
d = bzrdir.BzrDir.open(location)
457
working = d.open_workingtree()
458
except errors.NoWorkingTree:
459
raise errors.BzrCommandError("No working tree to remove")
460
except errors.NotLocalUrl:
461
raise errors.BzrCommandError("You cannot remove the working tree"
464
# XXX: What about pending merges ? -- vila 20090629
465
if working.has_changes(working.basis_tree()):
466
raise errors.UncommittedChanges(working)
468
working_path = working.bzrdir.root_transport.base
469
branch_path = working.branch.bzrdir.root_transport.base
470
if working_path != branch_path:
471
raise errors.BzrCommandError("You cannot remove the working tree"
472
" from a lightweight checkout")
474
d.destroy_workingtree()
490
477
class cmd_revno(Command):
547
538
wt = WorkingTree.open_containing(directory)[0]
550
self.add_cleanup(wt.unlock)
551
541
except (errors.NoWorkingTree, errors.NotLocalUrl):
553
543
b = Branch.open_containing(directory)[0]
555
self.add_cleanup(b.unlock)
557
if revision is not None:
558
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
559
if revision_info_list is not None:
560
for rev_str in revision_info_list:
561
rev_spec = RevisionSpec.from_string(rev_str)
562
revision_ids.append(rev_spec.as_revision_id(b))
563
# No arguments supplied, default to the last revision
564
if len(revision_ids) == 0:
567
raise errors.NoWorkingTree(directory)
568
revision_ids.append(wt.last_revision())
547
if revision is not None:
548
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
549
if revision_info_list is not None:
550
for rev_str in revision_info_list:
551
rev_spec = RevisionSpec.from_string(rev_str)
552
revision_ids.append(rev_spec.as_revision_id(b))
553
# No arguments supplied, default to the last revision
554
if len(revision_ids) == 0:
557
raise errors.NoWorkingTree(directory)
558
revision_ids.append(wt.last_revision())
560
revision_ids.append(b.last_revision())
564
for revision_id in revision_ids:
566
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
567
revno = '.'.join(str(i) for i in dotted_revno)
568
except errors.NoSuchRevision:
570
maxlen = max(maxlen, len(revno))
571
revinfos.append([revno, revision_id])
570
revision_ids.append(b.last_revision())
574
for revision_id in revision_ids:
576
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
577
revno = '.'.join(str(i) for i in dotted_revno)
578
except errors.NoSuchRevision:
580
maxlen = max(maxlen, len(revno))
581
revinfos.append([revno, revision_id])
584
578
for ri in revinfos:
585
579
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
732
729
revision = _get_one_revision('inventory', revision)
733
730
work_tree, file_list = tree_files(file_list)
734
731
work_tree.lock_read()
735
self.add_cleanup(work_tree.unlock)
736
if revision is not None:
737
tree = revision.as_tree(work_tree.branch)
739
extra_trees = [work_tree]
741
self.add_cleanup(tree.unlock)
746
if file_list is not None:
747
file_ids = tree.paths2ids(file_list, trees=extra_trees,
748
require_versioned=True)
749
# find_ids_across_trees may include some paths that don't
751
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
752
for file_id in file_ids if file_id in tree)
754
entries = tree.inventory.entries()
733
if revision is not None:
734
tree = revision.as_tree(work_tree.branch)
736
extra_trees = [work_tree]
742
if file_list is not None:
743
file_ids = tree.paths2ids(file_list, trees=extra_trees,
744
require_versioned=True)
745
# find_ids_across_trees may include some paths that don't
747
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
748
for file_id in file_ids if file_id in tree)
750
entries = tree.inventory.entries()
753
if tree is not work_tree:
757
756
for path, entry in entries:
758
757
if kind and kind != entry.kind:
897
899
dest = osutils.pathjoin(dest_parent, dest_tail)
898
900
mutter("attempting to move %s => %s", src, dest)
899
901
tree.rename_one(src, dest, after=after)
901
self.outf.write("%s => %s\n" % (src, dest))
902
self.outf.write("%s => %s\n" % (src, dest))
904
905
class cmd_pull(Command):
905
906
"""Turn this branch into a mirror of another branch.
907
By default, this command only works on branches that have not diverged.
908
Branches are considered diverged if the destination branch's most recent
909
commit is one that has not been merged (directly or indirectly) into the
908
This command only works on branches that have not diverged. Branches are
909
considered diverged if the destination branch's most recent commit is one
910
that has not been merged (directly or indirectly) into the parent.
912
912
If branches have diverged, you can use 'bzr merge' to integrate the changes
913
913
from one into the other. Once one branch has merged, the other should
914
914
be able to pull it again.
916
If you want to replace your local changes and just want your branch to
917
match the remote one, use pull --overwrite. This will work even if the two
918
branches have diverged.
916
If you want to forget your local changes and just update your branch to
917
match the remote one, use pull --overwrite.
920
919
If there is no default location set, the first pull will set it. After
921
920
that, you can omit the location to use the default. To change the
1003
1002
if branch_from is not branch_to:
1004
1003
branch_from.lock_read()
1005
self.add_cleanup(branch_from.unlock)
1006
if revision is not None:
1007
revision_id = revision.as_revision_id(branch_from)
1009
branch_to.lock_write()
1010
self.add_cleanup(branch_to.unlock)
1011
if tree_to is not None:
1012
view_info = _get_view_info_for_change_reporter(tree_to)
1013
change_reporter = delta._ChangeReporter(
1014
unversioned_filter=tree_to.is_ignored,
1015
view_info=view_info)
1016
result = tree_to.pull(
1017
branch_from, overwrite, revision_id, change_reporter,
1018
possible_transports=possible_transports, local=local)
1020
result = branch_to.pull(
1021
branch_from, overwrite, revision_id, local=local)
1023
result.report(self.outf)
1024
if verbose and result.old_revid != result.new_revid:
1025
log.show_branch_change(
1026
branch_to, self.outf, result.old_revno,
1005
if revision is not None:
1006
revision_id = revision.as_revision_id(branch_from)
1008
branch_to.lock_write()
1010
if tree_to is not None:
1011
view_info = _get_view_info_for_change_reporter(tree_to)
1012
change_reporter = delta._ChangeReporter(
1013
unversioned_filter=tree_to.is_ignored,
1014
view_info=view_info)
1015
result = tree_to.pull(
1016
branch_from, overwrite, revision_id, change_reporter,
1017
possible_transports=possible_transports, local=local)
1019
result = branch_to.pull(
1020
branch_from, overwrite, revision_id, local=local)
1022
result.report(self.outf)
1023
if verbose and result.old_revid != result.new_revid:
1024
log.show_branch_change(
1025
branch_to, self.outf, result.old_revno,
1030
if branch_from is not branch_to:
1031
branch_from.unlock()
1030
1034
class cmd_push(Command):
1185
1190
' directory exists, but does not already'
1186
1191
' have a control directory. This flag will'
1187
1192
' allow branch to proceed.'),
1189
help="Bind new branch to from location."),
1191
1194
aliases = ['get', 'clone']
1193
1196
def run(self, from_location, to_location=None, revision=None,
1194
1197
hardlink=False, stacked=False, standalone=False, no_tree=False,
1195
use_existing_dir=False, switch=False, bind=False):
1198
use_existing_dir=False, switch=False):
1196
1199
from bzrlib import switch as _mod_switch
1197
1200
from bzrlib.tag import _merge_tags_if_possible
1198
1201
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1203
if (accelerator_tree is not None and
1204
accelerator_tree.supports_content_filtering()):
1205
accelerator_tree = None
1200
1206
revision = _get_one_revision('branch', revision)
1201
1207
br_from.lock_read()
1202
self.add_cleanup(br_from.unlock)
1203
if revision is not None:
1204
revision_id = revision.as_revision_id(br_from)
1206
# FIXME - wt.last_revision, fallback to branch, fall back to
1207
# None or perhaps NULL_REVISION to mean copy nothing
1209
revision_id = br_from.last_revision()
1210
if to_location is None:
1211
to_location = urlutils.derive_to_location(from_location)
1212
to_transport = transport.get_transport(to_location)
1214
to_transport.mkdir('.')
1215
except errors.FileExists:
1216
if not use_existing_dir:
1217
raise errors.BzrCommandError('Target directory "%s" '
1218
'already exists.' % to_location)
1209
if revision is not None:
1210
revision_id = revision.as_revision_id(br_from)
1221
bzrdir.BzrDir.open_from_transport(to_transport)
1222
except errors.NotBranchError:
1212
# FIXME - wt.last_revision, fallback to branch, fall back to
1213
# None or perhaps NULL_REVISION to mean copy nothing
1215
revision_id = br_from.last_revision()
1216
if to_location is None:
1217
to_location = urlutils.derive_to_location(from_location)
1218
to_transport = transport.get_transport(to_location)
1220
to_transport.mkdir('.')
1221
except errors.FileExists:
1222
if not use_existing_dir:
1223
raise errors.BzrCommandError('Target directory "%s" '
1224
'already exists.' % to_location)
1225
raise errors.AlreadyBranchError(to_location)
1226
except errors.NoSuchFile:
1227
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1230
# preserve whatever source format we have.
1231
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1232
possible_transports=[to_transport],
1233
accelerator_tree=accelerator_tree,
1234
hardlink=hardlink, stacked=stacked,
1235
force_new_repo=standalone,
1236
create_tree_if_local=not no_tree,
1237
source_branch=br_from)
1238
branch = dir.open_branch()
1239
except errors.NoSuchRevision:
1240
to_transport.delete_tree('.')
1241
msg = "The branch %s has no revision %s." % (from_location,
1243
raise errors.BzrCommandError(msg)
1244
_merge_tags_if_possible(br_from, branch)
1245
# If the source branch is stacked, the new branch may
1246
# be stacked whether we asked for that explicitly or not.
1247
# We therefore need a try/except here and not just 'if stacked:'
1249
note('Created new stacked branch referring to %s.' %
1250
branch.get_stacked_on_url())
1251
except (errors.NotStacked, errors.UnstackableBranchFormat,
1252
errors.UnstackableRepositoryFormat), e:
1253
note('Branched %d revision(s).' % branch.revno())
1255
# Bind to the parent
1256
parent_branch = Branch.open(from_location)
1257
branch.bind(parent_branch)
1258
note('New branch bound to %s' % from_location)
1260
# Switch to the new branch
1261
wt, _ = WorkingTree.open_containing('.')
1262
_mod_switch.switch(wt.bzrdir, branch)
1263
note('Switched to branch: %s',
1264
urlutils.unescape_for_display(branch.base, 'utf-8'))
1227
bzrdir.BzrDir.open_from_transport(to_transport)
1228
except errors.NotBranchError:
1231
raise errors.AlreadyBranchError(to_location)
1232
except errors.NoSuchFile:
1233
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1236
# preserve whatever source format we have.
1237
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1238
possible_transports=[to_transport],
1239
accelerator_tree=accelerator_tree,
1240
hardlink=hardlink, stacked=stacked,
1241
force_new_repo=standalone,
1242
create_tree_if_local=not no_tree,
1243
source_branch=br_from)
1244
branch = dir.open_branch()
1245
except errors.NoSuchRevision:
1246
to_transport.delete_tree('.')
1247
msg = "The branch %s has no revision %s." % (from_location,
1249
raise errors.BzrCommandError(msg)
1250
_merge_tags_if_possible(br_from, branch)
1251
# If the source branch is stacked, the new branch may
1252
# be stacked whether we asked for that explicitly or not.
1253
# We therefore need a try/except here and not just 'if stacked:'
1255
note('Created new stacked branch referring to %s.' %
1256
branch.get_stacked_on_url())
1257
except (errors.NotStacked, errors.UnstackableBranchFormat,
1258
errors.UnstackableRepositoryFormat), e:
1259
note('Branched %d revision(s).' % branch.revno())
1261
# Switch to the new branch
1262
wt, _ = WorkingTree.open_containing('.')
1263
_mod_switch.switch(wt.bzrdir, branch)
1264
note('Switched to branch: %s',
1265
urlutils.unescape_for_display(branch.base, 'utf-8'))
1267
1270
class cmd_checkout(Command):
1346
1349
def run(self, dir=u'.'):
1347
1350
tree = WorkingTree.open_containing(dir)[0]
1348
1351
tree.lock_read()
1349
self.add_cleanup(tree.unlock)
1350
new_inv = tree.inventory
1351
old_tree = tree.basis_tree()
1352
old_tree.lock_read()
1353
self.add_cleanup(old_tree.unlock)
1354
old_inv = old_tree.inventory
1356
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1357
for f, paths, c, v, p, n, k, e in iterator:
1358
if paths[0] == paths[1]:
1362
renames.append(paths)
1364
for old_name, new_name in renames:
1365
self.outf.write("%s => %s\n" % (old_name, new_name))
1353
new_inv = tree.inventory
1354
old_tree = tree.basis_tree()
1355
old_tree.lock_read()
1357
old_inv = old_tree.inventory
1359
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1360
for f, paths, c, v, p, n, k, e in iterator:
1361
if paths[0] == paths[1]:
1365
renames.append(paths)
1367
for old_name, new_name in renames:
1368
self.outf.write("%s => %s\n" % (old_name, new_name))
1368
1375
class cmd_update(Command):
1375
1382
If you want to discard your local changes, you can just do a
1376
1383
'bzr revert' instead of 'bzr commit' after the update.
1378
If the tree's branch is bound to a master branch, it will also update
1379
the branch from the master.
1382
1386
_see_also = ['pull', 'working-trees', 'status-flags']
1383
1387
takes_args = ['dir?']
1384
takes_options = ['revision']
1385
1388
aliases = ['up']
1387
def run(self, dir='.', revision=None):
1388
if revision is not None and len(revision) != 1:
1389
raise errors.BzrCommandError(
1390
"bzr update --revision takes exactly one revision")
1390
def run(self, dir='.'):
1391
1391
tree = WorkingTree.open_containing(dir)[0]
1392
branch = tree.branch
1393
1392
possible_transports = []
1394
master = branch.get_master_branch(
1393
master = tree.branch.get_master_branch(
1395
1394
possible_transports=possible_transports)
1396
1395
if master is not None:
1397
1396
tree.lock_write()
1398
branch_location = master.base
1400
1398
tree.lock_tree_write()
1401
branch_location = tree.branch.base
1402
self.add_cleanup(tree.unlock)
1403
# get rid of the final '/' and be ready for display
1404
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1406
existing_pending_merges = tree.get_parent_ids()[1:]
1410
# may need to fetch data into a heavyweight checkout
1411
# XXX: this may take some time, maybe we should display a
1413
old_tip = branch.update(possible_transports)
1414
if revision is not None:
1415
revision_id = revision[0].as_revision_id(branch)
1417
revision_id = branch.last_revision()
1418
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1419
revno = branch.revision_id_to_revno(revision_id)
1420
note("Tree is up to date at revision %d of branch %s" %
1421
(revno, branch_location))
1423
view_info = _get_view_info_for_change_reporter(tree)
1424
change_reporter = delta._ChangeReporter(
1425
unversioned_filter=tree.is_ignored,
1426
view_info=view_info)
1400
existing_pending_merges = tree.get_parent_ids()[1:]
1401
last_rev = _mod_revision.ensure_null(tree.last_revision())
1402
if last_rev == _mod_revision.ensure_null(
1403
tree.branch.last_revision()):
1404
# may be up to date, check master too.
1405
if master is None or last_rev == _mod_revision.ensure_null(
1406
master.last_revision()):
1407
revno = tree.branch.revision_id_to_revno(last_rev)
1408
note("Tree is up to date at revision %d." % (revno,))
1410
view_info = _get_view_info_for_change_reporter(tree)
1428
1411
conflicts = tree.update(
1430
possible_transports=possible_transports,
1431
revision=revision_id,
1433
except errors.NoSuchRevision, e:
1434
raise errors.BzrCommandError(
1435
"branch has no revision %s\n"
1436
"bzr update --revision only works"
1437
" for a revision in the branch history"
1439
revno = tree.branch.revision_id_to_revno(
1440
_mod_revision.ensure_null(tree.last_revision()))
1441
note('Updated to revision %d of branch %s' %
1442
(revno, branch_location))
1443
if tree.get_parent_ids()[1:] != existing_pending_merges:
1444
note('Your local commits will now show as pending merges with '
1445
"'bzr status', and can be committed with 'bzr commit'.")
1412
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1413
view_info=view_info), possible_transports=possible_transports)
1414
revno = tree.branch.revision_id_to_revno(
1415
_mod_revision.ensure_null(tree.last_revision()))
1416
note('Updated to revision %d.' % (revno,))
1417
if tree.get_parent_ids()[1:] != existing_pending_merges:
1418
note('Your local commits will now show as pending merges with '
1419
"'bzr status', and can be committed with 'bzr commit'.")
1452
1428
class cmd_info(Command):
1523
1499
file_list = [f for f in file_list]
1525
1501
tree.lock_write()
1526
self.add_cleanup(tree.unlock)
1527
# Heuristics should probably all move into tree.remove_smart or
1530
added = tree.changes_from(tree.basis_tree(),
1531
specific_files=file_list).added
1532
file_list = sorted([f[0] for f in added], reverse=True)
1533
if len(file_list) == 0:
1534
raise errors.BzrCommandError('No matching files.')
1535
elif file_list is None:
1536
# missing files show up in iter_changes(basis) as
1537
# versioned-with-no-kind.
1539
for change in tree.iter_changes(tree.basis_tree()):
1540
# Find paths in the working tree that have no kind:
1541
if change[1][1] is not None and change[6][1] is None:
1542
missing.append(change[1][1])
1543
file_list = sorted(missing, reverse=True)
1544
file_deletion_strategy = 'keep'
1545
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1546
keep_files=file_deletion_strategy=='keep',
1547
force=file_deletion_strategy=='force')
1503
# Heuristics should probably all move into tree.remove_smart or
1506
added = tree.changes_from(tree.basis_tree(),
1507
specific_files=file_list).added
1508
file_list = sorted([f[0] for f in added], reverse=True)
1509
if len(file_list) == 0:
1510
raise errors.BzrCommandError('No matching files.')
1511
elif file_list is None:
1512
# missing files show up in iter_changes(basis) as
1513
# versioned-with-no-kind.
1515
for change in tree.iter_changes(tree.basis_tree()):
1516
# Find paths in the working tree that have no kind:
1517
if change[1][1] is not None and change[6][1] is None:
1518
missing.append(change[1][1])
1519
file_list = sorted(missing, reverse=True)
1520
file_deletion_strategy = 'keep'
1521
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1522
keep_files=file_deletion_strategy=='keep',
1523
force=file_deletion_strategy=='force')
1550
1528
class cmd_file_id(Command):
1772
1750
class cmd_init_repository(Command):
1773
"""Create a shared repository for branches to share storage space.
1751
"""Create a shared repository to hold branches.
1775
1753
New branches created under the repository directory will store their
1776
revisions in the repository, not in the branch directory. For branches
1777
with shared history, this reduces the amount of storage needed and
1778
speeds up the creation of new branches.
1754
revisions in the repository, not in the branch directory.
1780
If the --no-trees option is given then the branches in the repository
1781
will not have working trees by default. They will still exist as
1782
directories on disk, but they will not have separate copies of the
1783
files at a certain revision. This can be useful for repositories that
1784
store branches which are interacted with through checkouts or remote
1785
branches, such as on a server.
1756
If the --no-trees option is used then the branches in the repository
1757
will not have working trees by default.
1788
Create a shared repository holding just branches::
1760
Create a shared repositories holding just branches::
1790
1762
bzr init-repo --no-trees repo
1791
1763
bzr init repo/trunk
2352
2317
diff_type = 'full'
2354
# Build the log formatter
2355
if log_format is None:
2356
log_format = log.log_formatter_registry.get_default(b)
2357
# Make a non-encoding output to include the diffs - bug 328007
2358
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2359
lf = log_format(show_ids=show_ids, to_file=self.outf,
2360
to_exact_file=unencoded_output,
2361
show_timezone=timezone,
2362
delta_format=get_verbosity_level(),
2364
show_advice=levels is None)
2366
# Choose the algorithm for doing the logging. It's annoying
2367
# having multiple code paths like this but necessary until
2368
# the underlying repository format is faster at generating
2369
# deltas or can provide everything we need from the indices.
2370
# The default algorithm - match-using-deltas - works for
2371
# multiple files and directories and is faster for small
2372
# amounts of history (200 revisions say). However, it's too
2373
# slow for logging a single file in a repository with deep
2374
# history, i.e. > 10K revisions. In the spirit of "do no
2375
# evil when adding features", we continue to use the
2376
# original algorithm - per-file-graph - for the "single
2377
# file that isn't a directory without showing a delta" case.
2378
partial_history = revision and b.repository._format.supports_chks
2379
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2380
or delta_type or partial_history)
2382
# Build the LogRequest and execute it
2383
if len(file_ids) == 0:
2385
rqst = make_log_request_dict(
2386
direction=direction, specific_fileids=file_ids,
2387
start_revision=rev1, end_revision=rev2, limit=limit,
2388
message_search=message, delta_type=delta_type,
2389
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2390
Logger(b, rqst).show(lf)
2321
# Build the log formatter
2322
if log_format is None:
2323
log_format = log.log_formatter_registry.get_default(b)
2324
lf = log_format(show_ids=show_ids, to_file=self.outf,
2325
show_timezone=timezone,
2326
delta_format=get_verbosity_level(),
2328
show_advice=levels is None)
2330
# Choose the algorithm for doing the logging. It's annoying
2331
# having multiple code paths like this but necessary until
2332
# the underlying repository format is faster at generating
2333
# deltas or can provide everything we need from the indices.
2334
# The default algorithm - match-using-deltas - works for
2335
# multiple files and directories and is faster for small
2336
# amounts of history (200 revisions say). However, it's too
2337
# slow for logging a single file in a repository with deep
2338
# history, i.e. > 10K revisions. In the spirit of "do no
2339
# evil when adding features", we continue to use the
2340
# original algorithm - per-file-graph - for the "single
2341
# file that isn't a directory without showing a delta" case.
2342
partial_history = revision and b.repository._format.supports_chks
2343
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2344
or delta_type or partial_history)
2346
# Build the LogRequest and execute it
2347
if len(file_ids) == 0:
2349
rqst = make_log_request_dict(
2350
direction=direction, specific_fileids=file_ids,
2351
start_revision=rev1, end_revision=rev2, limit=limit,
2352
message_search=message, delta_type=delta_type,
2353
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2354
Logger(b, rqst).show(lf)
2393
2359
def _get_revision_range(revisionspec_list, branch, command_name):
2536
2499
note("Ignoring files outside view. View is %s" % view_str)
2538
2501
tree.lock_read()
2539
self.add_cleanup(tree.unlock)
2540
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2541
from_dir=relpath, recursive=recursive):
2542
# Apply additional masking
2543
if not all and not selection[fc]:
2545
if kind is not None and fkind != kind:
2550
fullpath = osutils.pathjoin(relpath, fp)
2553
views.check_path_in_view(tree, fullpath)
2554
except errors.FileOutsideView:
2503
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2504
from_dir=relpath, recursive=recursive):
2505
# Apply additional masking
2506
if not all and not selection[fc]:
2508
if kind is not None and fkind != kind:
2513
fullpath = osutils.pathjoin(relpath, fp)
2516
views.check_path_in_view(tree, fullpath)
2517
except errors.FileOutsideView:
2559
fp = osutils.pathjoin(prefix, fp)
2560
kindch = entry.kind_character()
2561
outstring = fp + kindch
2562
ui.ui_factory.clear_term()
2564
outstring = '%-8s %s' % (fc, outstring)
2565
if show_ids and fid is not None:
2566
outstring = "%-50s %s" % (outstring, fid)
2567
self.outf.write(outstring + '\n')
2569
self.outf.write(fp + '\0')
2572
self.outf.write(fid)
2573
self.outf.write('\0')
2581
self.outf.write('%-50s %s\n' % (outstring, my_id))
2522
fp = osutils.pathjoin(prefix, fp)
2523
kindch = entry.kind_character()
2524
outstring = fp + kindch
2525
ui.ui_factory.clear_term()
2527
outstring = '%-8s %s' % (fc, outstring)
2528
if show_ids and fid is not None:
2529
outstring = "%-50s %s" % (outstring, fid)
2583
2530
self.outf.write(outstring + '\n')
2532
self.outf.write(fp + '\0')
2535
self.outf.write(fid)
2536
self.outf.write('\0')
2544
self.outf.write('%-50s %s\n' % (outstring, my_id))
2546
self.outf.write(outstring + '\n')
2586
2551
class cmd_unknowns(Command):
3552
3458
verbose = not is_quiet()
3553
3459
# TODO: should possibly lock the history file...
3554
3460
benchfile = open(".perf_history", "at", buffering=1)
3555
self.add_cleanup(benchfile.close)
3557
3462
test_suite_factory = None
3558
3463
benchfile = None
3559
selftest_kwargs = {"verbose": verbose,
3561
"stop_on_failure": one,
3562
"transport": transport,
3563
"test_suite_factory": test_suite_factory,
3564
"lsprof_timed": lsprof_timed,
3565
"lsprof_tests": lsprof_tests,
3566
"bench_history": benchfile,
3567
"matching_tests_first": first,
3568
"list_only": list_only,
3569
"random_seed": randomize,
3570
"exclude_pattern": exclude,
3572
"load_list": load_list,
3573
"debug_flags": debugflag,
3574
"starting_with": starting_with
3576
selftest_kwargs.update(self.additional_selftest_args)
3577
result = selftest(**selftest_kwargs)
3465
selftest_kwargs = {"verbose": verbose,
3467
"stop_on_failure": one,
3468
"transport": transport,
3469
"test_suite_factory": test_suite_factory,
3470
"lsprof_timed": lsprof_timed,
3471
"bench_history": benchfile,
3472
"matching_tests_first": first,
3473
"list_only": list_only,
3474
"random_seed": randomize,
3475
"exclude_pattern": exclude,
3477
"load_list": load_list,
3478
"debug_flags": debugflag,
3479
"starting_with": starting_with
3481
selftest_kwargs.update(self.additional_selftest_args)
3482
result = selftest(**selftest_kwargs)
3484
if benchfile is not None:
3578
3486
return int(not result)
3750
3650
verified = 'inapplicable'
3751
3651
tree = WorkingTree.open_containing(directory)[0]
3653
# die as quickly as possible if there are uncommitted changes
3754
3655
basis_tree = tree.revision_tree(tree.last_revision())
3755
3656
except errors.NoSuchRevision:
3756
3657
basis_tree = tree.basis_tree()
3758
# die as quickly as possible if there are uncommitted changes
3760
if tree.has_changes():
3659
if tree.has_changes(basis_tree):
3761
3660
raise errors.UncommittedChanges(tree)
3763
3662
view_info = _get_view_info_for_change_reporter(tree)
3764
3663
change_reporter = delta._ChangeReporter(
3765
3664
unversioned_filter=tree.is_ignored, view_info=view_info)
3766
pb = ui.ui_factory.nested_progress_bar()
3767
self.add_cleanup(pb.finished)
3769
self.add_cleanup(tree.unlock)
3770
if location is not None:
3772
mergeable = bundle.read_mergeable_from_url(location,
3773
possible_transports=possible_transports)
3774
except errors.NotABundle:
3667
pb = ui.ui_factory.nested_progress_bar()
3668
cleanups.append(pb.finished)
3670
cleanups.append(tree.unlock)
3671
if location is not None:
3673
mergeable = bundle.read_mergeable_from_url(location,
3674
possible_transports=possible_transports)
3675
except errors.NotABundle:
3679
raise errors.BzrCommandError('Cannot use --uncommitted'
3680
' with bundles or merge directives.')
3682
if revision is not None:
3683
raise errors.BzrCommandError(
3684
'Cannot use -r with merge directives or bundles')
3685
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3688
if merger is None and uncommitted:
3689
if revision is not None and len(revision) > 0:
3690
raise errors.BzrCommandError('Cannot use --uncommitted and'
3691
' --revision at the same time.')
3692
merger = self.get_merger_from_uncommitted(tree, location, pb,
3694
allow_pending = False
3697
merger, allow_pending = self._get_merger_from_branch(tree,
3698
location, revision, remember, possible_transports, pb)
3700
merger.merge_type = merge_type
3701
merger.reprocess = reprocess
3702
merger.show_base = show_base
3703
self.sanity_check_merger(merger)
3704
if (merger.base_rev_id == merger.other_rev_id and
3705
merger.other_rev_id is not None):
3706
note('Nothing to do.')
3709
if merger.interesting_files is not None:
3710
raise errors.BzrCommandError('Cannot pull individual files')
3711
if (merger.base_rev_id == tree.last_revision()):
3712
result = tree.pull(merger.other_branch, False,
3713
merger.other_rev_id)
3714
result.report(self.outf)
3716
merger.check_basis(False)
3718
return self._do_preview(merger, cleanups)
3720
return self._do_interactive(merger, cleanups)
3778
raise errors.BzrCommandError('Cannot use --uncommitted'
3779
' with bundles or merge directives.')
3781
if revision is not None:
3782
raise errors.BzrCommandError(
3783
'Cannot use -r with merge directives or bundles')
3784
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3787
if merger is None and uncommitted:
3788
if revision is not None and len(revision) > 0:
3789
raise errors.BzrCommandError('Cannot use --uncommitted and'
3790
' --revision at the same time.')
3791
merger = self.get_merger_from_uncommitted(tree, location, None)
3792
allow_pending = False
3795
merger, allow_pending = self._get_merger_from_branch(tree,
3796
location, revision, remember, possible_transports, None)
3798
merger.merge_type = merge_type
3799
merger.reprocess = reprocess
3800
merger.show_base = show_base
3801
self.sanity_check_merger(merger)
3802
if (merger.base_rev_id == merger.other_rev_id and
3803
merger.other_rev_id is not None):
3804
note('Nothing to do.')
3807
if merger.interesting_files is not None:
3808
raise errors.BzrCommandError('Cannot pull individual files')
3809
if (merger.base_rev_id == tree.last_revision()):
3810
result = tree.pull(merger.other_branch, False,
3811
merger.other_rev_id)
3812
result.report(self.outf)
3814
if merger.this_basis is None:
3815
raise errors.BzrCommandError(
3816
"This branch has no commits."
3817
" (perhaps you would prefer 'bzr pull')")
3819
return self._do_preview(merger)
3821
return self._do_interactive(merger)
3823
return self._do_merge(merger, change_reporter, allow_pending,
3826
def _get_preview(self, merger):
3722
return self._do_merge(merger, change_reporter, allow_pending,
3725
for cleanup in reversed(cleanups):
3728
def _get_preview(self, merger, cleanups):
3827
3729
tree_merger = merger.make_merger()
3828
3730
tt = tree_merger.make_preview_transform()
3829
self.add_cleanup(tt.finalize)
3731
cleanups.append(tt.finalize)
3830
3732
result_tree = tt.get_preview_tree()
3831
3733
return result_tree
3833
def _do_preview(self, merger):
3735
def _do_preview(self, merger, cleanups):
3834
3736
from bzrlib.diff import show_diff_trees
3835
result_tree = self._get_preview(merger)
3737
result_tree = self._get_preview(merger, cleanups)
3836
3738
show_diff_trees(merger.this_tree, result_tree, self.outf,
3837
3739
old_label='', new_label='')
4028
3929
merge_type = _mod_merge.Merge3Merger
4029
3930
tree, file_list = tree_files(file_list)
4030
3931
tree.lock_write()
4031
self.add_cleanup(tree.unlock)
4032
parents = tree.get_parent_ids()
4033
if len(parents) != 2:
4034
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4035
" merges. Not cherrypicking or"
4037
repository = tree.branch.repository
4038
interesting_ids = None
4040
conflicts = tree.conflicts()
4041
if file_list is not None:
4042
interesting_ids = set()
4043
for filename in file_list:
4044
file_id = tree.path2id(filename)
4046
raise errors.NotVersionedError(filename)
4047
interesting_ids.add(file_id)
4048
if tree.kind(file_id) != "directory":
3933
parents = tree.get_parent_ids()
3934
if len(parents) != 2:
3935
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3936
" merges. Not cherrypicking or"
3938
repository = tree.branch.repository
3939
interesting_ids = None
3941
conflicts = tree.conflicts()
3942
if file_list is not None:
3943
interesting_ids = set()
3944
for filename in file_list:
3945
file_id = tree.path2id(filename)
3947
raise errors.NotVersionedError(filename)
3948
interesting_ids.add(file_id)
3949
if tree.kind(file_id) != "directory":
4051
for name, ie in tree.inventory.iter_entries(file_id):
4052
interesting_ids.add(ie.file_id)
4053
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4055
# Remerge only supports resolving contents conflicts
4056
allowed_conflicts = ('text conflict', 'contents conflict')
4057
restore_files = [c.path for c in conflicts
4058
if c.typestring in allowed_conflicts]
4059
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4060
tree.set_conflicts(ConflictList(new_conflicts))
4061
if file_list is not None:
4062
restore_files = file_list
4063
for filename in restore_files:
3952
for name, ie in tree.inventory.iter_entries(file_id):
3953
interesting_ids.add(ie.file_id)
3954
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3956
# Remerge only supports resolving contents conflicts
3957
allowed_conflicts = ('text conflict', 'contents conflict')
3958
restore_files = [c.path for c in conflicts
3959
if c.typestring in allowed_conflicts]
3960
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3961
tree.set_conflicts(ConflictList(new_conflicts))
3962
if file_list is not None:
3963
restore_files = file_list
3964
for filename in restore_files:
3966
restore(tree.abspath(filename))
3967
except errors.NotConflicted:
3969
# Disable pending merges, because the file texts we are remerging
3970
# have not had those merges performed. If we use the wrong parents
3971
# list, we imply that the working tree text has seen and rejected
3972
# all the changes from the other tree, when in fact those changes
3973
# have not yet been seen.
3974
pb = ui.ui_factory.nested_progress_bar()
3975
tree.set_parent_ids(parents[:1])
4065
restore(tree.abspath(filename))
4066
except errors.NotConflicted:
4068
# Disable pending merges, because the file texts we are remerging
4069
# have not had those merges performed. If we use the wrong parents
4070
# list, we imply that the working tree text has seen and rejected
4071
# all the changes from the other tree, when in fact those changes
4072
# have not yet been seen.
4073
tree.set_parent_ids(parents[:1])
4075
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
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()
3977
merger = _mod_merge.Merger.from_revision_ids(pb,
3979
merger.interesting_ids = interesting_ids
3980
merger.merge_type = merge_type
3981
merger.show_base = show_base
3982
merger.reprocess = reprocess
3983
conflicts = merger.do_merge()
3985
tree.set_parent_ids(parents)
4082
tree.set_parent_ids(parents)
4083
3989
if conflicts > 0:
4107
4013
name. If you name a directory, all the contents of that directory will be
4110
If you have newly added files since the target revision, they will be
4111
removed. If the files to be removed have been changed, backups will be
4112
created as above. Directories containing unknown files will not be
4016
Any files that have been newly added since that revision will be deleted,
4017
with a backup kept if appropriate. Directories containing unknown files
4018
will not be deleted.
4115
The working tree contains a list of revisions that have been merged but
4116
not yet committed. These revisions will be included as additional parents
4117
of the next commit. Normally, using revert clears that list as well as
4118
reverting the files. If any files are specified, revert leaves the list
4119
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4120
.`` in the tree root to revert all files but keep the recorded merges,
4121
and ``bzr revert --forget-merges`` to clear the pending merge list without
4020
The working tree contains a list of pending merged revisions, which will
4021
be included as parents in the next commit. Normally, revert clears that
4022
list as well as reverting the files. If any files are specified, revert
4023
leaves the pending merge list alone and reverts only the files. Use "bzr
4024
revert ." in the tree root to revert all files but keep the merge record,
4025
and "bzr revert --forget-merges" to clear the pending merge list without
4122
4026
reverting any files.
4124
Using "bzr revert --forget-merges", it is possible to apply all of the
4125
changes from a branch in a single revision. To do this, perform the merge
4126
as desired. Then doing revert with the "--forget-merges" option will keep
4127
the content of the tree as it was, but it will clear the list of pending
4128
merges. The next commit will then contain all of the changes that are
4129
present in the other branch, but without any other parent revisions.
4130
Because this technique forgets where these changes originated, it may
4131
cause additional conflicts on later merges involving the same source and
4135
4029
_see_also = ['cat', 'export']
4302
4198
if remote_branch.base == local_branch.base:
4303
4199
remote_branch = local_branch
4305
local_branch.lock_read()
4306
self.add_cleanup(local_branch.unlock)
4307
4201
local_revid_range = _revision_range_to_revid_range(
4308
4202
_get_revision_range(my_revision, local_branch,
4311
remote_branch.lock_read()
4312
self.add_cleanup(remote_branch.unlock)
4313
4205
remote_revid_range = _revision_range_to_revid_range(
4314
4206
_get_revision_range(revision,
4315
4207
remote_branch, self.name()))
4317
local_extra, remote_extra = find_unmerged(
4318
local_branch, remote_branch, restrict,
4319
backward=not reverse,
4320
include_merges=include_merges,
4321
local_revid_range=local_revid_range,
4322
remote_revid_range=remote_revid_range)
4324
if log_format is None:
4325
registry = log.log_formatter_registry
4326
log_format = registry.get_default(local_branch)
4327
lf = log_format(to_file=self.outf,
4329
show_timezone='original')
4332
if local_extra and not theirs_only:
4333
message("You have %d extra revision(s):\n" %
4335
for revision in iter_log_revisions(local_extra,
4336
local_branch.repository,
4338
lf.log_revision(revision)
4339
printed_local = True
4342
printed_local = False
4344
if remote_extra and not mine_only:
4345
if printed_local is True:
4347
message("You are missing %d revision(s):\n" %
4349
for revision in iter_log_revisions(remote_extra,
4350
remote_branch.repository,
4352
lf.log_revision(revision)
4355
if mine_only and not local_extra:
4356
# We checked local, and found nothing extra
4357
message('This branch is up to date.\n')
4358
elif theirs_only and not remote_extra:
4359
# We checked remote, and found nothing extra
4360
message('Other branch is up to date.\n')
4361
elif not (mine_only or theirs_only or local_extra or
4363
# We checked both branches, and neither one had extra
4365
message("Branches are up to date.\n")
4209
local_branch.lock_read()
4211
remote_branch.lock_read()
4213
local_extra, remote_extra = find_unmerged(
4214
local_branch, remote_branch, restrict,
4215
backward=not reverse,
4216
include_merges=include_merges,
4217
local_revid_range=local_revid_range,
4218
remote_revid_range=remote_revid_range)
4220
if log_format is None:
4221
registry = log.log_formatter_registry
4222
log_format = registry.get_default(local_branch)
4223
lf = log_format(to_file=self.outf,
4225
show_timezone='original')
4228
if local_extra and not theirs_only:
4229
message("You have %d extra revision(s):\n" %
4231
for revision in iter_log_revisions(local_extra,
4232
local_branch.repository,
4234
lf.log_revision(revision)
4235
printed_local = True
4238
printed_local = False
4240
if remote_extra and not mine_only:
4241
if printed_local is True:
4243
message("You are missing %d revision(s):\n" %
4245
for revision in iter_log_revisions(remote_extra,
4246
remote_branch.repository,
4248
lf.log_revision(revision)
4251
if mine_only and not local_extra:
4252
# We checked local, and found nothing extra
4253
message('This branch is up to date.\n')
4254
elif theirs_only and not remote_extra:
4255
# We checked remote, and found nothing extra
4256
message('Other branch is up to date.\n')
4257
elif not (mine_only or theirs_only or local_extra or
4259
# We checked both branches, and neither one had extra
4261
message("Branches are up to date.\n")
4263
remote_branch.unlock()
4265
local_branch.unlock()
4367
4266
if not status_code and parent is None and other_branch is not None:
4368
4267
local_branch.lock_write()
4369
self.add_cleanup(local_branch.unlock)
4370
# handle race conditions - a parent might be set while we run.
4371
if local_branch.get_parent() is None:
4372
local_branch.set_parent(remote_branch.base)
4269
# handle race conditions - a parent might be set while we run.
4270
if local_branch.get_parent() is None:
4271
local_branch.set_parent(remote_branch.base)
4273
local_branch.unlock()
4373
4274
return status_code
4495
4398
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4496
4399
if wt is not None:
4498
self.add_cleanup(wt.unlock)
4500
4402
branch.lock_read()
4501
self.add_cleanup(branch.unlock)
4502
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4504
self.add_cleanup(tree.unlock)
4506
file_id = wt.path2id(relpath)
4508
file_id = tree.path2id(relpath)
4510
raise errors.NotVersionedError(filename)
4511
file_version = tree.inventory[file_id].revision
4512
if wt is not None and revision is None:
4513
# If there is a tree and we're not annotating historical
4514
# versions, annotate the working tree's content.
4515
annotate_file_tree(wt, file_id, self.outf, long, all,
4518
annotate_file(branch, file_version, file_id, long, all, self.outf,
4404
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4406
file_id = wt.path2id(relpath)
4408
file_id = tree.path2id(relpath)
4410
raise errors.NotVersionedError(filename)
4411
file_version = tree.inventory[file_id].revision
4412
if wt is not None and revision is None:
4413
# If there is a tree and we're not annotating historical
4414
# versions, annotate the working tree's content.
4415
annotate_file_tree(wt, file_id, self.outf, long, all,
4418
annotate_file(branch, file_version, file_id, long, all, self.outf,
4522
4427
class cmd_re_sign(Command):
5039
4943
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.
4946
If --no-bundle is specified, then public_branch is needed (and must be
4947
up-to-date), so that the receiver can perform the merge using the
4948
public_branch. The public_branch is always included if known, so that
4949
people can check it later.
4951
The submit branch defaults to the parent, but can be overridden. Both
4952
submit branch and public branch will be remembered if supplied.
4954
If a public_branch is known for the submit_branch, that public submit
4955
branch is used in the merge instructions. This means that a local mirror
4956
can be used as your actual submit branch, once you have set public_branch
5069
4959
Mail is sent using your preferred mail program. This should be transparent
5070
4960
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5259
5144
branch, relpath = Branch.open_containing(directory)
5260
5145
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)
5148
branch.tags.delete_tag(tag_name)
5149
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)
5152
if len(revision) != 1:
5153
raise errors.BzrCommandError(
5154
"Tags can only be placed on a single revision, "
5156
revision_id = revision[0].as_revision_id(branch)
5158
revision_id = branch.last_revision()
5159
if (not force) and branch.tags.has_tag(tag_name):
5160
raise errors.TagAlreadyExists(tag_name)
5161
branch.tags.set_tag(tag_name, revision_id)
5162
self.outf.write('Created tag %s.\n' % tag_name)
5280
5167
class cmd_tags(Command):
5315
5202
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)
5205
graph = branch.repository.get_graph()
5206
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5207
revid1, revid2 = rev1.rev_id, rev2.rev_id
5208
# only show revisions between revid1 and revid2 (inclusive)
5209
tags = [(tag, revid) for tag, revid in tags if
5210
graph.is_between(revid, revid1, revid2)]
5213
elif sort == 'time':
5215
for tag, revid in tags:
5217
revobj = branch.repository.get_revision(revid)
5218
except errors.NoSuchRevision:
5219
timestamp = sys.maxint # place them at the end
5221
timestamp = revobj.timestamp
5222
timestamps[revid] = timestamp
5223
tags.sort(key=lambda x: timestamps[x[1]])
5225
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5226
for index, (tag, revid) in enumerate(tags):
5228
revno = branch.revision_id_to_dotted_revno(revid)
5229
if isinstance(revno, tuple):
5230
revno = '.'.join(map(str, revno))
5231
except errors.NoSuchRevision:
5232
# Bad tag data/merges can lead to tagged revisions
5233
# which are not in this branch. Fail gracefully ...
5235
tags[index] = (tag, revno)
5350
5238
for tag, revspec in tags:
5351
5239
self.outf.write('%-20s %s\n' % (tag, revspec))
5461
5349
/path/to/newbranch.
5463
5351
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
5352
locally, in which case switching will update the the local nickname to be
5465
5353
that of the master.
5468
takes_args = ['to_location?']
5356
takes_args = ['to_location']
5469
5357
takes_options = [Option('force',
5470
5358
help='Switch even if local commits will be lost.'),
5472
5359
Option('create-branch', short_name='b',
5473
5360
help='Create the target branch from this one before'
5474
5361
' switching to it.'),
5477
def run(self, to_location=None, force=False, create_branch=False,
5364
def run(self, to_location, force=False, create_branch=False):
5479
5365
from bzrlib import switch
5480
5366
tree_location = '.'
5481
revision = _get_one_revision('switch', revision)
5482
5367
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
5369
branch = control_dir.open_branch()
5490
5370
had_explicit_nick = branch.get_config().has_explicit_nickname()
added
removed
bzrlib/builtins.py
