333
358
' --revision or a revision_id')
334
359
b = WorkingTree.open_containing(u'.')[0].branch
336
# TODO: jam 20060112 should cat-revision always output utf-8?
337
if revision_id is not None:
338
revision_id = osutils.safe_revision_id(revision_id, warn=False)
340
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
341
except errors.NoSuchRevision:
342
msg = "The repository %s contains no revision %s." % (b.repository.base,
344
raise errors.BzrCommandError(msg)
345
elif revision is not None:
348
raise errors.BzrCommandError('You cannot specify a NULL'
350
rev_id = rev.as_revision_id(b)
351
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()
354
388
class cmd_dump_btree(Command):
355
389
"""Dump the contents of a btree index file to stdout.
434
470
To re-create the working tree, use "bzr checkout".
436
472
_see_also = ['checkout', 'working-trees']
437
takes_args = ['location?']
473
takes_args = ['location*']
438
474
takes_options = [
440
476
help='Remove the working tree even if it has '
441
477
'uncommitted changes.'),
444
def run(self, location='.', force=False):
445
d = bzrdir.BzrDir.open(location)
448
working = d.open_workingtree()
449
except errors.NoWorkingTree:
450
raise errors.BzrCommandError("No working tree to remove")
451
except errors.NotLocalUrl:
452
raise errors.BzrCommandError("You cannot remove the working tree"
455
# XXX: What about pending merges ? -- vila 20090629
456
if working.has_changes(working.basis_tree()):
457
raise errors.UncommittedChanges(working)
459
working_path = working.bzrdir.root_transport.base
460
branch_path = working.branch.bzrdir.root_transport.base
461
if working_path != branch_path:
462
raise errors.BzrCommandError("You cannot remove the working tree"
463
" from a lightweight checkout")
465
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()
468
507
class cmd_revno(Command):
529
564
wt = WorkingTree.open_containing(directory)[0]
567
self.add_cleanup(wt.unlock)
532
568
except (errors.NoWorkingTree, errors.NotLocalUrl):
534
570
b = Branch.open_containing(directory)[0]
538
if revision is not None:
539
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
540
if revision_info_list is not None:
541
for rev_str in revision_info_list:
542
rev_spec = RevisionSpec.from_string(rev_str)
543
revision_ids.append(rev_spec.as_revision_id(b))
544
# No arguments supplied, default to the last revision
545
if len(revision_ids) == 0:
548
raise errors.NoWorkingTree(directory)
549
revision_ids.append(wt.last_revision())
551
revision_ids.append(b.last_revision())
555
for revision_id in revision_ids:
557
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
558
revno = '.'.join(str(i) for i in dotted_revno)
559
except errors.NoSuchRevision:
561
maxlen = max(maxlen, len(revno))
562
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])
569
601
for ri in revinfos:
570
602
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
642
677
base_tree.lock_read()
644
file_list = self._maybe_expand_globs(file_list)
645
tree, file_list = tree_files_for_add(file_list)
646
added, ignored = tree.smart_add(file_list, not
647
no_recurse, action=action, save=not dry_run)
649
if base_tree is not None:
678
self.add_cleanup(base_tree.unlock)
679
tree, file_list = tree_files_for_add(file_list)
680
added, ignored = tree.smart_add(file_list, not
681
no_recurse, action=action, save=not dry_run)
651
683
if len(ignored) > 0:
653
685
for glob in sorted(ignored.keys()):
654
686
for path in ignored[glob]:
655
687
self.outf.write("ignored %s matching \"%s\"\n"
659
for glob, paths in ignored.items():
660
match_len += len(paths)
661
self.outf.write("ignored %d file(s).\n" % match_len)
662
self.outf.write("If you wish to add ignored files, "
663
"please add them explicitly by name. "
664
"(\"bzr ignored\" gives a list)\n")
667
691
class cmd_mkdir(Command):
725
749
revision = _get_one_revision('inventory', revision)
726
750
work_tree, file_list = tree_files(file_list)
727
751
work_tree.lock_read()
729
if revision is not None:
730
tree = revision.as_tree(work_tree.branch)
732
extra_trees = [work_tree]
738
if file_list is not None:
739
file_ids = tree.paths2ids(file_list, trees=extra_trees,
740
require_versioned=True)
741
# find_ids_across_trees may include some paths that don't
743
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
744
for file_id in file_ids if file_id in tree)
746
entries = tree.inventory.entries()
749
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()
752
774
for path, entry in entries:
753
775
if kind and kind != entry.kind:
895
914
dest = osutils.pathjoin(dest_parent, dest_tail)
896
915
mutter("attempting to move %s => %s", src, dest)
897
916
tree.rename_one(src, dest, after=after)
898
self.outf.write("%s => %s\n" % (src, dest))
918
self.outf.write("%s => %s\n" % (src, dest))
901
921
class cmd_pull(Command):
902
922
"""Turn this branch into a mirror of another branch.
904
This command only works on branches that have not diverged. Branches are
905
considered diverged if the destination branch's most recent commit is one
906
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
908
929
If branches have diverged, you can use 'bzr merge' to integrate the changes
909
930
from one into the other. Once one branch has merged, the other should
910
931
be able to pull it again.
912
If you want to forget your local changes and just update your branch to
913
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.
915
937
If there is no default location set, the first pull will set it. After
916
938
that, you can omit the location to use the default. To change the
998
1020
if branch_from is not branch_to:
999
1021
branch_from.lock_read()
1001
if revision is not None:
1002
revision_id = revision.as_revision_id(branch_from)
1004
branch_to.lock_write()
1006
if tree_to is not None:
1007
view_info = _get_view_info_for_change_reporter(tree_to)
1008
change_reporter = delta._ChangeReporter(
1009
unversioned_filter=tree_to.is_ignored,
1010
view_info=view_info)
1011
result = tree_to.pull(
1012
branch_from, overwrite, revision_id, change_reporter,
1013
possible_transports=possible_transports, local=local)
1015
result = branch_to.pull(
1016
branch_from, overwrite, revision_id, local=local)
1018
result.report(self.outf)
1019
if verbose and result.old_revid != result.new_revid:
1020
log.show_branch_change(
1021
branch_to, self.outf, result.old_revno,
1026
if branch_from is not branch_to:
1027
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,
1030
1047
class cmd_push(Command):
1183
1202
' directory exists, but does not already'
1184
1203
' have a control directory. This flag will'
1185
1204
' allow branch to proceed.'),
1206
help="Bind new branch to from location."),
1187
1208
aliases = ['get', 'clone']
1189
1210
def run(self, from_location, to_location=None, revision=None,
1190
1211
hardlink=False, stacked=False, standalone=False, no_tree=False,
1191
use_existing_dir=False):
1212
use_existing_dir=False, switch=False, bind=False):
1213
from bzrlib import switch as _mod_switch
1192
1214
from bzrlib.tag import _merge_tags_if_possible
1194
1215
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1196
if (accelerator_tree is not None and
1197
accelerator_tree.supports_content_filtering()):
1198
accelerator_tree = None
1199
1217
revision = _get_one_revision('branch', revision)
1200
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)
1202
if revision is not None:
1203
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)
1205
# FIXME - wt.last_revision, fallback to branch, fall back to
1206
# None or perhaps NULL_REVISION to mean copy nothing
1208
revision_id = br_from.last_revision()
1209
if to_location is None:
1210
to_location = urlutils.derive_to_location(from_location)
1211
to_transport = transport.get_transport(to_location)
1213
to_transport.mkdir('.')
1214
except errors.FileExists:
1215
if not use_existing_dir:
1216
raise errors.BzrCommandError('Target directory "%s" '
1217
'already exists.' % to_location)
1238
bzrdir.BzrDir.open_from_transport(to_transport)
1239
except errors.NotBranchError:
1220
bzrdir.BzrDir.open_from_transport(to_transport)
1221
except errors.NotBranchError:
1224
raise errors.AlreadyBranchError(to_location)
1225
except errors.NoSuchFile:
1226
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1229
# preserve whatever source format we have.
1230
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1231
possible_transports=[to_transport],
1232
accelerator_tree=accelerator_tree,
1233
hardlink=hardlink, stacked=stacked,
1234
force_new_repo=standalone,
1235
create_tree_if_local=not no_tree,
1236
source_branch=br_from)
1237
branch = dir.open_branch()
1238
except errors.NoSuchRevision:
1239
to_transport.delete_tree('.')
1240
msg = "The branch %s has no revision %s." % (from_location,
1242
raise errors.BzrCommandError(msg)
1243
_merge_tags_if_possible(br_from, branch)
1244
# If the source branch is stacked, the new branch may
1245
# be stacked whether we asked for that explicitly or not.
1246
# We therefore need a try/except here and not just 'if stacked:'
1248
note('Created new stacked branch referring to %s.' %
1249
branch.get_stacked_on_url())
1250
except (errors.NotStacked, errors.UnstackableBranchFormat,
1251
errors.UnstackableRepositoryFormat), e:
1252
note('Branched %d revision(s).' % branch.revno())
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'))
1257
1284
class cmd_checkout(Command):
1336
1363
def run(self, dir=u'.'):
1337
1364
tree = WorkingTree.open_containing(dir)[0]
1338
1365
tree.lock_read()
1340
new_inv = tree.inventory
1341
old_tree = tree.basis_tree()
1342
old_tree.lock_read()
1344
old_inv = old_tree.inventory
1346
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1347
for f, paths, c, v, p, n, k, e in iterator:
1348
if paths[0] == paths[1]:
1352
renames.append(paths)
1354
for old_name, new_name in renames:
1355
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))
1362
1385
class cmd_update(Command):
1369
1392
If you want to discard your local changes, you can just do a
1370
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.
1373
1399
_see_also = ['pull', 'working-trees', 'status-flags']
1374
1400
takes_args = ['dir?']
1401
takes_options = ['revision']
1375
1402
aliases = ['up']
1377
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")
1378
1408
tree = WorkingTree.open_containing(dir)[0]
1409
branch = tree.branch
1379
1410
possible_transports = []
1380
master = tree.branch.get_master_branch(
1411
master = branch.get_master_branch(
1381
1412
possible_transports=possible_transports)
1382
1413
if master is not None:
1383
1414
tree.lock_write()
1415
branch_location = master.base
1385
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)
1387
existing_pending_merges = tree.get_parent_ids()[1:]
1388
last_rev = _mod_revision.ensure_null(tree.last_revision())
1389
if last_rev == _mod_revision.ensure_null(
1390
tree.branch.last_revision()):
1391
# may be up to date, check master too.
1392
if master is None or last_rev == _mod_revision.ensure_null(
1393
master.last_revision()):
1394
revno = tree.branch.revision_id_to_revno(last_rev)
1395
note("Tree is up to date at revision %d." % (revno,))
1397
view_info = _get_view_info_for_change_reporter(tree)
1398
1445
conflicts = tree.update(
1399
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1400
view_info=view_info), possible_transports=possible_transports)
1401
revno = tree.branch.revision_id_to_revno(
1402
_mod_revision.ensure_null(tree.last_revision()))
1403
note('Updated to revision %d.' % (revno,))
1404
if tree.get_parent_ids()[1:] != existing_pending_merges:
1405
note('Your local commits will now show as pending merges with '
1406
"'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'.")
1415
1469
class cmd_info(Command):
1486
1540
file_list = [f for f in file_list]
1488
1542
tree.lock_write()
1490
# Heuristics should probably all move into tree.remove_smart or
1493
added = tree.changes_from(tree.basis_tree(),
1494
specific_files=file_list).added
1495
file_list = sorted([f[0] for f in added], reverse=True)
1496
if len(file_list) == 0:
1497
raise errors.BzrCommandError('No matching files.')
1498
elif file_list is None:
1499
# missing files show up in iter_changes(basis) as
1500
# versioned-with-no-kind.
1502
for change in tree.iter_changes(tree.basis_tree()):
1503
# Find paths in the working tree that have no kind:
1504
if change[1][1] is not None and change[6][1] is None:
1505
missing.append(change[1][1])
1506
file_list = sorted(missing, reverse=True)
1507
file_deletion_strategy = 'keep'
1508
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1509
keep_files=file_deletion_strategy=='keep',
1510
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')
1515
1567
class cmd_file_id(Command):
1737
1789
class cmd_init_repository(Command):
1738
"""Create a shared repository to hold branches.
1790
"""Create a shared repository for branches to share storage space.
1740
1792
New branches created under the repository directory will store their
1741
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.
1743
If the --no-trees option is used then the branches in the repository
1744
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.
1747
Create a shared repositories holding just branches::
1805
Create a shared repository holding just branches::
1749
1807
bzr init-repo --no-trees repo
1750
1808
bzr init repo/trunk
2304
2369
diff_type = 'full'
2308
# Build the log formatter
2309
if log_format is None:
2310
log_format = log.log_formatter_registry.get_default(b)
2311
lf = log_format(show_ids=show_ids, to_file=self.outf,
2312
show_timezone=timezone,
2313
delta_format=get_verbosity_level(),
2315
show_advice=levels is None)
2317
# Choose the algorithm for doing the logging. It's annoying
2318
# having multiple code paths like this but necessary until
2319
# the underlying repository format is faster at generating
2320
# deltas or can provide everything we need from the indices.
2321
# The default algorithm - match-using-deltas - works for
2322
# multiple files and directories and is faster for small
2323
# amounts of history (200 revisions say). However, it's too
2324
# slow for logging a single file in a repository with deep
2325
# history, i.e. > 10K revisions. In the spirit of "do no
2326
# evil when adding features", we continue to use the
2327
# original algorithm - per-file-graph - for the "single
2328
# file that isn't a directory without showing a delta" case.
2329
partial_history = revision and b.repository._format.supports_chks
2330
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2331
or delta_type or partial_history)
2333
# Build the LogRequest and execute it
2334
if len(file_ids) == 0:
2336
rqst = make_log_request_dict(
2337
direction=direction, specific_fileids=file_ids,
2338
start_revision=rev1, end_revision=rev2, limit=limit,
2339
message_search=message, delta_type=delta_type,
2340
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2341
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)
2346
2410
def _get_revision_range(revisionspec_list, branch, command_name):
2486
2553
note("Ignoring files outside view. View is %s" % view_str)
2488
2555
tree.lock_read()
2490
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2491
from_dir=relpath, recursive=recursive):
2492
# Apply additional masking
2493
if not all and not selection[fc]:
2495
if kind is not None and fkind != kind:
2500
fullpath = osutils.pathjoin(relpath, fp)
2503
views.check_path_in_view(tree, fullpath)
2504
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:
2509
fp = osutils.pathjoin(prefix, fp)
2510
kindch = entry.kind_character()
2511
outstring = fp + kindch
2512
ui.ui_factory.clear_term()
2514
outstring = '%-8s %s' % (fc, outstring)
2515
if show_ids and fid is not None:
2516
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))
2517
2600
self.outf.write(outstring + '\n')
2519
self.outf.write(fp + '\0')
2522
self.outf.write(fid)
2523
self.outf.write('\0')
2531
self.outf.write('%-50s %s\n' % (outstring, my_id))
2533
self.outf.write(outstring + '\n')
2538
2603
class cmd_unknowns(Command):
2761
2848
tree, branch, relpath = \
2762
2849
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2763
2850
branch.lock_read()
2765
return self._run(tree, branch, relpath, filename, revision,
2766
name_from_revision, filters)
2851
self.add_cleanup(branch.unlock)
2852
return self._run(tree, branch, relpath, filename, revision,
2853
name_from_revision, filters)
2770
2855
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2772
2857
if tree is None:
2773
2858
tree = b.basis_tree()
2774
2859
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2860
rev_tree.lock_read()
2861
self.add_cleanup(rev_tree.unlock)
2776
2863
old_file_id = rev_tree.path2id(relpath)
3441
3569
verbose = not is_quiet()
3442
3570
# TODO: should possibly lock the history file...
3443
3571
benchfile = open(".perf_history", "at", buffering=1)
3572
self.add_cleanup(benchfile.close)
3445
3574
test_suite_factory = None
3446
3575
benchfile = None
3448
selftest_kwargs = {"verbose": verbose,
3450
"stop_on_failure": one,
3451
"transport": transport,
3452
"test_suite_factory": test_suite_factory,
3453
"lsprof_timed": lsprof_timed,
3454
"bench_history": benchfile,
3455
"matching_tests_first": first,
3456
"list_only": list_only,
3457
"random_seed": randomize,
3458
"exclude_pattern": exclude,
3460
"load_list": load_list,
3461
"debug_flags": debugflag,
3462
"starting_with": starting_with
3464
selftest_kwargs.update(self.additional_selftest_args)
3465
result = selftest(**selftest_kwargs)
3467
if benchfile is not 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)
3469
3595
return int(not result)
3633
3767
verified = 'inapplicable'
3634
3768
tree = WorkingTree.open_containing(directory)[0]
3636
# die as quickly as possible if there are uncommitted changes
3638
3771
basis_tree = tree.revision_tree(tree.last_revision())
3639
3772
except errors.NoSuchRevision:
3640
3773
basis_tree = tree.basis_tree()
3775
# die as quickly as possible if there are uncommitted changes
3642
if tree.has_changes(basis_tree):
3777
if tree.has_changes():
3643
3778
raise errors.UncommittedChanges(tree)
3645
3780
view_info = _get_view_info_for_change_reporter(tree)
3646
3781
change_reporter = delta._ChangeReporter(
3647
3782
unversioned_filter=tree.is_ignored, view_info=view_info)
3650
pb = ui.ui_factory.nested_progress_bar()
3651
cleanups.append(pb.finished)
3653
cleanups.append(tree.unlock)
3654
if location is not None:
3656
mergeable = bundle.read_mergeable_from_url(location,
3657
possible_transports=possible_transports)
3658
except errors.NotABundle:
3662
raise errors.BzrCommandError('Cannot use --uncommitted'
3663
' with bundles or merge directives.')
3665
if revision is not None:
3666
raise errors.BzrCommandError(
3667
'Cannot use -r with merge directives or bundles')
3668
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3671
if merger is None and uncommitted:
3672
if revision is not None and len(revision) > 0:
3673
raise errors.BzrCommandError('Cannot use --uncommitted and'
3674
' --revision at the same time.')
3675
merger = self.get_merger_from_uncommitted(tree, location, pb,
3677
allow_pending = False
3680
merger, allow_pending = self._get_merger_from_branch(tree,
3681
location, revision, remember, possible_transports, pb)
3683
merger.merge_type = merge_type
3684
merger.reprocess = reprocess
3685
merger.show_base = show_base
3686
self.sanity_check_merger(merger)
3687
if (merger.base_rev_id == merger.other_rev_id and
3688
merger.other_rev_id is not None):
3689
note('Nothing to do.')
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:
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)
3692
if merger.interesting_files is not None:
3693
raise errors.BzrCommandError('Cannot pull individual files')
3694
if (merger.base_rev_id == tree.last_revision()):
3695
result = tree.pull(merger.other_branch, False,
3696
merger.other_rev_id)
3697
result.report(self.outf)
3699
merger.check_basis(False)
3701
return self._do_preview(merger, cleanups)
3703
return self._do_interactive(merger, cleanups)
3705
return self._do_merge(merger, change_reporter, allow_pending,
3708
for cleanup in reversed(cleanups):
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,
3711
def _get_preview(self, merger, cleanups):
3843
def _get_preview(self, merger):
3712
3844
tree_merger = merger.make_merger()
3713
3845
tt = tree_merger.make_preview_transform()
3714
cleanups.append(tt.finalize)
3846
self.add_cleanup(tt.finalize)
3715
3847
result_tree = tt.get_preview_tree()
3716
3848
return result_tree
3718
def _do_preview(self, merger, cleanups):
3850
def _do_preview(self, merger):
3719
3851
from bzrlib.diff import show_diff_trees
3720
result_tree = self._get_preview(merger, cleanups)
3852
result_tree = self._get_preview(merger)
3721
3853
show_diff_trees(merger.this_tree, result_tree, self.outf,
3722
3854
old_label='', new_label='')
3912
4045
merge_type = _mod_merge.Merge3Merger
3913
4046
tree, file_list = tree_files(file_list)
3914
4047
tree.lock_write()
3916
parents = tree.get_parent_ids()
3917
if len(parents) != 2:
3918
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3919
" merges. Not cherrypicking or"
3921
repository = tree.branch.repository
3922
interesting_ids = None
3924
conflicts = tree.conflicts()
3925
if file_list is not None:
3926
interesting_ids = set()
3927
for filename in file_list:
3928
file_id = tree.path2id(filename)
3930
raise errors.NotVersionedError(filename)
3931
interesting_ids.add(file_id)
3932
if tree.kind(file_id) != "directory":
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":
3935
for name, ie in tree.inventory.iter_entries(file_id):
3936
interesting_ids.add(ie.file_id)
3937
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3939
# Remerge only supports resolving contents conflicts
3940
allowed_conflicts = ('text conflict', 'contents conflict')
3941
restore_files = [c.path for c in conflicts
3942
if c.typestring in allowed_conflicts]
3943
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3944
tree.set_conflicts(ConflictList(new_conflicts))
3945
if file_list is not None:
3946
restore_files = file_list
3947
for filename in restore_files:
3949
restore(tree.abspath(filename))
3950
except errors.NotConflicted:
3952
# Disable pending merges, because the file texts we are remerging
3953
# have not had those merges performed. If we use the wrong parents
3954
# list, we imply that the working tree text has seen and rejected
3955
# all the changes from the other tree, when in fact those changes
3956
# have not yet been seen.
3957
pb = ui.ui_factory.nested_progress_bar()
3958
tree.set_parent_ids(parents[:1])
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:
3960
merger = _mod_merge.Merger.from_revision_ids(pb,
3962
merger.interesting_ids = interesting_ids
3963
merger.merge_type = merge_type
3964
merger.show_base = show_base
3965
merger.reprocess = reprocess
3966
conflicts = merger.do_merge()
3968
tree.set_parent_ids(parents)
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()
4099
tree.set_parent_ids(parents)
3972
4100
if conflicts > 0:
3996
4124
name. If you name a directory, all the contents of that directory will be
3999
Any files that have been newly added since that revision will be deleted,
4000
with a backup kept if appropriate. Directories containing unknown files
4001
will not be deleted.
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
4003
The working tree contains a list of pending merged revisions, which will
4004
be included as parents in the next commit. Normally, revert clears that
4005
list as well as reverting the files. If any files are specified, revert
4006
leaves the pending merge list alone and reverts only the files. Use "bzr
4007
revert ." in the tree root to revert all files but keep the merge record,
4008
and "bzr revert --forget-merges" to clear the pending merge list without
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
4009
4139
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
4012
4152
_see_also = ['cat', 'export']
4022
4162
forget_merges=None):
4023
4163
tree, file_list = tree_files(file_list)
4024
4164
tree.lock_write()
4027
tree.set_parent_ids(tree.get_parent_ids()[:1])
4029
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4165
self.add_cleanup(tree.unlock)
4167
tree.set_parent_ids(tree.get_parent_ids()[:1])
4169
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4034
4172
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4035
4173
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4036
pb = ui.ui_factory.nested_progress_bar()
4038
tree.revert(file_list, rev_tree, not no_backup, pb,
4039
report_changes=True)
4174
tree.revert(file_list, rev_tree, not no_backup, None,
4175
report_changes=True)
4044
4178
class cmd_assert_fail(Command):
4181
4319
if remote_branch.base == local_branch.base:
4182
4320
remote_branch = local_branch
4322
local_branch.lock_read()
4323
self.add_cleanup(local_branch.unlock)
4184
4324
local_revid_range = _revision_range_to_revid_range(
4185
4325
_get_revision_range(my_revision, local_branch,
4328
remote_branch.lock_read()
4329
self.add_cleanup(remote_branch.unlock)
4188
4330
remote_revid_range = _revision_range_to_revid_range(
4189
4331
_get_revision_range(revision,
4190
4332
remote_branch, self.name()))
4192
local_branch.lock_read()
4194
remote_branch.lock_read()
4196
local_extra, remote_extra = find_unmerged(
4197
local_branch, remote_branch, restrict,
4198
backward=not reverse,
4199
include_merges=include_merges,
4200
local_revid_range=local_revid_range,
4201
remote_revid_range=remote_revid_range)
4203
if log_format is None:
4204
registry = log.log_formatter_registry
4205
log_format = registry.get_default(local_branch)
4206
lf = log_format(to_file=self.outf,
4208
show_timezone='original')
4211
if local_extra and not theirs_only:
4212
message("You have %d extra revision(s):\n" %
4214
for revision in iter_log_revisions(local_extra,
4215
local_branch.repository,
4217
lf.log_revision(revision)
4218
printed_local = True
4221
printed_local = False
4223
if remote_extra and not mine_only:
4224
if printed_local is True:
4226
message("You are missing %d revision(s):\n" %
4228
for revision in iter_log_revisions(remote_extra,
4229
remote_branch.repository,
4231
lf.log_revision(revision)
4234
if mine_only and not local_extra:
4235
# We checked local, and found nothing extra
4236
message('This branch is up to date.\n')
4237
elif theirs_only and not remote_extra:
4238
# We checked remote, and found nothing extra
4239
message('Other branch is up to date.\n')
4240
elif not (mine_only or theirs_only or local_extra or
4242
# We checked both branches, and neither one had extra
4244
message("Branches are up to date.\n")
4246
remote_branch.unlock()
4248
local_branch.unlock()
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")
4249
4384
if not status_code and parent is None and other_branch is not None:
4250
4385
local_branch.lock_write()
4252
# handle race conditions - a parent might be set while we run.
4253
if local_branch.get_parent() is None:
4254
local_branch.set_parent(remote_branch.base)
4256
local_branch.unlock()
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)
4257
4390
return status_code
4381
4512
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4382
4513
if wt is not None:
4515
self.add_cleanup(wt.unlock)
4385
4517
branch.lock_read()
4387
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4389
file_id = wt.path2id(relpath)
4391
file_id = tree.path2id(relpath)
4393
raise errors.NotVersionedError(filename)
4394
file_version = tree.inventory[file_id].revision
4395
if wt is not None and revision is None:
4396
# If there is a tree and we're not annotating historical
4397
# versions, annotate the working tree's content.
4398
annotate_file_tree(wt, file_id, self.outf, long, all,
4401
annotate_file(branch, file_version, file_id, long, all, self.outf,
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,
4410
4539
class cmd_re_sign(Command):
4624
4750
end_revision=last_revno)
4627
print 'Dry-run, pretending to remove the above revisions.'
4629
val = raw_input('Press <enter> to continue')
4753
ui.ui_factory.note('Dry-run, pretending to remove the above revisions.')
4631
print 'The above revision(s) will be removed.'
4633
val = raw_input('Are you sure [y/N]? ')
4634
if val.lower() not in ('y', 'yes'):
4755
ui.ui_factory.note('The above revision(s) will be removed.')
4758
if not ui.ui_factory.get_boolean('Are you sure [y/N]? '):
4759
ui.ui_factory.note('Canceled')
4638
4762
mutter('Uncommitting from {%s} to {%s}',
4639
4763
last_rev_id, rev_id)
4640
4764
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4641
4765
revno=revno, local=local)
4642
note('You can restore the old tip by running:\n'
4643
' bzr pull . -r revid:%s', last_rev_id)
4766
ui.ui_factory.note('You can restore the old tip by running:\n'
4767
' bzr pull . -r revid:%s' % last_rev_id)
4646
4770
class cmd_break_lock(Command):
4926
5056
directly from the merge directive, without retrieving data from a
4929
If --no-bundle is specified, then public_branch is needed (and must be
4930
up-to-date), so that the receiver can perform the merge using the
4931
public_branch. The public_branch is always included if known, so that
4932
people can check it later.
4934
The submit branch defaults to the parent, but can be overridden. Both
4935
submit branch and public branch will be remembered if supplied.
4937
If a public_branch is known for the submit_branch, that public submit
4938
branch is used in the merge instructions. This means that a local mirror
4939
can be used as your actual submit branch, once you have set public_branch
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.
4942
5086
Mail is sent using your preferred mail program. This should be transparent
4943
5087
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5127
5276
branch, relpath = Branch.open_containing(directory)
5128
5277
branch.lock_write()
5131
branch.tags.delete_tag(tag_name)
5132
self.outf.write('Deleted tag %s.\n' % tag_name)
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)
5135
if len(revision) != 1:
5136
raise errors.BzrCommandError(
5137
"Tags can only be placed on a single revision, "
5139
revision_id = revision[0].as_revision_id(branch)
5141
revision_id = branch.last_revision()
5142
if (not force) and branch.tags.has_tag(tag_name):
5143
raise errors.TagAlreadyExists(tag_name)
5144
branch.tags.set_tag(tag_name, revision_id)
5145
self.outf.write('Created 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)
5150
5297
class cmd_tags(Command):
5185
5332
branch.lock_read()
5188
graph = branch.repository.get_graph()
5189
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5190
revid1, revid2 = rev1.rev_id, rev2.rev_id
5191
# only show revisions between revid1 and revid2 (inclusive)
5192
tags = [(tag, revid) for tag, revid in tags if
5193
graph.is_between(revid, revid1, revid2)]
5196
elif sort == 'time':
5198
for tag, revid in tags:
5200
revobj = branch.repository.get_revision(revid)
5201
except errors.NoSuchRevision:
5202
timestamp = sys.maxint # place them at the end
5204
timestamp = revobj.timestamp
5205
timestamps[revid] = timestamp
5206
tags.sort(key=lambda x: timestamps[x[1]])
5208
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5209
for index, (tag, revid) in enumerate(tags):
5211
revno = branch.revision_id_to_dotted_revno(revid)
5212
if isinstance(revno, tuple):
5213
revno = '.'.join(map(str, revno))
5214
except errors.NoSuchRevision:
5215
# Bad tag data/merges can lead to tagged revisions
5216
# which are not in this branch. Fail gracefully ...
5218
tags[index] = (tag, revno)
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)
5221
5367
for tag, revspec in tags:
5222
5368
self.outf.write('%-20s %s\n' % (tag, revspec))
5260
5406
Option('bind-to', help='Branch to bind checkout to.', type=str),
5261
5407
Option('force',
5262
help='Perform reconfiguration even if local changes'
5408
help='Perform reconfiguration even if local changes'
5410
Option('stacked-on',
5411
help='Reconfigure a branch to be stacked on another branch.',
5415
help='Reconfigure a branch to be unstacked. This '
5416
'may require copying substantial data into it.',
5266
def run(self, location=None, target_type=None, bind_to=None, force=False):
5420
def run(self, location=None, target_type=None, bind_to=None, force=False,
5267
5423
directory = bzrdir.BzrDir.open(location)
5424
if stacked_on and unstacked:
5425
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5426
elif stacked_on is not None:
5427
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5429
reconfigure.ReconfigureUnstacked().apply(directory)
5430
# At the moment you can use --stacked-on and a different
5431
# reconfiguration shape at the same time; there seems no good reason
5268
5433
if target_type is None:
5269
raise errors.BzrCommandError('No target configuration specified')
5434
if stacked_on or unstacked:
5437
raise errors.BzrCommandError('No target configuration '
5270
5439
elif target_type == 'branch':
5271
5440
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5272
5441
elif target_type == 'tree':
5309
5478
/path/to/newbranch.
5311
5480
Bound branches use the nickname of its master branch unless it is set
5312
locally, in which case switching will update the the local nickname to be
5481
locally, in which case switching will update the local nickname to be
5313
5482
that of the master.
5316
takes_args = ['to_location']
5485
takes_args = ['to_location?']
5317
5486
takes_options = [Option('force',
5318
5487
help='Switch even if local commits will be lost.'),
5319
5489
Option('create-branch', short_name='b',
5320
5490
help='Create the target branch from this one before'
5321
5491
' switching to it.'),
5324
def run(self, to_location, force=False, create_branch=False):
5494
def run(self, to_location=None, force=False, create_branch=False,
5325
5496
from bzrlib import switch
5326
5497
tree_location = '.'
5498
revision = _get_one_revision('switch', revision)
5327
5499
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')
5329
5506
branch = control_dir.open_branch()
5330
5507
had_explicit_nick = branch.get_config().has_explicit_nickname()
5604
5778
if writer is None:
5605
5779
writer = bzrlib.option.diff_writer_registry.get()
5607
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5608
message, destroy=destroy).run()
5781
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5782
file_list, message, destroy=destroy)
5609
5787
except errors.UserAbort:
5612
5790
def run_for_list(self):
5613
5791
tree = WorkingTree.open_containing('.')[0]
5614
5792
tree.lock_read()
5616
manager = tree.get_shelf_manager()
5617
shelves = manager.active_shelves()
5618
if len(shelves) == 0:
5619
note('No shelved changes.')
5621
for shelf_id in reversed(shelves):
5622
message = manager.get_metadata(shelf_id).get('message')
5624
message = '<no message>'
5625
self.outf.write('%3d: %s\n' % (shelf_id, message))
5793
self.add_cleanup(tree.unlock)
5794
manager = tree.get_shelf_manager()
5795
shelves = manager.active_shelves()
5796
if len(shelves) == 0:
5797
note('No shelved changes.')
5799
for shelf_id in reversed(shelves):
5800
message = manager.get_metadata(shelf_id).get('message')
5802
message = '<no message>'
5803
self.outf.write('%3d: %s\n' % (shelf_id, message))
5631
5807
class cmd_unshelve(Command):
added
removed
bzrlib/builtins.py
