362
320
' --revision or a revision_id')
363
321
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')
323
# TODO: jam 20060112 should cat-revision always output utf-8?
324
if revision_id is not None:
325
revision_id = osutils.safe_revision_id(revision_id, warn=False)
327
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
328
except errors.NoSuchRevision:
329
msg = "The repository %s contains no revision %s." % (b.repository.base,
331
raise errors.BzrCommandError(msg)
332
elif revision is not None:
335
raise errors.BzrCommandError('You cannot specify a NULL'
337
rev_id = rev.as_revision_id(b)
338
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
341
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
342
"""Dump the contents of a btree index file to stdout.
395
344
PATH is a btree index file, it can be any URL. This includes things like
396
345
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
479
421
To re-create the working tree, use "bzr checkout".
481
423
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
424
takes_args = ['location?']
483
425
takes_options = [
485
427
help='Remove the working tree even if it has '
486
428
'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()
431
def run(self, location='.', force=False):
432
d = bzrdir.BzrDir.open(location)
435
working = d.open_workingtree()
436
except errors.NoWorkingTree:
437
raise errors.BzrCommandError("No working tree to remove")
438
except errors.NotLocalUrl:
439
raise errors.BzrCommandError("You cannot remove the working tree of a "
442
changes = working.changes_from(working.basis_tree())
443
if changes.has_changed():
444
raise errors.UncommittedChanges(working)
446
working_path = working.bzrdir.root_transport.base
447
branch_path = working.branch.bzrdir.root_transport.base
448
if working_path != branch_path:
449
raise errors.BzrCommandError("You cannot remove the working tree from "
450
"a lightweight checkout")
452
d.destroy_workingtree()
514
455
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
456
"""Show current revision number.
517
458
This is equal to the number of revisions on this branch.
520
461
_see_also = ['info']
521
462
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')
465
def run(self, location=u'.'):
466
self.outf.write(str(Branch.open_containing(location)[0].revno()))
467
self.outf.write('\n')
548
470
class cmd_revision_info(Command):
549
__doc__ = """Show revision number and revision id for a given revision identifier.
471
"""Show revision number and revision id for a given revision identifier.
552
474
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=[]):
486
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
489
if revision is not None:
578
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
490
revs.extend(revision)
579
491
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:
492
for rev in revision_info_list:
493
revs.append(RevisionSpec.from_string(rev))
495
b = Branch.open_containing(directory)[0]
498
revs.append(RevisionSpec.from_string('-1'))
501
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)
503
revno = '%4d' % (b.revision_id_to_revno(revision_id))
598
504
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]))
505
dotted_map = b.get_revision_id_to_revno_map()
506
revno = '.'.join(str(i) for i in dotted_map[revision_id])
507
print '%s %s' % (revno, revision_id)
608
510
class cmd_add(Command):
609
__doc__ = """Add specified files or directories.
511
"""Add specified files or directories.
611
513
In non-recursive mode, all the named items are added, regardless
612
514
of whether they were previously ignored. A warning is given if
810
719
takes_args = ['names*']
811
720
takes_options = [Option("after", help="Move only the bzr identifier"
812
721
" of the file, because the file has already been moved."),
813
Option('auto', help='Automatically guess renames.'),
814
Option('dry-run', help='Avoid making changes when guessing renames.'),
816
723
aliases = ['move', 'rename']
817
724
encoding_type = 'replace'
819
def run(self, names_list, after=False, auto=False, dry_run=False):
821
return self.run_auto(names_list, after, dry_run)
823
raise errors.BzrCommandError('--dry-run requires --auto.')
726
def run(self, names_list, after=False):
824
727
if names_list is None:
826
730
if len(names_list) < 2:
827
731
raise errors.BzrCommandError("missing file argument")
828
732
tree, rel_names = tree_files(names_list, canonicalize=False)
829
self.add_cleanup(tree.lock_tree_write().unlock)
830
self._run(tree, names_list, rel_names, after)
832
def run_auto(self, names_list, after, dry_run):
833
if names_list is not None and len(names_list) > 1:
834
raise errors.BzrCommandError('Only one path may be specified to'
837
raise errors.BzrCommandError('--after cannot be specified with'
839
work_tree, file_list = tree_files(names_list, default_branch='.')
840
self.add_cleanup(work_tree.lock_tree_write().unlock)
841
rename_map.RenameMap.guess_renames(work_tree, dry_run)
735
self._run(tree, names_list, rel_names, after)
843
739
def _run(self, tree, names_list, rel_names, after):
844
740
into_existing = osutils.isdir(names_list[-1])
917
812
dest = osutils.pathjoin(dest_parent, dest_tail)
918
813
mutter("attempting to move %s => %s", src, dest)
919
814
tree.rename_one(src, dest, after=after)
921
self.outf.write("%s => %s\n" % (src, dest))
815
self.outf.write("%s => %s\n" % (src, dest))
924
818
class cmd_pull(Command):
925
__doc__ = """Turn this branch into a mirror of another branch.
819
"""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
821
This command only works on branches that have not diverged. Branches are
822
considered diverged if the destination branch's most recent commit is one
823
that has not been merged (directly or indirectly) into the parent.
932
825
If branches have diverged, you can use 'bzr merge' to integrate the changes
933
826
from one into the other. Once one branch has merged, the other should
934
827
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.
829
If you want to forget your local changes and just update your branch to
830
match the remote one, use pull --overwrite.
940
832
If there is no default location set, the first pull will set it. After
941
833
that, you can omit the location to use the default. To change the
1026
907
if revision is not None:
1027
908
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)
910
branch_to.lock_write()
912
if tree_to is not None:
913
view_info = _get_view_info_for_change_reporter(tree_to)
914
change_reporter = delta._ChangeReporter(
915
unversioned_filter=tree_to.is_ignored, view_info=view_info)
916
result = tree_to.pull(branch_from, overwrite, revision_id,
918
possible_transports=possible_transports)
920
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,
922
result.report(self.outf)
923
if verbose and result.old_revid != result.new_revid:
924
log.show_branch_change(branch_to, self.outf, result.old_revno,
1048
930
class cmd_push(Command):
1049
__doc__ = """Update a mirror of this branch.
931
"""Update a mirror of this branch.
1051
933
The target branch will not have its working tree populated because this
1052
934
is both expensive, and is not supported on remote file systems.
1180
1053
help='Hard-link working tree files where possible.'),
1181
1054
Option('no-tree',
1182
1055
help="Create a branch without a working-tree."),
1184
help="Switch the checkout in the current directory "
1185
"to the new branch."),
1186
1056
Option('stacked',
1187
1057
help='Create a stacked branch referring to the source branch. '
1188
1058
'The new branch will depend on the availability of the source '
1189
1059
'branch for all operations.'),
1190
1060
Option('standalone',
1191
1061
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
1063
aliases = ['get', 'clone']
1202
1065
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
1066
hardlink=False, stacked=False, standalone=False, no_tree=False):
1206
1067
from bzrlib.tag import _merge_tags_if_possible
1207
1069
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1209
1071
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)
1074
if revision is not None:
1075
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'))
1077
# FIXME - wt.last_revision, fallback to branch, fall back to
1078
# None or perhaps NULL_REVISION to mean copy nothing
1080
revision_id = br_from.last_revision()
1081
if to_location is None:
1082
to_location = urlutils.derive_to_location(from_location)
1083
to_transport = transport.get_transport(to_location)
1085
to_transport.mkdir('.')
1086
except errors.FileExists:
1087
raise errors.BzrCommandError('Target directory "%s" already'
1088
' exists.' % to_location)
1089
except errors.NoSuchFile:
1090
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1093
# preserve whatever source format we have.
1094
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1095
possible_transports=[to_transport],
1096
accelerator_tree=accelerator_tree,
1097
hardlink=hardlink, stacked=stacked,
1098
force_new_repo=standalone,
1099
create_tree_if_local=not no_tree,
1100
source_branch=br_from)
1101
branch = dir.open_branch()
1102
except errors.NoSuchRevision:
1103
to_transport.delete_tree('.')
1104
msg = "The branch %s has no revision %s." % (from_location,
1106
raise errors.BzrCommandError(msg)
1107
_merge_tags_if_possible(br_from, branch)
1108
# If the source branch is stacked, the new branch may
1109
# be stacked whether we asked for that explicitly or not.
1110
# We therefore need a try/except here and not just 'if stacked:'
1112
note('Created new stacked branch referring to %s.' %
1113
branch.get_stacked_on_url())
1114
except (errors.NotStacked, errors.UnstackableBranchFormat,
1115
errors.UnstackableRepositoryFormat), e:
1116
note('Branched %d revision(s).' % branch.revno())
1275
1121
class cmd_checkout(Command):
1276
__doc__ = """Create a new checkout of an existing branch.
1122
"""Create a new checkout of an existing branch.
1278
1124
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1279
1125
the branch found in '.'. This is useful if you have removed the working tree
1353
1199
@display_command
1354
1200
def run(self, dir=u'.'):
1355
1201
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))
1204
new_inv = tree.inventory
1205
old_tree = tree.basis_tree()
1206
old_tree.lock_read()
1208
old_inv = old_tree.inventory
1210
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1211
for f, paths, c, v, p, n, k, e in iterator:
1212
if paths[0] == paths[1]:
1216
renames.append(paths)
1218
for old_name, new_name in renames:
1219
self.outf.write("%s => %s\n" % (old_name, new_name))
1374
1226
class cmd_update(Command):
1375
__doc__ = """Update a tree to have the latest code committed to its branch.
1227
"""Update a tree to have the latest code committed to its branch.
1377
1229
This will perform a merge into the working tree, and may generate
1378
1230
conflicts. If you have any local changes, you will still
1381
1233
If you want to discard your local changes, you can just do a
1382
1234
'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
1237
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1238
takes_args = ['dir?']
1390
takes_options = ['revision']
1391
1239
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")
1241
def run(self, dir='.'):
1397
1242
tree = WorkingTree.open_containing(dir)[0]
1398
branch = tree.branch
1399
1243
possible_transports = []
1400
master = branch.get_master_branch(
1244
master = tree.branch.get_master_branch(
1401
1245
possible_transports=possible_transports)
1402
1246
if master is not None:
1403
branch_location = master.base
1404
1247
tree.lock_write()
1406
branch_location = tree.branch.base
1407
1249
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)
1251
existing_pending_merges = tree.get_parent_ids()[1:]
1252
last_rev = _mod_revision.ensure_null(tree.last_revision())
1253
if last_rev == _mod_revision.ensure_null(
1254
tree.branch.last_revision()):
1255
# may be up to date, check master too.
1256
if master is None or last_rev == _mod_revision.ensure_null(
1257
master.last_revision()):
1258
revno = tree.branch.revision_id_to_revno(last_rev)
1259
note("Tree is up to date at revision %d." % (revno,))
1261
view_info = _get_view_info_for_change_reporter(tree)
1435
1262
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'.")
1263
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1264
view_info=view_info), possible_transports=possible_transports)
1265
revno = tree.branch.revision_id_to_revno(
1266
_mod_revision.ensure_null(tree.last_revision()))
1267
note('Updated to revision %d.' % (revno,))
1268
if tree.get_parent_ids()[1:] != existing_pending_merges:
1269
note('Your local commits will now show as pending merges with '
1270
"'bzr status', and can be committed with 'bzr commit'.")
1460
1279
class cmd_info(Command):
1461
__doc__ = """Show information about a working tree, branch or repository.
1280
"""Show information about a working tree, branch or repository.
1463
1282
This command will show all known locations and formats associated to the
1464
1283
tree, branch or repository.
1530
1349
if file_list is not None:
1531
1350
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')
1354
# Heuristics should probably all move into tree.remove_smart or
1357
added = tree.changes_from(tree.basis_tree(),
1358
specific_files=file_list).added
1359
file_list = sorted([f[0] for f in added], reverse=True)
1360
if len(file_list) == 0:
1361
raise errors.BzrCommandError('No matching files.')
1362
elif file_list is None:
1363
# missing files show up in iter_changes(basis) as
1364
# versioned-with-no-kind.
1366
for change in tree.iter_changes(tree.basis_tree()):
1367
# Find paths in the working tree that have no kind:
1368
if change[1][1] is not None and change[6][1] is None:
1369
missing.append(change[1][1])
1370
file_list = sorted(missing, reverse=True)
1371
file_deletion_strategy = 'keep'
1372
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1373
keep_files=file_deletion_strategy=='keep',
1374
force=file_deletion_strategy=='force')
1557
1379
class cmd_file_id(Command):
1558
__doc__ = """Print file_id of a particular file or directory.
1380
"""Print file_id of a particular file or directory.
1560
1382
The file_id is assigned when the file is first added and remains the
1561
1383
same through all revisions where the file exists, even when it is
1961
1758
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1759
' 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)
1761
old_tree, new_tree, specific_files, extra_trees = \
1762
_get_trees_to_diff(file_list, revision, old, new,
1972
1764
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1765
specific_files=specific_files,
1974
1766
external_diff_options=diff_options,
1975
1767
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1768
extra_trees=extra_trees, using=using)
1980
1771
class cmd_deleted(Command):
1981
__doc__ = """List files deleted in the working tree.
1772
"""List files deleted in the working tree.
1983
1774
# TODO: Show files deleted since a previous revision, or
1984
1775
# between two revisions.
2209
2018
:Tips & tricks:
2211
2020
GUI tools and IDEs are often better at exploring history than command
2212
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2213
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2214
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2215
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2021
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2022
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2023
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2025
Web interfaces are often better at exploring history than command line
2026
tools, particularly for branches on servers. You may prefer Loggerhead
2027
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2217
2029
You may find it useful to add the aliases below to ``bazaar.conf``::
2221
top = log -l10 --line
2033
top = log -r-10.. --short --forward
2034
show = log -v -p -n1 --long
2224
2036
``bzr tip`` will then show the latest revision while ``bzr top``
2225
2037
will show the last 10 mainline revisions. To see the details of a
2226
2038
particular revision X, ``bzr show -rX``.
2228
If you are interested in looking deeper into a particular merge X,
2229
use ``bzr log -n0 -rX``.
2040
As many GUI tools and Web interfaces do, you may prefer viewing
2041
history collapsed initially. If you are interested in looking deeper
2042
into a particular merge X, use ``bzr log -n0 -rX``. If you like
2043
working this way, you may wish to either:
2045
* change your default log format to short (or line)
2046
* add this alias: log = log -n1
2231
2048
``bzr log -v`` on a branch with lots of history is currently
2232
2049
very slow. A fix for this issue is currently under development.
2357
2145
dir, relpath = bzrdir.BzrDir.open_containing(location)
2358
2146
b = dir.open_branch()
2359
self.add_cleanup(b.lock_read().unlock)
2360
2150
rev1, rev2 = _get_revision_range(revision, b, self.name())
2362
# Decide on the type of delta & diff filtering to use
2363
# TODO: add an --all-files option to make this configurable & consistent
2371
diff_type = 'partial'
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)
2151
if log_format is None:
2152
log_format = log.log_formatter_registry.get_default(b)
2154
lf = log_format(show_ids=show_ids, to_file=self.outf,
2155
show_timezone=timezone,
2156
delta_format=get_verbosity_level(),
2163
direction=direction,
2164
start_revision=rev1,
2168
show_diff=show_diff)
2416
2173
def _get_revision_range(revisionspec_list, branch, command_name):
2417
2174
"""Take the input of a revision option and turn it into a revision range.
2419
2176
It returns RevisionInfo objects which can be used to obtain the rev_id's
2420
of the desired revisions. It does some user input validations.
2177
of the desired revisons. It does some user input validations.
2422
2179
if revisionspec_list is None:
2560
2309
apply_view = True
2561
2310
view_str = views.view_display_str(view_files)
2562
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')
2311
note("ignoring files outside view: %s" % view_str)
2315
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2316
if fp.startswith(relpath):
2317
fp = osutils.pathjoin(prefix, fp[len(relpath):])
2318
if non_recursive and '/' in fp:
2320
if not all and not selection[fc]:
2322
if kind is not None and fkind != kind:
2326
views.check_path_in_view(tree, fp)
2327
except errors.FileOutsideView:
2329
kindch = entry.kind_character()
2330
outstring = fp + kindch
2332
outstring = '%-8s %s' % (fc, outstring)
2333
if show_ids and fid is not None:
2334
outstring = "%-50s %s" % (outstring, fid)
2335
self.outf.write(outstring + '\n')
2337
self.outf.write(fp + '\0')
2340
self.outf.write(fid)
2341
self.outf.write('\0')
2349
self.outf.write('%-50s %s\n' % (outstring, my_id))
2351
self.outf.write(outstring + '\n')
2611
2356
class cmd_unknowns(Command):
2612
__doc__ = """List unknown files.
2357
"""List unknown files.
2677
2399
Ignore everything but the "debian" toplevel directory::
2679
2401
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
2404
_see_also = ['status', 'ignored', 'patterns']
2690
2405
takes_args = ['name_pattern*']
2691
2406
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2407
Option('old-default-rules',
2408
help='Write out the ignore rules bzr < 0.9 always used.')
2696
def run(self, name_pattern_list=None, default_rules=None):
2411
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2412
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)
2413
if old_default_rules is not None:
2414
# dump the rules and exit
2415
for pattern in ignores.OLD_DEFAULTS:
2703
2418
if not name_pattern_list:
2704
2419
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2420
"NAME_PATTERN or --old-default-rules")
2706
2421
name_pattern_list = [globbing.normalize_pattern(p)
2707
2422
for p in name_pattern_list]
2708
2423
for name_pattern in name_pattern_list:
2850
2559
_see_also = ['ls']
2851
2560
takes_options = [
2852
2561
Option('name-from-revision', help='The path name in the old tree.'),
2853
Option('filters', help='Apply content filters to display the '
2854
'convenience form.'),
2857
2564
takes_args = ['filename']
2858
2565
encoding_type = 'exact'
2860
2567
@display_command
2861
def run(self, filename, revision=None, name_from_revision=False,
2568
def run(self, filename, revision=None, name_from_revision=False):
2863
2569
if revision is not None and len(revision) != 1:
2864
2570
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2865
2571
" one revision specifier")
2866
2572
tree, branch, relpath = \
2867
2573
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2868
self.add_cleanup(branch.lock_read().unlock)
2869
return self._run(tree, branch, relpath, filename, revision,
2870
name_from_revision, filters)
2576
return self._run(tree, branch, relpath, filename, revision,
2872
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2581
def _run(self, tree, b, relpath, filename, revision, name_from_revision):
2874
2582
if tree is None:
2875
2583
tree = b.basis_tree()
2876
2584
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2877
self.add_cleanup(rev_tree.lock_read().unlock)
2586
cur_file_id = tree.path2id(relpath)
2879
2587
old_file_id = rev_tree.path2id(relpath)
2881
2589
if name_from_revision:
2882
# Try in revision if requested
2883
2590
if old_file_id is None:
2884
2591
raise errors.BzrCommandError(
2885
2592
"%r is not present in revision %s" % (
2886
2593
filename, rev_tree.get_revision_id()))
2888
2595
content = rev_tree.get_file_text(old_file_id)
2890
cur_file_id = tree.path2id(relpath)
2892
if cur_file_id is not None:
2893
# Then try with the actual file id
2895
content = rev_tree.get_file_text(cur_file_id)
2897
except errors.NoSuchId:
2898
# The actual file id didn't exist at that time
2900
if not found and old_file_id is not None:
2901
# Finally try with the old file id
2902
content = rev_tree.get_file_text(old_file_id)
2905
# Can't be found anywhere
2906
raise errors.BzrCommandError(
2907
"%r is not present in revision %s" % (
2908
filename, rev_tree.get_revision_id()))
2910
from bzrlib.filters import (
2911
ContentFilterContext,
2912
filtered_output_bytes,
2914
filters = rev_tree._content_filter_stack(relpath)
2915
chunks = content.splitlines(True)
2916
content = filtered_output_bytes(chunks, filters,
2917
ContentFilterContext(relpath, rev_tree))
2919
self.outf.writelines(content)
2922
self.outf.write(content)
2596
elif cur_file_id is not None:
2597
content = rev_tree.get_file_text(cur_file_id)
2598
elif old_file_id is not None:
2599
content = rev_tree.get_file_text(old_file_id)
2601
raise errors.BzrCommandError(
2602
"%r is not present in revision %s" % (
2603
filename, rev_tree.get_revision_id()))
2604
self.outf.write(content)
2925
2607
class cmd_local_time_offset(Command):
2926
__doc__ = """Show the offset in seconds from GMT to local time."""
2608
"""Show the offset in seconds from GMT to local time."""
2928
2610
@display_command
2930
self.outf.write("%s\n" % osutils.local_time_offset())
2612
print osutils.local_time_offset()
2934
2616
class cmd_commit(Command):
2935
__doc__ = """Commit changes into a new revision.
2937
An explanatory message needs to be given for each commit. This is
2938
often done by using the --message option (getting the message from the
2939
command line) or by using the --file option (getting the message from
2940
a file). If neither of these options is given, an editor is opened for
2941
the user to enter the message. To see the changed files in the
2942
boilerplate text loaded into the editor, use the --show-diff option.
2944
By default, the entire tree is committed and the person doing the
2945
commit is assumed to be the author. These defaults can be overridden
2950
If selected files are specified, only changes to those files are
2951
committed. If a directory is specified then the directory and
2952
everything within it is committed.
2954
When excludes are given, they take precedence over selected files.
2955
For example, to commit only changes within foo, but not changes
2958
bzr commit foo -x foo/bar
2960
A selective commit after a merge is not yet supported.
2964
If the author of the change is not the same person as the committer,
2965
you can specify the author's name using the --author option. The
2966
name should be in the same format as a committer-id, e.g.
2967
"John Doe <jdoe@example.com>". If there is more than one author of
2968
the change you can specify the option multiple times, once for each
2973
A common mistake is to forget to add a new file or directory before
2974
running the commit command. The --strict option checks for unknown
2975
files and aborts the commit if any are found. More advanced pre-commit
2976
checks can be implemented by defining hooks. See ``bzr help hooks``
2981
If you accidentially commit the wrong changes or make a spelling
2982
mistake in the commit message say, you can use the uncommit command
2983
to undo it. See ``bzr help uncommit`` for details.
2985
Hooks can also be configured to run after a commit. This allows you
2986
to trigger updates to external systems like bug trackers. The --fixes
2987
option can be used to record the association between a revision and
2988
one or more bugs. See ``bzr help bugs`` for details.
2990
A selective commit may fail in some cases where the committed
2991
tree would be invalid. Consider::
2996
bzr commit foo -m "committing foo"
2997
bzr mv foo/bar foo/baz
3000
bzr commit foo/bar -m "committing bar but not baz"
3002
In the example above, the last commit will fail by design. This gives
3003
the user the opportunity to decide whether they want to commit the
3004
rename at the same time, separately first, or not at all. (As a general
3005
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2617
"""Commit changes into a new revision.
2619
If no arguments are given, the entire tree is committed.
2621
If selected files are specified, only changes to those files are
2622
committed. If a directory is specified then the directory and everything
2623
within it is committed.
2625
When excludes are given, they take precedence over selected files.
2626
For example, too commit only changes within foo, but not changes within
2629
bzr commit foo -x foo/bar
2631
If author of the change is not the same person as the committer, you can
2632
specify the author's name using the --author option. The name should be
2633
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2634
If there is more than one author of the change you can specify the option
2635
multiple times, once for each author.
2637
A selected-file commit may fail in some cases where the committed
2638
tree would be invalid. Consider::
2643
bzr commit foo -m "committing foo"
2644
bzr mv foo/bar foo/baz
2647
bzr commit foo/bar -m "committing bar but not baz"
2649
In the example above, the last commit will fail by design. This gives
2650
the user the opportunity to decide whether they want to commit the
2651
rename at the same time, separately first, or not at all. (As a general
2652
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2654
Note: A selected-file commit after a merge is not yet supported.
3007
2656
# TODO: Run hooks on tree to-be-committed, and after commit.
3111
2752
if fixes is None:
3113
bug_property = bugtracker.encode_fixes_bug_urls(
3114
self._iter_bug_fix_urls(fixes, tree.branch))
2754
bug_property = self._get_bug_fix_properties(fixes, tree.branch)
3115
2755
if bug_property:
3116
2756
properties['bugs'] = bug_property
3118
2758
if local and not tree.branch.get_bound_location():
3119
2759
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
2761
def get_message(commit_obj):
3143
2762
"""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,
2763
my_message = message
2764
if my_message is None and not file:
2765
t = make_commit_message_template_encoded(tree,
3153
2766
selected_list, diff=show_diff,
3154
2767
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
2768
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
2769
my_message = edit_commit_message_encoded(t,
3162
2770
start_message=start_message)
3163
2771
if my_message is None:
3164
2772
raise errors.BzrCommandError("please specify a commit"
3165
2773
" message with either --message or --file")
2774
elif my_message and file:
2775
raise errors.BzrCommandError(
2776
"please specify either --message or --file")
2778
my_message = codecs.open(file, 'rt',
2779
osutils.get_user_encoding()).read()
3166
2780
if my_message == "":
3167
2781
raise errors.BzrCommandError("empty commit message specified")
3168
2782
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
2785
tree.commit(message_callback=get_message,
3176
2786
specific_files=selected_list,
3177
2787
allow_pointless=unchanged, strict=strict, local=local,
3178
2788
reporter=None, verbose=verbose, revprops=properties,
3179
authors=author, timestamp=commit_stamp,
3181
2790
exclude=safe_relpath_files(tree, exclude))
3182
2791
except PointlessCommit:
3183
raise errors.BzrCommandError("No changes to commit."
3184
" Use --unchanged to commit anyhow.")
2792
# FIXME: This should really happen before the file is read in;
2793
# perhaps prepare the commit; get the message; then actually commit
2794
raise errors.BzrCommandError("no changes to commit."
2795
" use --unchanged to commit anyhow")
3185
2796
except ConflictsInTree:
3186
2797
raise errors.BzrCommandError('Conflicts detected in working '
3187
2798
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3206
2816
The working tree and branch checks will only give output if a problem is
3207
2817
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
2819
revisions: This is just the number of revisions checked. It doesn't
2821
versionedfiles: This is just the number of versionedfiles checked. It
2822
doesn't indicate a problem.
2823
unreferenced ancestors: Texts that are ancestors of other texts, but
2824
are not properly referenced by the revision ancestry. This is a
2825
subtle problem that Bazaar can work around.
2826
unique file texts: This is the total number of unique file contents
2827
seen in the checked revisions. It does not indicate a problem.
2828
repeated file texts: This is the total number of repeated texts seen
2829
in the checked revisions. Texts can be repeated when their file
2830
entries are modified, but the file contents are not. It does not
3232
2833
If no restrictions are specified, all Bazaar data that is found at the given
3233
2834
location will be checked.
3573
3163
if cache_dir is not None:
3574
3164
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3166
print 'testing: %s' % (osutils.realpath(sys.argv[0]),)
3167
print ' %s (%s python%s)' % (
3169
bzrlib.version_string,
3170
bzrlib._format_version_tuple(sys.version_info),
3575
3173
if testspecs_list is not None:
3576
3174
pattern = '|'.join(testspecs_list)
3581
from bzrlib.tests import SubUnitBzrRunner
3583
raise errors.BzrCommandError("subunit not available. subunit "
3584
"needs to be installed to use --subunit.")
3585
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3586
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
# stdout, which would corrupt the subunit stream.
3588
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3590
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3592
self.additional_selftest_args.setdefault(
3593
'suite_decorators', []).append(parallel)
3595
3178
test_suite_factory = benchmarks.test_suite
3596
3179
# Unless user explicitly asks for quiet, be verbose in benchmarks
3597
3180
verbose = not is_quiet()
3598
3181
# TODO: should possibly lock the history file...
3599
3182
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3602
3184
test_suite_factory = None
3603
3185
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)
3187
selftest_kwargs = {"verbose": verbose,
3189
"stop_on_failure": one,
3190
"transport": transport,
3191
"test_suite_factory": test_suite_factory,
3192
"lsprof_timed": lsprof_timed,
3193
"bench_history": benchfile,
3194
"matching_tests_first": first,
3195
"list_only": list_only,
3196
"random_seed": randomize,
3197
"exclude_pattern": exclude,
3199
"load_list": load_list,
3200
"debug_flags": debugflag,
3201
"starting_with": starting_with
3203
selftest_kwargs.update(self.additional_selftest_args)
3204
result = selftest(**selftest_kwargs)
3206
if benchfile is not None:
3209
note('tests passed')
3211
note('tests failed')
3623
3212
return int(not result)
3626
3215
class cmd_version(Command):
3627
__doc__ = """Show version of bzr."""
3216
"""Show version of bzr."""
3629
3218
encoding_type = 'replace'
3630
3219
takes_options = [
3793
3369
verified = 'inapplicable'
3794
3370
tree = WorkingTree.open_containing(directory)[0]
3372
# die as quickly as possible if there are uncommitted changes
3797
3374
basis_tree = tree.revision_tree(tree.last_revision())
3798
3375
except errors.NoSuchRevision:
3799
3376
basis_tree = tree.basis_tree()
3801
# die as quickly as possible if there are uncommitted changes
3803
if tree.has_changes():
3804
raise errors.UncommittedChanges(tree)
3377
changes = tree.changes_from(basis_tree)
3378
if changes.has_changed():
3379
raise errors.UncommittedChanges(tree)
3806
3381
view_info = _get_view_info_for_change_reporter(tree)
3807
3382
change_reporter = delta._ChangeReporter(
3808
3383
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:
3386
pb = ui.ui_factory.nested_progress_bar()
3387
cleanups.append(pb.finished)
3389
cleanups.append(tree.unlock)
3390
if location is not None:
3392
mergeable = bundle.read_mergeable_from_url(location,
3393
possible_transports=possible_transports)
3394
except errors.NotABundle:
3398
raise errors.BzrCommandError('Cannot use --uncommitted'
3399
' with bundles or merge directives.')
3401
if revision is not None:
3402
raise errors.BzrCommandError(
3403
'Cannot use -r with merge directives or bundles')
3404
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3407
if merger is None and uncommitted:
3408
if revision is not None and len(revision) > 0:
3409
raise errors.BzrCommandError('Cannot use --uncommitted and'
3410
' --revision at the same time.')
3411
location = self._select_branch_location(tree, location)[0]
3412
other_tree, other_path = WorkingTree.open_containing(location)
3413
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3415
allow_pending = False
3416
if other_path != '':
3417
merger.interesting_files = [other_path]
3420
merger, allow_pending = self._get_merger_from_branch(tree,
3421
location, revision, remember, possible_transports, pb)
3423
merger.merge_type = merge_type
3424
merger.reprocess = reprocess
3425
merger.show_base = show_base
3426
self.sanity_check_merger(merger)
3427
if (merger.base_rev_id == merger.other_rev_id and
3428
merger.other_rev_id is not None):
3429
note('Nothing to do.')
3432
if merger.interesting_files is not None:
3433
raise errors.BzrCommandError('Cannot pull individual files')
3434
if (merger.base_rev_id == tree.last_revision()):
3435
result = tree.pull(merger.other_branch, False,
3436
merger.other_rev_id)
3437
result.report(self.outf)
3439
merger.check_basis(False)
3441
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):
3443
return self._do_merge(merger, change_reporter, allow_pending,
3446
for cleanup in reversed(cleanups):
3449
def _do_preview(self, merger):
3450
from bzrlib.diff import show_diff_trees
3869
3451
tree_merger = merger.make_merger()
3870
3452
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='')
3454
result_tree = tt.get_preview_tree()
3455
show_diff_trees(merger.this_tree, result_tree, self.outf,
3456
old_label='', new_label='')
3881
3460
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3882
3461
merger.change_reporter = change_reporter
4067
3614
def run(self, file_list=None, merge_type=None, show_base=False,
4068
3615
reprocess=False):
4069
from bzrlib.conflicts import restore
4070
3616
if merge_type is None:
4071
3617
merge_type = _mod_merge.Merge3Merger
4072
3618
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":
3621
parents = tree.get_parent_ids()
3622
if len(parents) != 2:
3623
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3624
" merges. Not cherrypicking or"
3626
repository = tree.branch.repository
3627
interesting_ids = None
3629
conflicts = tree.conflicts()
3630
if file_list is not None:
3631
interesting_ids = set()
3632
for filename in file_list:
3633
file_id = tree.path2id(filename)
3635
raise errors.NotVersionedError(filename)
3636
interesting_ids.add(file_id)
3637
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:
3640
for name, ie in tree.inventory.iter_entries(file_id):
3641
interesting_ids.add(ie.file_id)
3642
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3644
# Remerge only supports resolving contents conflicts
3645
allowed_conflicts = ('text conflict', 'contents conflict')
3646
restore_files = [c.path for c in conflicts
3647
if c.typestring in allowed_conflicts]
3648
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3649
tree.set_conflicts(ConflictList(new_conflicts))
3650
if file_list is not None:
3651
restore_files = file_list
3652
for filename in restore_files:
3654
restore(tree.abspath(filename))
3655
except errors.NotConflicted:
3657
# Disable pending merges, because the file texts we are remerging
3658
# have not had those merges performed. If we use the wrong parents
3659
# list, we imply that the working tree text has seen and rejected
3660
# all the changes from the other tree, when in fact those changes
3661
# have not yet been seen.
3662
pb = ui.ui_factory.nested_progress_bar()
3663
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()
3665
merger = _mod_merge.Merger.from_revision_ids(pb,
3667
merger.interesting_ids = interesting_ids
3668
merger.merge_type = merge_type
3669
merger.show_base = show_base
3670
merger.reprocess = reprocess
3671
conflicts = merger.do_merge()
3673
tree.set_parent_ids(parents)
4124
tree.set_parent_ids(parents)
4125
3677
if conflicts > 0:
4149
3701
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
3704
Any files that have been newly added since that revision will be deleted,
3705
with a backup kept if appropriate. Directories containing unknown files
3706
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
3708
The working tree contains a list of pending merged revisions, which will
3709
be included as parents in the next commit. Normally, revert clears that
3710
list as well as reverting the files. If any files are specified, revert
3711
leaves the pending merge list alone and reverts only the files. Use "bzr
3712
revert ." in the tree root to revert all files but keep the merge record,
3713
and "bzr revert --forget-merges" to clear the pending merge list without
4164
3714
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
3717
_see_also = ['cat', 'export']
4355
3893
_get_revision_range(revision,
4356
3894
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")
3896
local_branch.lock_read()
3898
remote_branch.lock_read()
3900
local_extra, remote_extra = find_unmerged(
3901
local_branch, remote_branch, restrict,
3902
backward=not reverse,
3903
include_merges=include_merges,
3904
local_revid_range=local_revid_range,
3905
remote_revid_range=remote_revid_range)
3907
if log_format is None:
3908
registry = log.log_formatter_registry
3909
log_format = registry.get_default(local_branch)
3910
lf = log_format(to_file=self.outf,
3912
show_timezone='original')
3915
if local_extra and not theirs_only:
3916
message("You have %d extra revision(s):\n" %
3918
for revision in iter_log_revisions(local_extra,
3919
local_branch.repository,
3921
lf.log_revision(revision)
3922
printed_local = True
3925
printed_local = False
3927
if remote_extra and not mine_only:
3928
if printed_local is True:
3930
message("You are missing %d revision(s):\n" %
3932
for revision in iter_log_revisions(remote_extra,
3933
remote_branch.repository,
3935
lf.log_revision(revision)
3938
if mine_only and not local_extra:
3939
# We checked local, and found nothing extra
3940
message('This branch is up to date.\n')
3941
elif theirs_only and not remote_extra:
3942
# We checked remote, and found nothing extra
3943
message('Other branch is up to date.\n')
3944
elif not (mine_only or theirs_only or local_extra or
3946
# We checked both branches, and neither one had extra
3948
message("Branches are up to date.\n")
3950
remote_branch.unlock()
3952
local_branch.unlock()
4408
3953
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)
3954
local_branch.lock_write()
3956
# handle race conditions - a parent might be set while we run.
3957
if local_branch.get_parent() is None:
3958
local_branch.set_parent(remote_branch.base)
3960
local_branch.unlock()
4413
3961
return status_code
4416
3964
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.
3965
"""Compress the data within a repository."""
4435
3967
_see_also = ['repositories']
4436
3968
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):
3970
def run(self, branch_or_repo='.'):
4442
3971
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4444
3973
branch = dir.open_branch()
4445
3974
repository = branch.repository
4446
3975
except errors.NotBranchError:
4447
3976
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4451
3980
class cmd_plugins(Command):
4452
__doc__ = """List the installed plugins.
3981
"""List the installed plugins.
4454
3983
This command displays the list of installed plugins including
4455
3984
version of plugin and a short description of each.
4552
4084
wt, branch, relpath = \
4553
4085
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4086
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,
4091
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4093
file_id = wt.path2id(relpath)
4095
file_id = tree.path2id(relpath)
4097
raise errors.NotVersionedError(filename)
4098
file_version = tree.inventory[file_id].revision
4099
if wt is not None and revision is None:
4100
# If there is a tree and we're not annotating historical
4101
# versions, annotate the working tree's content.
4102
annotate_file_tree(wt, file_id, self.outf, long, all,
4105
annotate_file(branch, file_version, file_id, long, all, self.outf,
4577
4114
class cmd_re_sign(Command):
4578
__doc__ = """Create a digital signature for an existing revision."""
4115
"""Create a digital signature for an existing revision."""
4579
4116
# TODO be able to replace existing ones.
4581
4118
hidden = True # is this right ?
4785
4328
end_revision=last_revno)
4788
self.outf.write('Dry-run, pretending to remove'
4789
' the above revisions.\n')
4331
print 'Dry-run, pretending to remove the above revisions.'
4333
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')
4335
print 'The above revision(s) will be removed.'
4337
val = raw_input('Are you sure [y/N]? ')
4338
if val.lower() not in ('y', 'yes'):
4798
4342
mutter('Uncommitting from {%s} to {%s}',
4799
4343
last_rev_id, rev_id)
4800
4344
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4801
4345
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)
4346
note('You can restore the old tip by running:\n'
4347
' bzr pull . -r revid:%s', last_rev_id)
4806
4350
class cmd_break_lock(Command):
4807
__doc__ = """Break a dead lock on a repository, branch or working directory.
4351
"""Break a dead lock on a repository, branch or working directory.
4809
4353
CAUTION: Locks should only be broken when you are sure that the process
4810
4354
holding the lock has been stopped.
4812
You can get information on what locks are open via the 'bzr info
4813
[location]' command.
4356
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
4361
takes_args = ['location?']
4866
4404
Option('allow-writes',
4867
4405
help='By default the server is a readonly server. Supplying '
4868
4406
'--allow-writes enables write access to the contents of '
4869
'the served directory and below. Note that ``bzr serve`` '
4870
'does not perform authentication, so unless some form of '
4871
'external authentication is arranged supplying this '
4872
'option leads to global uncontrolled write access to your '
4407
'the served directory and below.'
4411
def run_smart_server(self, smart_server):
4412
"""Run 'smart_server' forever, with no UI output at all."""
4413
# For the duration of this server, no UI output is permitted. note
4414
# that this may cause problems with blackbox tests. This should be
4415
# changed with care though, as we dont want to use bandwidth sending
4416
# progress over stderr to smart server clients!
4417
from bzrlib import lockdir
4418
old_factory = ui.ui_factory
4419
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4421
ui.ui_factory = ui.SilentUIFactory()
4422
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4423
smart_server.serve()
4425
ui.ui_factory = old_factory
4426
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4877
4428
def get_host_and_port(self, port):
4878
4429
"""Return the host and port to run the smart server on.
4880
If 'port' is None, None will be returned for the host and port.
4431
If 'port' is None, the default host (`medium.BZR_DEFAULT_INTERFACE`)
4432
and port (`medium.BZR_DEFAULT_PORT`) will be used.
4882
4434
If 'port' has a colon in it, the string before the colon will be
4883
4435
interpreted as the host.
4886
4438
:return: A tuple of (host, port), where 'host' is a host name or IP,
4887
4439
and port is an integer TCP/IP port.
4890
if port is not None:
4441
from bzrlib.smart import medium
4442
host = medium.BZR_DEFAULT_INTERFACE
4444
port = medium.BZR_DEFAULT_PORT
4891
4446
if ':' in port:
4892
4447
host, port = port.split(':')
4893
4448
port = int(port)
4894
4449
return host, port
4896
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4898
from bzrlib.transport import get_transport, transport_server_registry
4451
def get_smart_server(self, transport, inet, port):
4452
"""Construct a smart server.
4454
:param transport: The base transport from which branches will be
4456
:param inet: If True, serve over stdin and stdout. Used for running
4458
:param port: The port to listen on. By default, it's `
4459
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4461
:return: A smart server.
4463
from bzrlib.smart import medium, server
4465
smart_server = medium.SmartServerPipeStreamMedium(
4466
sys.stdin, sys.stdout, transport)
4468
host, port = self.get_host_and_port(port)
4469
smart_server = server.SmartTCPServer(
4470
transport, host=host, port=port)
4471
note('listening on port: %s' % smart_server.port)
4474
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4475
from bzrlib.transport import get_transport
4476
from bzrlib.transport.chroot import ChrootServer
4899
4477
if directory is None:
4900
4478
directory = os.getcwd()
4901
if protocol is None:
4902
protocol = transport_server_registry.get()
4903
host, port = self.get_host_and_port(port)
4904
4479
url = urlutils.local_path_to_url(directory)
4905
4480
if not allow_writes:
4906
4481
url = 'readonly+' + url
4907
transport = get_transport(url)
4908
protocol(transport, host, port, inet)
4482
chroot_server = ChrootServer(get_transport(url))
4483
chroot_server.setUp()
4484
t = get_transport(chroot_server.get_url())
4485
smart_server = self.get_smart_server(t, inet, port)
4486
self.run_smart_server(smart_server)
4911
4489
class cmd_join(Command):
4912
__doc__ = """Combine a tree into its containing tree.
4490
"""Combine a subtree into its containing tree.
4914
This command requires the target tree to be in a rich-root format.
4492
This command is for experimental use only. It requires the target tree
4493
to be in dirstate-with-subtree format, which cannot be converted into
4916
4496
The TREE argument should be an independent tree, inside another tree, but
4917
4497
not part of it. (Such trees can be produced by "bzr split", but also by
5092
4679
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.
4682
If --no-bundle is specified, then public_branch is needed (and must be
4683
up-to-date), so that the receiver can perform the merge using the
4684
public_branch. The public_branch is always included if known, so that
4685
people can check it later.
4687
The submit branch defaults to the parent, but can be overridden. Both
4688
submit branch and public branch will be remembered if supplied.
4690
If a public_branch is known for the submit_branch, that public submit
4691
branch is used in the merge instructions. This means that a local mirror
4692
can be used as your actual submit branch, once you have set public_branch
5122
4695
Mail is sent using your preferred mail program. This should be transparent
5123
4696
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5168
4736
short_name='f',
5170
4738
Option('output', short_name='o',
5171
help='Write merge directive to this file or directory; '
4739
help='Write merge directive to this file; '
5172
4740
'use - for stdout.',
5175
help='Refuse to send if there are uncommitted changes in'
5176
' the working tree, --no-strict disables the check.'),
5177
4742
Option('mail-to', help='Mail the request to this address.',
5181
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')),
4746
RegistryOption.from_kwargs('format',
4747
'Use the specified output format.',
4748
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4749
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5187
4752
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5188
4753
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,
4754
format='4', mail_to=None, message=None, **kwargs):
4755
return self._run(submit_branch, revision, public_branch, remember,
4756
format, no_bundle, no_patch, output,
4757
kwargs.get('from', '.'), mail_to, message)
4759
def _run(self, submit_branch, revision, public_branch, remember, format,
4760
no_bundle, no_patch, output, from_, mail_to, message):
4761
from bzrlib.revision import NULL_REVISION
4762
branch = Branch.open_containing(from_)[0]
4764
outfile = cStringIO.StringIO()
4768
outfile = open(output, 'wb')
4769
# we may need to write data into branch's repository to calculate
4774
config = branch.get_config()
4776
mail_to = config.get_user_option('submit_to')
4777
mail_client = config.get_mail_client()
4778
if remember and submit_branch is None:
4779
raise errors.BzrCommandError(
4780
'--remember requires a branch to be specified.')
4781
stored_submit_branch = branch.get_submit_branch()
4782
remembered_submit_branch = None
4783
if submit_branch is None:
4784
submit_branch = stored_submit_branch
4785
remembered_submit_branch = "submit"
4787
if stored_submit_branch is None or remember:
4788
branch.set_submit_branch(submit_branch)
4789
if submit_branch is None:
4790
submit_branch = branch.get_parent()
4791
remembered_submit_branch = "parent"
4792
if submit_branch is None:
4793
raise errors.BzrCommandError('No submit branch known or'
4795
if remembered_submit_branch is not None:
4796
note('Using saved %s location "%s" to determine what '
4797
'changes to submit.', remembered_submit_branch,
4801
submit_config = Branch.open(submit_branch).get_config()
4802
mail_to = submit_config.get_user_option("child_submit_to")
4804
stored_public_branch = branch.get_public_branch()
4805
if public_branch is None:
4806
public_branch = stored_public_branch
4807
elif stored_public_branch is None or remember:
4808
branch.set_public_branch(public_branch)
4809
if no_bundle and public_branch is None:
4810
raise errors.BzrCommandError('No public branch specified or'
4812
base_revision_id = None
4814
if revision is not None:
4815
if len(revision) > 2:
4816
raise errors.BzrCommandError('bzr send takes '
4817
'at most two one revision identifiers')
4818
revision_id = revision[-1].as_revision_id(branch)
4819
if len(revision) == 2:
4820
base_revision_id = revision[0].as_revision_id(branch)
4821
if revision_id is None:
4822
revision_id = branch.last_revision()
4823
if revision_id == NULL_REVISION:
4824
raise errors.BzrCommandError('No revisions to submit.')
4826
directive = merge_directive.MergeDirective2.from_objects(
4827
branch.repository, revision_id, time.time(),
4828
osutils.local_time_offset(), submit_branch,
4829
public_branch=public_branch, include_patch=not no_patch,
4830
include_bundle=not no_bundle, message=message,
4831
base_revision_id=base_revision_id)
4832
elif format == '0.9':
4835
patch_type = 'bundle'
4837
raise errors.BzrCommandError('Format 0.9 does not'
4838
' permit bundle with no patch')
4844
directive = merge_directive.MergeDirective.from_objects(
4845
branch.repository, revision_id, time.time(),
4846
osutils.local_time_offset(), submit_branch,
4847
public_branch=public_branch, patch_type=patch_type,
4850
outfile.writelines(directive.to_lines())
4852
subject = '[MERGE] '
4853
if message is not None:
4856
revision = branch.repository.get_revision(revision_id)
4857
subject += revision.get_summary()
4858
basename = directive.get_disk_name(branch)
4859
mail_client.compose_merge_request(mail_to, subject,
4860
outfile.getvalue(), basename)
5199
4867
class cmd_bundle_revisions(cmd_send):
5200
__doc__ = """Create a merge-directive for submitting changes.
4869
"""Create a merge-directive for submitting changes.
5202
4871
A merge directive provides many things needed for requesting merges:
5260
4927
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5261
4928
no_patch=False, revision=None, remember=False, output=None,
5262
format=None, strict=None, **kwargs):
4929
format='4', **kwargs):
5263
4930
if output is None:
5265
from bzrlib.send import send
5266
return send(submit_branch, revision, public_branch, remember,
4932
return self._run(submit_branch, revision, public_branch, remember,
5267
4933
format, no_bundle, no_patch, output,
5268
kwargs.get('from', '.'), None, None, None,
5269
self.outf, strict=strict)
4934
kwargs.get('from', '.'), None, None)
5272
4937
class cmd_tag(Command):
5273
__doc__ = """Create, remove or modify a tag naming a revision.
4938
"""Create, remove or modify a tag naming a revision.
5275
4940
Tags give human-meaningful names to revisions. Commands that take a -r
5276
4941
(--revision) option can be given -rtag:X, where X is any previously
5311
def run(self, tag_name=None,
4971
def run(self, tag_name,
5317
4977
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)
4981
branch.tags.delete_tag(tag_name)
4982
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)
4985
if len(revision) != 1:
4986
raise errors.BzrCommandError(
4987
"Tags can only be placed on a single revision, "
4989
revision_id = revision[0].as_revision_id(branch)
4991
revision_id = branch.last_revision()
4992
if (not force) and branch.tags.has_tag(tag_name):
4993
raise errors.TagAlreadyExists(tag_name)
4994
branch.tags.set_tag(tag_name, revision_id)
4995
self.outf.write('Created tag %s.\n' % tag_name)
5344
5000
class cmd_tags(Command):
5345
__doc__ = """List tags.
5347
5003
This command shows a table of tag names and the revisions they reference.
5452
5103
Option('bind-to', help='Branch to bind checkout to.', type=str),
5453
5104
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.',
5105
help='Perform reconfiguration even if local changes'
5466
def run(self, location=None, target_type=None, bind_to=None, force=False,
5109
def run(self, location=None, target_type=None, bind_to=None, force=False):
5469
5110
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
5111
if target_type is None:
5480
if stacked_on or unstacked:
5483
raise errors.BzrCommandError('No target configuration '
5112
raise errors.BzrCommandError('No target configuration specified')
5485
5113
elif target_type == 'branch':
5486
5114
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
5115
elif target_type == 'tree':
5524
5152
/path/to/newbranch.
5526
5154
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
5155
locally, in which case switching will update the the local nickname to be
5528
5156
that of the master.
5531
takes_args = ['to_location?']
5159
takes_args = ['to_location']
5532
5160
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.'),
5161
help='Switch even if local commits will be lost.')
5540
def run(self, to_location=None, force=False, create_branch=False,
5164
def run(self, to_location, force=False):
5542
5165
from bzrlib import switch
5543
5166
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5167
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')
5168
branch = control_dir.open_branch()
5552
branch = control_dir.open_branch()
5553
had_explicit_nick = branch.get_config().has_explicit_nickname()
5170
to_branch = Branch.open(to_location)
5554
5171
except errors.NotBranchError:
5556
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)
5580
if had_explicit_nick:
5172
this_branch = control_dir.open_branch()
5173
# This may be a heavy checkout, where we want the master branch
5174
this_url = this_branch.get_bound_location()
5175
# If not, use a local sibling
5176
if this_url is None:
5177
this_url = this_branch.base
5178
to_branch = Branch.open(
5179
urlutils.join(this_url, '..', to_location))
5180
switch.switch(control_dir, to_branch, force)
5181
if branch.get_config().has_explicit_nickname():
5581
5182
branch = control_dir.open_branch() #get the new branch!
5582
5183
branch.nick = to_branch.nick
5583
5184
note('Switched to branch: %s',
5584
5185
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
5586
def _get_branch_location(self, control_dir):
5587
"""Return location of branch for this control dir."""
5589
this_branch = control_dir.open_branch()
5590
# This may be a heavy checkout, where we want the master branch
5591
master_location = this_branch.get_bound_location()
5592
if master_location is not None:
5593
return master_location
5594
# If not, use a local sibling
5595
return this_branch.base
5596
except errors.NotBranchError:
5597
format = control_dir.find_branch_format()
5598
if getattr(format, 'get_reference', None) is not None:
5599
return format.get_reference(control_dir)
5601
return control_dir.root_transport.base
5604
5188
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5189
"""Manage filtered views.
5607
5191
Views provide a mask over the tree so that users can focus on
5608
5192
a subset of a tree when doing their work. After creating a view,
5758
5342
class cmd_hooks(Command):
5759
__doc__ = """Show hooks."""
5343
"""Show a branch's currently registered hooks.
5764
for hook_key in sorted(hooks.known_hooks.keys()):
5765
some_hooks = hooks.known_hooks_key_to_object(hook_key)
5766
self.outf.write("%s:\n" % type(some_hooks).__name__)
5767
for hook_name, hook_point in sorted(some_hooks.items()):
5768
self.outf.write(" %s:\n" % (hook_name,))
5769
found_hooks = list(hook_point)
5771
for hook in found_hooks:
5772
self.outf.write(" %s\n" %
5773
(some_hooks.get_hook_name(hook),))
5775
self.outf.write(" <no hooks installed>\n")
5778
class cmd_remove_branch(Command):
5779
__doc__ = """Remove a branch.
5781
This will remove the branch from the specified location but
5782
will keep any working tree or repository in place.
5786
Remove the branch at repo/trunk::
5788
bzr remove-branch repo/trunk
5792
takes_args = ["location?"]
5794
aliases = ["rmbranch"]
5796
def run(self, location=None):
5797
if location is None:
5799
branch = Branch.open_containing(location)[0]
5800
branch.bzrdir.destroy_branch()
5347
takes_args = ['path?']
5349
def run(self, path=None):
5352
branch_hooks = Branch.open(path).hooks
5353
for hook_type in branch_hooks:
5354
hooks = branch_hooks[hook_type]
5355
self.outf.write("%s:\n" % (hook_type,))
5358
self.outf.write(" %s\n" %
5359
(branch_hooks.get_hook_name(hook),))
5361
self.outf.write(" <no hooks installed>\n")
5803
5364
class cmd_shelve(Command):
5804
__doc__ = """Temporarily set aside some changes from the current tree.
5365
"""Temporarily set aside some changes from the current tree.
5806
5367
Shelve allows you to temporarily put changes you've made "on the shelf",
5807
5368
ie. out of the way, until a later time when you can bring them back from
5836
5397
value_switches=True, enum_switch=False),
5838
5399
Option('list', help='List shelved changes.'),
5840
help='Destroy removed changes instead of shelving them.'),
5842
5401
_see_also = ['unshelve']
5844
5403
def run(self, revision=None, all=False, file_list=None, message=None,
5845
writer=None, list=False, destroy=False):
5404
writer=None, list=False):
5847
5406
return self.run_for_list()
5848
5407
from bzrlib.shelf_ui import Shelver
5849
5408
if writer is None:
5850
5409
writer = bzrlib.option.diff_writer_registry.get()
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
5411
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5858
5413
except errors.UserAbort:
5861
5416
def run_for_list(self):
5862
5417
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))
5420
manager = tree.get_shelf_manager()
5421
shelves = manager.active_shelves()
5422
if len(shelves) == 0:
5423
note('No shelved changes.')
5425
for shelf_id in reversed(shelves):
5426
message = manager.get_metadata(shelf_id).get('message')
5428
message = '<no message>'
5429
self.outf.write('%3d: %s\n' % (shelf_id, message))
5877
5435
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5436
"""Restore shelved changes.
5880
5438
By default, the most recently shelved changes are restored. However if you
5881
5439
specify a shelf by id those changes will be restored instead. This works
5940
5491
dry_run=dry_run, no_prompt=force)
5943
class cmd_reference(Command):
5944
__doc__ = """list, view and set branch locations for nested trees.
5946
If no arguments are provided, lists the branch locations for nested trees.
5947
If one argument is provided, display the branch location for that tree.
5948
If two arguments are provided, set the branch location for that tree.
5953
takes_args = ['path?', 'location?']
5955
def run(self, path=None, location=None):
5957
if path is not None:
5959
tree, branch, relpath =(
5960
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
5961
if path is not None:
5964
tree = branch.basis_tree()
5966
info = branch._get_all_reference_info().iteritems()
5967
self._display_reference_info(tree, branch, info)
5494
def _create_prefix(cur_transport):
5495
needed = [cur_transport]
5496
# Recurse upwards until we can create a directory successfully
5498
new_transport = cur_transport.clone('..')
5499
if new_transport.base == cur_transport.base:
5500
raise errors.BzrCommandError(
5501
"Failed to create path prefix for %s."
5502
% cur_transport.base)
5504
new_transport.mkdir('.')
5505
except errors.NoSuchFile:
5506
needed.append(new_transport)
5507
cur_transport = new_transport
5969
file_id = tree.path2id(path)
5971
raise errors.NotVersionedError(path)
5972
if location is None:
5973
info = [(file_id, branch.get_reference_info(file_id))]
5974
self._display_reference_info(tree, branch, info)
5976
branch.set_reference_info(file_id, path, location)
5978
def _display_reference_info(self, tree, branch, info):
5980
for file_id, (path, location) in info:
5982
path = tree.id2path(file_id)
5983
except errors.NoSuchId:
5985
ref_list.append((path, location))
5986
for path, location in sorted(ref_list):
5987
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)
5510
# Now we only need to create child directories
5512
cur_transport = needed.pop()
5513
cur_transport.ensure_base()
5516
# these get imported and then picked up by the scan for cmd_*
5517
# TODO: Some more consistent way to split command definitions across files;
5518
# we do need to load at least some information about them to know of
5519
# aliases. ideally we would avoid loading the implementation until the
5520
# details were needed.
5521
from bzrlib.cmd_version_info import cmd_version_info
5522
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5523
from bzrlib.bundle.commands import (
5526
from bzrlib.sign_my_commits import cmd_sign_my_commits
5527
from bzrlib.weave_commands import cmd_versionedfile_list, \
5528
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
