358
342
' --revision or a revision_id')
359
343
b = WorkingTree.open_containing(u'.')[0].branch
361
revisions = b.repository.revisions
362
if revisions is None:
363
raise errors.BzrCommandError('Repository %r does not support '
364
'access to raw revision texts')
345
# TODO: jam 20060112 should cat-revision always output utf-8?
346
if revision_id is not None:
347
revision_id = osutils.safe_revision_id(revision_id, warn=False)
349
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
350
except errors.NoSuchRevision:
351
msg = "The repository %s contains no revision %s." % (b.repository.base,
353
raise errors.BzrCommandError(msg)
354
elif revision is not None:
357
raise errors.BzrCommandError('You cannot specify a NULL'
359
rev_id = rev.as_revision_id(b)
360
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
366
b.repository.lock_read()
368
# TODO: jam 20060112 should cat-revision always output utf-8?
369
if revision_id is not None:
370
revision_id = osutils.safe_revision_id(revision_id, warn=False)
372
self.print_revision(revisions, revision_id)
373
except errors.NoSuchRevision:
374
msg = "The repository %s contains no revision %s." % (
375
b.repository.base, revision_id)
376
raise errors.BzrCommandError(msg)
377
elif revision is not None:
380
raise errors.BzrCommandError(
381
'You cannot specify a NULL revision.')
382
rev_id = rev.as_revision_id(b)
383
self.print_revision(revisions, rev_id)
385
b.repository.unlock()
388
363
class cmd_dump_btree(Command):
389
364
"""Dump the contents of a btree index file to stdout.
470
443
To re-create the working tree, use "bzr checkout".
472
445
_see_also = ['checkout', 'working-trees']
473
takes_args = ['location*']
446
takes_args = ['location?']
474
447
takes_options = [
476
449
help='Remove the working tree even if it has '
477
450
'uncommitted changes.'),
480
def run(self, location_list, force=False):
481
if not location_list:
484
for location in location_list:
485
d = bzrdir.BzrDir.open(location)
488
working = d.open_workingtree()
489
except errors.NoWorkingTree:
490
raise errors.BzrCommandError("No working tree to remove")
491
except errors.NotLocalUrl:
492
raise errors.BzrCommandError("You cannot remove the working tree"
495
if (working.has_changes()):
496
raise errors.UncommittedChanges(working)
498
working_path = working.bzrdir.root_transport.base
499
branch_path = working.branch.bzrdir.root_transport.base
500
if working_path != branch_path:
501
raise errors.BzrCommandError("You cannot remove the working tree"
502
" from a lightweight checkout")
504
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()
507
477
class cmd_revno(Command):
564
538
wt = WorkingTree.open_containing(directory)[0]
567
self.add_cleanup(wt.unlock)
568
541
except (errors.NoWorkingTree, errors.NotLocalUrl):
570
543
b = Branch.open_containing(directory)[0]
572
self.add_cleanup(b.unlock)
574
if revision is not None:
575
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
576
if revision_info_list is not None:
577
for rev_str in revision_info_list:
578
rev_spec = RevisionSpec.from_string(rev_str)
579
revision_ids.append(rev_spec.as_revision_id(b))
580
# No arguments supplied, default to the last revision
581
if len(revision_ids) == 0:
584
raise errors.NoWorkingTree(directory)
585
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])
587
revision_ids.append(b.last_revision())
591
for revision_id in revision_ids:
593
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
594
revno = '.'.join(str(i) for i in dotted_revno)
595
except errors.NoSuchRevision:
597
maxlen = max(maxlen, len(revno))
598
revinfos.append([revno, revision_id])
601
578
for ri in revinfos:
602
579
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
749
729
revision = _get_one_revision('inventory', revision)
750
730
work_tree, file_list = tree_files(file_list)
751
731
work_tree.lock_read()
752
self.add_cleanup(work_tree.unlock)
753
if revision is not None:
754
tree = revision.as_tree(work_tree.branch)
756
extra_trees = [work_tree]
758
self.add_cleanup(tree.unlock)
763
if file_list is not None:
764
file_ids = tree.paths2ids(file_list, trees=extra_trees,
765
require_versioned=True)
766
# find_ids_across_trees may include some paths that don't
768
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
769
for file_id in file_ids if file_id in tree)
771
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:
774
756
for path, entry in entries:
775
757
if kind and kind != entry.kind:
914
899
dest = osutils.pathjoin(dest_parent, dest_tail)
915
900
mutter("attempting to move %s => %s", src, dest)
916
901
tree.rename_one(src, dest, after=after)
918
self.outf.write("%s => %s\n" % (src, dest))
902
self.outf.write("%s => %s\n" % (src, dest))
921
905
class cmd_pull(Command):
922
906
"""Turn this branch into a mirror of another branch.
924
By default, this command only works on branches that have not diverged.
925
Branches are considered diverged if the destination branch's most recent
926
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.
929
912
If branches have diverged, you can use 'bzr merge' to integrate the changes
930
913
from one into the other. Once one branch has merged, the other should
931
914
be able to pull it again.
933
If you want to replace your local changes and just want your branch to
934
match the remote one, use pull --overwrite. This will work even if the two
935
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.
937
919
If there is no default location set, the first pull will set it. After
938
920
that, you can omit the location to use the default. To change the
1020
1002
if branch_from is not branch_to:
1021
1003
branch_from.lock_read()
1022
self.add_cleanup(branch_from.unlock)
1023
if revision is not None:
1024
revision_id = revision.as_revision_id(branch_from)
1026
branch_to.lock_write()
1027
self.add_cleanup(branch_to.unlock)
1028
if tree_to is not None:
1029
view_info = _get_view_info_for_change_reporter(tree_to)
1030
change_reporter = delta._ChangeReporter(
1031
unversioned_filter=tree_to.is_ignored,
1032
view_info=view_info)
1033
result = tree_to.pull(
1034
branch_from, overwrite, revision_id, change_reporter,
1035
possible_transports=possible_transports, local=local)
1037
result = branch_to.pull(
1038
branch_from, overwrite, revision_id, local=local)
1040
result.report(self.outf)
1041
if verbose and result.old_revid != result.new_revid:
1042
log.show_branch_change(
1043
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()
1047
1034
class cmd_push(Command):
1202
1190
' directory exists, but does not already'
1203
1191
' have a control directory. This flag will'
1204
1192
' allow branch to proceed.'),
1206
help="Bind new branch to from location."),
1208
1194
aliases = ['get', 'clone']
1210
1196
def run(self, from_location, to_location=None, revision=None,
1211
1197
hardlink=False, stacked=False, standalone=False, no_tree=False,
1212
use_existing_dir=False, switch=False, bind=False):
1198
use_existing_dir=False, switch=False):
1213
1199
from bzrlib import switch as _mod_switch
1214
1200
from bzrlib.tag import _merge_tags_if_possible
1215
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
1217
1206
revision = _get_one_revision('branch', revision)
1218
1207
br_from.lock_read()
1219
self.add_cleanup(br_from.unlock)
1220
if revision is not None:
1221
revision_id = revision.as_revision_id(br_from)
1223
# FIXME - wt.last_revision, fallback to branch, fall back to
1224
# None or perhaps NULL_REVISION to mean copy nothing
1226
revision_id = br_from.last_revision()
1227
if to_location is None:
1228
to_location = urlutils.derive_to_location(from_location)
1229
to_transport = transport.get_transport(to_location)
1231
to_transport.mkdir('.')
1232
except errors.FileExists:
1233
if not use_existing_dir:
1234
raise errors.BzrCommandError('Target directory "%s" '
1235
'already exists.' % to_location)
1209
if revision is not None:
1210
revision_id = revision.as_revision_id(br_from)
1238
bzrdir.BzrDir.open_from_transport(to_transport)
1239
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)
1242
raise errors.AlreadyBranchError(to_location)
1243
except errors.NoSuchFile:
1244
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1247
# preserve whatever source format we have.
1248
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1249
possible_transports=[to_transport],
1250
accelerator_tree=accelerator_tree,
1251
hardlink=hardlink, stacked=stacked,
1252
force_new_repo=standalone,
1253
create_tree_if_local=not no_tree,
1254
source_branch=br_from)
1255
branch = dir.open_branch()
1256
except errors.NoSuchRevision:
1257
to_transport.delete_tree('.')
1258
msg = "The branch %s has no revision %s." % (from_location,
1260
raise errors.BzrCommandError(msg)
1261
_merge_tags_if_possible(br_from, branch)
1262
# If the source branch is stacked, the new branch may
1263
# be stacked whether we asked for that explicitly or not.
1264
# We therefore need a try/except here and not just 'if stacked:'
1266
note('Created new stacked branch referring to %s.' %
1267
branch.get_stacked_on_url())
1268
except (errors.NotStacked, errors.UnstackableBranchFormat,
1269
errors.UnstackableRepositoryFormat), e:
1270
note('Branched %d revision(s).' % branch.revno())
1272
# Bind to the parent
1273
parent_branch = Branch.open(from_location)
1274
branch.bind(parent_branch)
1275
note('New branch bound to %s' % from_location)
1277
# Switch to the new branch
1278
wt, _ = WorkingTree.open_containing('.')
1279
_mod_switch.switch(wt.bzrdir, branch)
1280
note('Switched to branch: %s',
1281
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'))
1284
1270
class cmd_checkout(Command):
1363
1349
def run(self, dir=u'.'):
1364
1350
tree = WorkingTree.open_containing(dir)[0]
1365
1351
tree.lock_read()
1366
self.add_cleanup(tree.unlock)
1367
new_inv = tree.inventory
1368
old_tree = tree.basis_tree()
1369
old_tree.lock_read()
1370
self.add_cleanup(old_tree.unlock)
1371
old_inv = old_tree.inventory
1373
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1374
for f, paths, c, v, p, n, k, e in iterator:
1375
if paths[0] == paths[1]:
1379
renames.append(paths)
1381
for old_name, new_name in renames:
1382
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))
1385
1375
class cmd_update(Command):
1392
1382
If you want to discard your local changes, you can just do a
1393
1383
'bzr revert' instead of 'bzr commit' after the update.
1395
If the tree's branch is bound to a master branch, it will also update
1396
the branch from the master.
1399
1386
_see_also = ['pull', 'working-trees', 'status-flags']
1400
1387
takes_args = ['dir?']
1401
takes_options = ['revision']
1402
1388
aliases = ['up']
1404
def run(self, dir='.', revision=None):
1405
if revision is not None and len(revision) != 1:
1406
raise errors.BzrCommandError(
1407
"bzr update --revision takes exactly one revision")
1390
def run(self, dir='.'):
1408
1391
tree = WorkingTree.open_containing(dir)[0]
1409
branch = tree.branch
1410
1392
possible_transports = []
1411
master = branch.get_master_branch(
1393
master = tree.branch.get_master_branch(
1412
1394
possible_transports=possible_transports)
1413
1395
if master is not None:
1414
1396
tree.lock_write()
1415
branch_location = master.base
1417
1398
tree.lock_tree_write()
1418
branch_location = tree.branch.base
1419
self.add_cleanup(tree.unlock)
1420
# get rid of the final '/' and be ready for display
1421
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1423
existing_pending_merges = tree.get_parent_ids()[1:]
1427
# may need to fetch data into a heavyweight checkout
1428
# XXX: this may take some time, maybe we should display a
1430
old_tip = branch.update(possible_transports)
1431
if revision is not None:
1432
revision_id = revision[0].as_revision_id(branch)
1434
revision_id = branch.last_revision()
1435
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1436
revno = branch.revision_id_to_revno(revision_id)
1437
note("Tree is up to date at revision %d of branch %s" %
1438
(revno, branch_location))
1440
view_info = _get_view_info_for_change_reporter(tree)
1441
change_reporter = delta._ChangeReporter(
1442
unversioned_filter=tree.is_ignored,
1443
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)
1445
1411
conflicts = tree.update(
1447
possible_transports=possible_transports,
1448
revision=revision_id,
1450
except errors.NoSuchRevision, e:
1451
raise errors.BzrCommandError(
1452
"branch has no revision %s\n"
1453
"bzr update --revision only works"
1454
" for a revision in the branch history"
1456
revno = tree.branch.revision_id_to_revno(
1457
_mod_revision.ensure_null(tree.last_revision()))
1458
note('Updated to revision %d of branch %s' %
1459
(revno, branch_location))
1460
if tree.get_parent_ids()[1:] != existing_pending_merges:
1461
note('Your local commits will now show as pending merges with '
1462
"'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'.")
1469
1428
class cmd_info(Command):
1540
1499
file_list = [f for f in file_list]
1542
1501
tree.lock_write()
1543
self.add_cleanup(tree.unlock)
1544
# Heuristics should probably all move into tree.remove_smart or
1547
added = tree.changes_from(tree.basis_tree(),
1548
specific_files=file_list).added
1549
file_list = sorted([f[0] for f in added], reverse=True)
1550
if len(file_list) == 0:
1551
raise errors.BzrCommandError('No matching files.')
1552
elif file_list is None:
1553
# missing files show up in iter_changes(basis) as
1554
# versioned-with-no-kind.
1556
for change in tree.iter_changes(tree.basis_tree()):
1557
# Find paths in the working tree that have no kind:
1558
if change[1][1] is not None and change[6][1] is None:
1559
missing.append(change[1][1])
1560
file_list = sorted(missing, reverse=True)
1561
file_deletion_strategy = 'keep'
1562
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1563
keep_files=file_deletion_strategy=='keep',
1564
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')
1567
1528
class cmd_file_id(Command):
1789
1750
class cmd_init_repository(Command):
1790
"""Create a shared repository for branches to share storage space.
1751
"""Create a shared repository to hold branches.
1792
1753
New branches created under the repository directory will store their
1793
revisions in the repository, not in the branch directory. For branches
1794
with shared history, this reduces the amount of storage needed and
1795
speeds up the creation of new branches.
1754
revisions in the repository, not in the branch directory.
1797
If the --no-trees option is given then the branches in the repository
1798
will not have working trees by default. They will still exist as
1799
directories on disk, but they will not have separate copies of the
1800
files at a certain revision. This can be useful for repositories that
1801
store branches which are interacted with through checkouts or remote
1802
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.
1805
Create a shared repository holding just branches::
1760
Create a shared repositories holding just branches::
1807
1762
bzr init-repo --no-trees repo
1808
1763
bzr init repo/trunk
2369
2317
diff_type = 'full'
2371
# Build the log formatter
2372
if log_format is None:
2373
log_format = log.log_formatter_registry.get_default(b)
2374
# Make a non-encoding output to include the diffs - bug 328007
2375
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2376
lf = log_format(show_ids=show_ids, to_file=self.outf,
2377
to_exact_file=unencoded_output,
2378
show_timezone=timezone,
2379
delta_format=get_verbosity_level(),
2381
show_advice=levels is None)
2383
# Choose the algorithm for doing the logging. It's annoying
2384
# having multiple code paths like this but necessary until
2385
# the underlying repository format is faster at generating
2386
# deltas or can provide everything we need from the indices.
2387
# The default algorithm - match-using-deltas - works for
2388
# multiple files and directories and is faster for small
2389
# amounts of history (200 revisions say). However, it's too
2390
# slow for logging a single file in a repository with deep
2391
# history, i.e. > 10K revisions. In the spirit of "do no
2392
# evil when adding features", we continue to use the
2393
# original algorithm - per-file-graph - for the "single
2394
# file that isn't a directory without showing a delta" case.
2395
partial_history = revision and b.repository._format.supports_chks
2396
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2397
or delta_type or partial_history)
2399
# Build the LogRequest and execute it
2400
if len(file_ids) == 0:
2402
rqst = make_log_request_dict(
2403
direction=direction, specific_fileids=file_ids,
2404
start_revision=rev1, end_revision=rev2, limit=limit,
2405
message_search=message, delta_type=delta_type,
2406
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2407
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)
2410
2359
def _get_revision_range(revisionspec_list, branch, command_name):
2553
2499
note("Ignoring files outside view. View is %s" % view_str)
2555
2501
tree.lock_read()
2556
self.add_cleanup(tree.unlock)
2557
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2558
from_dir=relpath, recursive=recursive):
2559
# Apply additional masking
2560
if not all and not selection[fc]:
2562
if kind is not None and fkind != kind:
2567
fullpath = osutils.pathjoin(relpath, fp)
2570
views.check_path_in_view(tree, fullpath)
2571
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:
2576
fp = osutils.pathjoin(prefix, fp)
2577
kindch = entry.kind_character()
2578
outstring = fp + kindch
2579
ui.ui_factory.clear_term()
2581
outstring = '%-8s %s' % (fc, outstring)
2582
if show_ids and fid is not None:
2583
outstring = "%-50s %s" % (outstring, fid)
2584
self.outf.write(outstring + '\n')
2586
self.outf.write(fp + '\0')
2589
self.outf.write(fid)
2590
self.outf.write('\0')
2598
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)
2600
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')
2603
2551
class cmd_unknowns(Command):
3569
3460
verbose = not is_quiet()
3570
3461
# TODO: should possibly lock the history file...
3571
3462
benchfile = open(".perf_history", "at", buffering=1)
3572
self.add_cleanup(benchfile.close)
3574
3464
test_suite_factory = None
3575
3465
benchfile = None
3576
selftest_kwargs = {"verbose": verbose,
3578
"stop_on_failure": one,
3579
"transport": transport,
3580
"test_suite_factory": test_suite_factory,
3581
"lsprof_timed": lsprof_timed,
3582
"lsprof_tests": lsprof_tests,
3583
"bench_history": benchfile,
3584
"matching_tests_first": first,
3585
"list_only": list_only,
3586
"random_seed": randomize,
3587
"exclude_pattern": exclude,
3589
"load_list": load_list,
3590
"debug_flags": debugflag,
3591
"starting_with": starting_with
3593
selftest_kwargs.update(self.additional_selftest_args)
3594
result = selftest(**selftest_kwargs)
3467
selftest_kwargs = {"verbose": verbose,
3469
"stop_on_failure": one,
3470
"transport": transport,
3471
"test_suite_factory": test_suite_factory,
3472
"lsprof_timed": lsprof_timed,
3473
"lsprof_tests": lsprof_tests,
3474
"bench_history": benchfile,
3475
"matching_tests_first": first,
3476
"list_only": list_only,
3477
"random_seed": randomize,
3478
"exclude_pattern": exclude,
3480
"load_list": load_list,
3481
"debug_flags": debugflag,
3482
"starting_with": starting_with
3484
selftest_kwargs.update(self.additional_selftest_args)
3485
result = selftest(**selftest_kwargs)
3487
if benchfile is not None:
3595
3489
return int(not result)
3767
3653
verified = 'inapplicable'
3768
3654
tree = WorkingTree.open_containing(directory)[0]
3656
# die as quickly as possible if there are uncommitted changes
3771
3658
basis_tree = tree.revision_tree(tree.last_revision())
3772
3659
except errors.NoSuchRevision:
3773
3660
basis_tree = tree.basis_tree()
3775
# die as quickly as possible if there are uncommitted changes
3777
if tree.has_changes():
3662
if tree.has_changes(basis_tree):
3778
3663
raise errors.UncommittedChanges(tree)
3780
3665
view_info = _get_view_info_for_change_reporter(tree)
3781
3666
change_reporter = delta._ChangeReporter(
3782
3667
unversioned_filter=tree.is_ignored, view_info=view_info)
3783
pb = ui.ui_factory.nested_progress_bar()
3784
self.add_cleanup(pb.finished)
3786
self.add_cleanup(tree.unlock)
3787
if location is not None:
3789
mergeable = bundle.read_mergeable_from_url(location,
3790
possible_transports=possible_transports)
3791
except errors.NotABundle:
3670
pb = ui.ui_factory.nested_progress_bar()
3671
cleanups.append(pb.finished)
3673
cleanups.append(tree.unlock)
3674
if location is not None:
3676
mergeable = bundle.read_mergeable_from_url(location,
3677
possible_transports=possible_transports)
3678
except errors.NotABundle:
3682
raise errors.BzrCommandError('Cannot use --uncommitted'
3683
' with bundles or merge directives.')
3685
if revision is not None:
3686
raise errors.BzrCommandError(
3687
'Cannot use -r with merge directives or bundles')
3688
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3691
if merger is None and uncommitted:
3692
if revision is not None and len(revision) > 0:
3693
raise errors.BzrCommandError('Cannot use --uncommitted and'
3694
' --revision at the same time.')
3695
merger = self.get_merger_from_uncommitted(tree, location, pb,
3697
allow_pending = False
3700
merger, allow_pending = self._get_merger_from_branch(tree,
3701
location, revision, remember, possible_transports, pb)
3703
merger.merge_type = merge_type
3704
merger.reprocess = reprocess
3705
merger.show_base = show_base
3706
self.sanity_check_merger(merger)
3707
if (merger.base_rev_id == merger.other_rev_id and
3708
merger.other_rev_id is not None):
3709
note('Nothing to do.')
3712
if merger.interesting_files is not None:
3713
raise errors.BzrCommandError('Cannot pull individual files')
3714
if (merger.base_rev_id == tree.last_revision()):
3715
result = tree.pull(merger.other_branch, False,
3716
merger.other_rev_id)
3717
result.report(self.outf)
3719
merger.check_basis(False)
3721
return self._do_preview(merger, cleanups)
3723
return self._do_interactive(merger, cleanups)
3795
raise errors.BzrCommandError('Cannot use --uncommitted'
3796
' with bundles or merge directives.')
3798
if revision is not None:
3799
raise errors.BzrCommandError(
3800
'Cannot use -r with merge directives or bundles')
3801
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3804
if merger is None and uncommitted:
3805
if revision is not None and len(revision) > 0:
3806
raise errors.BzrCommandError('Cannot use --uncommitted and'
3807
' --revision at the same time.')
3808
merger = self.get_merger_from_uncommitted(tree, location, None)
3809
allow_pending = False
3812
merger, allow_pending = self._get_merger_from_branch(tree,
3813
location, revision, remember, possible_transports, None)
3815
merger.merge_type = merge_type
3816
merger.reprocess = reprocess
3817
merger.show_base = show_base
3818
self.sanity_check_merger(merger)
3819
if (merger.base_rev_id == merger.other_rev_id and
3820
merger.other_rev_id is not None):
3821
note('Nothing to do.')
3824
if merger.interesting_files is not None:
3825
raise errors.BzrCommandError('Cannot pull individual files')
3826
if (merger.base_rev_id == tree.last_revision()):
3827
result = tree.pull(merger.other_branch, False,
3828
merger.other_rev_id)
3829
result.report(self.outf)
3831
if merger.this_basis is None:
3832
raise errors.BzrCommandError(
3833
"This branch has no commits."
3834
" (perhaps you would prefer 'bzr pull')")
3836
return self._do_preview(merger)
3838
return self._do_interactive(merger)
3840
return self._do_merge(merger, change_reporter, allow_pending,
3843
def _get_preview(self, merger):
3725
return self._do_merge(merger, change_reporter, allow_pending,
3728
for cleanup in reversed(cleanups):
3731
def _get_preview(self, merger, cleanups):
3844
3732
tree_merger = merger.make_merger()
3845
3733
tt = tree_merger.make_preview_transform()
3846
self.add_cleanup(tt.finalize)
3734
cleanups.append(tt.finalize)
3847
3735
result_tree = tt.get_preview_tree()
3848
3736
return result_tree
3850
def _do_preview(self, merger):
3738
def _do_preview(self, merger, cleanups):
3851
3739
from bzrlib.diff import show_diff_trees
3852
result_tree = self._get_preview(merger)
3740
result_tree = self._get_preview(merger, cleanups)
3853
3741
show_diff_trees(merger.this_tree, result_tree, self.outf,
3854
3742
old_label='', new_label='')
4045
3932
merge_type = _mod_merge.Merge3Merger
4046
3933
tree, file_list = tree_files(file_list)
4047
3934
tree.lock_write()
4048
self.add_cleanup(tree.unlock)
4049
parents = tree.get_parent_ids()
4050
if len(parents) != 2:
4051
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4052
" merges. Not cherrypicking or"
4054
repository = tree.branch.repository
4055
interesting_ids = None
4057
conflicts = tree.conflicts()
4058
if file_list is not None:
4059
interesting_ids = set()
4060
for filename in file_list:
4061
file_id = tree.path2id(filename)
4063
raise errors.NotVersionedError(filename)
4064
interesting_ids.add(file_id)
4065
if tree.kind(file_id) != "directory":
3936
parents = tree.get_parent_ids()
3937
if len(parents) != 2:
3938
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3939
" merges. Not cherrypicking or"
3941
repository = tree.branch.repository
3942
interesting_ids = None
3944
conflicts = tree.conflicts()
3945
if file_list is not None:
3946
interesting_ids = set()
3947
for filename in file_list:
3948
file_id = tree.path2id(filename)
3950
raise errors.NotVersionedError(filename)
3951
interesting_ids.add(file_id)
3952
if tree.kind(file_id) != "directory":
4068
for name, ie in tree.inventory.iter_entries(file_id):
4069
interesting_ids.add(ie.file_id)
4070
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4072
# Remerge only supports resolving contents conflicts
4073
allowed_conflicts = ('text conflict', 'contents conflict')
4074
restore_files = [c.path for c in conflicts
4075
if c.typestring in allowed_conflicts]
4076
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4077
tree.set_conflicts(ConflictList(new_conflicts))
4078
if file_list is not None:
4079
restore_files = file_list
4080
for filename in restore_files:
3955
for name, ie in tree.inventory.iter_entries(file_id):
3956
interesting_ids.add(ie.file_id)
3957
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3959
# Remerge only supports resolving contents conflicts
3960
allowed_conflicts = ('text conflict', 'contents conflict')
3961
restore_files = [c.path for c in conflicts
3962
if c.typestring in allowed_conflicts]
3963
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3964
tree.set_conflicts(ConflictList(new_conflicts))
3965
if file_list is not None:
3966
restore_files = file_list
3967
for filename in restore_files:
3969
restore(tree.abspath(filename))
3970
except errors.NotConflicted:
3972
# Disable pending merges, because the file texts we are remerging
3973
# have not had those merges performed. If we use the wrong parents
3974
# list, we imply that the working tree text has seen and rejected
3975
# all the changes from the other tree, when in fact those changes
3976
# have not yet been seen.
3977
pb = ui.ui_factory.nested_progress_bar()
3978
tree.set_parent_ids(parents[:1])
4082
restore(tree.abspath(filename))
4083
except errors.NotConflicted:
4085
# Disable pending merges, because the file texts we are remerging
4086
# have not had those merges performed. If we use the wrong parents
4087
# list, we imply that the working tree text has seen and rejected
4088
# all the changes from the other tree, when in fact those changes
4089
# have not yet been seen.
4090
tree.set_parent_ids(parents[:1])
4092
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4093
merger.interesting_ids = interesting_ids
4094
merger.merge_type = merge_type
4095
merger.show_base = show_base
4096
merger.reprocess = reprocess
4097
conflicts = merger.do_merge()
3980
merger = _mod_merge.Merger.from_revision_ids(pb,
3982
merger.interesting_ids = interesting_ids
3983
merger.merge_type = merge_type
3984
merger.show_base = show_base
3985
merger.reprocess = reprocess
3986
conflicts = merger.do_merge()
3988
tree.set_parent_ids(parents)
4099
tree.set_parent_ids(parents)
4100
3992
if conflicts > 0:
4124
4016
name. If you name a directory, all the contents of that directory will be
4127
If you have newly added files since the target revision, they will be
4128
removed. If the files to be removed have been changed, backups will be
4129
created as above. Directories containing unknown files will not be
4019
Any files that have been newly added since that revision will be deleted,
4020
with a backup kept if appropriate. Directories containing unknown files
4021
will not be deleted.
4132
The working tree contains a list of revisions that have been merged but
4133
not yet committed. These revisions will be included as additional parents
4134
of the next commit. Normally, using revert clears that list as well as
4135
reverting the files. If any files are specified, revert leaves the list
4136
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4137
.`` in the tree root to revert all files but keep the recorded merges,
4138
and ``bzr revert --forget-merges`` to clear the pending merge list without
4023
The working tree contains a list of pending merged revisions, which will
4024
be included as parents in the next commit. Normally, revert clears that
4025
list as well as reverting the files. If any files are specified, revert
4026
leaves the pending merge list alone and reverts only the files. Use "bzr
4027
revert ." in the tree root to revert all files but keep the merge record,
4028
and "bzr revert --forget-merges" to clear the pending merge list without
4139
4029
reverting any files.
4141
Using "bzr revert --forget-merges", it is possible to apply all of the
4142
changes from a branch in a single revision. To do this, perform the merge
4143
as desired. Then doing revert with the "--forget-merges" option will keep
4144
the content of the tree as it was, but it will clear the list of pending
4145
merges. The next commit will then contain all of the changes that are
4146
present in the other branch, but without any other parent revisions.
4147
Because this technique forgets where these changes originated, it may
4148
cause additional conflicts on later merges involving the same source and
4152
4032
_see_also = ['cat', 'export']
4319
4201
if remote_branch.base == local_branch.base:
4320
4202
remote_branch = local_branch
4322
local_branch.lock_read()
4323
self.add_cleanup(local_branch.unlock)
4324
4204
local_revid_range = _revision_range_to_revid_range(
4325
4205
_get_revision_range(my_revision, local_branch,
4328
remote_branch.lock_read()
4329
self.add_cleanup(remote_branch.unlock)
4330
4208
remote_revid_range = _revision_range_to_revid_range(
4331
4209
_get_revision_range(revision,
4332
4210
remote_branch, self.name()))
4334
local_extra, remote_extra = find_unmerged(
4335
local_branch, remote_branch, restrict,
4336
backward=not reverse,
4337
include_merges=include_merges,
4338
local_revid_range=local_revid_range,
4339
remote_revid_range=remote_revid_range)
4341
if log_format is None:
4342
registry = log.log_formatter_registry
4343
log_format = registry.get_default(local_branch)
4344
lf = log_format(to_file=self.outf,
4346
show_timezone='original')
4349
if local_extra and not theirs_only:
4350
message("You have %d extra revision(s):\n" %
4352
for revision in iter_log_revisions(local_extra,
4353
local_branch.repository,
4355
lf.log_revision(revision)
4356
printed_local = True
4359
printed_local = False
4361
if remote_extra and not mine_only:
4362
if printed_local is True:
4364
message("You are missing %d revision(s):\n" %
4366
for revision in iter_log_revisions(remote_extra,
4367
remote_branch.repository,
4369
lf.log_revision(revision)
4372
if mine_only and not local_extra:
4373
# We checked local, and found nothing extra
4374
message('This branch is up to date.\n')
4375
elif theirs_only and not remote_extra:
4376
# We checked remote, and found nothing extra
4377
message('Other branch is up to date.\n')
4378
elif not (mine_only or theirs_only or local_extra or
4380
# We checked both branches, and neither one had extra
4382
message("Branches are up to date.\n")
4212
local_branch.lock_read()
4214
remote_branch.lock_read()
4216
local_extra, remote_extra = find_unmerged(
4217
local_branch, remote_branch, restrict,
4218
backward=not reverse,
4219
include_merges=include_merges,
4220
local_revid_range=local_revid_range,
4221
remote_revid_range=remote_revid_range)
4223
if log_format is None:
4224
registry = log.log_formatter_registry
4225
log_format = registry.get_default(local_branch)
4226
lf = log_format(to_file=self.outf,
4228
show_timezone='original')
4231
if local_extra and not theirs_only:
4232
message("You have %d extra revision(s):\n" %
4234
for revision in iter_log_revisions(local_extra,
4235
local_branch.repository,
4237
lf.log_revision(revision)
4238
printed_local = True
4241
printed_local = False
4243
if remote_extra and not mine_only:
4244
if printed_local is True:
4246
message("You are missing %d revision(s):\n" %
4248
for revision in iter_log_revisions(remote_extra,
4249
remote_branch.repository,
4251
lf.log_revision(revision)
4254
if mine_only and not local_extra:
4255
# We checked local, and found nothing extra
4256
message('This branch is up to date.\n')
4257
elif theirs_only and not remote_extra:
4258
# We checked remote, and found nothing extra
4259
message('Other branch is up to date.\n')
4260
elif not (mine_only or theirs_only or local_extra or
4262
# We checked both branches, and neither one had extra
4264
message("Branches are up to date.\n")
4266
remote_branch.unlock()
4268
local_branch.unlock()
4384
4269
if not status_code and parent is None and other_branch is not None:
4385
4270
local_branch.lock_write()
4386
self.add_cleanup(local_branch.unlock)
4387
# handle race conditions - a parent might be set while we run.
4388
if local_branch.get_parent() is None:
4389
local_branch.set_parent(remote_branch.base)
4272
# handle race conditions - a parent might be set while we run.
4273
if local_branch.get_parent() is None:
4274
local_branch.set_parent(remote_branch.base)
4276
local_branch.unlock()
4390
4277
return status_code
4512
4401
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4513
4402
if wt is not None:
4515
self.add_cleanup(wt.unlock)
4517
4405
branch.lock_read()
4518
self.add_cleanup(branch.unlock)
4519
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4521
self.add_cleanup(tree.unlock)
4523
file_id = wt.path2id(relpath)
4525
file_id = tree.path2id(relpath)
4527
raise errors.NotVersionedError(filename)
4528
file_version = tree.inventory[file_id].revision
4529
if wt is not None and revision is None:
4530
# If there is a tree and we're not annotating historical
4531
# versions, annotate the working tree's content.
4532
annotate_file_tree(wt, file_id, self.outf, long, all,
4535
annotate_file(branch, file_version, file_id, long, all, self.outf,
4407
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4409
file_id = wt.path2id(relpath)
4411
file_id = tree.path2id(relpath)
4413
raise errors.NotVersionedError(filename)
4414
file_version = tree.inventory[file_id].revision
4415
if wt is not None and revision is None:
4416
# If there is a tree and we're not annotating historical
4417
# versions, annotate the working tree's content.
4418
annotate_file_tree(wt, file_id, self.outf, long, all,
4421
annotate_file(branch, file_version, file_id, long, all, self.outf,
4539
4430
class cmd_re_sign(Command):
5056
4946
directly from the merge directive, without retrieving data from a
5059
`bzr send` creates a compact data set that, when applied using bzr
5060
merge, has the same effect as merging from the source branch.
5062
By default the merge directive is self-contained and can be applied to any
5063
branch containing submit_branch in its ancestory without needing access to
5066
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5067
revisions, but only a structured request to merge from the
5068
public_location. In that case the public_branch is needed and it must be
5069
up-to-date and accessible to the recipient. The public_branch is always
5070
included if known, so that people can check it later.
5072
The submit branch defaults to the parent of the source branch, but can be
5073
overridden. Both submit branch and public branch will be remembered in
5074
branch.conf the first time they are used for a particular branch. The
5075
source branch defaults to that containing the working directory, but can
5076
be changed using --from.
5078
In order to calculate those changes, bzr must analyse the submit branch.
5079
Therefore it is most efficient for the submit branch to be a local mirror.
5080
If a public location is known for the submit_branch, that location is used
5081
in the merge directive.
5083
The default behaviour is to send the merge directive by mail, unless -o is
5084
given, in which case it is sent to a file.
4949
If --no-bundle is specified, then public_branch is needed (and must be
4950
up-to-date), so that the receiver can perform the merge using the
4951
public_branch. The public_branch is always included if known, so that
4952
people can check it later.
4954
The submit branch defaults to the parent, but can be overridden. Both
4955
submit branch and public branch will be remembered if supplied.
4957
If a public_branch is known for the submit_branch, that public submit
4958
branch is used in the merge instructions. This means that a local mirror
4959
can be used as your actual submit branch, once you have set public_branch
5086
4962
Mail is sent using your preferred mail program. This should be transparent
5087
4963
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5276
5147
branch, relpath = Branch.open_containing(directory)
5277
5148
branch.lock_write()
5278
self.add_cleanup(branch.unlock)
5280
branch.tags.delete_tag(tag_name)
5281
self.outf.write('Deleted tag %s.\n' % tag_name)
5284
if len(revision) != 1:
5285
raise errors.BzrCommandError(
5286
"Tags can only be placed on a single revision, "
5288
revision_id = revision[0].as_revision_id(branch)
5151
branch.tags.delete_tag(tag_name)
5152
self.outf.write('Deleted tag %s.\n' % tag_name)
5290
revision_id = branch.last_revision()
5291
if (not force) and branch.tags.has_tag(tag_name):
5292
raise errors.TagAlreadyExists(tag_name)
5293
branch.tags.set_tag(tag_name, revision_id)
5294
self.outf.write('Created tag %s.\n' % tag_name)
5155
if len(revision) != 1:
5156
raise errors.BzrCommandError(
5157
"Tags can only be placed on a single revision, "
5159
revision_id = revision[0].as_revision_id(branch)
5161
revision_id = branch.last_revision()
5162
if (not force) and branch.tags.has_tag(tag_name):
5163
raise errors.TagAlreadyExists(tag_name)
5164
branch.tags.set_tag(tag_name, revision_id)
5165
self.outf.write('Created tag %s.\n' % tag_name)
5297
5170
class cmd_tags(Command):
5332
5205
branch.lock_read()
5333
self.add_cleanup(branch.unlock)
5335
graph = branch.repository.get_graph()
5336
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5337
revid1, revid2 = rev1.rev_id, rev2.rev_id
5338
# only show revisions between revid1 and revid2 (inclusive)
5339
tags = [(tag, revid) for tag, revid in tags if
5340
graph.is_between(revid, revid1, revid2)]
5343
elif sort == 'time':
5345
for tag, revid in tags:
5347
revobj = branch.repository.get_revision(revid)
5348
except errors.NoSuchRevision:
5349
timestamp = sys.maxint # place them at the end
5351
timestamp = revobj.timestamp
5352
timestamps[revid] = timestamp
5353
tags.sort(key=lambda x: timestamps[x[1]])
5355
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5356
for index, (tag, revid) in enumerate(tags):
5358
revno = branch.revision_id_to_dotted_revno(revid)
5359
if isinstance(revno, tuple):
5360
revno = '.'.join(map(str, revno))
5361
except errors.NoSuchRevision:
5362
# Bad tag data/merges can lead to tagged revisions
5363
# which are not in this branch. Fail gracefully ...
5365
tags[index] = (tag, revno)
5208
graph = branch.repository.get_graph()
5209
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5210
revid1, revid2 = rev1.rev_id, rev2.rev_id
5211
# only show revisions between revid1 and revid2 (inclusive)
5212
tags = [(tag, revid) for tag, revid in tags if
5213
graph.is_between(revid, revid1, revid2)]
5216
elif sort == 'time':
5218
for tag, revid in tags:
5220
revobj = branch.repository.get_revision(revid)
5221
except errors.NoSuchRevision:
5222
timestamp = sys.maxint # place them at the end
5224
timestamp = revobj.timestamp
5225
timestamps[revid] = timestamp
5226
tags.sort(key=lambda x: timestamps[x[1]])
5228
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5229
for index, (tag, revid) in enumerate(tags):
5231
revno = branch.revision_id_to_dotted_revno(revid)
5232
if isinstance(revno, tuple):
5233
revno = '.'.join(map(str, revno))
5234
except errors.NoSuchRevision:
5235
# Bad tag data/merges can lead to tagged revisions
5236
# which are not in this branch. Fail gracefully ...
5238
tags[index] = (tag, revno)
5367
5241
for tag, revspec in tags:
5368
5242
self.outf.write('%-20s %s\n' % (tag, revspec))
5478
5352
/path/to/newbranch.
5480
5354
Bound branches use the nickname of its master branch unless it is set
5481
locally, in which case switching will update the local nickname to be
5355
locally, in which case switching will update the the local nickname to be
5482
5356
that of the master.
5485
takes_args = ['to_location?']
5359
takes_args = ['to_location']
5486
5360
takes_options = [Option('force',
5487
5361
help='Switch even if local commits will be lost.'),
5489
5362
Option('create-branch', short_name='b',
5490
5363
help='Create the target branch from this one before'
5491
5364
' switching to it.'),
5494
def run(self, to_location=None, force=False, create_branch=False,
5367
def run(self, to_location, force=False, create_branch=False):
5496
5368
from bzrlib import switch
5497
5369
tree_location = '.'
5498
revision = _get_one_revision('switch', revision)
5499
5370
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5500
if to_location is None:
5501
if revision is None:
5502
raise errors.BzrCommandError('You must supply either a'
5503
' revision or a location')
5506
5372
branch = control_dir.open_branch()
5507
5373
had_explicit_nick = branch.get_config().has_explicit_nickname()
added
removed
bzrlib/builtins.py
