350
311
takes_args = ['revision_id?']
351
takes_options = ['directory', 'revision']
312
takes_options = ['revision']
352
313
# cat-revision is more for frontends so should be exact
353
314
encoding = 'strict'
355
def print_revision(self, revisions, revid):
356
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
357
record = stream.next()
358
if record.storage_kind == 'absent':
359
raise errors.NoSuchRevision(revisions, revid)
360
revtext = record.get_bytes_as('fulltext')
361
self.outf.write(revtext.decode('utf-8'))
364
def run(self, revision_id=None, revision=None, directory=u'.'):
317
def run(self, revision_id=None, revision=None):
365
318
if revision_id is not None and revision is not None:
366
319
raise errors.BzrCommandError('You can only supply one of'
367
320
' revision_id or --revision')
368
321
if revision_id is None and revision is None:
369
322
raise errors.BzrCommandError('You must supply either'
370
323
' --revision or a revision_id')
371
b = WorkingTree.open_containing(directory)[0].branch
373
revisions = b.repository.revisions
374
if revisions is None:
375
raise errors.BzrCommandError('Repository %r does not support '
376
'access to raw revision texts')
378
b.repository.lock_read()
380
# TODO: jam 20060112 should cat-revision always output utf-8?
381
if revision_id is not None:
382
revision_id = osutils.safe_revision_id(revision_id, warn=False)
384
self.print_revision(revisions, revision_id)
385
except errors.NoSuchRevision:
386
msg = "The repository %s contains no revision %s." % (
387
b.repository.base, revision_id)
388
raise errors.BzrCommandError(msg)
389
elif revision is not None:
392
raise errors.BzrCommandError(
393
'You cannot specify a NULL revision.')
394
rev_id = rev.as_revision_id(b)
395
self.print_revision(revisions, rev_id)
397
b.repository.unlock()
324
b = WorkingTree.open_containing(u'.')[0].branch
326
# TODO: jam 20060112 should cat-revision always output utf-8?
327
if revision_id is not None:
328
revision_id = osutils.safe_revision_id(revision_id, warn=False)
330
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
331
except errors.NoSuchRevision:
332
msg = "The repository %s contains no revision %s." % (b.repository.base,
334
raise errors.BzrCommandError(msg)
335
elif revision is not None:
338
raise errors.BzrCommandError('You cannot specify a NULL'
340
rev_id = rev.as_revision_id(b)
341
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
400
344
class cmd_dump_btree(Command):
401
__doc__ = """Dump the contents of a btree index file to stdout.
345
"""Dump the contents of a btree index file to stdout.
403
347
PATH is a btree index file, it can be any URL. This includes things like
404
348
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
487
424
To re-create the working tree, use "bzr checkout".
489
426
_see_also = ['checkout', 'working-trees']
490
takes_args = ['location*']
427
takes_args = ['location?']
491
428
takes_options = [
493
430
help='Remove the working tree even if it has '
494
431
'uncommitted changes.'),
497
def run(self, location_list, force=False):
498
if not location_list:
501
for location in location_list:
502
d = bzrdir.BzrDir.open(location)
505
working = d.open_workingtree()
506
except errors.NoWorkingTree:
507
raise errors.BzrCommandError("No working tree to remove")
508
except errors.NotLocalUrl:
509
raise errors.BzrCommandError("You cannot remove the working tree"
512
if (working.has_changes()):
513
raise errors.UncommittedChanges(working)
515
if working.user_url != working.branch.user_url:
516
raise errors.BzrCommandError("You cannot remove the working tree"
517
" from a lightweight checkout")
519
d.destroy_workingtree()
434
def run(self, location='.', force=False):
435
d = bzrdir.BzrDir.open(location)
438
working = d.open_workingtree()
439
except errors.NoWorkingTree:
440
raise errors.BzrCommandError("No working tree to remove")
441
except errors.NotLocalUrl:
442
raise errors.BzrCommandError("You cannot remove the working tree of a "
445
changes = working.changes_from(working.basis_tree())
446
if changes.has_changed():
447
raise errors.UncommittedChanges(working)
449
working_path = working.bzrdir.root_transport.base
450
branch_path = working.branch.bzrdir.root_transport.base
451
if working_path != branch_path:
452
raise errors.BzrCommandError("You cannot remove the working tree from "
453
"a lightweight checkout")
455
d.destroy_workingtree()
522
458
class cmd_revno(Command):
523
__doc__ = """Show current revision number.
459
"""Show current revision number.
525
461
This is equal to the number of revisions on this branch.
528
464
_see_also = ['info']
529
465
takes_args = ['location?']
531
Option('tree', help='Show revno of working tree'),
535
def run(self, tree=False, location=u'.'):
538
wt = WorkingTree.open_containing(location)[0]
539
self.add_cleanup(wt.lock_read().unlock)
540
except (errors.NoWorkingTree, errors.NotLocalUrl):
541
raise errors.NoWorkingTree(location)
542
revid = wt.last_revision()
544
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
545
except errors.NoSuchRevision:
547
revno = ".".join(str(n) for n in revno_t)
549
b = Branch.open_containing(location)[0]
550
self.add_cleanup(b.lock_read().unlock)
553
self.outf.write(str(revno) + '\n')
468
def run(self, location=u'.'):
469
self.outf.write(str(Branch.open_containing(location)[0].revno()))
470
self.outf.write('\n')
556
473
class cmd_revision_info(Command):
557
__doc__ = """Show revision number and revision id for a given revision identifier.
474
"""Show revision number and revision id for a given revision identifier.
560
477
takes_args = ['revision_info*']
561
478
takes_options = [
563
custom_help('directory',
564
481
help='Branch to examine, '
565
'rather than the one containing the working directory.'),
566
Option('tree', help='Show revno of working tree'),
482
'rather than the one containing the working directory.',
570
def run(self, revision=None, directory=u'.', tree=False,
571
revision_info_list=[]):
489
def run(self, revision=None, directory=u'.', revision_info_list=[]):
574
wt = WorkingTree.open_containing(directory)[0]
576
self.add_cleanup(wt.lock_read().unlock)
577
except (errors.NoWorkingTree, errors.NotLocalUrl):
579
b = Branch.open_containing(directory)[0]
580
self.add_cleanup(b.lock_read().unlock)
582
492
if revision is not None:
583
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
493
revs.extend(revision)
584
494
if revision_info_list is not None:
585
for rev_str in revision_info_list:
586
rev_spec = RevisionSpec.from_string(rev_str)
587
revision_ids.append(rev_spec.as_revision_id(b))
588
# No arguments supplied, default to the last revision
589
if len(revision_ids) == 0:
592
raise errors.NoWorkingTree(directory)
593
revision_ids.append(wt.last_revision())
595
revision_ids.append(b.last_revision())
599
for revision_id in revision_ids:
495
for rev in revision_info_list:
496
revs.append(RevisionSpec.from_string(rev))
498
b = Branch.open_containing(directory)[0]
501
revs.append(RevisionSpec.from_string('-1'))
504
revision_id = rev.as_revision_id(b)
601
dotted_revno = b.revision_id_to_dotted_revno(revision_id)
602
revno = '.'.join(str(i) for i in dotted_revno)
506
revno = '%4d' % (b.revision_id_to_revno(revision_id))
603
507
except errors.NoSuchRevision:
605
maxlen = max(maxlen, len(revno))
606
revinfos.append([revno, revision_id])
610
self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
508
dotted_map = b.get_revision_id_to_revno_map()
509
revno = '.'.join(str(i) for i in dotted_map[revision_id])
510
print '%s %s' % (revno, revision_id)
613
513
class cmd_add(Command):
614
__doc__ = """Add specified files or directories.
514
"""Add specified files or directories.
616
516
In non-recursive mode, all the named items are added, regardless
617
517
of whether they were previously ignored. A warning is given if
682
579
should_print=(not is_quiet()))
685
self.add_cleanup(base_tree.lock_read().unlock)
686
tree, file_list = tree_files_for_add(file_list)
687
added, ignored = tree.smart_add(file_list, not
688
no_recurse, action=action, save=not dry_run)
582
base_tree.lock_read()
584
file_list = self._maybe_expand_globs(file_list)
585
tree, file_list = tree_files_for_add(file_list)
586
added, ignored = tree.smart_add(file_list, not
587
no_recurse, action=action, save=not dry_run)
589
if base_tree is not None:
690
591
if len(ignored) > 0:
692
593
for glob in sorted(ignored.keys()):
693
594
for path in ignored[glob]:
694
595
self.outf.write("ignored %s matching \"%s\"\n"
599
for glob, paths in ignored.items():
600
match_len += len(paths)
601
self.outf.write("ignored %d file(s).\n" % match_len)
602
self.outf.write("If you wish to add some of these files,"
603
" please add them by name.\n")
698
606
class cmd_mkdir(Command):
699
__doc__ = """Create a new versioned directory.
607
"""Create a new versioned directory.
701
609
This is equivalent to creating the directory and then adding it.
761
664
revision = _get_one_revision('inventory', revision)
762
665
work_tree, file_list = tree_files(file_list)
763
self.add_cleanup(work_tree.lock_read().unlock)
764
if revision is not None:
765
tree = revision.as_tree(work_tree.branch)
767
extra_trees = [work_tree]
768
self.add_cleanup(tree.lock_read().unlock)
773
if file_list is not None:
774
file_ids = tree.paths2ids(file_list, trees=extra_trees,
775
require_versioned=True)
776
# find_ids_across_trees may include some paths that don't
778
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
779
for file_id in file_ids if file_id in tree)
781
entries = tree.inventory.entries()
666
work_tree.lock_read()
668
if revision is not None:
669
tree = revision.as_tree(work_tree.branch)
671
extra_trees = [work_tree]
677
if file_list is not None:
678
file_ids = tree.paths2ids(file_list, trees=extra_trees,
679
require_versioned=True)
680
# find_ids_across_trees may include some paths that don't
682
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
683
for file_id in file_ids if file_id in tree)
685
entries = tree.inventory.entries()
688
if tree is not work_tree:
784
691
for path, entry in entries:
785
692
if kind and kind != entry.kind:
815
722
takes_args = ['names*']
816
723
takes_options = [Option("after", help="Move only the bzr identifier"
817
724
" of the file, because the file has already been moved."),
818
Option('auto', help='Automatically guess renames.'),
819
Option('dry-run', help='Avoid making changes when guessing renames.'),
821
726
aliases = ['move', 'rename']
822
727
encoding_type = 'replace'
824
def run(self, names_list, after=False, auto=False, dry_run=False):
826
return self.run_auto(names_list, after, dry_run)
828
raise errors.BzrCommandError('--dry-run requires --auto.')
729
def run(self, names_list, after=False):
829
730
if names_list is None:
831
733
if len(names_list) < 2:
832
734
raise errors.BzrCommandError("missing file argument")
833
735
tree, rel_names = tree_files(names_list, canonicalize=False)
834
self.add_cleanup(tree.lock_tree_write().unlock)
835
self._run(tree, names_list, rel_names, after)
837
def run_auto(self, names_list, after, dry_run):
838
if names_list is not None and len(names_list) > 1:
839
raise errors.BzrCommandError('Only one path may be specified to'
842
raise errors.BzrCommandError('--after cannot be specified with'
844
work_tree, file_list = tree_files(names_list, default_branch='.')
845
self.add_cleanup(work_tree.lock_tree_write().unlock)
846
rename_map.RenameMap.guess_renames(work_tree, dry_run)
738
self._run(tree, names_list, rel_names, after)
848
742
def _run(self, tree, names_list, rel_names, after):
849
743
into_existing = osutils.isdir(names_list[-1])
922
815
dest = osutils.pathjoin(dest_parent, dest_tail)
923
816
mutter("attempting to move %s => %s", src, dest)
924
817
tree.rename_one(src, dest, after=after)
926
self.outf.write("%s => %s\n" % (src, dest))
818
self.outf.write("%s => %s\n" % (src, dest))
929
821
class cmd_pull(Command):
930
__doc__ = """Turn this branch into a mirror of another branch.
822
"""Turn this branch into a mirror of another branch.
932
By default, this command only works on branches that have not diverged.
933
Branches are considered diverged if the destination branch's most recent
934
commit is one that has not been merged (directly or indirectly) into the
824
This command only works on branches that have not diverged. Branches are
825
considered diverged if the destination branch's most recent commit is one
826
that has not been merged (directly or indirectly) into the parent.
937
828
If branches have diverged, you can use 'bzr merge' to integrate the changes
938
829
from one into the other. Once one branch has merged, the other should
939
830
be able to pull it again.
941
If you want to replace your local changes and just want your branch to
942
match the remote one, use pull --overwrite. This will work even if the two
943
branches have diverged.
832
If you want to forget your local changes and just update your branch to
833
match the remote one, use pull --overwrite.
945
835
If there is no default location set, the first pull will set it. After
946
836
that, you can omit the location to use the default. To change the
1028
910
if revision is not None:
1029
911
revision_id = revision.as_revision_id(branch_from)
1031
if tree_to is not None:
1032
view_info = _get_view_info_for_change_reporter(tree_to)
1033
change_reporter = delta._ChangeReporter(
1034
unversioned_filter=tree_to.is_ignored,
1035
view_info=view_info)
1036
result = tree_to.pull(
1037
branch_from, overwrite, revision_id, change_reporter,
1038
possible_transports=possible_transports, local=local)
1040
result = branch_to.pull(
1041
branch_from, overwrite, revision_id, local=local)
913
branch_to.lock_write()
915
if tree_to is not None:
916
view_info = _get_view_info_for_change_reporter(tree_to)
917
change_reporter = delta._ChangeReporter(
918
unversioned_filter=tree_to.is_ignored, view_info=view_info)
919
result = tree_to.pull(branch_from, overwrite, revision_id,
921
possible_transports=possible_transports)
923
result = branch_to.pull(branch_from, overwrite, revision_id)
1043
result.report(self.outf)
1044
if verbose and result.old_revid != result.new_revid:
1045
log.show_branch_change(
1046
branch_to, self.outf, result.old_revno,
925
result.report(self.outf)
926
if verbose and result.old_revid != result.new_revid:
927
log.show_branch_change(branch_to, self.outf, result.old_revno,
1050
933
class cmd_push(Command):
1051
__doc__ = """Update a mirror of this branch.
934
"""Update a mirror of this branch.
1053
936
The target branch will not have its working tree populated because this
1054
937
is both expensive, and is not supported on remote file systems.
1104
987
def run(self, location=None, remember=False, overwrite=False,
1105
988
create_prefix=False, verbose=False, revision=None,
1106
989
use_existing_dir=False, directory=None, stacked_on=None,
1107
stacked=False, strict=None):
1108
991
from bzrlib.push import _show_push_branch
993
# Get the source branch and revision_id
1110
994
if directory is None:
1112
# Get the source branch
1114
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1115
# Get the tip's revision_id
996
br_from = Branch.open_containing(directory)[0]
1116
997
revision = _get_one_revision('push', revision)
1117
998
if revision is not None:
1118
999
revision_id = revision.in_history(br_from).rev_id
1121
if tree is not None and revision_id is None:
1122
tree.check_changed_or_out_of_date(
1123
strict, 'push_strict',
1124
more_error='Use --no-strict to force the push.',
1125
more_warning='Uncommitted changes will not be pushed.')
1001
revision_id = br_from.last_revision()
1126
1003
# Get the stacked_on branch, if any
1127
1004
if stacked_on is not None:
1128
1005
stacked_on = urlutils.normalize_url(stacked_on)
1179
1056
help='Hard-link working tree files where possible.'),
1180
1057
Option('no-tree',
1181
1058
help="Create a branch without a working-tree."),
1183
help="Switch the checkout in the current directory "
1184
"to the new branch."),
1185
1059
Option('stacked',
1186
1060
help='Create a stacked branch referring to the source branch. '
1187
1061
'The new branch will depend on the availability of the source '
1188
1062
'branch for all operations.'),
1189
1063
Option('standalone',
1190
1064
help='Do not use a shared repository, even if available.'),
1191
Option('use-existing-dir',
1192
help='By default branch will fail if the target'
1193
' directory exists, but does not already'
1194
' have a control directory. This flag will'
1195
' allow branch to proceed.'),
1197
help="Bind new branch to from location."),
1199
1066
aliases = ['get', 'clone']
1201
1068
def run(self, from_location, to_location=None, revision=None,
1202
hardlink=False, stacked=False, standalone=False, no_tree=False,
1203
use_existing_dir=False, switch=False, bind=False):
1204
from bzrlib import switch as _mod_switch
1069
hardlink=False, stacked=False, standalone=False, no_tree=False):
1205
1070
from bzrlib.tag import _merge_tags_if_possible
1206
1072
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1208
1074
revision = _get_one_revision('branch', revision)
1209
self.add_cleanup(br_from.lock_read().unlock)
1210
if revision is not None:
1211
revision_id = revision.as_revision_id(br_from)
1213
# FIXME - wt.last_revision, fallback to branch, fall back to
1214
# None or perhaps NULL_REVISION to mean copy nothing
1216
revision_id = br_from.last_revision()
1217
if to_location is None:
1218
to_location = urlutils.derive_to_location(from_location)
1219
to_transport = transport.get_transport(to_location)
1221
to_transport.mkdir('.')
1222
except errors.FileExists:
1223
if not use_existing_dir:
1224
raise errors.BzrCommandError('Target directory "%s" '
1225
'already exists.' % to_location)
1077
if revision is not None:
1078
revision_id = revision.as_revision_id(br_from)
1228
bzrdir.BzrDir.open_from_transport(to_transport)
1229
except errors.NotBranchError:
1232
raise errors.AlreadyBranchError(to_location)
1233
except errors.NoSuchFile:
1234
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1237
# preserve whatever source format we have.
1238
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1239
possible_transports=[to_transport],
1240
accelerator_tree=accelerator_tree,
1241
hardlink=hardlink, stacked=stacked,
1242
force_new_repo=standalone,
1243
create_tree_if_local=not no_tree,
1244
source_branch=br_from)
1245
branch = dir.open_branch()
1246
except errors.NoSuchRevision:
1247
to_transport.delete_tree('.')
1248
msg = "The branch %s has no revision %s." % (from_location,
1250
raise errors.BzrCommandError(msg)
1251
_merge_tags_if_possible(br_from, branch)
1252
# If the source branch is stacked, the new branch may
1253
# be stacked whether we asked for that explicitly or not.
1254
# We therefore need a try/except here and not just 'if stacked:'
1256
note('Created new stacked branch referring to %s.' %
1257
branch.get_stacked_on_url())
1258
except (errors.NotStacked, errors.UnstackableBranchFormat,
1259
errors.UnstackableRepositoryFormat), e:
1260
note('Branched %d revision(s).' % branch.revno())
1262
# Bind to the parent
1263
parent_branch = Branch.open(from_location)
1264
branch.bind(parent_branch)
1265
note('New branch bound to %s' % from_location)
1267
# Switch to the new branch
1268
wt, _ = WorkingTree.open_containing('.')
1269
_mod_switch.switch(wt.bzrdir, branch)
1270
note('Switched to branch: %s',
1271
urlutils.unescape_for_display(branch.base, 'utf-8'))
1080
# FIXME - wt.last_revision, fallback to branch, fall back to
1081
# None or perhaps NULL_REVISION to mean copy nothing
1083
revision_id = br_from.last_revision()
1084
if to_location is None:
1085
to_location = urlutils.derive_to_location(from_location)
1086
to_transport = transport.get_transport(to_location)
1088
to_transport.mkdir('.')
1089
except errors.FileExists:
1090
raise errors.BzrCommandError('Target directory "%s" already'
1091
' exists.' % to_location)
1092
except errors.NoSuchFile:
1093
raise errors.BzrCommandError('Parent of "%s" does not exist.'
1096
# preserve whatever source format we have.
1097
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1098
possible_transports=[to_transport],
1099
accelerator_tree=accelerator_tree,
1100
hardlink=hardlink, stacked=stacked,
1101
force_new_repo=standalone,
1102
create_tree_if_local=not no_tree,
1103
source_branch=br_from)
1104
branch = dir.open_branch()
1105
except errors.NoSuchRevision:
1106
to_transport.delete_tree('.')
1107
msg = "The branch %s has no revision %s." % (from_location,
1109
raise errors.BzrCommandError(msg)
1110
_merge_tags_if_possible(br_from, branch)
1111
# If the source branch is stacked, the new branch may
1112
# be stacked whether we asked for that explicitly or not.
1113
# We therefore need a try/except here and not just 'if stacked:'
1115
note('Created new stacked branch referring to %s.' %
1116
branch.get_stacked_on_url())
1117
except (errors.NotStacked, errors.UnstackableBranchFormat,
1118
errors.UnstackableRepositoryFormat), e:
1119
note('Branched %d revision(s).' % branch.revno())
1274
1124
class cmd_checkout(Command):
1275
__doc__ = """Create a new checkout of an existing branch.
1125
"""Create a new checkout of an existing branch.
1277
1127
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1278
1128
the branch found in '.'. This is useful if you have removed the working tree
1357
1202
@display_command
1358
1203
def run(self, dir=u'.'):
1359
1204
tree = WorkingTree.open_containing(dir)[0]
1360
self.add_cleanup(tree.lock_read().unlock)
1361
new_inv = tree.inventory
1362
old_tree = tree.basis_tree()
1363
self.add_cleanup(old_tree.lock_read().unlock)
1364
old_inv = old_tree.inventory
1366
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1367
for f, paths, c, v, p, n, k, e in iterator:
1368
if paths[0] == paths[1]:
1372
renames.append(paths)
1374
for old_name, new_name in renames:
1375
self.outf.write("%s => %s\n" % (old_name, new_name))
1207
new_inv = tree.inventory
1208
old_tree = tree.basis_tree()
1209
old_tree.lock_read()
1211
old_inv = old_tree.inventory
1213
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1214
for f, paths, c, v, p, n, k, e in iterator:
1215
if paths[0] == paths[1]:
1219
renames.append(paths)
1221
for old_name, new_name in renames:
1222
self.outf.write("%s => %s\n" % (old_name, new_name))
1378
1229
class cmd_update(Command):
1379
__doc__ = """Update a tree to have the latest code committed to its branch.
1230
"""Update a tree to have the latest code committed to its branch.
1381
1232
This will perform a merge into the working tree, and may generate
1382
1233
conflicts. If you have any local changes, you will still
1385
1236
If you want to discard your local changes, you can just do a
1386
1237
'bzr revert' instead of 'bzr commit' after the update.
1388
If the tree's branch is bound to a master branch, it will also update
1389
the branch from the master.
1392
1240
_see_also = ['pull', 'working-trees', 'status-flags']
1393
1241
takes_args = ['dir?']
1394
takes_options = ['revision']
1395
1242
aliases = ['up']
1397
def run(self, dir='.', revision=None):
1398
if revision is not None and len(revision) != 1:
1399
raise errors.BzrCommandError(
1400
"bzr update --revision takes exactly one revision")
1244
def run(self, dir='.'):
1401
1245
tree = WorkingTree.open_containing(dir)[0]
1402
branch = tree.branch
1403
1246
possible_transports = []
1404
master = branch.get_master_branch(
1247
master = tree.branch.get_master_branch(
1405
1248
possible_transports=possible_transports)
1406
1249
if master is not None:
1407
branch_location = master.base
1408
1250
tree.lock_write()
1410
branch_location = tree.branch.base
1411
1252
tree.lock_tree_write()
1412
self.add_cleanup(tree.unlock)
1413
# get rid of the final '/' and be ready for display
1414
branch_location = urlutils.unescape_for_display(
1415
branch_location.rstrip('/'),
1417
existing_pending_merges = tree.get_parent_ids()[1:]
1421
# may need to fetch data into a heavyweight checkout
1422
# XXX: this may take some time, maybe we should display a
1424
old_tip = branch.update(possible_transports)
1425
if revision is not None:
1426
revision_id = revision[0].as_revision_id(branch)
1428
revision_id = branch.last_revision()
1429
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1430
revno = branch.revision_id_to_dotted_revno(revision_id)
1431
note("Tree is up to date at revision %s of branch %s" %
1432
('.'.join(map(str, revno)), branch_location))
1434
view_info = _get_view_info_for_change_reporter(tree)
1435
change_reporter = delta._ChangeReporter(
1436
unversioned_filter=tree.is_ignored,
1437
view_info=view_info)
1254
existing_pending_merges = tree.get_parent_ids()[1:]
1255
last_rev = _mod_revision.ensure_null(tree.last_revision())
1256
if last_rev == _mod_revision.ensure_null(
1257
tree.branch.last_revision()):
1258
# may be up to date, check master too.
1259
if master is None or last_rev == _mod_revision.ensure_null(
1260
master.last_revision()):
1261
revno = tree.branch.revision_id_to_revno(last_rev)
1262
note("Tree is up to date at revision %d." % (revno,))
1264
view_info = _get_view_info_for_change_reporter(tree)
1439
1265
conflicts = tree.update(
1441
possible_transports=possible_transports,
1442
revision=revision_id,
1444
except errors.NoSuchRevision, e:
1445
raise errors.BzrCommandError(
1446
"branch has no revision %s\n"
1447
"bzr update --revision only works"
1448
" for a revision in the branch history"
1450
revno = tree.branch.revision_id_to_dotted_revno(
1451
_mod_revision.ensure_null(tree.last_revision()))
1452
note('Updated to revision %s of branch %s' %
1453
('.'.join(map(str, revno)), branch_location))
1454
parent_ids = tree.get_parent_ids()
1455
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1456
note('Your local commits will now show as pending merges with '
1457
"'bzr status', and can be committed with 'bzr commit'.")
1266
delta._ChangeReporter(unversioned_filter=tree.is_ignored,
1267
view_info=view_info), possible_transports=possible_transports)
1268
revno = tree.branch.revision_id_to_revno(
1269
_mod_revision.ensure_null(tree.last_revision()))
1270
note('Updated to revision %d.' % (revno,))
1271
if tree.get_parent_ids()[1:] != existing_pending_merges:
1272
note('Your local commits will now show as pending merges with '
1273
"'bzr status', and can be committed with 'bzr commit'.")
1464
1282
class cmd_info(Command):
1465
__doc__ = """Show information about a working tree, branch or repository.
1283
"""Show information about a working tree, branch or repository.
1467
1285
This command will show all known locations and formats associated to the
1468
1286
tree, branch or repository.
1534
1352
if file_list is not None:
1535
1353
file_list = [f for f in file_list]
1537
self.add_cleanup(tree.lock_write().unlock)
1538
# Heuristics should probably all move into tree.remove_smart or
1541
added = tree.changes_from(tree.basis_tree(),
1542
specific_files=file_list).added
1543
file_list = sorted([f[0] for f in added], reverse=True)
1544
if len(file_list) == 0:
1545
raise errors.BzrCommandError('No matching files.')
1546
elif file_list is None:
1547
# missing files show up in iter_changes(basis) as
1548
# versioned-with-no-kind.
1550
for change in tree.iter_changes(tree.basis_tree()):
1551
# Find paths in the working tree that have no kind:
1552
if change[1][1] is not None and change[6][1] is None:
1553
missing.append(change[1][1])
1554
file_list = sorted(missing, reverse=True)
1555
file_deletion_strategy = 'keep'
1556
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1557
keep_files=file_deletion_strategy=='keep',
1558
force=file_deletion_strategy=='force')
1357
# Heuristics should probably all move into tree.remove_smart or
1360
added = tree.changes_from(tree.basis_tree(),
1361
specific_files=file_list).added
1362
file_list = sorted([f[0] for f in added], reverse=True)
1363
if len(file_list) == 0:
1364
raise errors.BzrCommandError('No matching files.')
1365
elif file_list is None:
1366
# missing files show up in iter_changes(basis) as
1367
# versioned-with-no-kind.
1369
for change in tree.iter_changes(tree.basis_tree()):
1370
# Find paths in the working tree that have no kind:
1371
if change[1][1] is not None and change[6][1] is None:
1372
missing.append(change[1][1])
1373
file_list = sorted(missing, reverse=True)
1374
file_deletion_strategy = 'keep'
1375
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1376
keep_files=file_deletion_strategy=='keep',
1377
force=file_deletion_strategy=='force')
1561
1382
class cmd_file_id(Command):
1562
__doc__ = """Print file_id of a particular file or directory.
1383
"""Print file_id of a particular file or directory.
1564
1385
The file_id is assigned when the file is first added and remains the
1565
1386
same through all revisions where the file exists, even when it is
1965
1761
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1966
1762
' one or two revision specifiers')
1968
if using is not None and format is not None:
1969
raise errors.BzrCommandError('--using and --format are mutually '
1972
(old_tree, new_tree,
1973
old_branch, new_branch,
1974
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1975
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1764
old_tree, new_tree, specific_files, extra_trees = \
1765
_get_trees_to_diff(file_list, revision, old, new,
1976
1767
return show_diff_trees(old_tree, new_tree, sys.stdout,
1977
1768
specific_files=specific_files,
1978
1769
external_diff_options=diff_options,
1979
1770
old_label=old_label, new_label=new_label,
1980
extra_trees=extra_trees, using=using,
1771
extra_trees=extra_trees, using=using)
1984
1774
class cmd_deleted(Command):
1985
__doc__ = """List files deleted in the working tree.
1775
"""List files deleted in the working tree.
1987
1777
# TODO: Show files deleted since a previous revision, or
1988
1778
# between two revisions.
1991
1781
# level of effort but possibly much less IO. (Or possibly not,
1992
1782
# if the directories are very large...)
1993
1783
_see_also = ['status', 'ls']
1994
takes_options = ['directory', 'show-ids']
1784
takes_options = ['show-ids']
1996
1786
@display_command
1997
def run(self, show_ids=False, directory=u'.'):
1998
tree = WorkingTree.open_containing(directory)[0]
1999
self.add_cleanup(tree.lock_read().unlock)
2000
old = tree.basis_tree()
2001
self.add_cleanup(old.lock_read().unlock)
2002
for path, ie in old.inventory.iter_entries():
2003
if not tree.has_id(ie.file_id):
2004
self.outf.write(path)
2006
self.outf.write(' ')
2007
self.outf.write(ie.file_id)
2008
self.outf.write('\n')
1787
def run(self, show_ids=False):
1788
tree = WorkingTree.open_containing(u'.')[0]
1791
old = tree.basis_tree()
1794
for path, ie in old.inventory.iter_entries():
1795
if not tree.has_id(ie.file_id):
1796
self.outf.write(path)
1798
self.outf.write(' ')
1799
self.outf.write(ie.file_id)
1800
self.outf.write('\n')
2011
1807
class cmd_modified(Command):
2012
__doc__ = """List files modified in working tree.
1808
"""List files modified in working tree.
2016
1812
_see_also = ['status', 'ls']
2017
takes_options = ['directory', 'null']
1815
help='Write an ascii NUL (\\0) separator '
1816
'between files rather than a newline.')
2019
1819
@display_command
2020
def run(self, null=False, directory=u'.'):
2021
tree = WorkingTree.open_containing(directory)[0]
1820
def run(self, null=False):
1821
tree = WorkingTree.open_containing(u'.')[0]
2022
1822
td = tree.changes_from(tree.basis_tree())
2023
1823
for path, id, kind, text_modified, meta_modified in td.modified:
2030
1830
class cmd_added(Command):
2031
__doc__ = """List files added in working tree.
1831
"""List files added in working tree.
2035
1835
_see_also = ['status', 'ls']
2036
takes_options = ['directory', 'null']
1838
help='Write an ascii NUL (\\0) separator '
1839
'between files rather than a newline.')
2038
1842
@display_command
2039
def run(self, null=False, directory=u'.'):
2040
wt = WorkingTree.open_containing(directory)[0]
2041
self.add_cleanup(wt.lock_read().unlock)
2042
basis = wt.basis_tree()
2043
self.add_cleanup(basis.lock_read().unlock)
2044
basis_inv = basis.inventory
2047
if file_id in basis_inv:
2049
if inv.is_root(file_id) and len(basis_inv) == 0:
2051
path = inv.id2path(file_id)
2052
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2055
self.outf.write(path + '\0')
2057
self.outf.write(osutils.quotefn(path) + '\n')
1843
def run(self, null=False):
1844
wt = WorkingTree.open_containing(u'.')[0]
1847
basis = wt.basis_tree()
1850
basis_inv = basis.inventory
1853
if file_id in basis_inv:
1855
if inv.is_root(file_id) and len(basis_inv) == 0:
1857
path = inv.id2path(file_id)
1858
if not os.access(osutils.abspath(path), os.F_OK):
1861
self.outf.write(path + '\0')
1863
self.outf.write(osutils.quotefn(path) + '\n')
2060
1870
class cmd_root(Command):
2061
__doc__ = """Show the tree root directory.
1871
"""Show the tree root directory.
2063
1873
The root is the nearest enclosing directory with a .bzr control
2375
2162
diff_type = 'full'
2377
# Build the log formatter
2378
if log_format is None:
2379
log_format = log.log_formatter_registry.get_default(b)
2380
# Make a non-encoding output to include the diffs - bug 328007
2381
unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2382
lf = log_format(show_ids=show_ids, to_file=self.outf,
2383
to_exact_file=unencoded_output,
2384
show_timezone=timezone,
2385
delta_format=get_verbosity_level(),
2387
show_advice=levels is None,
2388
author_list_handler=authors)
2390
# Choose the algorithm for doing the logging. It's annoying
2391
# having multiple code paths like this but necessary until
2392
# the underlying repository format is faster at generating
2393
# deltas or can provide everything we need from the indices.
2394
# The default algorithm - match-using-deltas - works for
2395
# multiple files and directories and is faster for small
2396
# amounts of history (200 revisions say). However, it's too
2397
# slow for logging a single file in a repository with deep
2398
# history, i.e. > 10K revisions. In the spirit of "do no
2399
# evil when adding features", we continue to use the
2400
# original algorithm - per-file-graph - for the "single
2401
# file that isn't a directory without showing a delta" case.
2402
partial_history = revision and b.repository._format.supports_chks
2403
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2404
or delta_type or partial_history)
2406
# Build the LogRequest and execute it
2407
if len(file_ids) == 0:
2409
rqst = make_log_request_dict(
2410
direction=direction, specific_fileids=file_ids,
2411
start_revision=rev1, end_revision=rev2, limit=limit,
2412
message_search=message, delta_type=delta_type,
2413
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2414
exclude_common_ancestry=exclude_common_ancestry,
2416
Logger(b, rqst).show(lf)
2166
# Build the log formatter
2167
if log_format is None:
2168
log_format = log.log_formatter_registry.get_default(b)
2169
lf = log_format(show_ids=show_ids, to_file=self.outf,
2170
show_timezone=timezone,
2171
delta_format=get_verbosity_level(),
2174
# Choose the algorithm for doing the logging. It's annoying
2175
# having multiple code paths like this but necessary until
2176
# the underlying repository format is faster at generating
2177
# deltas or can provide everything we need from the indices.
2178
# The default algorithm - match-using-deltas - works for
2179
# multiple files and directories and is faster for small
2180
# amounts of history (200 revisions say). However, it's too
2181
# slow for logging a single file in a repository with deep
2182
# history, i.e. > 10K revisions. In the spirit of "do no
2183
# evil when adding features", we continue to use the
2184
# original algorithm - per-file-graph - for the "single
2185
# file that isn't a directory without showing a delta" case.
2186
match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2189
# Build the LogRequest and execute it
2190
if len(file_ids) == 0:
2192
rqst = make_log_request_dict(
2193
direction=direction, specific_fileids=file_ids,
2194
start_revision=rev1, end_revision=rev2, limit=limit,
2195
message_search=message, delta_type=delta_type,
2196
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2197
Logger(b, rqst).show(lf)
2419
2202
def _get_revision_range(revisionspec_list, branch, command_name):
2487
2266
@display_command
2488
2267
def run(self, filename):
2489
2268
tree, relpath = WorkingTree.open_containing(filename)
2490
2270
file_id = tree.path2id(relpath)
2492
self.add_cleanup(b.lock_read().unlock)
2493
touching_revs = log.find_touching_revisions(b, file_id)
2494
for revno, revision_id, what in touching_revs:
2271
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
2495
2272
self.outf.write("%6d %s\n" % (revno, what))
2498
2275
class cmd_ls(Command):
2499
__doc__ = """List files in a tree.
2276
"""List files in a tree.
2502
2279
_see_also = ['status', 'cat']
2503
2280
takes_args = ['path?']
2281
# TODO: Take a revision or remote path and list that tree instead.
2504
2282
takes_options = [
2507
Option('recursive', short_name='R',
2508
help='Recurse into subdirectories.'),
2285
Option('non-recursive',
2286
help='Don\'t recurse into subdirectories.'),
2509
2287
Option('from-root',
2510
2288
help='Print paths relative to the root of the branch.'),
2511
Option('unknown', short_name='u',
2512
help='Print unknown files.'),
2289
Option('unknown', help='Print unknown files.'),
2513
2290
Option('versioned', help='Print versioned files.',
2514
2291
short_name='V'),
2515
Option('ignored', short_name='i',
2516
help='Print ignored files.'),
2517
Option('kind', short_name='k',
2292
Option('ignored', help='Print ignored files.'),
2294
help='Write an ascii NUL (\\0) separator '
2295
'between files rather than a newline.'),
2518
2297
help='List entries of a particular kind: file, directory, symlink.',
2524
2301
@display_command
2525
2302
def run(self, revision=None, verbose=False,
2526
recursive=False, from_root=False,
2303
non_recursive=False, from_root=False,
2527
2304
unknown=False, versioned=False, ignored=False,
2528
null=False, kind=None, show_ids=False, path=None, directory=None):
2305
null=False, kind=None, show_ids=False, path=None):
2530
2307
if kind and kind not in ('file', 'directory', 'symlink'):
2531
2308
raise errors.BzrCommandError('invalid kind specified')
2565
2339
view_str = views.view_display_str(view_files)
2566
2340
note("Ignoring files outside view. View is %s" % view_str)
2568
self.add_cleanup(tree.lock_read().unlock)
2569
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2570
from_dir=relpath, recursive=recursive):
2571
# Apply additional masking
2572
if not all and not selection[fc]:
2574
if kind is not None and fkind != kind:
2579
fullpath = osutils.pathjoin(relpath, fp)
2582
views.check_path_in_view(tree, fullpath)
2583
except errors.FileOutsideView:
2588
fp = osutils.pathjoin(prefix, fp)
2589
kindch = entry.kind_character()
2590
outstring = fp + kindch
2591
ui.ui_factory.clear_term()
2593
outstring = '%-8s %s' % (fc, outstring)
2594
if show_ids and fid is not None:
2595
outstring = "%-50s %s" % (outstring, fid)
2596
self.outf.write(outstring + '\n')
2598
self.outf.write(fp + '\0')
2601
self.outf.write(fid)
2602
self.outf.write('\0')
2610
self.outf.write('%-50s %s\n' % (outstring, my_id))
2612
self.outf.write(outstring + '\n')
2344
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2345
if fp.startswith(relpath):
2346
fp = osutils.pathjoin(prefix, fp[len(relpath):])
2347
if non_recursive and '/' in fp:
2349
if not all and not selection[fc]:
2351
if kind is not None and fkind != kind:
2355
views.check_path_in_view(tree, fp)
2356
except errors.FileOutsideView:
2358
kindch = entry.kind_character()
2359
outstring = fp + kindch
2361
outstring = '%-8s %s' % (fc, outstring)
2362
if show_ids and fid is not None:
2363
outstring = "%-50s %s" % (outstring, fid)
2364
self.outf.write(outstring + '\n')
2366
self.outf.write(fp + '\0')
2369
self.outf.write(fid)
2370
self.outf.write('\0')
2378
self.outf.write('%-50s %s\n' % (outstring, my_id))
2380
self.outf.write(outstring + '\n')
2615
2385
class cmd_unknowns(Command):
2616
__doc__ = """List unknown files.
2386
"""List unknown files.
2620
2390
_see_also = ['ls']
2621
takes_options = ['directory']
2623
2392
@display_command
2624
def run(self, directory=u'.'):
2625
for f in WorkingTree.open_containing(directory)[0].unknowns():
2394
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2626
2395
self.outf.write(osutils.quotefn(f) + '\n')
2629
2398
class cmd_ignore(Command):
2630
__doc__ = """Ignore specified files or patterns.
2399
"""Ignore specified files or patterns.
2632
2401
See ``bzr help patterns`` for details on the syntax of patterns.
2634
If a .bzrignore file does not exist, the ignore command
2635
will create one and add the specified files or patterns to the newly
2636
created file. The ignore command will also automatically add the
2637
.bzrignore file to be versioned. Creating a .bzrignore file without
2638
the use of the ignore command will require an explicit add command.
2640
2403
To remove patterns from the ignore list, edit the .bzrignore file.
2641
2404
After adding, editing or deleting that file either indirectly by
2642
2405
using this command or directly by using an editor, be sure to commit
2645
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2646
the global ignore file can be found in the application data directory as
2647
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2648
Global ignores are not touched by this command. The global ignore file
2649
can be edited directly using an editor.
2651
Patterns prefixed with '!' are exceptions to ignore patterns and take
2652
precedence over regular ignores. Such exceptions are used to specify
2653
files that should be versioned which would otherwise be ignored.
2655
Patterns prefixed with '!!' act as regular ignore patterns, but have
2656
precedence over the '!' exception patterns.
2658
2408
Note: ignore patterns containing shell wildcards must be quoted from
2659
2409
the shell on Unix.
2682
2428
Ignore everything but the "debian" toplevel directory::
2684
2430
bzr ignore "RE:(?!debian/).*"
2686
Ignore everything except the "local" toplevel directory,
2687
but always ignore "*~" autosave files, even under local/::
2690
bzr ignore "!./local"
2694
2433
_see_also = ['status', 'ignored', 'patterns']
2695
2434
takes_args = ['name_pattern*']
2696
takes_options = ['directory',
2697
Option('default-rules',
2698
help='Display the default ignore rules that bzr uses.')
2436
Option('old-default-rules',
2437
help='Write out the ignore rules bzr < 0.9 always used.')
2701
def run(self, name_pattern_list=None, default_rules=None,
2440
def run(self, name_pattern_list=None, old_default_rules=None):
2703
2441
from bzrlib import ignores
2704
if default_rules is not None:
2705
# dump the default rules and exit
2706
for pattern in ignores.USER_DEFAULTS:
2707
self.outf.write("%s\n" % pattern)
2442
if old_default_rules is not None:
2443
# dump the rules and exit
2444
for pattern in ignores.OLD_DEFAULTS:
2709
2447
if not name_pattern_list:
2710
2448
raise errors.BzrCommandError("ignore requires at least one "
2711
"NAME_PATTERN or --default-rules.")
2449
"NAME_PATTERN or --old-default-rules")
2712
2450
name_pattern_list = [globbing.normalize_pattern(p)
2713
2451
for p in name_pattern_list]
2714
2452
for name_pattern in name_pattern_list:
2749
2487
encoding_type = 'replace'
2750
2488
_see_also = ['ignore', 'ls']
2751
takes_options = ['directory']
2753
2490
@display_command
2754
def run(self, directory=u'.'):
2755
tree = WorkingTree.open_containing(directory)[0]
2756
self.add_cleanup(tree.lock_read().unlock)
2757
for path, file_class, kind, file_id, entry in tree.list_files():
2758
if file_class != 'I':
2760
## XXX: Slightly inefficient since this was already calculated
2761
pat = tree.is_ignored(path)
2762
self.outf.write('%-50s %s\n' % (path, pat))
2492
tree = WorkingTree.open_containing(u'.')[0]
2495
for path, file_class, kind, file_id, entry in tree.list_files():
2496
if file_class != 'I':
2498
## XXX: Slightly inefficient since this was already calculated
2499
pat = tree.is_ignored(path)
2500
self.outf.write('%-50s %s\n' % (path, pat))
2765
2505
class cmd_lookup_revision(Command):
2766
__doc__ = """Lookup the revision-id from a revision-number
2506
"""Lookup the revision-id from a revision-number
2769
2509
bzr lookup-revision 33
2772
2512
takes_args = ['revno']
2773
takes_options = ['directory']
2775
2514
@display_command
2776
def run(self, revno, directory=u'.'):
2515
def run(self, revno):
2778
2517
revno = int(revno)
2779
2518
except ValueError:
2780
raise errors.BzrCommandError("not a valid revision-number: %r"
2782
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2783
self.outf.write("%s\n" % revid)
2519
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2521
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2786
2524
class cmd_export(Command):
2787
__doc__ = """Export current or past revision to a destination directory or archive.
2525
"""Export current or past revision to a destination directory or archive.
2789
2527
If no revision is specified this exports the last committed revision.
2868
2602
@display_command
2869
2603
def run(self, filename, revision=None, name_from_revision=False,
2870
filters=False, directory=None):
2871
2605
if revision is not None and len(revision) != 1:
2872
2606
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2873
2607
" one revision specifier")
2874
2608
tree, branch, relpath = \
2875
_open_directory_or_containing_tree_or_branch(filename, directory)
2876
self.add_cleanup(branch.lock_read().unlock)
2877
return self._run(tree, branch, relpath, filename, revision,
2878
name_from_revision, filters)
2609
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2612
return self._run(tree, branch, relpath, filename, revision,
2613
name_from_revision, filters)
2880
2617
def _run(self, tree, b, relpath, filename, revision, name_from_revision,
2882
2619
if tree is None:
2883
2620
tree = b.basis_tree()
2884
2621
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2885
self.add_cleanup(rev_tree.lock_read().unlock)
2887
2623
old_file_id = rev_tree.path2id(relpath)
2923
2659
chunks = content.splitlines(True)
2924
2660
content = filtered_output_bytes(chunks, filters,
2925
2661
ContentFilterContext(relpath, rev_tree))
2927
2662
self.outf.writelines(content)
2930
2664
self.outf.write(content)
2933
2667
class cmd_local_time_offset(Command):
2934
__doc__ = """Show the offset in seconds from GMT to local time."""
2668
"""Show the offset in seconds from GMT to local time."""
2936
2670
@display_command
2938
self.outf.write("%s\n" % osutils.local_time_offset())
2672
print osutils.local_time_offset()
2942
2676
class cmd_commit(Command):
2943
__doc__ = """Commit changes into a new revision.
2945
An explanatory message needs to be given for each commit. This is
2946
often done by using the --message option (getting the message from the
2947
command line) or by using the --file option (getting the message from
2948
a file). If neither of these options is given, an editor is opened for
2949
the user to enter the message. To see the changed files in the
2950
boilerplate text loaded into the editor, use the --show-diff option.
2952
By default, the entire tree is committed and the person doing the
2953
commit is assumed to be the author. These defaults can be overridden
2958
If selected files are specified, only changes to those files are
2959
committed. If a directory is specified then the directory and
2960
everything within it is committed.
2962
When excludes are given, they take precedence over selected files.
2963
For example, to commit only changes within foo, but not changes
2966
bzr commit foo -x foo/bar
2968
A selective commit after a merge is not yet supported.
2972
If the author of the change is not the same person as the committer,
2973
you can specify the author's name using the --author option. The
2974
name should be in the same format as a committer-id, e.g.
2975
"John Doe <jdoe@example.com>". If there is more than one author of
2976
the change you can specify the option multiple times, once for each
2981
A common mistake is to forget to add a new file or directory before
2982
running the commit command. The --strict option checks for unknown
2983
files and aborts the commit if any are found. More advanced pre-commit
2984
checks can be implemented by defining hooks. See ``bzr help hooks``
2989
If you accidentially commit the wrong changes or make a spelling
2990
mistake in the commit message say, you can use the uncommit command
2991
to undo it. See ``bzr help uncommit`` for details.
2993
Hooks can also be configured to run after a commit. This allows you
2994
to trigger updates to external systems like bug trackers. The --fixes
2995
option can be used to record the association between a revision and
2996
one or more bugs. See ``bzr help bugs`` for details.
2998
A selective commit may fail in some cases where the committed
2999
tree would be invalid. Consider::
3004
bzr commit foo -m "committing foo"
3005
bzr mv foo/bar foo/baz
3008
bzr commit foo/bar -m "committing bar but not baz"
3010
In the example above, the last commit will fail by design. This gives
3011
the user the opportunity to decide whether they want to commit the
3012
rename at the same time, separately first, or not at all. (As a general
3013
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2677
"""Commit changes into a new revision.
2679
If no arguments are given, the entire tree is committed.
2681
If selected files are specified, only changes to those files are
2682
committed. If a directory is specified then the directory and everything
2683
within it is committed.
2685
When excludes are given, they take precedence over selected files.
2686
For example, too commit only changes within foo, but not changes within
2689
bzr commit foo -x foo/bar
2691
If author of the change is not the same person as the committer, you can
2692
specify the author's name using the --author option. The name should be
2693
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2694
If there is more than one author of the change you can specify the option
2695
multiple times, once for each author.
2697
A selected-file commit may fail in some cases where the committed
2698
tree would be invalid. Consider::
2703
bzr commit foo -m "committing foo"
2704
bzr mv foo/bar foo/baz
2707
bzr commit foo/bar -m "committing bar but not baz"
2709
In the example above, the last commit will fail by design. This gives
2710
the user the opportunity to decide whether they want to commit the
2711
rename at the same time, separately first, or not at all. (As a general
2712
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2714
Note: A selected-file commit after a merge is not yet supported.
3015
2716
# TODO: Run hooks on tree to-be-committed, and after commit.
3126
2816
if local and not tree.branch.get_bound_location():
3127
2817
raise errors.LocalRequiresBoundBranch()
3129
if message is not None:
3131
file_exists = osutils.lexists(message)
3132
except UnicodeError:
3133
# The commit message contains unicode characters that can't be
3134
# represented in the filesystem encoding, so that can't be a
3139
'The commit message is a file name: "%(f)s".\n'
3140
'(use --file "%(f)s" to take commit message from that file)'
3142
ui.ui_factory.show_warning(warning_msg)
3144
message = message.replace('\r\n', '\n')
3145
message = message.replace('\r', '\n')
3147
raise errors.BzrCommandError(
3148
"please specify either --message or --file")
3150
2819
def get_message(commit_obj):
3151
2820
"""Callback to get commit message"""
3153
my_message = codecs.open(
3154
file, 'rt', osutils.get_user_encoding()).read()
3155
elif message is not None:
3156
my_message = message
3158
# No message supplied: make one up.
3159
# text is the status of the tree
3160
text = make_commit_message_template_encoded(tree,
2821
my_message = message
2822
if my_message is None and not file:
2823
t = make_commit_message_template_encoded(tree,
3161
2824
selected_list, diff=show_diff,
3162
2825
output_encoding=osutils.get_user_encoding())
3163
# start_message is the template generated from hooks
3164
# XXX: Warning - looks like hooks return unicode,
3165
# make_commit_message_template_encoded returns user encoding.
3166
# We probably want to be using edit_commit_message instead to
3168
2826
start_message = generate_commit_message_template(commit_obj)
3169
my_message = edit_commit_message_encoded(text,
2827
my_message = edit_commit_message_encoded(t,
3170
2828
start_message=start_message)
3171
2829
if my_message is None:
3172
2830
raise errors.BzrCommandError("please specify a commit"
3173
2831
" message with either --message or --file")
2832
elif my_message and file:
2833
raise errors.BzrCommandError(
2834
"please specify either --message or --file")
2836
my_message = codecs.open(file, 'rt',
2837
osutils.get_user_encoding()).read()
3174
2838
if my_message == "":
3175
2839
raise errors.BzrCommandError("empty commit message specified")
3176
2840
return my_message
3178
# The API permits a commit with a filter of [] to mean 'select nothing'
3179
# but the command line should not do that.
3180
if not selected_list:
3181
selected_list = None
3183
2843
tree.commit(message_callback=get_message,
3184
2844
specific_files=selected_list,
3185
2845
allow_pointless=unchanged, strict=strict, local=local,
3186
2846
reporter=None, verbose=verbose, revprops=properties,
3187
authors=author, timestamp=commit_stamp,
3189
2848
exclude=safe_relpath_files(tree, exclude))
3190
2849
except PointlessCommit:
3191
raise errors.BzrCommandError("No changes to commit."
3192
" Use --unchanged to commit anyhow.")
2850
# FIXME: This should really happen before the file is read in;
2851
# perhaps prepare the commit; get the message; then actually commit
2852
raise errors.BzrCommandError("no changes to commit."
2853
" use --unchanged to commit anyhow")
3193
2854
except ConflictsInTree:
3194
2855
raise errors.BzrCommandError('Conflicts detected in working '
3195
2856
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3214
2874
The working tree and branch checks will only give output if a problem is
3215
2875
detected. The output fields of the repository check are:
3218
This is just the number of revisions checked. It doesn't
3222
This is just the number of versionedfiles checked. It
3223
doesn't indicate a problem.
3225
unreferenced ancestors
3226
Texts that are ancestors of other texts, but
3227
are not properly referenced by the revision ancestry. This is a
3228
subtle problem that Bazaar can work around.
3231
This is the total number of unique file contents
3232
seen in the checked revisions. It does not indicate a problem.
3235
This is the total number of repeated texts seen
3236
in the checked revisions. Texts can be repeated when their file
3237
entries are modified, but the file contents are not. It does not
2877
revisions: This is just the number of revisions checked. It doesn't
2879
versionedfiles: This is just the number of versionedfiles checked. It
2880
doesn't indicate a problem.
2881
unreferenced ancestors: Texts that are ancestors of other texts, but
2882
are not properly referenced by the revision ancestry. This is a
2883
subtle problem that Bazaar can work around.
2884
unique file texts: This is the total number of unique file contents
2885
seen in the checked revisions. It does not indicate a problem.
2886
repeated file texts: This is the total number of repeated texts seen
2887
in the checked revisions. Texts can be repeated when their file
2888
entries are modified, but the file contents are not. It does not
3240
2891
If no restrictions are specified, all Bazaar data that is found at the given
3241
2892
location will be checked.
3606
3254
verbose = not is_quiet()
3607
3255
# TODO: should possibly lock the history file...
3608
3256
benchfile = open(".perf_history", "at", buffering=1)
3609
self.add_cleanup(benchfile.close)
3611
3258
test_suite_factory = None
3612
3259
benchfile = None
3613
selftest_kwargs = {"verbose": verbose,
3615
"stop_on_failure": one,
3616
"transport": transport,
3617
"test_suite_factory": test_suite_factory,
3618
"lsprof_timed": lsprof_timed,
3619
"lsprof_tests": lsprof_tests,
3620
"bench_history": benchfile,
3621
"matching_tests_first": first,
3622
"list_only": list_only,
3623
"random_seed": randomize,
3624
"exclude_pattern": exclude,
3626
"load_list": load_list,
3627
"debug_flags": debugflag,
3628
"starting_with": starting_with
3630
selftest_kwargs.update(self.additional_selftest_args)
3631
result = selftest(**selftest_kwargs)
3261
selftest_kwargs = {"verbose": verbose,
3263
"stop_on_failure": one,
3264
"transport": transport,
3265
"test_suite_factory": test_suite_factory,
3266
"lsprof_timed": lsprof_timed,
3267
"bench_history": benchfile,
3268
"matching_tests_first": first,
3269
"list_only": list_only,
3270
"random_seed": randomize,
3271
"exclude_pattern": exclude,
3273
"load_list": load_list,
3274
"debug_flags": debugflag,
3275
"starting_with": starting_with
3277
selftest_kwargs.update(self.additional_selftest_args)
3278
result = selftest(**selftest_kwargs)
3280
if benchfile is not None:
3283
note('tests passed')
3285
note('tests failed')
3632
3286
return int(not result)
3635
3289
class cmd_version(Command):
3636
__doc__ = """Show version of bzr."""
3290
"""Show version of bzr."""
3638
3292
encoding_type = 'replace'
3639
3293
takes_options = [
3799
3443
verified = 'inapplicable'
3800
3444
tree = WorkingTree.open_containing(directory)[0]
3446
# die as quickly as possible if there are uncommitted changes
3803
3448
basis_tree = tree.revision_tree(tree.last_revision())
3804
3449
except errors.NoSuchRevision:
3805
3450
basis_tree = tree.basis_tree()
3807
# die as quickly as possible if there are uncommitted changes
3809
if tree.has_changes():
3452
changes = tree.changes_from(basis_tree)
3453
if changes.has_changed():
3810
3454
raise errors.UncommittedChanges(tree)
3812
3456
view_info = _get_view_info_for_change_reporter(tree)
3813
3457
change_reporter = delta._ChangeReporter(
3814
3458
unversioned_filter=tree.is_ignored, view_info=view_info)
3815
pb = ui.ui_factory.nested_progress_bar()
3816
self.add_cleanup(pb.finished)
3817
self.add_cleanup(tree.lock_write().unlock)
3818
if location is not None:
3820
mergeable = bundle.read_mergeable_from_url(location,
3821
possible_transports=possible_transports)
3822
except errors.NotABundle:
3461
pb = ui.ui_factory.nested_progress_bar()
3462
cleanups.append(pb.finished)
3464
cleanups.append(tree.unlock)
3465
if location is not None:
3467
mergeable = bundle.read_mergeable_from_url(location,
3468
possible_transports=possible_transports)
3469
except errors.NotABundle:
3473
raise errors.BzrCommandError('Cannot use --uncommitted'
3474
' with bundles or merge directives.')
3476
if revision is not None:
3477
raise errors.BzrCommandError(
3478
'Cannot use -r with merge directives or bundles')
3479
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3482
if merger is None and uncommitted:
3483
if revision is not None and len(revision) > 0:
3484
raise errors.BzrCommandError('Cannot use --uncommitted and'
3485
' --revision at the same time.')
3486
location = self._select_branch_location(tree, location)[0]
3487
other_tree, other_path = WorkingTree.open_containing(location)
3488
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
3490
allow_pending = False
3491
if other_path != '':
3492
merger.interesting_files = [other_path]
3495
merger, allow_pending = self._get_merger_from_branch(tree,
3496
location, revision, remember, possible_transports, pb)
3498
merger.merge_type = merge_type
3499
merger.reprocess = reprocess
3500
merger.show_base = show_base
3501
self.sanity_check_merger(merger)
3502
if (merger.base_rev_id == merger.other_rev_id and
3503
merger.other_rev_id is not None):
3504
note('Nothing to do.')
3507
if merger.interesting_files is not None:
3508
raise errors.BzrCommandError('Cannot pull individual files')
3509
if (merger.base_rev_id == tree.last_revision()):
3510
result = tree.pull(merger.other_branch, False,
3511
merger.other_rev_id)
3512
result.report(self.outf)
3514
merger.check_basis(False)
3516
return self._do_preview(merger)
3826
raise errors.BzrCommandError('Cannot use --uncommitted'
3827
' with bundles or merge directives.')
3829
if revision is not None:
3830
raise errors.BzrCommandError(
3831
'Cannot use -r with merge directives or bundles')
3832
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3835
if merger is None and uncommitted:
3836
if revision is not None and len(revision) > 0:
3837
raise errors.BzrCommandError('Cannot use --uncommitted and'
3838
' --revision at the same time.')
3839
merger = self.get_merger_from_uncommitted(tree, location, None)
3840
allow_pending = False
3843
merger, allow_pending = self._get_merger_from_branch(tree,
3844
location, revision, remember, possible_transports, None)
3846
merger.merge_type = merge_type
3847
merger.reprocess = reprocess
3848
merger.show_base = show_base
3849
self.sanity_check_merger(merger)
3850
if (merger.base_rev_id == merger.other_rev_id and
3851
merger.other_rev_id is not None):
3852
note('Nothing to do.')
3855
if merger.interesting_files is not None:
3856
raise errors.BzrCommandError('Cannot pull individual files')
3857
if (merger.base_rev_id == tree.last_revision()):
3858
result = tree.pull(merger.other_branch, False,
3859
merger.other_rev_id)
3860
result.report(self.outf)
3862
if merger.this_basis is None:
3863
raise errors.BzrCommandError(
3864
"This branch has no commits."
3865
" (perhaps you would prefer 'bzr pull')")
3867
return self._do_preview(merger)
3869
return self._do_interactive(merger)
3871
return self._do_merge(merger, change_reporter, allow_pending,
3874
def _get_preview(self, merger):
3518
return self._do_merge(merger, change_reporter, allow_pending,
3521
for cleanup in reversed(cleanups):
3524
def _do_preview(self, merger):
3525
from bzrlib.diff import show_diff_trees
3875
3526
tree_merger = merger.make_merger()
3876
3527
tt = tree_merger.make_preview_transform()
3877
self.add_cleanup(tt.finalize)
3878
result_tree = tt.get_preview_tree()
3881
def _do_preview(self, merger):
3882
from bzrlib.diff import show_diff_trees
3883
result_tree = self._get_preview(merger)
3884
show_diff_trees(merger.this_tree, result_tree, self.outf,
3885
old_label='', new_label='')
3529
result_tree = tt.get_preview_tree()
3530
show_diff_trees(merger.this_tree, result_tree, self.outf,
3531
old_label='', new_label='')
3887
3535
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3888
3536
merger.change_reporter = change_reporter
4073
3689
def run(self, file_list=None, merge_type=None, show_base=False,
4074
3690
reprocess=False):
4075
from bzrlib.conflicts import restore
4076
3691
if merge_type is None:
4077
3692
merge_type = _mod_merge.Merge3Merger
4078
3693
tree, file_list = tree_files(file_list)
4079
self.add_cleanup(tree.lock_write().unlock)
4080
parents = tree.get_parent_ids()
4081
if len(parents) != 2:
4082
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4083
" merges. Not cherrypicking or"
4085
repository = tree.branch.repository
4086
interesting_ids = None
4088
conflicts = tree.conflicts()
4089
if file_list is not None:
4090
interesting_ids = set()
4091
for filename in file_list:
4092
file_id = tree.path2id(filename)
4094
raise errors.NotVersionedError(filename)
4095
interesting_ids.add(file_id)
4096
if tree.kind(file_id) != "directory":
3696
parents = tree.get_parent_ids()
3697
if len(parents) != 2:
3698
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3699
" merges. Not cherrypicking or"
3701
repository = tree.branch.repository
3702
interesting_ids = None
3704
conflicts = tree.conflicts()
3705
if file_list is not None:
3706
interesting_ids = set()
3707
for filename in file_list:
3708
file_id = tree.path2id(filename)
3710
raise errors.NotVersionedError(filename)
3711
interesting_ids.add(file_id)
3712
if tree.kind(file_id) != "directory":
4099
for name, ie in tree.inventory.iter_entries(file_id):
4100
interesting_ids.add(ie.file_id)
4101
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4103
# Remerge only supports resolving contents conflicts
4104
allowed_conflicts = ('text conflict', 'contents conflict')
4105
restore_files = [c.path for c in conflicts
4106
if c.typestring in allowed_conflicts]
4107
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4108
tree.set_conflicts(ConflictList(new_conflicts))
4109
if file_list is not None:
4110
restore_files = file_list
4111
for filename in restore_files:
3715
for name, ie in tree.inventory.iter_entries(file_id):
3716
interesting_ids.add(ie.file_id)
3717
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3719
# Remerge only supports resolving contents conflicts
3720
allowed_conflicts = ('text conflict', 'contents conflict')
3721
restore_files = [c.path for c in conflicts
3722
if c.typestring in allowed_conflicts]
3723
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3724
tree.set_conflicts(ConflictList(new_conflicts))
3725
if file_list is not None:
3726
restore_files = file_list
3727
for filename in restore_files:
3729
restore(tree.abspath(filename))
3730
except errors.NotConflicted:
3732
# Disable pending merges, because the file texts we are remerging
3733
# have not had those merges performed. If we use the wrong parents
3734
# list, we imply that the working tree text has seen and rejected
3735
# all the changes from the other tree, when in fact those changes
3736
# have not yet been seen.
3737
pb = ui.ui_factory.nested_progress_bar()
3738
tree.set_parent_ids(parents[:1])
4113
restore(tree.abspath(filename))
4114
except errors.NotConflicted:
4116
# Disable pending merges, because the file texts we are remerging
4117
# have not had those merges performed. If we use the wrong parents
4118
# list, we imply that the working tree text has seen and rejected
4119
# all the changes from the other tree, when in fact those changes
4120
# have not yet been seen.
4121
tree.set_parent_ids(parents[:1])
4123
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4124
merger.interesting_ids = interesting_ids
4125
merger.merge_type = merge_type
4126
merger.show_base = show_base
4127
merger.reprocess = reprocess
4128
conflicts = merger.do_merge()
3740
merger = _mod_merge.Merger.from_revision_ids(pb,
3742
merger.interesting_ids = interesting_ids
3743
merger.merge_type = merge_type
3744
merger.show_base = show_base
3745
merger.reprocess = reprocess
3746
conflicts = merger.do_merge()
3748
tree.set_parent_ids(parents)
4130
tree.set_parent_ids(parents)
4131
3752
if conflicts > 0:
4155
3776
name. If you name a directory, all the contents of that directory will be
4158
If you have newly added files since the target revision, they will be
4159
removed. If the files to be removed have been changed, backups will be
4160
created as above. Directories containing unknown files will not be
3779
Any files that have been newly added since that revision will be deleted,
3780
with a backup kept if appropriate. Directories containing unknown files
3781
will not be deleted.
4163
The working tree contains a list of revisions that have been merged but
4164
not yet committed. These revisions will be included as additional parents
4165
of the next commit. Normally, using revert clears that list as well as
4166
reverting the files. If any files are specified, revert leaves the list
4167
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4168
.`` in the tree root to revert all files but keep the recorded merges,
4169
and ``bzr revert --forget-merges`` to clear the pending merge list without
3783
The working tree contains a list of pending merged revisions, which will
3784
be included as parents in the next commit. Normally, revert clears that
3785
list as well as reverting the files. If any files are specified, revert
3786
leaves the pending merge list alone and reverts only the files. Use "bzr
3787
revert ." in the tree root to revert all files but keep the merge record,
3788
and "bzr revert --forget-merges" to clear the pending merge list without
4170
3789
reverting any files.
4172
Using "bzr revert --forget-merges", it is possible to apply all of the
4173
changes from a branch in a single revision. To do this, perform the merge
4174
as desired. Then doing revert with the "--forget-merges" option will keep
4175
the content of the tree as it was, but it will clear the list of pending
4176
merges. The next commit will then contain all of the changes that are
4177
present in the other branch, but without any other parent revisions.
4178
Because this technique forgets where these changes originated, it may
4179
cause additional conflicts on later merges involving the same source and
4183
3792
_see_also = ['cat', 'export']
4192
3801
def run(self, revision=None, no_backup=False, file_list=None,
4193
3802
forget_merges=None):
4194
3803
tree, file_list = tree_files(file_list)
4195
self.add_cleanup(tree.lock_tree_write().unlock)
4197
tree.set_parent_ids(tree.get_parent_ids()[:1])
4199
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3807
tree.set_parent_ids(tree.get_parent_ids()[:1])
3809
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
4202
3814
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4203
3815
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4204
tree.revert(file_list, rev_tree, not no_backup, None,
4205
report_changes=True)
3816
pb = ui.ui_factory.nested_progress_bar()
3818
tree.revert(file_list, rev_tree, not no_backup, pb,
3819
report_changes=True)
4208
3824
class cmd_assert_fail(Command):
4209
__doc__ = """Test reporting of assertion failures"""
3825
"""Test reporting of assertion failures"""
4210
3826
# intended just for use in testing
4361
3969
_get_revision_range(revision,
4362
3970
remote_branch, self.name()))
4364
local_extra, remote_extra = find_unmerged(
4365
local_branch, remote_branch, restrict,
4366
backward=not reverse,
4367
include_merges=include_merges,
4368
local_revid_range=local_revid_range,
4369
remote_revid_range=remote_revid_range)
4371
if log_format is None:
4372
registry = log.log_formatter_registry
4373
log_format = registry.get_default(local_branch)
4374
lf = log_format(to_file=self.outf,
4376
show_timezone='original')
4379
if local_extra and not theirs_only:
4380
message("You have %d extra revision(s):\n" %
4382
for revision in iter_log_revisions(local_extra,
4383
local_branch.repository,
4385
lf.log_revision(revision)
4386
printed_local = True
4389
printed_local = False
4391
if remote_extra and not mine_only:
4392
if printed_local is True:
4394
message("You are missing %d revision(s):\n" %
4396
for revision in iter_log_revisions(remote_extra,
4397
remote_branch.repository,
4399
lf.log_revision(revision)
4402
if mine_only and not local_extra:
4403
# We checked local, and found nothing extra
4404
message('This branch is up to date.\n')
4405
elif theirs_only and not remote_extra:
4406
# We checked remote, and found nothing extra
4407
message('Other branch is up to date.\n')
4408
elif not (mine_only or theirs_only or local_extra or
4410
# We checked both branches, and neither one had extra
4412
message("Branches are up to date.\n")
3972
local_branch.lock_read()
3974
remote_branch.lock_read()
3976
local_extra, remote_extra = find_unmerged(
3977
local_branch, remote_branch, restrict,
3978
backward=not reverse,
3979
include_merges=include_merges,
3980
local_revid_range=local_revid_range,
3981
remote_revid_range=remote_revid_range)
3983
if log_format is None:
3984
registry = log.log_formatter_registry
3985
log_format = registry.get_default(local_branch)
3986
lf = log_format(to_file=self.outf,
3988
show_timezone='original')
3991
if local_extra and not theirs_only:
3992
message("You have %d extra revision(s):\n" %
3994
for revision in iter_log_revisions(local_extra,
3995
local_branch.repository,
3997
lf.log_revision(revision)
3998
printed_local = True
4001
printed_local = False
4003
if remote_extra and not mine_only:
4004
if printed_local is True:
4006
message("You are missing %d revision(s):\n" %
4008
for revision in iter_log_revisions(remote_extra,
4009
remote_branch.repository,
4011
lf.log_revision(revision)
4014
if mine_only and not local_extra:
4015
# We checked local, and found nothing extra
4016
message('This branch is up to date.\n')
4017
elif theirs_only and not remote_extra:
4018
# We checked remote, and found nothing extra
4019
message('Other branch is up to date.\n')
4020
elif not (mine_only or theirs_only or local_extra or
4022
# We checked both branches, and neither one had extra
4024
message("Branches are up to date.\n")
4026
remote_branch.unlock()
4028
local_branch.unlock()
4414
4029
if not status_code and parent is None and other_branch is not None:
4415
self.add_cleanup(local_branch.lock_write().unlock)
4416
# handle race conditions - a parent might be set while we run.
4417
if local_branch.get_parent() is None:
4418
local_branch.set_parent(remote_branch.base)
4030
local_branch.lock_write()
4032
# handle race conditions - a parent might be set while we run.
4033
if local_branch.get_parent() is None:
4034
local_branch.set_parent(remote_branch.base)
4036
local_branch.unlock()
4419
4037
return status_code
4422
4040
class cmd_pack(Command):
4423
__doc__ = """Compress the data within a repository.
4425
This operation compresses the data within a bazaar repository. As
4426
bazaar supports automatic packing of repository, this operation is
4427
normally not required to be done manually.
4429
During the pack operation, bazaar takes a backup of existing repository
4430
data, i.e. pack files. This backup is eventually removed by bazaar
4431
automatically when it is safe to do so. To save disk space by removing
4432
the backed up pack files, the --clean-obsolete-packs option may be
4435
Warning: If you use --clean-obsolete-packs and your machine crashes
4436
during or immediately after repacking, you may be left with a state
4437
where the deletion has been written to disk but the new packs have not
4438
been. In this case the repository may be unusable.
4041
"""Compress the data within a repository."""
4441
4043
_see_also = ['repositories']
4442
4044
takes_args = ['branch_or_repo?']
4444
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4447
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4046
def run(self, branch_or_repo='.'):
4448
4047
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4450
4049
branch = dir.open_branch()
4451
4050
repository = branch.repository
4452
4051
except errors.NotBranchError:
4453
4052
repository = dir.open_repository()
4454
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4457
4056
class cmd_plugins(Command):
4458
__doc__ = """List the installed plugins.
4057
"""List the installed plugins.
4460
4059
This command displays the list of installed plugins including
4461
4060
version of plugin and a short description of each.
4548
4150
Option('long', help='Show commit date in annotations.'),
4553
4154
encoding_type = 'exact'
4555
4156
@display_command
4556
4157
def run(self, filename, all=False, long=False, revision=None,
4557
show_ids=False, directory=None):
4558
4159
from bzrlib.annotate import annotate_file, annotate_file_tree
4559
4160
wt, branch, relpath = \
4560
_open_directory_or_containing_tree_or_branch(filename, directory)
4562
self.add_cleanup(wt.lock_read().unlock)
4564
self.add_cleanup(branch.lock_read().unlock)
4565
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
self.add_cleanup(tree.lock_read().unlock)
4568
file_id = wt.path2id(relpath)
4570
file_id = tree.path2id(relpath)
4572
raise errors.NotVersionedError(filename)
4573
file_version = tree.inventory[file_id].revision
4574
if wt is not None and revision is None:
4575
# If there is a tree and we're not annotating historical
4576
# versions, annotate the working tree's content.
4577
annotate_file_tree(wt, file_id, self.outf, long, all,
4580
annotate_file(branch, file_version, file_id, long, all, self.outf,
4161
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4167
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4169
file_id = wt.path2id(relpath)
4171
file_id = tree.path2id(relpath)
4173
raise errors.NotVersionedError(filename)
4174
file_version = tree.inventory[file_id].revision
4175
if wt is not None and revision is None:
4176
# If there is a tree and we're not annotating historical
4177
# versions, annotate the working tree's content.
4178
annotate_file_tree(wt, file_id, self.outf, long, all,
4181
annotate_file(branch, file_version, file_id, long, all, self.outf,
4584
4190
class cmd_re_sign(Command):
4585
__doc__ = """Create a digital signature for an existing revision."""
4191
"""Create a digital signature for an existing revision."""
4586
4192
# TODO be able to replace existing ones.
4588
4194
hidden = True # is this right ?
4589
4195
takes_args = ['revision_id*']
4590
takes_options = ['directory', 'revision']
4196
takes_options = ['revision']
4592
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4198
def run(self, revision_id_list=None, revision=None):
4593
4199
if revision_id_list is not None and revision is not None:
4594
4200
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4595
4201
if revision_id_list is None and revision is None:
4596
4202
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4597
b = WorkingTree.open_containing(directory)[0].branch
4598
self.add_cleanup(b.lock_write().unlock)
4599
return self._run(b, revision_id_list, revision)
4203
b = WorkingTree.open_containing(u'.')[0].branch
4206
return self._run(b, revision_id_list, revision)
4601
4210
def _run(self, b, revision_id_list, revision):
4602
4211
import bzrlib.gpg as gpg
4792
4404
end_revision=last_revno)
4795
self.outf.write('Dry-run, pretending to remove'
4796
' the above revisions.\n')
4407
print 'Dry-run, pretending to remove the above revisions.'
4409
val = raw_input('Press <enter> to continue')
4798
self.outf.write('The above revision(s) will be removed.\n')
4801
if not ui.ui_factory.get_boolean('Are you sure'):
4802
self.outf.write('Canceled')
4411
print 'The above revision(s) will be removed.'
4413
val = raw_input('Are you sure [y/N]? ')
4414
if val.lower() not in ('y', 'yes'):
4805
4418
mutter('Uncommitting from {%s} to {%s}',
4806
4419
last_rev_id, rev_id)
4807
4420
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4808
4421
revno=revno, local=local)
4809
self.outf.write('You can restore the old tip by running:\n'
4810
' bzr pull . -r revid:%s\n' % last_rev_id)
4422
note('You can restore the old tip by running:\n'
4423
' bzr pull . -r revid:%s', last_rev_id)
4813
4426
class cmd_break_lock(Command):
4814
__doc__ = """Break a dead lock on a repository, branch or working directory.
4427
"""Break a dead lock on a repository, branch or working directory.
4816
4429
CAUTION: Locks should only be broken when you are sure that the process
4817
4430
holding the lock has been stopped.
4819
You can get information on what locks are open via the 'bzr info
4820
[location]' command.
4432
You can get information on what locks are open via the 'bzr info' command.
4824
bzr break-lock bzr+ssh://example.com/bzr/foo
4826
4437
takes_args = ['location?']
4852
4463
class cmd_serve(Command):
4853
__doc__ = """Run the bzr server."""
4464
"""Run the bzr server."""
4855
4466
aliases = ['server']
4857
4468
takes_options = [
4859
4470
help='Serve on stdin/out for use from inetd or sshd.'),
4860
RegistryOption('protocol',
4861
help="Protocol to serve.",
4862
lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4863
value_switches=True),
4865
4472
help='Listen for connections on nominated port of the form '
4866
4473
'[hostname:]portnumber. Passing 0 as the port number will '
4867
'result in a dynamically allocated port. The default port '
4868
'depends on the protocol.',
4474
'result in a dynamically allocated port. The default port is '
4870
custom_help('directory',
4871
help='Serve contents of this directory.'),
4478
help='Serve contents of this directory.',
4872
4480
Option('allow-writes',
4873
4481
help='By default the server is a readonly server. Supplying '
4874
4482
'--allow-writes enables write access to the contents of '
4875
'the served directory and below. Note that ``bzr serve`` '
4876
'does not perform authentication, so unless some form of '
4877
'external authentication is arranged supplying this '
4878
'option leads to global uncontrolled write access to your '
4483
'the served directory and below.'
4487
def run_smart_server(self, smart_server):
4488
"""Run 'smart_server' forever, with no UI output at all."""
4489
# For the duration of this server, no UI output is permitted. note
4490
# that this may cause problems with blackbox tests. This should be
4491
# changed with care though, as we dont want to use bandwidth sending
4492
# progress over stderr to smart server clients!
4493
from bzrlib import lockdir
4494
old_factory = ui.ui_factory
4495
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
4497
ui.ui_factory = ui.SilentUIFactory()
4498
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
4499
smart_server.serve()
4501
ui.ui_factory = old_factory
4502
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
4883
4504
def get_host_and_port(self, port):
4884
4505
"""Return the host and port to run the smart server on.
4886
If 'port' is None, None will be returned for the host and port.
4507
If 'port' is None, the default host (`medium.BZR_DEFAULT_INTERFACE`)
4508
and port (`medium.BZR_DEFAULT_PORT`) will be used.
4888
4510
If 'port' has a colon in it, the string before the colon will be
4889
4511
interpreted as the host.
4892
4514
:return: A tuple of (host, port), where 'host' is a host name or IP,
4893
4515
and port is an integer TCP/IP port.
4896
if port is not None:
4517
from bzrlib.smart import medium
4518
host = medium.BZR_DEFAULT_INTERFACE
4520
port = medium.BZR_DEFAULT_PORT
4897
4522
if ':' in port:
4898
4523
host, port = port.split(':')
4899
4524
port = int(port)
4900
4525
return host, port
4902
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4904
from bzrlib.transport import get_transport, transport_server_registry
4527
def get_smart_server(self, transport, inet, port):
4528
"""Construct a smart server.
4530
:param transport: The base transport from which branches will be
4532
:param inet: If True, serve over stdin and stdout. Used for running
4534
:param port: The port to listen on. By default, it's `
4535
medium.BZR_DEFAULT_PORT`. See `get_host_and_port` for more
4537
:return: A smart server.
4539
from bzrlib.smart import medium, server
4541
smart_server = medium.SmartServerPipeStreamMedium(
4542
sys.stdin, sys.stdout, transport)
4544
host, port = self.get_host_and_port(port)
4545
smart_server = server.SmartTCPServer(
4546
transport, host=host, port=port)
4547
note('listening on port: %s' % smart_server.port)
4550
def run(self, port=None, inet=False, directory=None, allow_writes=False):
4551
from bzrlib.transport import get_transport
4552
from bzrlib.transport.chroot import ChrootServer
4905
4553
if directory is None:
4906
4554
directory = os.getcwd()
4907
if protocol is None:
4908
protocol = transport_server_registry.get()
4909
host, port = self.get_host_and_port(port)
4910
4555
url = urlutils.local_path_to_url(directory)
4911
4556
if not allow_writes:
4912
4557
url = 'readonly+' + url
4913
transport = get_transport(url)
4914
protocol(transport, host, port, inet)
4558
chroot_server = ChrootServer(get_transport(url))
4559
chroot_server.setUp()
4560
t = get_transport(chroot_server.get_url())
4561
smart_server = self.get_smart_server(t, inet, port)
4562
self.run_smart_server(smart_server)
4917
4565
class cmd_join(Command):
4918
__doc__ = """Combine a tree into its containing tree.
4566
"""Combine a subtree into its containing tree.
4920
This command requires the target tree to be in a rich-root format.
4568
This command is for experimental use only. It requires the target tree
4569
to be in dirstate-with-subtree format, which cannot be converted into
4922
4572
The TREE argument should be an independent tree, inside another tree, but
4923
4573
not part of it. (Such trees can be produced by "bzr split", but also by
5098
4755
directly from the merge directive, without retrieving data from a
5101
`bzr send` creates a compact data set that, when applied using bzr
5102
merge, has the same effect as merging from the source branch.
5104
By default the merge directive is self-contained and can be applied to any
5105
branch containing submit_branch in its ancestory without needing access to
5108
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5109
revisions, but only a structured request to merge from the
5110
public_location. In that case the public_branch is needed and it must be
5111
up-to-date and accessible to the recipient. The public_branch is always
5112
included if known, so that people can check it later.
5114
The submit branch defaults to the parent of the source branch, but can be
5115
overridden. Both submit branch and public branch will be remembered in
5116
branch.conf the first time they are used for a particular branch. The
5117
source branch defaults to that containing the working directory, but can
5118
be changed using --from.
5120
In order to calculate those changes, bzr must analyse the submit branch.
5121
Therefore it is most efficient for the submit branch to be a local mirror.
5122
If a public location is known for the submit_branch, that location is used
5123
in the merge directive.
5125
The default behaviour is to send the merge directive by mail, unless -o is
5126
given, in which case it is sent to a file.
4758
If --no-bundle is specified, then public_branch is needed (and must be
4759
up-to-date), so that the receiver can perform the merge using the
4760
public_branch. The public_branch is always included if known, so that
4761
people can check it later.
4763
The submit branch defaults to the parent, but can be overridden. Both
4764
submit branch and public branch will be remembered if supplied.
4766
If a public_branch is known for the submit_branch, that public submit
4767
branch is used in the merge instructions. This means that a local mirror
4768
can be used as your actual submit branch, once you have set public_branch
5128
4771
Mail is sent using your preferred mail program. This should be transparent
5129
4772
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5174
4812
short_name='f',
5176
4814
Option('output', short_name='o',
5177
help='Write merge directive to this file or directory; '
4815
help='Write merge directive to this file; '
5178
4816
'use - for stdout.',
5181
help='Refuse to send if there are uncommitted changes in'
5182
' the working tree, --no-strict disables the check.'),
5183
4818
Option('mail-to', help='Mail the request to this address.',
5187
4822
Option('body', help='Body for the email.', type=unicode),
5188
RegistryOption('format',
5189
help='Use the specified output format.',
5190
lazy_registry=('bzrlib.send', 'format_registry')),
4823
RegistryOption.from_kwargs('format',
4824
'Use the specified output format.',
4825
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4826
'0.9': 'Bundle format 0.9, Merge Directive 1',})
5193
4829
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5194
4830
no_patch=False, revision=None, remember=False, output=None,
5195
format=None, mail_to=None, message=None, body=None,
5196
strict=None, **kwargs):
5197
from bzrlib.send import send
5198
return send(submit_branch, revision, public_branch, remember,
5199
format, no_bundle, no_patch, output,
5200
kwargs.get('from', '.'), mail_to, message, body,
4831
format='4', mail_to=None, message=None, body=None, **kwargs):
4832
return self._run(submit_branch, revision, public_branch, remember,
4833
format, no_bundle, no_patch, output,
4834
kwargs.get('from', '.'), mail_to, message, body)
4836
def _run(self, submit_branch, revision, public_branch, remember, format,
4837
no_bundle, no_patch, output, from_, mail_to, message, body):
4838
from bzrlib.revision import NULL_REVISION
4839
branch = Branch.open_containing(from_)[0]
4841
outfile = cStringIO.StringIO()
4845
outfile = open(output, 'wb')
4846
# we may need to write data into branch's repository to calculate
4851
config = branch.get_config()
4853
mail_to = config.get_user_option('submit_to')
4854
mail_client = config.get_mail_client()
4855
if (not getattr(mail_client, 'supports_body', False)
4856
and body is not None):
4857
raise errors.BzrCommandError(
4858
'Mail client "%s" does not support specifying body' %
4859
mail_client.__class__.__name__)
4860
if remember and submit_branch is None:
4861
raise errors.BzrCommandError(
4862
'--remember requires a branch to be specified.')
4863
stored_submit_branch = branch.get_submit_branch()
4864
remembered_submit_branch = None
4865
if submit_branch is None:
4866
submit_branch = stored_submit_branch
4867
remembered_submit_branch = "submit"
4869
if stored_submit_branch is None or remember:
4870
branch.set_submit_branch(submit_branch)
4871
if submit_branch is None:
4872
submit_branch = branch.get_parent()
4873
remembered_submit_branch = "parent"
4874
if submit_branch is None:
4875
raise errors.BzrCommandError('No submit branch known or'
4877
if remembered_submit_branch is not None:
4878
note('Using saved %s location "%s" to determine what '
4879
'changes to submit.', remembered_submit_branch,
4883
submit_config = Branch.open(submit_branch).get_config()
4884
mail_to = submit_config.get_user_option("child_submit_to")
4886
stored_public_branch = branch.get_public_branch()
4887
if public_branch is None:
4888
public_branch = stored_public_branch
4889
elif stored_public_branch is None or remember:
4890
branch.set_public_branch(public_branch)
4891
if no_bundle and public_branch is None:
4892
raise errors.BzrCommandError('No public branch specified or'
4894
base_revision_id = None
4896
if revision is not None:
4897
if len(revision) > 2:
4898
raise errors.BzrCommandError('bzr send takes '
4899
'at most two one revision identifiers')
4900
revision_id = revision[-1].as_revision_id(branch)
4901
if len(revision) == 2:
4902
base_revision_id = revision[0].as_revision_id(branch)
4903
if revision_id is None:
4904
revision_id = branch.last_revision()
4905
if revision_id == NULL_REVISION:
4906
raise errors.BzrCommandError('No revisions to submit.')
4908
directive = merge_directive.MergeDirective2.from_objects(
4909
branch.repository, revision_id, time.time(),
4910
osutils.local_time_offset(), submit_branch,
4911
public_branch=public_branch, include_patch=not no_patch,
4912
include_bundle=not no_bundle, message=message,
4913
base_revision_id=base_revision_id)
4914
elif format == '0.9':
4917
patch_type = 'bundle'
4919
raise errors.BzrCommandError('Format 0.9 does not'
4920
' permit bundle with no patch')
4926
directive = merge_directive.MergeDirective.from_objects(
4927
branch.repository, revision_id, time.time(),
4928
osutils.local_time_offset(), submit_branch,
4929
public_branch=public_branch, patch_type=patch_type,
4932
outfile.writelines(directive.to_lines())
4934
subject = '[MERGE] '
4935
if message is not None:
4938
revision = branch.repository.get_revision(revision_id)
4939
subject += revision.get_summary()
4940
basename = directive.get_disk_name(branch)
4941
mail_client.compose_merge_request(mail_to, subject,
5205
4950
class cmd_bundle_revisions(cmd_send):
5206
__doc__ = """Create a merge-directive for submitting changes.
4952
"""Create a merge-directive for submitting changes.
5208
4954
A merge directive provides many things needed for requesting merges:
5266
5010
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5267
5011
no_patch=False, revision=None, remember=False, output=None,
5268
format=None, strict=None, **kwargs):
5012
format='4', **kwargs):
5269
5013
if output is None:
5271
from bzrlib.send import send
5272
return send(submit_branch, revision, public_branch, remember,
5015
return self._run(submit_branch, revision, public_branch, remember,
5273
5016
format, no_bundle, no_patch, output,
5274
kwargs.get('from', '.'), None, None, None,
5275
self.outf, strict=strict)
5017
kwargs.get('from', '.'), None, None, None)
5278
5020
class cmd_tag(Command):
5279
__doc__ = """Create, remove or modify a tag naming a revision.
5021
"""Create, remove or modify a tag naming a revision.
5281
5023
Tags give human-meaningful names to revisions. Commands that take a -r
5282
5024
(--revision) option can be given -rtag:X, where X is any previously
5291
5033
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5292
5034
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5294
If no tag name is specified it will be determined through the
5295
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5296
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5300
5037
_see_also = ['commit', 'tags']
5301
takes_args = ['tag_name?']
5038
takes_args = ['tag_name']
5302
5039
takes_options = [
5303
5040
Option('delete',
5304
5041
help='Delete this tag rather than placing it.',
5306
custom_help('directory',
5307
help='Branch in which to place the tag.'),
5044
help='Branch in which to place the tag.',
5308
5048
Option('force',
5309
5049
help='Replace existing tags.',
5314
def run(self, tag_name=None,
5054
def run(self, tag_name,
5320
5060
branch, relpath = Branch.open_containing(directory)
5321
self.add_cleanup(branch.lock_write().unlock)
5323
if tag_name is None:
5324
raise errors.BzrCommandError("No tag specified to delete.")
5325
branch.tags.delete_tag(tag_name)
5326
self.outf.write('Deleted tag %s.\n' % tag_name)
5329
if len(revision) != 1:
5330
raise errors.BzrCommandError(
5331
"Tags can only be placed on a single revision, "
5333
revision_id = revision[0].as_revision_id(branch)
5064
branch.tags.delete_tag(tag_name)
5065
self.outf.write('Deleted tag %s.\n' % tag_name)
5335
revision_id = branch.last_revision()
5336
if tag_name is None:
5337
tag_name = branch.automatic_tag_name(revision_id)
5338
if tag_name is None:
5339
raise errors.BzrCommandError(
5340
"Please specify a tag name.")
5341
if (not force) and branch.tags.has_tag(tag_name):
5342
raise errors.TagAlreadyExists(tag_name)
5343
branch.tags.set_tag(tag_name, revision_id)
5344
self.outf.write('Created tag %s.\n' % tag_name)
5068
if len(revision) != 1:
5069
raise errors.BzrCommandError(
5070
"Tags can only be placed on a single revision, "
5072
revision_id = revision[0].as_revision_id(branch)
5074
revision_id = branch.last_revision()
5075
if (not force) and branch.tags.has_tag(tag_name):
5076
raise errors.TagAlreadyExists(tag_name)
5077
branch.tags.set_tag(tag_name, revision_id)
5078
self.outf.write('Created tag %s.\n' % tag_name)
5347
5083
class cmd_tags(Command):
5348
__doc__ = """List tags.
5350
5086
This command shows a table of tag names and the revisions they reference.
5353
5089
_see_also = ['tag']
5354
5090
takes_options = [
5355
custom_help('directory',
5356
help='Branch whose tags should be displayed.'),
5092
help='Branch whose tags should be displayed.',
5357
5096
RegistryOption.from_kwargs('sort',
5358
5097
'Sort tags by different criteria.', title='Sorting',
5359
5098
alpha='Sort tags lexicographically (default).',
5399
5141
tags.sort(key=lambda x: timestamps[x[1]])
5400
5142
if not show_ids:
5401
5143
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
for index, (tag, revid) in enumerate(tags):
5404
revno = branch.revision_id_to_dotted_revno(revid)
5405
if isinstance(revno, tuple):
5406
revno = '.'.join(map(str, revno))
5407
except errors.NoSuchRevision:
5408
# Bad tag data/merges can lead to tagged revisions
5409
# which are not in this branch. Fail gracefully ...
5411
tags[index] = (tag, revno)
5144
revno_map = branch.get_revision_id_to_revno_map()
5145
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
5146
for tag, revid in tags ]
5413
5147
for tag, revspec in tags:
5414
5148
self.outf.write('%-20s %s\n' % (tag, revspec))
5417
5151
class cmd_reconfigure(Command):
5418
__doc__ = """Reconfigure the type of a bzr directory.
5152
"""Reconfigure the type of a bzr directory.
5420
5154
A target configuration must be specified.
5452
5186
Option('bind-to', help='Branch to bind checkout to.', type=str),
5453
5187
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.',
5188
help='Perform reconfiguration even if local changes'
5466
def run(self, location=None, target_type=None, bind_to=None, force=False,
5192
def run(self, location=None, target_type=None, bind_to=None, force=False):
5469
5193
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
5194
if target_type is None:
5480
if stacked_on or unstacked:
5483
raise errors.BzrCommandError('No target configuration '
5195
raise errors.BzrCommandError('No target configuration specified')
5485
5196
elif target_type == 'branch':
5486
5197
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5487
5198
elif target_type == 'tree':
5524
5235
/path/to/newbranch.
5526
5237
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
5238
locally, in which case switching will update the the local nickname to be
5528
5239
that of the master.
5531
takes_args = ['to_location?']
5242
takes_args = ['to_location']
5532
5243
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.'),
5244
help='Switch even if local commits will be lost.')
5540
def run(self, to_location=None, force=False, create_branch=False,
5247
def run(self, to_location, force=False):
5542
5248
from bzrlib import switch
5543
5249
tree_location = '.'
5544
revision = _get_one_revision('switch', revision)
5545
5250
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')
5251
branch = control_dir.open_branch()
5552
branch = control_dir.open_branch()
5553
had_explicit_nick = branch.get_config().has_explicit_nickname()
5253
to_branch = Branch.open(to_location)
5554
5254
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:
5255
this_branch = control_dir.open_branch()
5256
# This may be a heavy checkout, where we want the master branch
5257
this_url = this_branch.get_bound_location()
5258
# If not, use a local sibling
5259
if this_url is None:
5260
this_url = this_branch.base
5261
to_branch = Branch.open(
5262
urlutils.join(this_url, '..', to_location))
5263
switch.switch(control_dir, to_branch, force)
5264
if branch.get_config().has_explicit_nickname():
5581
5265
branch = control_dir.open_branch() #get the new branch!
5582
5266
branch.nick = to_branch.nick
5583
5267
note('Switched to branch: %s',
5584
5268
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."""
5271
class cmd_guess_renames(Command):
5272
"""Guess which files have been have been renamed, based on their content.
5274
Only versioned files which have been deleted are candidates for rename
5275
detection, and renames to ignored files will not be detected.
5279
work_tree, file_list = tree_files(None, default_branch='.')
5280
work_tree.lock_write()
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
5282
rename_map.RenameMap.guess_renames(work_tree)
5604
5287
class cmd_view(Command):
5605
__doc__ = """Manage filtered views.
5288
"""Manage filtered views.
5607
5290
Views provide a mask over the tree so that users can focus on
5608
5291
a subset of a tree when doing their work. After creating a view,
5849
5507
if writer is None:
5850
5508
writer = bzrlib.option.diff_writer_registry.get()
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
5510
Shelver.from_args(writer(sys.stdout), revision, all, file_list,
5511
message, destroy=destroy).run()
5858
5512
except errors.UserAbort:
5861
5515
def run_for_list(self):
5862
5516
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))
5519
manager = tree.get_shelf_manager()
5520
shelves = manager.active_shelves()
5521
if len(shelves) == 0:
5522
note('No shelved changes.')
5524
for shelf_id in reversed(shelves):
5525
message = manager.get_metadata(shelf_id).get('message')
5527
message = '<no message>'
5528
self.outf.write('%3d: %s\n' % (shelf_id, message))
5877
5534
class cmd_unshelve(Command):
5878
__doc__ = """Restore shelved changes.
5535
"""Restore shelved changes.
5880
5537
By default, the most recently shelved changes are restored. However if you
5881
5538
specify a shelf by id those changes will be restored instead. This works
5931
5580
' deleting them.'),
5932
5581
Option('force', help='Do not prompt before deleting.')]
5933
5582
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
force=False, directory=u'.'):
5935
5584
from bzrlib.clean_tree import clean_tree
5936
5585
if not (unknown or ignored or detritus):
5940
clean_tree(directory, unknown=unknown, ignored=ignored,
5941
detritus=detritus, dry_run=dry_run, no_prompt=force)
5944
class cmd_reference(Command):
5945
__doc__ = """list, view and set branch locations for nested trees.
5947
If no arguments are provided, lists the branch locations for nested trees.
5948
If one argument is provided, display the branch location for that tree.
5949
If two arguments are provided, set the branch location for that tree.
5954
takes_args = ['path?', 'location?']
5956
def run(self, path=None, location=None):
5958
if path is not None:
5960
tree, branch, relpath =(
5961
bzrdir.BzrDir.open_containing_tree_or_branch(branchdir))
5962
if path is not None:
5965
tree = branch.basis_tree()
5967
info = branch._get_all_reference_info().iteritems()
5968
self._display_reference_info(tree, branch, info)
5589
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5590
dry_run=dry_run, no_prompt=force)
5593
def _create_prefix(cur_transport):
5594
needed = [cur_transport]
5595
# Recurse upwards until we can create a directory successfully
5597
new_transport = cur_transport.clone('..')
5598
if new_transport.base == cur_transport.base:
5599
raise errors.BzrCommandError(
5600
"Failed to create path prefix for %s."
5601
% cur_transport.base)
5603
new_transport.mkdir('.')
5604
except errors.NoSuchFile:
5605
needed.append(new_transport)
5606
cur_transport = new_transport
5970
file_id = tree.path2id(path)
5972
raise errors.NotVersionedError(path)
5973
if location is None:
5974
info = [(file_id, branch.get_reference_info(file_id))]
5975
self._display_reference_info(tree, branch, info)
5977
branch.set_reference_info(file_id, path, location)
5979
def _display_reference_info(self, tree, branch, info):
5981
for file_id, (path, location) in info:
5983
path = tree.id2path(file_id)
5984
except errors.NoSuchId:
5986
ref_list.append((path, location))
5987
for path, location in sorted(ref_list):
5988
self.outf.write('%s %s\n' % (path, location))
5991
def _register_lazy_builtins():
5992
# register lazy builtins from other modules; called at startup and should
5993
# be only called once.
5994
for (name, aliases, module_name) in [
5995
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5996
('cmd_dpush', [], 'bzrlib.foreign'),
5997
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5998
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5999
('cmd_conflicts', [], 'bzrlib.conflicts'),
6000
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6002
builtin_command_registry.register_lazy(name, aliases, module_name)
5609
# Now we only need to create child directories
5611
cur_transport = needed.pop()
5612
cur_transport.ensure_base()
5615
# these get imported and then picked up by the scan for cmd_*
5616
# TODO: Some more consistent way to split command definitions across files;
5617
# we do need to load at least some information about them to know of
5618
# aliases. ideally we would avoid loading the implementation until the
5619
# details were needed.
5620
from bzrlib.cmd_version_info import cmd_version_info
5621
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5622
from bzrlib.bundle.commands import (
5625
from bzrlib.sign_my_commits import cmd_sign_my_commits
5626
from bzrlib.weave_commands import cmd_versionedfile_list, \
5627
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
