362
334
' --revision or a revision_id')
363
335
b = WorkingTree.open_containing(u'.')[0].branch
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
337
# TODO: jam 20060112 should cat-revision always output utf-8?
338
if revision_id is not None:
339
revision_id = osutils.safe_revision_id(revision_id, warn=False)
341
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
342
except errors.NoSuchRevision:
343
msg = "The repository %s contains no revision %s." % (b.repository.base,
345
raise errors.BzrCommandError(msg)
346
elif revision is not None:
349
raise errors.BzrCommandError('You cannot specify a NULL'
351
rev_id = rev.as_revision_id(b)
352
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
370
b.repository.lock_read()
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
389
b.repository.unlock()
392
355
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
356
"""Dump the contents of a btree index file to stdout.
395
358
PATH is a btree index file, it can be any URL. This includes things like
396
359
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
479
435
To re-create the working tree, use "bzr checkout".
481
437
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
438
takes_args = ['location?']
483
439
takes_options = [
485
441
help='Remove the working tree even if it has '
486
442
'uncommitted changes.'),
489
def run(self, location_list, force=False):
490
if not location_list:
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
511
d.destroy_workingtree()
445
def run(self, location='.', force=False):
446
d = bzrdir.BzrDir.open(location)
449
working = d.open_workingtree()
450
except errors.NoWorkingTree:
451
raise errors.BzrCommandError("No working tree to remove")
452
except errors.NotLocalUrl:
453
raise errors.BzrCommandError("You cannot remove the working tree of a "
456
changes = working.changes_from(working.basis_tree())
457
if changes.has_changed():
458
raise errors.UncommittedChanges(working)
460
working_path = working.bzrdir.root_transport.base
461
branch_path = working.branch.bzrdir.root_transport.base
462
if working_path != branch_path:
463
raise errors.BzrCommandError("You cannot remove the working tree from "
464
"a lightweight checkout")
466
d.destroy_workingtree()
514
469
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
470
"""Show current revision number.
517
472
This is equal to the number of revisions on this branch.
520
475
_see_also = ['info']
521
476
takes_args = ['location?']
523
Option('tree', help='Show revno of working tree'),
527
def run(self, tree=False, location=u'.'):
530
wt = WorkingTree.open_containing(location)[0]
531
self.add_cleanup(wt.lock_read().unlock)
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
raise errors.NoWorkingTree(location)
534
revid = wt.last_revision()
536
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
537
except errors.NoSuchRevision:
539
revno = ".".join(str(n) for n in revno_t)
541
b = Branch.open_containing(location)[0]
542
self.add_cleanup(b.lock_read().unlock)
545
self.outf.write(str(revno) + '\n')
479
def run(self, location=u'.'):
480
self.outf.write(str(Branch.open_containing(location)[0].revno()))
481
self.outf.write('\n')
548
484
class cmd_revision_info(Command):
549
__doc__ = """Show revision number and revision id for a given revision identifier.
485
"""Show revision number and revision id for a given revision identifier.
552
488
takes_args = ['revision_info*']
561
Option('tree', help='Show revno of working tree'),
565
def run(self, revision=None, directory=u'.', tree=False,
566
revision_info_list=[]):
500
def run(self, revision=None, directory=u'.', revision_info_list=[]):
569
wt = WorkingTree.open_containing(directory)[0]
571
self.add_cleanup(wt.lock_read().unlock)
572
except (errors.NoWorkingTree, errors.NotLocalUrl):
574
b = Branch.open_containing(directory)[0]
575
self.add_cleanup(b.lock_read().unlock)
577
503
if revision is not None:
578
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
504
revs.extend(revision)
579
505
if revision_info_list is not None:
580
for rev_str in revision_info_list:
581
rev_spec = RevisionSpec.from_string(rev_str)
582
revision_ids.append(rev_spec.as_revision_id(b))
583
# No arguments supplied, default to the last revision
584
if len(revision_ids) == 0:
587
raise errors.NoWorkingTree(directory)
588
revision_ids.append(wt.last_revision())
590
revision_ids.append(b.last_revision())
594
for revision_id in revision_ids:
506
for rev in revision_info_list:
507
revs.append(RevisionSpec.from_string(rev))
509
b = Branch.open_containing(directory)[0]
512
revs.append(RevisionSpec.from_string('-1'))
515
revision_id = rev.as_revision_id(b)
596
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
597
revno = '.'.join(str(i) for i in dotted_revno)
517
revno = '%4d' % (b.revision_id_to_revno(revision_id))
598
518
except errors.NoSuchRevision:
600
maxlen = max(maxlen, len(revno))
601
revinfos.append([revno, revision_id])
605
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
519
dotted_map = b.get_revision_id_to_revno_map()
520
revno = '.'.join(str(i) for i in dotted_map[revision_id])
521
print '%s %s' % (revno, revision_id)
608
524
class cmd_add(Command):
609
__doc__ = """Add specified files or directories.
525
"""Add specified files or directories.
611
527
In non-recursive mode, all the named items are added, regardless
612
528
of whether they were previously ignored. A warning is given if
677
590
should_print=(not is_quiet()))
680
self.add_cleanup(base_tree.lock_read().unlock)
681
tree, file_list = tree_files_for_add(file_list)
682
added, ignored = tree.smart_add(file_list, not
683
no_recurse, action=action, save=not dry_run)
593
base_tree.lock_read()
595
file_list = self._maybe_expand_globs(file_list)
596
tree, file_list = tree_files_for_add(file_list)
597
added, ignored = tree.smart_add(file_list, not
598
no_recurse, action=action, save=not dry_run)
600
if base_tree is not None:
685
602
if len(ignored) > 0:
687
604
for glob in sorted(ignored.keys()):
688
605
for path in ignored[glob]:
689
606
self.outf.write("ignored %s matching \"%s\"\n"
610
for glob, paths in ignored.items():
611
match_len += len(paths)
612
self.outf.write("ignored %d file(s).\n" % match_len)
613
self.outf.write("If you wish to add some of these files,"
614
" please add them by name.\n")
693
617
class cmd_mkdir(Command):
694
__doc__ = """Create a new versioned directory.
618
"""Create a new versioned directory.
696
620
This is equivalent to creating the directory and then adding it.
756
675
revision = _get_one_revision('inventory', revision)
757
676
work_tree, file_list = tree_files(file_list)
758
self.add_cleanup(work_tree.lock_read().unlock)
759
if revision is not None:
760
tree = revision.as_tree(work_tree.branch)
762
extra_trees = [work_tree]
763
self.add_cleanup(tree.lock_read().unlock)
768
if file_list is not None:
769
file_ids = tree.paths2ids(file_list, trees=extra_trees,
770
require_versioned=True)
771
# find_ids_across_trees may include some paths that don't
773
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
774
for file_id in file_ids if file_id in tree)
776
entries = tree.inventory.entries()
677
work_tree.lock_read()
679
if revision is not None:
680
tree = revision.as_tree(work_tree.branch)
682
extra_trees = [work_tree]
688
if file_list is not None:
689
file_ids = tree.paths2ids(file_list, trees=extra_trees,
690
require_versioned=True)
691
# find_ids_across_trees may include some paths that don't
693
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
694
for file_id in file_ids if file_id in tree)
696
entries = tree.inventory.entries()
699
if tree is not work_tree:
779
702
for path, entry in entries:
780
703
if kind and kind != entry.kind:
917
845
dest = osutils.pathjoin(dest_parent, dest_tail)
918
846
mutter("attempting to move %s => %s", src, dest)
919
847
tree.rename_one(src, dest, after=after)
921
self.outf.write("%s => %s\n" % (src, dest))
848
self.outf.write("%s => %s\n" % (src, dest))
924
851
class cmd_pull(Command):
925
__doc__ = """Turn this branch into a mirror of another branch.
852
"""Turn this branch into a mirror of another branch.
927
By default, this command only works on branches that have not diverged.
928
Branches are considered diverged if the destination branch's most recent
929
commit is one that has not been merged (directly or indirectly) into the
854
This command only works on branches that have not diverged. Branches are
855
considered diverged if the destination branch's most recent commit is one
856
that has not been merged (directly or indirectly) into the parent.
932
858
If branches have diverged, you can use 'bzr merge' to integrate the changes
933
859
from one into the other. Once one branch has merged, the other should
934
860
be able to pull it again.
936
If you want to replace your local changes and just want your branch to
937
match the remote one, use pull --overwrite. This will work even if the two
938
branches have diverged.
862
If you want to forget your local changes and just update your branch to
863
match the remote one, use pull --overwrite.
940
865
If there is no default location set, the first pull will set it. After
941
866
that, you can omit the location to use the default. To change the
1026
948
if revision is not None:
1027
949
revision_id = revision.as_revision_id(branch_from)
1029
if tree_to is not None:
1030
view_info = _get_view_info_for_change_reporter(tree_to)
1031
change_reporter = delta._ChangeReporter(
1032
unversioned_filter=tree_to.is_ignored,
1033
view_info=view_info)
1034
result = tree_to.pull(
1035
branch_from, overwrite, revision_id, change_reporter,
1036
possible_transports=possible_transports, local=local)
1038
result = branch_to.pull(
1039
branch_from, overwrite, revision_id, local=local)
951
branch_to.lock_write()
953
if tree_to is not None:
954
view_info = _get_view_info_for_change_reporter(tree_to)
955
change_reporter = delta._ChangeReporter(
956
unversioned_filter=tree_to.is_ignored, view_info=view_info)
957
result = tree_to.pull(branch_from, overwrite, revision_id,
959
possible_transports=possible_transports,
962
result = branch_to.pull(branch_from, overwrite, revision_id,
1041
result.report(self.outf)
1042
if verbose and result.old_revid != result.new_revid:
1043
log.show_branch_change(
1044
branch_to, self.outf, result.old_revno,
965
result.report(self.outf)
966
if verbose and result.old_revid != result.new_revid:
967
log.show_branch_change(branch_to, self.outf, result.old_revno,
1048
973
class cmd_push(Command):
1049
__doc__ = """Update a mirror of this branch.
974
"""Update a mirror of this branch.
1051
976
The target branch will not have its working tree populated because this
1052
977
is both expensive, and is not supported on remote file systems.
1105
1027
def run(self, location=None, remember=False, overwrite=False,
1106
1028
create_prefix=False, verbose=False, revision=None,
1107
1029
use_existing_dir=False, directory=None, stacked_on=None,
1108
stacked=False, strict=None):
1109
1031
from bzrlib.push import _show_push_branch
1033
# Get the source branch and revision_id
1111
1034
if directory is None:
1112
1035
directory = '.'
1113
# Get the source branch
1115
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1116
# Get the tip's revision_id
1036
br_from = Branch.open_containing(directory)[0]
1117
1037
revision = _get_one_revision('push', revision)
1118
1038
if revision is not None:
1119
1039
revision_id = revision.in_history(br_from).rev_id
1121
1041
revision_id = None
1122
if tree is not None and revision_id is None:
1123
tree.check_changed_or_out_of_date(
1124
strict, 'push_strict',
1125
more_error='Use --no-strict to force the push.',
1126
more_warning='Uncommitted changes will not be pushed.')
1127
1043
# Get the stacked_on branch, if any
1128
1044
if stacked_on is not None:
1129
1045
stacked_on = urlutils.normalize_url(stacked_on)
1180
1096
help='Hard-link working tree files where possible.'),
1181
1097
Option('no-tree',
1182
1098
help="Create a branch without a working-tree."),
1184
help="Switch the checkout in the current directory "
1185
"to the new branch."),
1186
1099
Option('stacked',
1187
1100
help='Create a stacked branch referring to the source branch. '
1188
1101
'The new branch will depend on the availability of the source '
1189
1102
'branch for all operations.'),
1190
1103
Option('standalone',
1191
1104
help='Do not use a shared repository, even if available.'),
1192
Option('use-existing-dir',
1193
help='By default branch will fail if the target'
1194
' directory exists, but does not already'
1195
' have a control directory. This flag will'
1196
' allow branch to proceed.'),
1198
help="Bind new branch to from location."),
1200
1106
aliases = ['get', 'clone']
1202
1108
def run(self, from_location, to_location=None, revision=None,
1203
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1205
from bzrlib import switch as _mod_switch
1109
hardlink=False, stacked=False, standalone=False, no_tree=False):
1206
1110
from bzrlib.tag import _merge_tags_if_possible
1207
1112
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1209
1114
revision = _get_one_revision('branch', revision)
1210
self.add_cleanup(br_from.lock_read().unlock)
1211
if revision is not None:
1212
revision_id = revision.as_revision_id(br_from)
1214
# FIXME - wt.last_revision, fallback to branch, fall back to
1215
# None or perhaps NULL_REVISION to mean copy nothing
1217
revision_id = br_from.last_revision()
1218
if to_location is None:
1219
to_location = urlutils.derive_to_location(from_location)
1220
to_transport = transport.get_transport(to_location)
1222
to_transport.mkdir('.')
1223
except errors.FileExists:
1224
if not use_existing_dir:
1225
raise errors.BzrCommandError('Target directory "%s" '
1226
'already exists.' % to_location)
1117
if revision is not None:
1118
revision_id = revision.as_revision_id(br_from)
1229
bzrdir.BzrDir.open_from_transport(to_transport)
1230
except errors.NotBranchError:
1233
raise errors.AlreadyBranchError(to_location)
1234
except errors.NoSuchFile:
1235
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1238
# preserve whatever source format we have.
1239
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1240
possible_transports=[to_transport],
1241
accelerator_tree=accelerator_tree,
1242
hardlink=hardlink, stacked=stacked,
1243
force_new_repo=standalone,
1244
create_tree_if_local=not no_tree,
1245
source_branch=br_from)
1246
branch = dir.open_branch()
1247
except errors.NoSuchRevision:
1248
to_transport.delete_tree('.')
1249
msg = "The branch %s has no revision %s." % (from_location,
1251
raise errors.BzrCommandError(msg)
1252
_merge_tags_if_possible(br_from, branch)
1253
# If the source branch is stacked, the new branch may
1254
# be stacked whether we asked for that explicitly or not.
1255
# We therefore need a try/except here and not just 'if stacked:'
1257
note('Created new stacked branch referring to %s.' %
1258
branch.get_stacked_on_url())
1259
except (errors.NotStacked, errors.UnstackableBranchFormat,
1260
errors.UnstackableRepositoryFormat), e:
1261
note('Branched %d revision(s).' % branch.revno())
1263
# Bind to the parent
1264
parent_branch = Branch.open(from_location)
1265
branch.bind(parent_branch)
1266
note('New branch bound to %s' % from_location)
1268
# Switch to the new branch
1269
wt, _ = WorkingTree.open_containing('.')
1270
_mod_switch.switch(wt.bzrdir, branch)
1271
note('Switched to branch: %s',
1272
urlutils.unescape_for_display(branch.base, 'utf-8'))
1120
# FIXME - wt.last_revision, fallback to branch, fall back to
1121
# None or perhaps NULL_REVISION to mean copy nothing
1123
revision_id = br_from.last_revision()
1124
if to_location is None:
1125
to_location = urlutils.derive_to_location(from_location)
1126
to_transport = transport.get_transport(to_location)
1128
to_transport.mkdir('.')
1129
except errors.FileExists:
1130
raise errors.BzrCommandError('Target directory "%s" already'
1131
' exists.' % to_location)
1132
except errors.NoSuchFile:
1133
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1136
# preserve whatever source format we have.
1137
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1138
possible_transports=[to_transport],
1139
accelerator_tree=accelerator_tree,
1140
hardlink=hardlink, stacked=stacked,
1141
force_new_repo=standalone,
1142
create_tree_if_local=not no_tree,
1143
source_branch=br_from)
1144
branch = dir.open_branch()
1145
except errors.NoSuchRevision:
1146
to_transport.delete_tree('.')
1147
msg = "The branch %s has no revision %s." % (from_location,
1149
raise errors.BzrCommandError(msg)
1150
_merge_tags_if_possible(br_from, branch)
1151
# If the source branch is stacked, the new branch may
1152
# be stacked whether we asked for that explicitly or not.
1153
# We therefore need a try/except here and not just 'if stacked:'
1155
note('Created new stacked branch referring to %s.' %
1156
branch.get_stacked_on_url())
1157
except (errors.NotStacked, errors.UnstackableBranchFormat,
1158
errors.UnstackableRepositoryFormat), e:
1159
note('Branched %d revision(s).' % branch.revno())
1275
1164
class cmd_checkout(Command):
1276
__doc__ = """Create a new checkout of an existing branch.
1165
"""Create a new checkout of an existing branch.
1278
1167
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1279
1168
the branch found in '.'. This is useful if you have removed the working tree
1353
1242
@display_command
1354
1243
def run(self, dir=u'.'):
1355
1244
tree = WorkingTree.open_containing(dir)[0]
1356
self.add_cleanup(tree.lock_read().unlock)
1357
new_inv = tree.inventory
1358
old_tree = tree.basis_tree()
1359
self.add_cleanup(old_tree.lock_read().unlock)
1360
old_inv = old_tree.inventory
1362
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1363
for f, paths, c, v, p, n, k, e in iterator:
1364
if paths[0] == paths[1]:
1368
renames.append(paths)
1370
for old_name, new_name in renames:
1371
self.outf.write("%s => %s\n" % (old_name, new_name))
1247
new_inv = tree.inventory
1248
old_tree = tree.basis_tree()
1249
old_tree.lock_read()
1251
old_inv = old_tree.inventory
1253
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1254
for f, paths, c, v, p, n, k, e in iterator:
1255
if paths[0] == paths[1]:
1259
renames.append(paths)
1261
for old_name, new_name in renames:
1262
self.outf.write("%s => %s\n" % (old_name, new_name))
1374
1269
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1270
"""Update a tree to have the latest code committed to its branch.
1377
1272
This will perform a merge into the working tree, and may generate
1378
1273
conflicts. If you have any local changes, you will still
1381
1276
If you want to discard your local changes, you can just do a
1382
1277
'bzr revert' instead of 'bzr commit' after the update.
1384
If the tree's branch is bound to a master branch, it will also update
1385
the branch from the master.
1388
1280
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1281
takes_args = ['dir?']
1390
takes_options = ['revision']
1391
1282
aliases = ['up']
1393
def run(self, dir='.', revision=None):
1394
if revision is not None and len(revision) != 1:
1395
raise errors.BzrCommandError(
1396
"bzr update --revision takes exactly one revision")
1284
def run(self, dir='.'):
1397
1285
tree = WorkingTree.open_containing(dir)[0]
1398
branch = tree.branch
1399
1286
possible_transports = []
1400
master = branch.get_master_branch(
1287
master = tree.branch.get_master_branch(
1401
1288
possible_transports=possible_transports)
1402
1289
if master is not None:
1403
branch_location = master.base
1404
1290
tree.lock_write()
1406
branch_location = tree.branch.base
1407
1292
tree.lock_tree_write()
1408
self.add_cleanup(tree.unlock)
1409
# get rid of the final '/' and be ready for display
1410
branch_location = urlutils.unescape_for_display(
1411
branch_location.rstrip('/'),
1413
existing_pending_merges = tree.get_parent_ids()[1:]
1417
# may need to fetch data into a heavyweight checkout
1418
# XXX: this may take some time, maybe we should display a
1420
old_tip = branch.update(possible_transports)
1421
if revision is not None:
1422
revision_id = revision[0].as_revision_id(branch)
1424
revision_id = branch.last_revision()
1425
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1426
revno = branch.revision_id_to_dotted_revno(revision_id)
1427
note("Tree is up to date at revision %s of branch %s" %
1428
('.'.join(map(str, revno)), branch_location))
1430
view_info = _get_view_info_for_change_reporter(tree)
1431
change_reporter = delta._ChangeReporter(
1432
unversioned_filter=tree.is_ignored,
1433
view_info=view_info)
1294
existing_pending_merges = tree.get_parent_ids()[1:]
1295
last_rev = _mod_revision.ensure_null(tree.last_revision())
1296
if last_rev == _mod_revision.ensure_null(
1297
tree.branch.last_revision()):
1298
# may be up to date, check master too.
1299
if master is None or last_rev == _mod_revision.ensure_null(
1300
master.last_revision()):
1301
revno = tree.branch.revision_id_to_revno(last_rev)
1302
note("Tree is up to date at revision %d." % (revno,))
1304
view_info = _get_view_info_for_change_reporter(tree)
1435
1305
conflicts = tree.update(
1437
possible_transports=possible_transports,
1438
revision=revision_id,
1440
except errors.NoSuchRevision, e:
1441
raise errors.BzrCommandError(
1442
"branch has no revision %s\n"
1443
"bzr update --revision only works"
1444
" for a revision in the branch history"
1446
revno = tree.branch.revision_id_to_dotted_revno(
1447
_mod_revision.ensure_null(tree.last_revision()))
1448
note('Updated to revision %s of branch %s' %
1449
('.'.join(map(str, revno)), branch_location))
1450
parent_ids = tree.get_parent_ids()
1451
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1452
note('Your local commits will now show as pending merges with '
1453
"'bzr status', and can be committed with 'bzr commit'.")
1306
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1307
view_info=view_info), possible_transports=possible_transports)
1308
revno = tree.branch.revision_id_to_revno(
1309
_mod_revision.ensure_null(tree.last_revision()))
1310
note('Updated to revision %d.' % (revno,))
1311
if tree.get_parent_ids()[1:] != existing_pending_merges:
1312
note('Your local commits will now show as pending merges with '
1313
"'bzr status', and can be committed with 'bzr commit'.")
1460
1322
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1323
"""Show information about a working tree, branch or repository.
1463
1325
This command will show all known locations and formats associated to the
1464
1326
tree, branch or repository.
1530
1392
if file_list is not None:
1531
1393
file_list = [f for f in file_list]
1533
self.add_cleanup(tree.lock_write().unlock)
1534
# Heuristics should probably all move into tree.remove_smart or
1537
added = tree.changes_from(tree.basis_tree(),
1538
specific_files=file_list).added
1539
file_list = sorted([f[0] for f in added], reverse=True)
1540
if len(file_list) == 0:
1541
raise errors.BzrCommandError('No matching files.')
1542
elif file_list is None:
1543
# missing files show up in iter_changes(basis) as
1544
# versioned-with-no-kind.
1546
for change in tree.iter_changes(tree.basis_tree()):
1547
# Find paths in the working tree that have no kind:
1548
if change[1][1] is not None and change[6][1] is None:
1549
missing.append(change[1][1])
1550
file_list = sorted(missing, reverse=True)
1551
file_deletion_strategy = 'keep'
1552
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1553
keep_files=file_deletion_strategy=='keep',
1554
force=file_deletion_strategy=='force')
1397
# Heuristics should probably all move into tree.remove_smart or
1400
added = tree.changes_from(tree.basis_tree(),
1401
specific_files=file_list).added
1402
file_list = sorted([f[0] for f in added], reverse=True)
1403
if len(file_list) == 0:
1404
raise errors.BzrCommandError('No matching files.')
1405
elif file_list is None:
1406
# missing files show up in iter_changes(basis) as
1407
# versioned-with-no-kind.
1409
for change in tree.iter_changes(tree.basis_tree()):
1410
# Find paths in the working tree that have no kind:
1411
if change[1][1] is not None and change[6][1] is None:
1412
missing.append(change[1][1])
1413
file_list = sorted(missing, reverse=True)
1414
file_deletion_strategy = 'keep'
1415
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1416
keep_files=file_deletion_strategy=='keep',
1417
force=file_deletion_strategy=='force')
1557
1422
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1423
"""Print file_id of a particular file or directory.
1560
1425
The file_id is assigned when the file is first added and remains the
1561
1426
same through all revisions where the file exists, even when it is
1961
1801
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1802
' one or two revision specifiers')
1964
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
1968
(old_tree, new_tree,
1969
old_branch, new_branch,
1970
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1804
old_tree, new_tree, specific_files, extra_trees = \
1805
_get_trees_to_diff(file_list, revision, old, new,
1972
1807
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1808
specific_files=specific_files,
1974
1809
external_diff_options=diff_options,
1975
1810
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1811
extra_trees=extra_trees, using=using)
1980
1814
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1815
"""List files deleted in the working tree.
1983
1817
# TODO: Show files deleted since a previous revision, or
1984
1818
# between two revisions.
2373
2211
diff_type = 'full'
2375
# Build the log formatter
2376
if log_format is None:
2377
log_format = log.log_formatter_registry.get_default(b)
2378
# Make a non-encoding output to include the diffs - bug 328007
2379
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2380
lf = log_format(show_ids=show_ids, to_file=self.outf,
2381
to_exact_file=unencoded_output,
2382
show_timezone=timezone,
2383
delta_format=get_verbosity_level(),
2385
show_advice=levels is None)
2387
# Choose the algorithm for doing the logging. It's annoying
2388
# having multiple code paths like this but necessary until
2389
# the underlying repository format is faster at generating
2390
# deltas or can provide everything we need from the indices.
2391
# The default algorithm - match-using-deltas - works for
2392
# multiple files and directories and is faster for small
2393
# amounts of history (200 revisions say). However, it's too
2394
# slow for logging a single file in a repository with deep
2395
# history, i.e. > 10K revisions. In the spirit of "do no
2396
# evil when adding features", we continue to use the
2397
# original algorithm - per-file-graph - for the "single
2398
# file that isn't a directory without showing a delta" case.
2399
partial_history = revision and b.repository._format.supports_chks
2400
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2401
or delta_type or partial_history)
2403
# Build the LogRequest and execute it
2404
if len(file_ids) == 0:
2406
rqst = make_log_request_dict(
2407
direction=direction, specific_fileids=file_ids,
2408
start_revision=rev1, end_revision=rev2, limit=limit,
2409
message_search=message, delta_type=delta_type,
2410
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2411
exclude_common_ancestry=exclude_common_ancestry,
2413
Logger(b, rqst).show(lf)
2215
# Build the log formatter
2216
if log_format is None:
2217
log_format = log.log_formatter_registry.get_default(b)
2218
lf = log_format(show_ids=show_ids, to_file=self.outf,
2219
show_timezone=timezone,
2220
delta_format=get_verbosity_level(),
2222
show_advice=levels is None)
2224
# Choose the algorithm for doing the logging. It's annoying
2225
# having multiple code paths like this but necessary until
2226
# the underlying repository format is faster at generating
2227
# deltas or can provide everything we need from the indices.
2228
# The default algorithm - match-using-deltas - works for
2229
# multiple files and directories and is faster for small
2230
# amounts of history (200 revisions say). However, it's too
2231
# slow for logging a single file in a repository with deep
2232
# history, i.e. > 10K revisions. In the spirit of "do no
2233
# evil when adding features", we continue to use the
2234
# original algorithm - per-file-graph - for the "single
2235
# file that isn't a directory without showing a delta" case.
2236
partial_history = revision and b.repository._format.supports_chks
2237
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2238
or delta_type or partial_history)
2240
# Build the LogRequest and execute it
2241
if len(file_ids) == 0:
2243
rqst = make_log_request_dict(
2244
direction=direction, specific_fileids=file_ids,
2245
start_revision=rev1, end_revision=rev2, limit=limit,
2246
message_search=message, delta_type=delta_type,
2247
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2248
Logger(b, rqst).show(lf)
2416
2253
def _get_revision_range(revisionspec_list, branch, command_name):
2561
2389
view_str = views.view_display_str(view_files)
2562
2390
note("Ignoring files outside view. View is %s" % view_str)
2564
self.add_cleanup(tree.lock_read().unlock)
2565
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2566
from_dir=relpath, recursive=recursive):
2567
# Apply additional masking
2568
if not all and not selection[fc]:
2570
if kind is not None and fkind != kind:
2575
fullpath = osutils.pathjoin(relpath, fp)
2578
views.check_path_in_view(tree, fullpath)
2579
except errors.FileOutsideView:
2584
fp = osutils.pathjoin(prefix, fp)
2585
kindch = entry.kind_character()
2586
outstring = fp + kindch
2587
ui.ui_factory.clear_term()
2589
outstring = '%-8s %s' % (fc, outstring)
2590
if show_ids and fid is not None:
2591
outstring = "%-50s %s" % (outstring, fid)
2592
self.outf.write(outstring + '\n')
2594
self.outf.write(fp + '\0')
2597
self.outf.write(fid)
2598
self.outf.write('\0')
2606
self.outf.write('%-50s %s\n' % (outstring, my_id))
2608
self.outf.write(outstring + '\n')
2394
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2395
if fp.startswith(relpath):
2396
rp = fp[len(relpath):]
2397
fp = osutils.pathjoin(prefix, rp)
2398
if not recursive and '/' in rp:
2400
if not all and not selection[fc]:
2402
if kind is not None and fkind != kind:
2406
views.check_path_in_view(tree, fp)
2407
except errors.FileOutsideView:
2409
kindch = entry.kind_character()
2410
outstring = fp + kindch
2412
outstring = '%-8s %s' % (fc, outstring)
2413
if show_ids and fid is not None:
2414
outstring = "%-50s %s" % (outstring, fid)
2415
self.outf.write(outstring + '\n')
2417
self.outf.write(fp + '\0')
2420
self.outf.write(fid)
2421
self.outf.write('\0')
2429
self.outf.write('%-50s %s\n' % (outstring, my_id))
2431
self.outf.write(outstring + '\n')
2611
2436
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2437
"""List unknown files.
2624
2449
class cmd_ignore(Command):
2625
__doc__ = """Ignore specified files or patterns.
2450
"""Ignore specified files or patterns.
2627
2452
See ``bzr help patterns`` for details on the syntax of patterns.
2629
If a .bzrignore file does not exist, the ignore command
2630
will create one and add the specified files or patterns to the newly
2631
created file. The ignore command will also automatically add the
2632
.bzrignore file to be versioned. Creating a .bzrignore file without
2633
the use of the ignore command will require an explicit add command.
2635
2454
To remove patterns from the ignore list, edit the .bzrignore file.
2636
2455
After adding, editing or deleting that file either indirectly by
2637
2456
using this command or directly by using an editor, be sure to commit
2640
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2641
the global ignore file can be found in the application data directory as
2642
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2643
Global ignores are not touched by this command. The global ignore file
2644
can be edited directly using an editor.
2646
Patterns prefixed with '!' are exceptions to ignore patterns and take
2647
precedence over regular ignores. Such exceptions are used to specify
2648
files that should be versioned which would otherwise be ignored.
2650
Patterns prefixed with '!!' act as regular ignore patterns, but have
2651
precedence over the '!' exception patterns.
2653
2459
Note: ignore patterns containing shell wildcards must be quoted from
2654
2460
the shell on Unix.
2677
2479
Ignore everything but the "debian" toplevel directory::
2679
2481
bzr ignore "RE:(?!debian/).*"
2681
Ignore everything except the "local" toplevel directory,
2682
but always ignore "*~" autosave files, even under local/::
2685
bzr ignore "!./local"
2689
2484
_see_also = ['status', 'ignored', 'patterns']
2690
2485
takes_args = ['name_pattern*']
2691
2486
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2487
Option('old-default-rules',
2488
help='Write out the ignore rules bzr < 0.9 always used.')
2696
def run(self, name_pattern_list=None, default_rules=None):
2491
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2492
from bzrlib import ignores
2698
if default_rules is not None:
2699
# dump the default rules and exit
2700
for pattern in ignores.USER_DEFAULTS:
2701
self.outf.write("%s\n" % pattern)
2493
if old_default_rules is not None:
2494
# dump the rules and exit
2495
for pattern in ignores.OLD_DEFAULTS:
2703
2498
if not name_pattern_list:
2704
2499
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2500
"NAME_PATTERN or --old-default-rules")
2706
2501
name_pattern_list = [globbing.normalize_pattern(p)
2707
2502
for p in name_pattern_list]
2708
2503
for name_pattern in name_pattern_list:
3118
2900
if local and not tree.branch.get_bound_location():
3119
2901
raise errors.LocalRequiresBoundBranch()
3121
if message is not None:
3123
file_exists = osutils.lexists(message)
3124
except UnicodeError:
3125
# The commit message contains unicode characters that can't be
3126
# represented in the filesystem encoding, so that can't be a
3131
'The commit message is a file name: "%(f)s".\n'
3132
'(use --file "%(f)s" to take commit message from that file)'
3134
ui.ui_factory.show_warning(warning_msg)
3136
message = message.replace('\r\n', '\n')
3137
message = message.replace('\r', '\n')
3139
raise errors.BzrCommandError(
3140
"please specify either --message or --file")
3142
2903
def get_message(commit_obj):
3143
2904
"""Callback to get commit message"""
3145
my_message = codecs.open(
3146
file, 'rt', osutils.get_user_encoding()).read()
3147
elif message is not None:
3148
my_message = message
3150
# No message supplied: make one up.
3151
# text is the status of the tree
3152
text = make_commit_message_template_encoded(tree,
2905
my_message = message
2906
if my_message is None and not file:
2907
t = make_commit_message_template_encoded(tree,
3153
2908
selected_list, diff=show_diff,
3154
2909
output_encoding=osutils.get_user_encoding())
3155
# start_message is the template generated from hooks
3156
# XXX: Warning - looks like hooks return unicode,
3157
# make_commit_message_template_encoded returns user encoding.
3158
# We probably want to be using edit_commit_message instead to
3160
2910
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
2911
my_message = edit_commit_message_encoded(t,
3162
2912
start_message=start_message)
3163
2913
if my_message is None:
3164
2914
raise errors.BzrCommandError("please specify a commit"
3165
2915
" message with either --message or --file")
2916
elif my_message and file:
2917
raise errors.BzrCommandError(
2918
"please specify either --message or --file")
2920
my_message = codecs.open(file, 'rt',
2921
osutils.get_user_encoding()).read()
3166
2922
if my_message == "":
3167
2923
raise errors.BzrCommandError("empty commit message specified")
3168
2924
return my_message
3170
# The API permits a commit with a filter of [] to mean 'select nothing'
3171
# but the command line should not do that.
3172
if not selected_list:
3173
selected_list = None
3175
2927
tree.commit(message_callback=get_message,
3176
2928
specific_files=selected_list,
3177
2929
allow_pointless=unchanged, strict=strict, local=local,
3178
2930
reporter=None, verbose=verbose, revprops=properties,
3179
authors=author, timestamp=commit_stamp,
3181
2932
exclude=safe_relpath_files(tree, exclude))
3182
2933
except PointlessCommit:
2934
# FIXME: This should really happen before the file is read in;
2935
# perhaps prepare the commit; get the message; then actually commit
3183
2936
raise errors.BzrCommandError("No changes to commit."
3184
2937
" Use --unchanged to commit anyhow.")
3185
2938
except ConflictsInTree:
3206
2958
The working tree and branch checks will only give output if a problem is
3207
2959
detected. The output fields of the repository check are:
3210
This is just the number of revisions checked. It doesn't
3214
This is just the number of versionedfiles checked. It
3215
doesn't indicate a problem.
3217
unreferenced ancestors
3218
Texts that are ancestors of other texts, but
3219
are not properly referenced by the revision ancestry. This is a
3220
subtle problem that Bazaar can work around.
3223
This is the total number of unique file contents
3224
seen in the checked revisions. It does not indicate a problem.
3227
This is the total number of repeated texts seen
3228
in the checked revisions. Texts can be repeated when their file
3229
entries are modified, but the file contents are not. It does not
2961
revisions: This is just the number of revisions checked. It doesn't
2963
versionedfiles: This is just the number of versionedfiles checked. It
2964
doesn't indicate a problem.
2965
unreferenced ancestors: Texts that are ancestors of other texts, but
2966
are not properly referenced by the revision ancestry. This is a
2967
subtle problem that Bazaar can work around.
2968
unique file texts: This is the total number of unique file contents
2969
seen in the checked revisions. It does not indicate a problem.
2970
repeated file texts: This is the total number of repeated texts seen
2971
in the checked revisions. Texts can be repeated when their file
2972
entries are modified, but the file contents are not. It does not
3232
2975
If no restrictions are specified, all Bazaar data that is found at the given
3233
2976
location will be checked.
3597
3330
verbose = not is_quiet()
3598
3331
# TODO: should possibly lock the history file...
3599
3332
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3602
3334
test_suite_factory = None
3603
3335
benchfile = None
3604
selftest_kwargs = {"verbose": verbose,
3606
"stop_on_failure": one,
3607
"transport": transport,
3608
"test_suite_factory": test_suite_factory,
3609
"lsprof_timed": lsprof_timed,
3610
"lsprof_tests": lsprof_tests,
3611
"bench_history": benchfile,
3612
"matching_tests_first": first,
3613
"list_only": list_only,
3614
"random_seed": randomize,
3615
"exclude_pattern": exclude,
3617
"load_list": load_list,
3618
"debug_flags": debugflag,
3619
"starting_with": starting_with
3621
selftest_kwargs.update(self.additional_selftest_args)
3622
result = selftest(**selftest_kwargs)
3337
selftest_kwargs = {"verbose": verbose,
3339
"stop_on_failure": one,
3340
"transport": transport,
3341
"test_suite_factory": test_suite_factory,
3342
"lsprof_timed": lsprof_timed,
3343
"bench_history": benchfile,
3344
"matching_tests_first": first,
3345
"list_only": list_only,
3346
"random_seed": randomize,
3347
"exclude_pattern": exclude,
3349
"load_list": load_list,
3350
"debug_flags": debugflag,
3351
"starting_with": starting_with
3353
selftest_kwargs.update(self.additional_selftest_args)
3354
result = selftest(**selftest_kwargs)
3356
if benchfile is not None:
3623
3358
return int(not result)
3626
3361
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
3362
"""Show version of bzr."""
3629
3364
encoding_type = 'replace'
3630
3365
takes_options = [
3793
3515
verified = 'inapplicable'
3794
3516
tree = WorkingTree.open_containing(directory)[0]
3518
# die as quickly as possible if there are uncommitted changes
3797
3520
basis_tree = tree.revision_tree(tree.last_revision())
3798
3521
except errors.NoSuchRevision:
3799
3522
basis_tree = tree.basis_tree()
3801
# die as quickly as possible if there are uncommitted changes
3803
if tree.has_changes():
3524
changes = tree.changes_from(basis_tree)
3525
if changes.has_changed():
3804
3526
raise errors.UncommittedChanges(tree)
3806
3528
view_info = _get_view_info_for_change_reporter(tree)
3807
3529
change_reporter = delta._ChangeReporter(
3808
3530
unversioned_filter=tree.is_ignored, view_info=view_info)
3809
pb = ui.ui_factory.nested_progress_bar()
3810
self.add_cleanup(pb.finished)
3811
self.add_cleanup(tree.lock_write().unlock)
3812
if location is not None:
3814
mergeable = bundle.read_mergeable_from_url(location,
3815
possible_transports=possible_transports)
3816
except errors.NotABundle:
3533
pb = ui.ui_factory.nested_progress_bar()
3534
cleanups.append(pb.finished)
3536
cleanups.append(tree.unlock)
3537
if location is not None:
3539
mergeable = bundle.read_mergeable_from_url(location,
3540
possible_transports=possible_transports)
3541
except errors.NotABundle:
3545
raise errors.BzrCommandError('Cannot use --uncommitted'
3546
' with bundles or merge directives.')
3548
if revision is not None:
3549
raise errors.BzrCommandError(
3550
'Cannot use -r with merge directives or bundles')
3551
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3554
if merger is None and uncommitted:
3555
if revision is not None and len(revision) > 0:
3556
raise errors.BzrCommandError('Cannot use --uncommitted and'
3557
' --revision at the same time.')
3558
location = self._select_branch_location(tree, location)[0]
3559
other_tree, other_path = WorkingTree.open_containing(location)
3560
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3562
allow_pending = False
3563
if other_path != '':
3564
merger.interesting_files = [other_path]
3567
merger, allow_pending = self._get_merger_from_branch(tree,
3568
location, revision, remember, possible_transports, pb)
3570
merger.merge_type = merge_type
3571
merger.reprocess = reprocess
3572
merger.show_base = show_base
3573
self.sanity_check_merger(merger)
3574
if (merger.base_rev_id == merger.other_rev_id and
3575
merger.other_rev_id is not None):
3576
note('Nothing to do.')
3579
if merger.interesting_files is not None:
3580
raise errors.BzrCommandError('Cannot pull individual files')
3581
if (merger.base_rev_id == tree.last_revision()):
3582
result = tree.pull(merger.other_branch, False,
3583
merger.other_rev_id)
3584
result.report(self.outf)
3586
merger.check_basis(False)
3588
return self._do_preview(merger)
3820
raise errors.BzrCommandError('Cannot use --uncommitted'
3821
' with bundles or merge directives.')
3823
if revision is not None:
3824
raise errors.BzrCommandError(
3825
'Cannot use -r with merge directives or bundles')
3826
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3829
if merger is None and uncommitted:
3830
if revision is not None and len(revision) > 0:
3831
raise errors.BzrCommandError('Cannot use --uncommitted and'
3832
' --revision at the same time.')
3833
merger = self.get_merger_from_uncommitted(tree, location, None)
3834
allow_pending = False
3837
merger, allow_pending = self._get_merger_from_branch(tree,
3838
location, revision, remember, possible_transports, None)
3840
merger.merge_type = merge_type
3841
merger.reprocess = reprocess
3842
merger.show_base = show_base
3843
self.sanity_check_merger(merger)
3844
if (merger.base_rev_id == merger.other_rev_id and
3845
merger.other_rev_id is not None):
3846
note('Nothing to do.')
3849
if merger.interesting_files is not None:
3850
raise errors.BzrCommandError('Cannot pull individual files')
3851
if (merger.base_rev_id == tree.last_revision()):
3852
result = tree.pull(merger.other_branch, False,
3853
merger.other_rev_id)
3854
result.report(self.outf)
3856
if merger.this_basis is None:
3857
raise errors.BzrCommandError(
3858
"This branch has no commits."
3859
" (perhaps you would prefer 'bzr pull')")
3861
return self._do_preview(merger)
3863
return self._do_interactive(merger)
3865
return self._do_merge(merger, change_reporter, allow_pending,
3868
def _get_preview(self, merger):
3590
return self._do_merge(merger, change_reporter, allow_pending,
3593
for cleanup in reversed(cleanups):
3596
def _do_preview(self, merger):
3597
from bzrlib.diff import show_diff_trees
3869
3598
tree_merger = merger.make_merger()
3870
3599
tt = tree_merger.make_preview_transform()
3871
self.add_cleanup(tt.finalize)
3872
result_tree = tt.get_preview_tree()
3875
def _do_preview(self, merger):
3876
from bzrlib.diff import show_diff_trees
3877
result_tree = self._get_preview(merger)
3878
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
old_label='', new_label='')
3601
result_tree = tt.get_preview_tree()
3602
show_diff_trees(merger.this_tree, result_tree, self.outf,
3603
old_label='', new_label='')
3881
3607
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3882
3608
merger.change_reporter = change_reporter
4067
3761
def run(self, file_list=None, merge_type=None, show_base=False,
4068
3762
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
3763
if merge_type is None:
4071
3764
merge_type = _mod_merge.Merge3Merger
4072
3765
tree, file_list = tree_files(file_list)
4073
self.add_cleanup(tree.lock_write().unlock)
4074
parents = tree.get_parent_ids()
4075
if len(parents) != 2:
4076
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4077
" merges. Not cherrypicking or"
4079
repository = tree.branch.repository
4080
interesting_ids = None
4082
conflicts = tree.conflicts()
4083
if file_list is not None:
4084
interesting_ids = set()
4085
for filename in file_list:
4086
file_id = tree.path2id(filename)
4088
raise errors.NotVersionedError(filename)
4089
interesting_ids.add(file_id)
4090
if tree.kind(file_id) != "directory":
3768
parents = tree.get_parent_ids()
3769
if len(parents) != 2:
3770
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3771
" merges. Not cherrypicking or"
3773
repository = tree.branch.repository
3774
interesting_ids = None
3776
conflicts = tree.conflicts()
3777
if file_list is not None:
3778
interesting_ids = set()
3779
for filename in file_list:
3780
file_id = tree.path2id(filename)
3782
raise errors.NotVersionedError(filename)
3783
interesting_ids.add(file_id)
3784
if tree.kind(file_id) != "directory":
4093
for name, ie in tree.inventory.iter_entries(file_id):
4094
interesting_ids.add(ie.file_id)
4095
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4097
# Remerge only supports resolving contents conflicts
4098
allowed_conflicts = ('text conflict', 'contents conflict')
4099
restore_files = [c.path for c in conflicts
4100
if c.typestring in allowed_conflicts]
4101
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4102
tree.set_conflicts(ConflictList(new_conflicts))
4103
if file_list is not None:
4104
restore_files = file_list
4105
for filename in restore_files:
3787
for name, ie in tree.inventory.iter_entries(file_id):
3788
interesting_ids.add(ie.file_id)
3789
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3791
# Remerge only supports resolving contents conflicts
3792
allowed_conflicts = ('text conflict', 'contents conflict')
3793
restore_files = [c.path for c in conflicts
3794
if c.typestring in allowed_conflicts]
3795
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3796
tree.set_conflicts(ConflictList(new_conflicts))
3797
if file_list is not None:
3798
restore_files = file_list
3799
for filename in restore_files:
3801
restore(tree.abspath(filename))
3802
except errors.NotConflicted:
3804
# Disable pending merges, because the file texts we are remerging
3805
# have not had those merges performed. If we use the wrong parents
3806
# list, we imply that the working tree text has seen and rejected
3807
# all the changes from the other tree, when in fact those changes
3808
# have not yet been seen.
3809
pb = ui.ui_factory.nested_progress_bar()
3810
tree.set_parent_ids(parents[:1])
4107
restore(tree.abspath(filename))
4108
except errors.NotConflicted:
4110
# Disable pending merges, because the file texts we are remerging
4111
# have not had those merges performed. If we use the wrong parents
4112
# list, we imply that the working tree text has seen and rejected
4113
# all the changes from the other tree, when in fact those changes
4114
# have not yet been seen.
4115
tree.set_parent_ids(parents[:1])
4117
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4118
merger.interesting_ids = interesting_ids
4119
merger.merge_type = merge_type
4120
merger.show_base = show_base
4121
merger.reprocess = reprocess
4122
conflicts = merger.do_merge()
3812
merger = _mod_merge.Merger.from_revision_ids(pb,
3814
merger.interesting_ids = interesting_ids
3815
merger.merge_type = merge_type
3816
merger.show_base = show_base
3817
merger.reprocess = reprocess
3818
conflicts = merger.do_merge()
3820
tree.set_parent_ids(parents)
4124
tree.set_parent_ids(parents)
4125
3824
if conflicts > 0:
4149
3848
name. If you name a directory, all the contents of that directory will be
4152
If you have newly added files since the target revision, they will be
4153
removed. If the files to be removed have been changed, backups will be
4154
created as above. Directories containing unknown files will not be
3851
Any files that have been newly added since that revision will be deleted,
3852
with a backup kept if appropriate. Directories containing unknown files
3853
will not be deleted.
4157
The working tree contains a list of revisions that have been merged but
4158
not yet committed. These revisions will be included as additional parents
4159
of the next commit. Normally, using revert clears that list as well as
4160
reverting the files. If any files are specified, revert leaves the list
4161
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4162
.`` in the tree root to revert all files but keep the recorded merges,
4163
and ``bzr revert --forget-merges`` to clear the pending merge list without
3855
The working tree contains a list of pending merged revisions, which will
3856
be included as parents in the next commit. Normally, revert clears that
3857
list as well as reverting the files. If any files are specified, revert
3858
leaves the pending merge list alone and reverts only the files. Use "bzr
3859
revert ." in the tree root to revert all files but keep the merge record,
3860
and "bzr revert --forget-merges" to clear the pending merge list without
4164
3861
reverting any files.
4166
Using "bzr revert --forget-merges", it is possible to apply all of the
4167
changes from a branch in a single revision. To do this, perform the merge
4168
as desired. Then doing revert with the "--forget-merges" option will keep
4169
the content of the tree as it was, but it will clear the list of pending
4170
merges. The next commit will then contain all of the changes that are
4171
present in the other branch, but without any other parent revisions.
4172
Because this technique forgets where these changes originated, it may
4173
cause additional conflicts on later merges involving the same source and
4177
3864
_see_also = ['cat', 'export']
4186
3873
def run(self, revision=None, no_backup=False, file_list=None,
4187
3874
forget_merges=None):
4188
3875
tree, file_list = tree_files(file_list)
4189
self.add_cleanup(tree.lock_tree_write().unlock)
4191
tree.set_parent_ids(tree.get_parent_ids()[:1])
4193
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3879
tree.set_parent_ids(tree.get_parent_ids()[:1])
3881
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4196
3886
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4197
3887
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4198
tree.revert(file_list, rev_tree, not no_backup, None,
4199
report_changes=True)
3888
pb = ui.ui_factory.nested_progress_bar()
3890
tree.revert(file_list, rev_tree, not no_backup, pb,
3891
report_changes=True)
4202
3896
class cmd_assert_fail(Command):
4203
__doc__ = """Test reporting of assertion failures"""
3897
"""Test reporting of assertion failures"""
4204
3898
# intended just for use in testing
4355
4041
_get_revision_range(revision,
4356
4042
remote_branch, self.name()))
4358
local_extra, remote_extra = find_unmerged(
4359
local_branch, remote_branch, restrict,
4360
backward=not reverse,
4361
include_merges=include_merges,
4362
local_revid_range=local_revid_range,
4363
remote_revid_range=remote_revid_range)
4365
if log_format is None:
4366
registry = log.log_formatter_registry
4367
log_format = registry.get_default(local_branch)
4368
lf = log_format(to_file=self.outf,
4370
show_timezone='original')
4373
if local_extra and not theirs_only:
4374
message("You have %d extra revision(s):\n" %
4376
for revision in iter_log_revisions(local_extra,
4377
local_branch.repository,
4379
lf.log_revision(revision)
4380
printed_local = True
4383
printed_local = False
4385
if remote_extra and not mine_only:
4386
if printed_local is True:
4388
message("You are missing %d revision(s):\n" %
4390
for revision in iter_log_revisions(remote_extra,
4391
remote_branch.repository,
4393
lf.log_revision(revision)
4396
if mine_only and not local_extra:
4397
# We checked local, and found nothing extra
4398
message('This branch is up to date.\n')
4399
elif theirs_only and not remote_extra:
4400
# We checked remote, and found nothing extra
4401
message('Other branch is up to date.\n')
4402
elif not (mine_only or theirs_only or local_extra or
4404
# We checked both branches, and neither one had extra
4406
message("Branches are up to date.\n")
4044
local_branch.lock_read()
4046
remote_branch.lock_read()
4048
local_extra, remote_extra = find_unmerged(
4049
local_branch, remote_branch, restrict,
4050
backward=not reverse,
4051
include_merges=include_merges,
4052
local_revid_range=local_revid_range,
4053
remote_revid_range=remote_revid_range)
4055
if log_format is None:
4056
registry = log.log_formatter_registry
4057
log_format = registry.get_default(local_branch)
4058
lf = log_format(to_file=self.outf,
4060
show_timezone='original')
4063
if local_extra and not theirs_only:
4064
message("You have %d extra revision(s):\n" %
4066
for revision in iter_log_revisions(local_extra,
4067
local_branch.repository,
4069
lf.log_revision(revision)
4070
printed_local = True
4073
printed_local = False
4075
if remote_extra and not mine_only:
4076
if printed_local is True:
4078
message("You are missing %d revision(s):\n" %
4080
for revision in iter_log_revisions(remote_extra,
4081
remote_branch.repository,
4083
lf.log_revision(revision)
4086
if mine_only and not local_extra:
4087
# We checked local, and found nothing extra
4088
message('This branch is up to date.\n')
4089
elif theirs_only and not remote_extra:
4090
# We checked remote, and found nothing extra
4091
message('Other branch is up to date.\n')
4092
elif not (mine_only or theirs_only or local_extra or
4094
# We checked both branches, and neither one had extra
4096
message("Branches are up to date.\n")
4098
remote_branch.unlock()
4100
local_branch.unlock()
4408
4101
if not status_code and parent is None and other_branch is not None:
4409
self.add_cleanup(local_branch.lock_write().unlock)
4410
# handle race conditions - a parent might be set while we run.
4411
if local_branch.get_parent() is None:
4412
local_branch.set_parent(remote_branch.base)
4102
local_branch.lock_write()
4104
# handle race conditions - a parent might be set while we run.
4105
if local_branch.get_parent() is None:
4106
local_branch.set_parent(remote_branch.base)
4108
local_branch.unlock()
4413
4109
return status_code
4416
4112
class cmd_pack(Command):
4417
__doc__ = """Compress the data within a repository.
4419
This operation compresses the data within a bazaar repository. As
4420
bazaar supports automatic packing of repository, this operation is
4421
normally not required to be done manually.
4423
During the pack operation, bazaar takes a backup of existing repository
4424
data, i.e. pack files. This backup is eventually removed by bazaar
4425
automatically when it is safe to do so. To save disk space by removing
4426
the backed up pack files, the --clean-obsolete-packs option may be
4429
Warning: If you use --clean-obsolete-packs and your machine crashes
4430
during or immediately after repacking, you may be left with a state
4431
where the deletion has been written to disk but the new packs have not
4432
been. In this case the repository may be unusable.
4113
"""Compress the data within a repository."""
4435
4115
_see_also = ['repositories']
4436
4116
takes_args = ['branch_or_repo?']
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4118
def run(self, branch_or_repo='.'):
4442
4119
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4444
4121
branch = dir.open_branch()
4445
4122
repository = branch.repository
4446
4123
except errors.NotBranchError:
4447
4124
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4451
4128
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
4129
"""List the installed plugins.
4454
4131
This command displays the list of installed plugins including
4455
4132
version of plugin and a short description of each.
4552
4232
wt, branch, relpath = \
4553
4233
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4234
if wt is not None:
4555
self.add_cleanup(wt.lock_read().unlock)
4557
self.add_cleanup(branch.lock_read().unlock)
4558
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
self.add_cleanup(tree.lock_read().unlock)
4561
file_id = wt.path2id(relpath)
4563
file_id = tree.path2id(relpath)
4565
raise errors.NotVersionedError(filename)
4566
file_version = tree.inventory[file_id].revision
4567
if wt is not None and revision is None:
4568
# If there is a tree and we're not annotating historical
4569
# versions, annotate the working tree's content.
4570
annotate_file_tree(wt, file_id, self.outf, long, all,
4573
annotate_file(branch, file_version, file_id, long, all, self.outf,
4239
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4241
file_id = wt.path2id(relpath)
4243
file_id = tree.path2id(relpath)
4245
raise errors.NotVersionedError(filename)
4246
file_version = tree.inventory[file_id].revision
4247
if wt is not None and revision is None:
4248
# If there is a tree and we're not annotating historical
4249
# versions, annotate the working tree's content.
4250
annotate_file_tree(wt, file_id, self.outf, long, all,
4253
annotate_file(branch, file_version, file_id, long, all, self.outf,
4577
4262
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
4263
"""Create a digital signature for an existing revision."""
4579
4264
# TODO be able to replace existing ones.
4581
4266
hidden = True # is this right ?
4785
4476
end_revision=last_revno)
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
4479
print 'Dry-run, pretending to remove the above revisions.'
4481
val = raw_input('Press <enter> to continue')
4791
self.outf.write('The above revision(s) will be removed.\n')
4794
if not ui.ui_factory.get_boolean('Are you sure'):
4795
self.outf.write('Canceled')
4483
print 'The above revision(s) will be removed.'
4485
val = raw_input('Are you sure [y/N]? ')
4486
if val.lower() not in ('y', 'yes'):
4798
4490
mutter('Uncommitting from {%s} to {%s}',
4799
4491
last_rev_id, rev_id)
4800
4492
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
4493
revno=revno, local=local)
4802
self.outf.write('You can restore the old tip by running:\n'
4803
' bzr pull . -r revid:%s\n' % last_rev_id)
4494
note('You can restore the old tip by running:\n'
4495
' bzr pull . -r revid:%s', last_rev_id)
4806
4498
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
4499
"""Break a dead lock on a repository, branch or working directory.
4809
4501
CAUTION: Locks should only be broken when you are sure that the process
4810
4502
holding the lock has been stopped.
4812
You can get information on what locks are open via the 'bzr info
4813
[location]' command.
4504
You can get information on what locks are open via the 'bzr info' command.
4817
bzr break-lock bzr+ssh://example.com/bzr/foo
4819
4509
takes_args = ['location?']
5092
4778
directly from the merge directive, without retrieving data from a
5095
`bzr send` creates a compact data set that, when applied using bzr
5096
merge, has the same effect as merging from the source branch.
5098
By default the merge directive is self-contained and can be applied to any
5099
branch containing submit_branch in its ancestory without needing access to
5102
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5103
revisions, but only a structured request to merge from the
5104
public_location. In that case the public_branch is needed and it must be
5105
up-to-date and accessible to the recipient. The public_branch is always
5106
included if known, so that people can check it later.
5108
The submit branch defaults to the parent of the source branch, but can be
5109
overridden. Both submit branch and public branch will be remembered in
5110
branch.conf the first time they are used for a particular branch. The
5111
source branch defaults to that containing the working directory, but can
5112
be changed using --from.
5114
In order to calculate those changes, bzr must analyse the submit branch.
5115
Therefore it is most efficient for the submit branch to be a local mirror.
5116
If a public location is known for the submit_branch, that location is used
5117
in the merge directive.
5119
The default behaviour is to send the merge directive by mail, unless -o is
5120
given, in which case it is sent to a file.
4781
If --no-bundle is specified, then public_branch is needed (and must be
4782
up-to-date), so that the receiver can perform the merge using the
4783
public_branch. The public_branch is always included if known, so that
4784
people can check it later.
4786
The submit branch defaults to the parent, but can be overridden. Both
4787
submit branch and public branch will be remembered if supplied.
4789
If a public_branch is known for the submit_branch, that public submit
4790
branch is used in the merge instructions. This means that a local mirror
4791
can be used as your actual submit branch, once you have set public_branch
5122
4794
Mail is sent using your preferred mail program. This should be transparent
5123
4795
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5168
4835
short_name='f',
5170
4837
Option('output', short_name='o',
5171
help='Write merge directive to this file or directory; '
4838
help='Write merge directive to this file; '
5172
4839
'use - for stdout.',
5175
help='Refuse to send if there are uncommitted changes in'
5176
' the working tree, --no-strict disables the check.'),
5177
4841
Option('mail-to', help='Mail the request to this address.',
5181
4845
Option('body', help='Body for the email.', type=unicode),
5182
RegistryOption('format',
5183
help='Use the specified output format.',
5184
lazy_registry=('bzrlib.send', 'format_registry')),
4846
RegistryOption.from_kwargs('format',
4847
'Use the specified output format.',
4848
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4849
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5187
4852
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5188
4853
no_patch=False, revision=None, remember=False, output=None,
5189
format=None, mail_to=None, message=None, body=None,
5190
strict=None, **kwargs):
5191
from bzrlib.send import send
5192
return send(submit_branch, revision, public_branch, remember,
5193
format, no_bundle, no_patch, output,
5194
kwargs.get('from', '.'), mail_to, message, body,
4854
format=None, mail_to=None, message=None, body=None, **kwargs):
4855
return self._run(submit_branch, revision, public_branch, remember,
4856
format, no_bundle, no_patch, output,
4857
kwargs.get('from', '.'), mail_to, message, body)
4859
def _run(self, submit_branch, revision, public_branch, remember, format,
4860
no_bundle, no_patch, output, from_, mail_to, message, body):
4861
from bzrlib.revision import NULL_REVISION
4862
tree, branch = bzrdir.BzrDir.open_containing_tree_or_branch(from_)[:2]
4863
# we may need to write data into branch's repository to calculate
4868
config = branch.get_config()
4870
mail_to = config.get_user_option('submit_to')
4871
mail_client = config.get_mail_client()
4872
if (not getattr(mail_client, 'supports_body', False)
4873
and body is not None):
4874
raise errors.BzrCommandError(
4875
'Mail client "%s" does not support specifying body' %
4876
mail_client.__class__.__name__)
4877
if remember and submit_branch is None:
4878
raise errors.BzrCommandError(
4879
'--remember requires a branch to be specified.')
4880
stored_submit_branch = branch.get_submit_branch()
4881
remembered_submit_branch = None
4882
if submit_branch is None:
4883
submit_branch = stored_submit_branch
4884
remembered_submit_branch = "submit"
4886
if stored_submit_branch is None or remember:
4887
branch.set_submit_branch(submit_branch)
4888
if submit_branch is None:
4889
submit_branch = branch.get_parent()
4890
remembered_submit_branch = "parent"
4891
if submit_branch is None:
4892
raise errors.BzrCommandError('No submit branch known or'
4894
if remembered_submit_branch is not None:
4895
note('Using saved %s location "%s" to determine what '
4896
'changes to submit.', remembered_submit_branch,
4899
if mail_to is None or format is None:
4900
submit_config = Branch.open(submit_branch).get_config()
4902
mail_to = submit_config.get_user_option("child_submit_to")
4904
format = submit_config.get_user_option("child_submit_format")
4906
stored_public_branch = branch.get_public_branch()
4907
if public_branch is None:
4908
public_branch = stored_public_branch
4909
elif stored_public_branch is None or remember:
4910
branch.set_public_branch(public_branch)
4911
if no_bundle and public_branch is None:
4912
raise errors.BzrCommandError('No public branch specified or'
4914
base_revision_id = None
4916
if revision is not None:
4917
if len(revision) > 2:
4918
raise errors.BzrCommandError('bzr send takes '
4919
'at most two one revision identifiers')
4920
revision_id = revision[-1].as_revision_id(branch)
4921
if len(revision) == 2:
4922
base_revision_id = revision[0].as_revision_id(branch)
4923
if revision_id is None:
4924
revision_id = branch.last_revision()
4925
if revision_id == NULL_REVISION:
4926
raise errors.BzrCommandError('No revisions to submit.')
4930
directive = merge_directive.MergeDirective2.from_objects(
4931
branch.repository, revision_id, time.time(),
4932
osutils.local_time_offset(), submit_branch,
4933
public_branch=public_branch, include_patch=not no_patch,
4934
include_bundle=not no_bundle, message=message,
4935
base_revision_id=base_revision_id)
4936
elif format == '0.9':
4939
patch_type = 'bundle'
4941
raise errors.BzrCommandError('Format 0.9 does not'
4942
' permit bundle with no patch')
4948
directive = merge_directive.MergeDirective.from_objects(
4949
branch.repository, revision_id, time.time(),
4950
osutils.local_time_offset(), submit_branch,
4951
public_branch=public_branch, patch_type=patch_type,
4954
raise errors.BzrCommandError("No such send format '%s'." %
4958
directive.compose_merge_request(mail_client, mail_to, body,
4964
outfile = open(output, 'wb')
4966
outfile.writelines(directive.to_lines())
4968
if outfile is not self.outf:
5199
4974
class cmd_bundle_revisions(cmd_send):
5200
__doc__ = """Create a merge-directive for submitting changes.
4976
"""Create a merge-directive for submitting changes.
5202
4978
A merge directive provides many things needed for requesting merges:
5260
5034
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5261
5035
no_patch=False, revision=None, remember=False, output=None,
5262
format=None, strict=None, **kwargs):
5036
format=None, **kwargs):
5263
5037
if output is None:
5265
from bzrlib.send import send
5266
return send(submit_branch, revision, public_branch, remember,
5039
return self._run(submit_branch, revision, public_branch, remember,
5267
5040
format, no_bundle, no_patch, output,
5268
kwargs.get('from', '.'), None, None, None,
5269
self.outf, strict=strict)
5041
kwargs.get('from', '.'), None, None, None)
5272
5044
class cmd_tag(Command):
5273
__doc__ = """Create, remove or modify a tag naming a revision.
5045
"""Create, remove or modify a tag naming a revision.
5275
5047
Tags give human-meaningful names to revisions. Commands that take a -r
5276
5048
(--revision) option can be given -rtag:X, where X is any previously
5311
def run(self, tag_name=None,
5078
def run(self, tag_name,
5317
5084
branch, relpath = Branch.open_containing(directory)
5318
self.add_cleanup(branch.lock_write().unlock)
5320
if tag_name is None:
5321
raise errors.BzrCommandError("No tag specified to delete.")
5322
branch.tags.delete_tag(tag_name)
5323
self.outf.write('Deleted tag %s.\n' % tag_name)
5326
if len(revision) != 1:
5327
raise errors.BzrCommandError(
5328
"Tags can only be placed on a single revision, "
5330
revision_id = revision[0].as_revision_id(branch)
5088
branch.tags.delete_tag(tag_name)
5089
self.outf.write('Deleted tag %s.\n' % tag_name)
5332
revision_id = branch.last_revision()
5333
if tag_name is None:
5334
tag_name = branch.automatic_tag_name(revision_id)
5335
if tag_name is None:
5336
raise errors.BzrCommandError(
5337
"Please specify a tag name.")
5338
if (not force) and branch.tags.has_tag(tag_name):
5339
raise errors.TagAlreadyExists(tag_name)
5340
branch.tags.set_tag(tag_name, revision_id)
5341
self.outf.write('Created tag %s.\n' % tag_name)
5092
if len(revision) != 1:
5093
raise errors.BzrCommandError(
5094
"Tags can only be placed on a single revision, "
5096
revision_id = revision[0].as_revision_id(branch)
5098
revision_id = branch.last_revision()
5099
if (not force) and branch.tags.has_tag(tag_name):
5100
raise errors.TagAlreadyExists(tag_name)
5101
branch.tags.set_tag(tag_name, revision_id)
5102
self.outf.write('Created tag %s.\n' % tag_name)
5344
5107
class cmd_tags(Command):
5345
__doc__ = """List tags.
5347
5110
This command shows a table of tag names and the revisions they reference.
5399
5165
tags.sort(key=lambda x: timestamps[x[1]])
5400
5166
if not show_ids:
5401
5167
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
for index, (tag, revid) in enumerate(tags):
5404
revno = branch.revision_id_to_dotted_revno(revid)
5405
if isinstance(revno, tuple):
5406
revno = '.'.join(map(str, revno))
5407
except errors.NoSuchRevision:
5408
# Bad tag data/merges can lead to tagged revisions
5409
# which are not in this branch. Fail gracefully ...
5411
tags[index] = (tag, revno)
5168
revno_map = branch.get_revision_id_to_revno_map()
5169
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
5170
for tag, revid in tags ]
5413
5171
for tag, revspec in tags:
5414
5172
self.outf.write('%-20s %s\n' % (tag, revspec))
5417
5175
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5176
"""Reconfigure the type of a bzr directory.
5420
5178
A target configuration must be specified.
5452
5210
Option('bind-to', help='Branch to bind checkout to.', type=str),
5453
5211
Option('force',
5454
help='Perform reconfiguration even if local changes'
5456
Option('stacked-on',
5457
help='Reconfigure a branch to be stacked on another branch.',
5461
help='Reconfigure a branch to be unstacked. This '
5462
'may require copying substantial data into it.',
5212
help='Perform reconfiguration even if local changes'
5466
def run(self, location=None, target_type=None, bind_to=None, force=False,
5216
def run(self, location=None, target_type=None, bind_to=None, force=False):
5469
5217
directory = bzrdir.BzrDir.open(location)
5470
if stacked_on and unstacked:
5471
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5472
elif stacked_on is not None:
5473
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5475
reconfigure.ReconfigureUnstacked().apply(directory)
5476
# At the moment you can use --stacked-on and a different
5477
# reconfiguration shape at the same time; there seems no good reason
5479
5218
if target_type is None:
5480
if stacked_on or unstacked:
5483
raise errors.BzrCommandError('No target configuration '
5219
raise errors.BzrCommandError('No target configuration specified')
5485
5220
elif target_type == 'branch':
5486
5221
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
5222
elif target_type == 'tree':
5524
5259
/path/to/newbranch.
5526
5261
Bound branches use the nickname of its master branch unless it is set
5527
locally, in which case switching will update the local nickname to be
5262
locally, in which case switching will update the the local nickname to be
5528
5263
that of the master.
5531
takes_args = ['to_location?']
5266
takes_args = ['to_location']
5532
5267
takes_options = [Option('force',
5533
help='Switch even if local commits will be lost.'),
5535
Option('create-branch', short_name='b',
5536
help='Create the target branch from this one before'
5537
' switching to it.'),
5268
help='Switch even if local commits will be lost.')
5540
def run(self, to_location=None, force=False, create_branch=False,
5271
def run(self, to_location, force=False):
5542
5272
from bzrlib import switch
5543
5273
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5274
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
if to_location is None:
5547
if revision is None:
5548
raise errors.BzrCommandError('You must supply either a'
5549
' revision or a location')
5552
5276
branch = control_dir.open_branch()
5553
5277
had_explicit_nick = branch.get_config().has_explicit_nickname()
5554
5278
except errors.NotBranchError:
5556
5279
had_explicit_nick = False
5559
raise errors.BzrCommandError('cannot create branch without'
5561
to_location = directory_service.directories.dereference(
5563
if '/' not in to_location and '\\' not in to_location:
5564
# This path is meant to be relative to the existing branch
5565
this_url = self._get_branch_location(control_dir)
5566
to_location = urlutils.join(this_url, '..', to_location)
5567
to_branch = branch.bzrdir.sprout(to_location,
5568
possible_transports=[branch.bzrdir.root_transport],
5569
source_branch=branch).open_branch()
5572
to_branch = Branch.open(to_location)
5573
except errors.NotBranchError:
5574
this_url = self._get_branch_location(control_dir)
5575
to_branch = Branch.open(
5576
urlutils.join(this_url, '..', to_location))
5577
if revision is not None:
5578
revision = revision.as_revision_id(to_branch)
5579
switch.switch(control_dir, to_branch, force, revision_id=revision)
5281
to_branch = Branch.open(to_location)
5282
except errors.NotBranchError:
5283
this_url = self._get_branch_location(control_dir)
5284
to_branch = Branch.open(
5285
urlutils.join(this_url, '..', to_location))
5286
switch.switch(control_dir, to_branch, force)
5580
5287
if had_explicit_nick:
5581
5288
branch = control_dir.open_branch() #get the new branch!
5582
5289
branch.nick = to_branch.nick
5849
5531
if writer is None:
5850
5532
writer = bzrlib.option.diff_writer_registry.get()
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
5534
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5535
message, destroy=destroy).run()
5858
5536
except errors.UserAbort:
5861
5539
def run_for_list(self):
5862
5540
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5864
manager = tree.get_shelf_manager()
5865
shelves = manager.active_shelves()
5866
if len(shelves) == 0:
5867
note('No shelved changes.')
5869
for shelf_id in reversed(shelves):
5870
message = manager.get_metadata(shelf_id).get('message')
5872
message = '<no message>'
5873
self.outf.write('%3d: %s\n' % (shelf_id, message))
5543
manager = tree.get_shelf_manager()
5544
shelves = manager.active_shelves()
5545
if len(shelves) == 0:
5546
note('No shelved changes.')
5548
for shelf_id in reversed(shelves):
5549
message = manager.get_metadata(shelf_id).get('message')
5551
message = '<no message>'
5552
self.outf.write('%3d: %s\n' % (shelf_id, message))
5877
5558
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5559
"""Restore shelved changes.
5880
5561
By default, the most recently shelved changes are restored. However if you
5881
5562
specify a shelf by id those changes will be restored instead. This works
5987
5661
self.outf.write('%s %s\n' % (path, location))
5990
def _register_lazy_builtins():
5991
# register lazy builtins from other modules; called at startup and should
5992
# be only called once.
5993
for (name, aliases, module_name) in [
5994
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5995
('cmd_dpush', [], 'bzrlib.foreign'),
5996
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6001
builtin_command_registry.register_lazy(name, aliases, module_name)
5664
# these get imported and then picked up by the scan for cmd_*
5665
# TODO: Some more consistent way to split command definitions across files;
5666
# we do need to load at least some information about them to know of
5667
# aliases. ideally we would avoid loading the implementation until the
5668
# details were needed.
5669
from bzrlib.cmd_version_info import cmd_version_info
5670
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5671
from bzrlib.bundle.commands import (
5674
from bzrlib.foreign import cmd_dpush
5675
from bzrlib.sign_my_commits import cmd_sign_my_commits
5676
from bzrlib.weave_commands import cmd_versionedfile_list, \
5677
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
