342
358
' --revision or a revision_id')
343
359
b = WorkingTree.open_containing(u'.')[0].branch
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'))
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')
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()
363
388
class cmd_dump_btree(Command):
364
389
"""Dump the contents of a btree index file to stdout.
443
470
To re-create the working tree, use "bzr checkout".
445
472
_see_also = ['checkout', 'working-trees']
446
takes_args = ['location?']
473
takes_args = ['location*']
447
474
takes_options = [
449
476
help='Remove the working tree even if it has '
450
477
'uncommitted changes.'),
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()
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()
477
507
class cmd_revno(Command):
538
564
wt = WorkingTree.open_containing(directory)[0]
567
self.add_cleanup(wt.unlock)
541
568
except (errors.NoWorkingTree, errors.NotLocalUrl):
543
570
b = Branch.open_containing(directory)[0]
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])
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())
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])
578
601
for ri in revinfos:
579
602
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
729
749
revision = _get_one_revision('inventory', revision)
730
750
work_tree, file_list = tree_files(file_list)
731
751
work_tree.lock_read()
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:
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()
756
774
for path, entry in entries:
757
775
if kind and kind != entry.kind:
899
914
dest = osutils.pathjoin(dest_parent, dest_tail)
900
915
mutter("attempting to move %s => %s", src, dest)
901
916
tree.rename_one(src, dest, after=after)
902
self.outf.write("%s => %s\n" % (src, dest))
918
self.outf.write("%s => %s\n" % (src, dest))
905
921
class cmd_pull(Command):
906
922
"""Turn this branch into a mirror of another branch.
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.
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
912
929
If branches have diverged, you can use 'bzr merge' to integrate the changes
913
930
from one into the other. Once one branch has merged, the other should
914
931
be able to pull it again.
916
If you want to forget your local changes and just update your branch to
917
match the remote one, use pull --overwrite.
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.
919
937
If there is no default location set, the first pull will set it. After
920
938
that, you can omit the location to use the default. To change the
1002
1020
if branch_from is not branch_to:
1003
1021
branch_from.lock_read()
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()
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,
1034
1047
class cmd_push(Command):
1190
1202
' directory exists, but does not already'
1191
1203
' have a control directory. This flag will'
1192
1204
' allow branch to proceed.'),
1206
help="Bind new branch to from location."),
1194
1208
aliases = ['get', 'clone']
1196
1210
def run(self, from_location, to_location=None, revision=None,
1197
1211
hardlink=False, stacked=False, standalone=False, no_tree=False,
1198
use_existing_dir=False, switch=False):
1212
use_existing_dir=False, switch=False, bind=False):
1199
1213
from bzrlib import switch as _mod_switch
1200
1214
from bzrlib.tag import _merge_tags_if_possible
1201
1215
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
1206
1217
revision = _get_one_revision('branch', revision)
1207
1218
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)
1209
if revision is not None:
1210
revision_id = revision.as_revision_id(br_from)
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)
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)
1238
bzrdir.BzrDir.open_from_transport(to_transport)
1239
except errors.NotBranchError:
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'))
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'))
1270
1284
class cmd_checkout(Command):
1349
1363
def run(self, dir=u'.'):
1350
1364
tree = WorkingTree.open_containing(dir)[0]
1351
1365
tree.lock_read()
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))
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))
1375
1385
class cmd_update(Command):
1382
1392
If you want to discard your local changes, you can just do a
1383
1393
'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.
1386
1399
_see_also = ['pull', 'working-trees', 'status-flags']
1387
1400
takes_args = ['dir?']
1401
takes_options = ['revision']
1388
1402
aliases = ['up']
1390
def run(self, dir='.'):
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")
1391
1408
tree = WorkingTree.open_containing(dir)[0]
1409
branch = tree.branch
1392
1410
possible_transports = []
1393
master = tree.branch.get_master_branch(
1411
master = branch.get_master_branch(
1394
1412
possible_transports=possible_transports)
1395
1413
if master is not None:
1396
1414
tree.lock_write()
1415
branch_location = master.base
1398
1417
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)
1411
1445
conflicts = tree.update(
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'.")
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'.")
1428
1469
class cmd_info(Command):
1499
1540
file_list = [f for f in file_list]
1501
1542
tree.lock_write()
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')
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')
1528
1567
class cmd_file_id(Command):
1750
1789
class cmd_init_repository(Command):
1751
"""Create a shared repository to hold branches.
1790
"""Create a shared repository for branches to share storage space.
1753
1792
New branches created under the repository directory will store their
1754
revisions in the repository, not in the branch directory.
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.
1756
If the --no-trees option is used then the branches in the repository
1757
will not have working trees by default.
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.
1760
Create a shared repositories holding just branches::
1805
Create a shared repository holding just branches::
1762
1807
bzr init-repo --no-trees repo
1763
1808
bzr init repo/trunk
2317
2369
diff_type = 'full'
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)
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)
2359
2410
def _get_revision_range(revisionspec_list, branch, command_name):
2499
2553
note("Ignoring files outside view. View is %s" % view_str)
2501
2555
tree.lock_read()
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:
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:
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)
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))
2530
2600
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')
2551
2603
class cmd_unknowns(Command):
3458
3570
verbose = not is_quiet()
3459
3571
# TODO: should possibly lock the history file...
3460
3572
benchfile = open(".perf_history", "at", buffering=1)
3573
self.add_cleanup(benchfile.close)
3462
3575
test_suite_factory = None
3463
3576
benchfile = None
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:
3577
selftest_kwargs = {"verbose": verbose,
3579
"stop_on_failure": one,
3580
"transport": transport,
3581
"test_suite_factory": test_suite_factory,
3582
"lsprof_timed": lsprof_timed,
3583
"lsprof_tests": lsprof_tests,
3584
"bench_history": benchfile,
3585
"matching_tests_first": first,
3586
"list_only": list_only,
3587
"random_seed": randomize,
3588
"exclude_pattern": exclude,
3590
"load_list": load_list,
3591
"debug_flags": debugflag,
3592
"starting_with": starting_with
3594
selftest_kwargs.update(self.additional_selftest_args)
3595
result = selftest(**selftest_kwargs)
3486
3596
return int(not result)
3650
3768
verified = 'inapplicable'
3651
3769
tree = WorkingTree.open_containing(directory)[0]
3653
# die as quickly as possible if there are uncommitted changes
3655
3772
basis_tree = tree.revision_tree(tree.last_revision())
3656
3773
except errors.NoSuchRevision:
3657
3774
basis_tree = tree.basis_tree()
3776
# die as quickly as possible if there are uncommitted changes
3659
if tree.has_changes(basis_tree):
3778
if tree.has_changes():
3660
3779
raise errors.UncommittedChanges(tree)
3662
3781
view_info = _get_view_info_for_change_reporter(tree)
3663
3782
change_reporter = delta._ChangeReporter(
3664
3783
unversioned_filter=tree.is_ignored, view_info=view_info)
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.')
3784
pb = ui.ui_factory.nested_progress_bar()
3785
self.add_cleanup(pb.finished)
3787
self.add_cleanup(tree.unlock)
3788
if location is not None:
3790
mergeable = bundle.read_mergeable_from_url(location,
3791
possible_transports=possible_transports)
3792
except errors.NotABundle:
3796
raise errors.BzrCommandError('Cannot use --uncommitted'
3797
' with bundles or merge directives.')
3799
if revision is not None:
3800
raise errors.BzrCommandError(
3801
'Cannot use -r with merge directives or bundles')
3802
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3805
if merger is None and uncommitted:
3806
if revision is not None and len(revision) > 0:
3807
raise errors.BzrCommandError('Cannot use --uncommitted and'
3808
' --revision at the same time.')
3809
merger = self.get_merger_from_uncommitted(tree, location, None)
3810
allow_pending = False
3813
merger, allow_pending = self._get_merger_from_branch(tree,
3814
location, revision, remember, possible_transports, None)
3816
merger.merge_type = merge_type
3817
merger.reprocess = reprocess
3818
merger.show_base = show_base
3819
self.sanity_check_merger(merger)
3820
if (merger.base_rev_id == merger.other_rev_id and
3821
merger.other_rev_id is not None):
3822
note('Nothing to do.')
3825
if merger.interesting_files is not None:
3826
raise errors.BzrCommandError('Cannot pull individual files')
3827
if (merger.base_rev_id == tree.last_revision()):
3828
result = tree.pull(merger.other_branch, False,
3829
merger.other_rev_id)
3830
result.report(self.outf)
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)
3722
return self._do_merge(merger, change_reporter, allow_pending,
3725
for cleanup in reversed(cleanups):
3832
if merger.this_basis is None:
3833
raise errors.BzrCommandError(
3834
"This branch has no commits."
3835
" (perhaps you would prefer 'bzr pull')")
3837
return self._do_preview(merger)
3839
return self._do_interactive(merger)
3841
return self._do_merge(merger, change_reporter, allow_pending,
3728
def _get_preview(self, merger, cleanups):
3844
def _get_preview(self, merger):
3729
3845
tree_merger = merger.make_merger()
3730
3846
tt = tree_merger.make_preview_transform()
3731
cleanups.append(tt.finalize)
3847
self.add_cleanup(tt.finalize)
3732
3848
result_tree = tt.get_preview_tree()
3733
3849
return result_tree
3735
def _do_preview(self, merger, cleanups):
3851
def _do_preview(self, merger):
3736
3852
from bzrlib.diff import show_diff_trees
3737
result_tree = self._get_preview(merger, cleanups)
3853
result_tree = self._get_preview(merger)
3738
3854
show_diff_trees(merger.this_tree, result_tree, self.outf,
3739
3855
old_label='', new_label='')
3929
4046
merge_type = _mod_merge.Merge3Merger
3930
4047
tree, file_list = tree_files(file_list)
3931
4048
tree.lock_write()
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":
4049
self.add_cleanup(tree.unlock)
4050
parents = tree.get_parent_ids()
4051
if len(parents) != 2:
4052
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4053
" merges. Not cherrypicking or"
4055
repository = tree.branch.repository
4056
interesting_ids = None
4058
conflicts = tree.conflicts()
4059
if file_list is not None:
4060
interesting_ids = set()
4061
for filename in file_list:
4062
file_id = tree.path2id(filename)
4064
raise errors.NotVersionedError(filename)
4065
interesting_ids.add(file_id)
4066
if tree.kind(file_id) != "directory":
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])
4069
for name, ie in tree.inventory.iter_entries(file_id):
4070
interesting_ids.add(ie.file_id)
4071
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4073
# Remerge only supports resolving contents conflicts
4074
allowed_conflicts = ('text conflict', 'contents conflict')
4075
restore_files = [c.path for c in conflicts
4076
if c.typestring in allowed_conflicts]
4077
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4078
tree.set_conflicts(ConflictList(new_conflicts))
4079
if file_list is not None:
4080
restore_files = file_list
4081
for filename in restore_files:
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)
4083
restore(tree.abspath(filename))
4084
except errors.NotConflicted:
4086
# Disable pending merges, because the file texts we are remerging
4087
# have not had those merges performed. If we use the wrong parents
4088
# list, we imply that the working tree text has seen and rejected
4089
# all the changes from the other tree, when in fact those changes
4090
# have not yet been seen.
4091
tree.set_parent_ids(parents[:1])
4093
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4094
merger.interesting_ids = interesting_ids
4095
merger.merge_type = merge_type
4096
merger.show_base = show_base
4097
merger.reprocess = reprocess
4098
conflicts = merger.do_merge()
4100
tree.set_parent_ids(parents)
3989
4101
if conflicts > 0:
4013
4125
name. If you name a directory, all the contents of that directory will 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.
4128
If you have newly added files since the target revision, they will be
4129
removed. If the files to be removed have been changed, backups will be
4130
created as above. Directories containing unknown files will not be
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
4133
The working tree contains a list of revisions that have been merged but
4134
not yet committed. These revisions will be included as additional parents
4135
of the next commit. Normally, using revert clears that list as well as
4136
reverting the files. If any files are specified, revert leaves the list
4137
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4138
.`` in the tree root to revert all files but keep the recorded merges,
4139
and ``bzr revert --forget-merges`` to clear the pending merge list without
4026
4140
reverting any files.
4142
Using "bzr revert --forget-merges", it is possible to apply all of the
4143
changes from a branch in a single revision. To do this, perform the merge
4144
as desired. Then doing revert with the "--forget-merges" option will keep
4145
the content of the tree as it was, but it will clear the list of pending
4146
merges. The next commit will then contain all of the changes that are
4147
present in the other branch, but without any other parent revisions.
4148
Because this technique forgets where these changes originated, it may
4149
cause additional conflicts on later merges involving the same source and
4029
4153
_see_also = ['cat', 'export']
4198
4320
if remote_branch.base == local_branch.base:
4199
4321
remote_branch = local_branch
4323
local_branch.lock_read()
4324
self.add_cleanup(local_branch.unlock)
4201
4325
local_revid_range = _revision_range_to_revid_range(
4202
4326
_get_revision_range(my_revision, local_branch,
4329
remote_branch.lock_read()
4330
self.add_cleanup(remote_branch.unlock)
4205
4331
remote_revid_range = _revision_range_to_revid_range(
4206
4332
_get_revision_range(revision,
4207
4333
remote_branch, self.name()))
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()
4335
local_extra, remote_extra = find_unmerged(
4336
local_branch, remote_branch, restrict,
4337
backward=not reverse,
4338
include_merges=include_merges,
4339
local_revid_range=local_revid_range,
4340
remote_revid_range=remote_revid_range)
4342
if log_format is None:
4343
registry = log.log_formatter_registry
4344
log_format = registry.get_default(local_branch)
4345
lf = log_format(to_file=self.outf,
4347
show_timezone='original')
4350
if local_extra and not theirs_only:
4351
message("You have %d extra revision(s):\n" %
4353
for revision in iter_log_revisions(local_extra,
4354
local_branch.repository,
4356
lf.log_revision(revision)
4357
printed_local = True
4360
printed_local = False
4362
if remote_extra and not mine_only:
4363
if printed_local is True:
4365
message("You are missing %d revision(s):\n" %
4367
for revision in iter_log_revisions(remote_extra,
4368
remote_branch.repository,
4370
lf.log_revision(revision)
4373
if mine_only and not local_extra:
4374
# We checked local, and found nothing extra
4375
message('This branch is up to date.\n')
4376
elif theirs_only and not remote_extra:
4377
# We checked remote, and found nothing extra
4378
message('Other branch is up to date.\n')
4379
elif not (mine_only or theirs_only or local_extra or
4381
# We checked both branches, and neither one had extra
4383
message("Branches are up to date.\n")
4266
4385
if not status_code and parent is None and other_branch is not None:
4267
4386
local_branch.lock_write()
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()
4387
self.add_cleanup(local_branch.unlock)
4388
# handle race conditions - a parent might be set while we run.
4389
if local_branch.get_parent() is None:
4390
local_branch.set_parent(remote_branch.base)
4274
4391
return status_code
4398
4513
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4399
4514
if wt is not None:
4516
self.add_cleanup(wt.unlock)
4402
4518
branch.lock_read()
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,
4519
self.add_cleanup(branch.unlock)
4520
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4522
self.add_cleanup(tree.unlock)
4524
file_id = wt.path2id(relpath)
4526
file_id = tree.path2id(relpath)
4528
raise errors.NotVersionedError(filename)
4529
file_version = tree.inventory[file_id].revision
4530
if wt is not None and revision is None:
4531
# If there is a tree and we're not annotating historical
4532
# versions, annotate the working tree's content.
4533
annotate_file_tree(wt, file_id, self.outf, long, all,
4536
annotate_file(branch, file_version, file_id, long, all, self.outf,
4427
4540
class cmd_re_sign(Command):
4641
4750
end_revision=last_revno)
4644
print 'Dry-run, pretending to remove the above revisions.'
4646
val = raw_input('Press <enter> to continue')
4753
self.outf.write('Dry-run, pretending to remove'
4754
' the above revisions.\n')
4648
print 'The above revision(s) will be removed.'
4650
val = raw_input('Are you sure [y/N]? ')
4651
if val.lower() not in ('y', 'yes'):
4756
self.outf.write('The above revision(s) will be removed.\n')
4759
if not ui.ui_factory.get_boolean('Are you sure'):
4760
self.outf.write('Canceled')
4655
4763
mutter('Uncommitting from {%s} to {%s}',
4656
4764
last_rev_id, rev_id)
4657
4765
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4658
4766
revno=revno, local=local)
4659
note('You can restore the old tip by running:\n'
4660
' bzr pull . -r revid:%s', last_rev_id)
4767
self.outf.write('You can restore the old tip by running:\n'
4768
' bzr pull . -r revid:%s\n' % last_rev_id)
4663
4771
class cmd_break_lock(Command):
4943
5057
directly from the merge directive, without retrieving data from a
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
5060
`bzr send` creates a compact data set that, when applied using bzr
5061
merge, has the same effect as merging from the source branch.
5063
By default the merge directive is self-contained and can be applied to any
5064
branch containing submit_branch in its ancestory without needing access to
5067
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5068
revisions, but only a structured request to merge from the
5069
public_location. In that case the public_branch is needed and it must be
5070
up-to-date and accessible to the recipient. The public_branch is always
5071
included if known, so that people can check it later.
5073
The submit branch defaults to the parent of the source branch, but can be
5074
overridden. Both submit branch and public branch will be remembered in
5075
branch.conf the first time they are used for a particular branch. The
5076
source branch defaults to that containing the working directory, but can
5077
be changed using --from.
5079
In order to calculate those changes, bzr must analyse the submit branch.
5080
Therefore it is most efficient for the submit branch to be a local mirror.
5081
If a public location is known for the submit_branch, that location is used
5082
in the merge directive.
5084
The default behaviour is to send the merge directive by mail, unless -o is
5085
given, in which case it is sent to a file.
4959
5087
Mail is sent using your preferred mail program. This should be transparent
4960
5088
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5144
5277
branch, relpath = Branch.open_containing(directory)
5145
5278
branch.lock_write()
5148
branch.tags.delete_tag(tag_name)
5149
self.outf.write('Deleted tag %s.\n' % tag_name)
5279
self.add_cleanup(branch.unlock)
5281
branch.tags.delete_tag(tag_name)
5282
self.outf.write('Deleted tag %s.\n' % tag_name)
5285
if len(revision) != 1:
5286
raise errors.BzrCommandError(
5287
"Tags can only be placed on a single revision, "
5289
revision_id = revision[0].as_revision_id(branch)
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)
5291
revision_id = branch.last_revision()
5292
if (not force) and branch.tags.has_tag(tag_name):
5293
raise errors.TagAlreadyExists(tag_name)
5294
branch.tags.set_tag(tag_name, revision_id)
5295
self.outf.write('Created tag %s.\n' % tag_name)
5167
5298
class cmd_tags(Command):
5202
5333
branch.lock_read()
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)
5334
self.add_cleanup(branch.unlock)
5336
graph = branch.repository.get_graph()
5337
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5338
revid1, revid2 = rev1.rev_id, rev2.rev_id
5339
# only show revisions between revid1 and revid2 (inclusive)
5340
tags = [(tag, revid) for tag, revid in tags if
5341
graph.is_between(revid, revid1, revid2)]
5344
elif sort == 'time':
5346
for tag, revid in tags:
5348
revobj = branch.repository.get_revision(revid)
5349
except errors.NoSuchRevision:
5350
timestamp = sys.maxint # place them at the end
5352
timestamp = revobj.timestamp
5353
timestamps[revid] = timestamp
5354
tags.sort(key=lambda x: timestamps[x[1]])
5356
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5357
for index, (tag, revid) in enumerate(tags):
5359
revno = branch.revision_id_to_dotted_revno(revid)
5360
if isinstance(revno, tuple):
5361
revno = '.'.join(map(str, revno))
5362
except errors.NoSuchRevision:
5363
# Bad tag data/merges can lead to tagged revisions
5364
# which are not in this branch. Fail gracefully ...
5366
tags[index] = (tag, revno)
5238
5368
for tag, revspec in tags:
5239
5369
self.outf.write('%-20s %s\n' % (tag, revspec))
5349
5479
/path/to/newbranch.
5351
5481
Bound branches use the nickname of its master branch unless it is set
5352
locally, in which case switching will update the the local nickname to be
5482
locally, in which case switching will update the local nickname to be
5353
5483
that of the master.
5356
takes_args = ['to_location']
5486
takes_args = ['to_location?']
5357
5487
takes_options = [Option('force',
5358
5488
help='Switch even if local commits will be lost.'),
5359
5490
Option('create-branch', short_name='b',
5360
5491
help='Create the target branch from this one before'
5361
5492
' switching to it.'),
5364
def run(self, to_location, force=False, create_branch=False):
5495
def run(self, to_location=None, force=False, create_branch=False,
5365
5497
from bzrlib import switch
5366
5498
tree_location = '.'
5499
revision = _get_one_revision('switch', revision)
5367
5500
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5501
if to_location is None:
5502
if revision is None:
5503
raise errors.BzrCommandError('You must supply either a'
5504
' revision or a location')
5369
5507
branch = control_dir.open_branch()
5370
5508
had_explicit_nick = branch.get_config().has_explicit_nickname()
added
removed
bzrlib/builtins.py
