1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
55
55
from bzrlib.branch import Branch
56
56
from bzrlib.conflicts import ConflictList
57
from bzrlib.transport import memory
58
57
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
59
58
from bzrlib.smtp_connection import SMTPConnection
60
59
from bzrlib.workingtree import WorkingTree
63
from bzrlib.commands import (
65
builtin_command_registry,
62
from bzrlib.commands import Command, display_command
68
63
from bzrlib.option import (
334
329
class cmd_cat_revision(Command):
335
__doc__ = """Write out metadata for a revision.
330
"""Write out metadata for a revision.
337
332
The revision to print can either be specified by a specific
338
333
revision identifier, or you can use --revision.
344
339
# cat-revision is more for frontends so should be exact
345
340
encoding = 'strict'
347
def print_revision(self, revisions, revid):
348
stream = revisions.get_record_stream([(revid,)], 'unordered', True)
349
record = stream.next()
350
if record.storage_kind == 'absent':
351
raise errors.NoSuchRevision(revisions, revid)
352
revtext = record.get_bytes_as('fulltext')
353
self.outf.write(revtext.decode('utf-8'))
356
343
def run(self, revision_id=None, revision=None):
357
344
if revision_id is not None and revision is not None:
362
349
' --revision or a revision_id')
363
350
b = WorkingTree.open_containing(u'.')[0].branch
365
revisions = b.repository.revisions
366
if revisions is None:
367
raise errors.BzrCommandError('Repository %r does not support '
368
'access to raw revision texts')
352
# TODO: jam 20060112 should cat-revision always output utf-8?
353
if revision_id is not None:
354
revision_id = osutils.safe_revision_id(revision_id, warn=False)
356
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
357
except errors.NoSuchRevision:
358
msg = "The repository %s contains no revision %s." % (b.repository.base,
360
raise errors.BzrCommandError(msg)
361
elif revision is not None:
364
raise errors.BzrCommandError('You cannot specify a NULL'
366
rev_id = rev.as_revision_id(b)
367
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
370
b.repository.lock_read()
372
# TODO: jam 20060112 should cat-revision always output utf-8?
373
if revision_id is not None:
374
revision_id = osutils.safe_revision_id(revision_id, warn=False)
376
self.print_revision(revisions, revision_id)
377
except errors.NoSuchRevision:
378
msg = "The repository %s contains no revision %s." % (
379
b.repository.base, revision_id)
380
raise errors.BzrCommandError(msg)
381
elif revision is not None:
384
raise errors.BzrCommandError(
385
'You cannot specify a NULL revision.')
386
rev_id = rev.as_revision_id(b)
387
self.print_revision(revisions, rev_id)
389
b.repository.unlock()
392
370
class cmd_dump_btree(Command):
393
__doc__ = """Dump the contents of a btree index file to stdout.
371
"""Dump the contents of a btree index file to stdout.
395
373
PATH is a btree index file, it can be any URL. This includes things like
396
374
.bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
460
438
for node in bt.iter_all_entries():
461
439
# Node is made up of:
462
440
# (index, key, value, [references])
466
refs_as_tuples = None
468
refs_as_tuples = static_tuple.as_tuples(refs)
441
refs_as_tuples = static_tuple.as_tuples(node[3])
469
442
as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
470
443
self.outf.write('%s\n' % (as_tuple,))
473
446
class cmd_remove_tree(Command):
474
__doc__ = """Remove the working tree from a given branch/checkout.
447
"""Remove the working tree from a given branch/checkout.
476
449
Since a lightweight checkout is little more than a working tree
477
450
this will refuse to run against one.
479
452
To re-create the working tree, use "bzr checkout".
481
454
_see_also = ['checkout', 'working-trees']
482
takes_args = ['location*']
455
takes_args = ['location?']
483
456
takes_options = [
485
458
help='Remove the working tree even if it has '
486
459
'uncommitted changes.'),
489
def run(self, location_list, force=False):
490
if not location_list:
493
for location in location_list:
494
d = bzrdir.BzrDir.open(location)
497
working = d.open_workingtree()
498
except errors.NoWorkingTree:
499
raise errors.BzrCommandError("No working tree to remove")
500
except errors.NotLocalUrl:
501
raise errors.BzrCommandError("You cannot remove the working tree"
504
if (working.has_changes()):
505
raise errors.UncommittedChanges(working)
507
if working.user_url != working.branch.user_url:
508
raise errors.BzrCommandError("You cannot remove the working tree"
509
" from a lightweight checkout")
511
d.destroy_workingtree()
462
def run(self, location='.', force=False):
463
d = bzrdir.BzrDir.open(location)
466
working = d.open_workingtree()
467
except errors.NoWorkingTree:
468
raise errors.BzrCommandError("No working tree to remove")
469
except errors.NotLocalUrl:
470
raise errors.BzrCommandError("You cannot remove the working tree"
473
if (working.has_changes()):
474
raise errors.UncommittedChanges(working)
476
working_path = working.bzrdir.root_transport.base
477
branch_path = working.branch.bzrdir.root_transport.base
478
if working_path != branch_path:
479
raise errors.BzrCommandError("You cannot remove the working tree"
480
" from a lightweight checkout")
482
d.destroy_workingtree()
514
485
class cmd_revno(Command):
515
__doc__ = """Show current revision number.
486
"""Show current revision number.
517
488
This is equal to the number of revisions on this branch.
707
678
def run(self, dir_list):
708
679
for d in dir_list:
709
681
wt, dd = WorkingTree.open_containing(d)
710
base = os.path.dirname(dd)
711
id = wt.path2id(base)
715
self.outf.write('added %s\n' % d)
717
raise errors.NotVersionedError(path=base)
683
self.outf.write('added %s\n' % d)
720
686
class cmd_relpath(Command):
721
__doc__ = """Show path of a file relative to root"""
687
"""Show path of a file relative to root"""
723
689
takes_args = ['filename']
987
953
tree_to = WorkingTree.open_containing(directory)[0]
988
954
branch_to = tree_to.branch
990
self.add_cleanup(tree_to.unlock)
991
955
except errors.NoWorkingTree:
993
957
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
997
959
if local and not branch_to.get_bound_location():
998
960
raise errors.LocalRequiresBoundBranch()
1030
992
branch_from = Branch.open(location,
1031
993
possible_transports=possible_transports)
995
if branch_to.get_parent() is None or remember:
996
branch_to.set_parent(branch_from.base)
998
if branch_from is not branch_to:
1032
999
branch_from.lock_read()
1033
1000
self.add_cleanup(branch_from.unlock)
1035
if branch_to.get_parent() is None or remember:
1036
branch_to.set_parent(branch_from.base)
1038
1001
if revision is not None:
1039
1002
revision_id = revision.as_revision_id(branch_from)
1004
branch_to.lock_write()
1005
self.add_cleanup(branch_to.unlock)
1041
1006
if tree_to is not None:
1042
1007
view_info = _get_view_info_for_change_reporter(tree_to)
1043
1008
change_reporter = delta._ChangeReporter(
1125
1090
# Get the source branch
1126
1091
(tree, br_from,
1127
1092
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1094
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1095
if strict is None: strict = True # default value
1128
1096
# Get the tip's revision_id
1129
1097
revision = _get_one_revision('push', revision)
1130
1098
if revision is not None:
1131
1099
revision_id = revision.in_history(br_from).rev_id
1133
1101
revision_id = None
1134
if tree is not None and revision_id is None:
1135
tree.check_changed_or_out_of_date(
1136
strict, 'push_strict',
1137
more_error='Use --no-strict to force the push.',
1138
more_warning='Uncommitted changes will not be pushed.')
1102
if strict and tree is not None and revision_id is None:
1103
if (tree.has_changes()):
1104
raise errors.UncommittedChanges(
1105
tree, more='Use --no-strict to force the push.')
1106
if tree.last_revision() != tree.branch.last_revision():
1107
# The tree has lost sync with its branch, there is little
1108
# chance that the user is aware of it but he can still force
1109
# the push with --no-strict
1110
raise errors.OutOfDateTree(
1111
tree, more='Use --no-strict to force the push.')
1139
1113
# Get the stacked_on branch, if any
1140
1114
if stacked_on is not None:
1141
1115
stacked_on = urlutils.normalize_url(stacked_on)
1175
1149
class cmd_branch(Command):
1176
__doc__ = """Create a new branch that is a copy of an existing branch.
1150
"""Create a new branch that is a copy of an existing branch.
1178
1152
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1179
1153
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
1206
1180
' directory exists, but does not already'
1207
1181
' have a control directory. This flag will'
1208
1182
' allow branch to proceed.'),
1210
help="Bind new branch to from location."),
1212
1184
aliases = ['get', 'clone']
1214
1186
def run(self, from_location, to_location=None, revision=None,
1215
1187
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1188
use_existing_dir=False, switch=False):
1217
1189
from bzrlib import switch as _mod_switch
1218
1190
from bzrlib.tag import _merge_tags_if_possible
1219
1191
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1272
1244
except (errors.NotStacked, errors.UnstackableBranchFormat,
1273
1245
errors.UnstackableRepositoryFormat), e:
1274
1246
note('Branched %d revision(s).' % branch.revno())
1276
# Bind to the parent
1277
parent_branch = Branch.open(from_location)
1278
branch.bind(parent_branch)
1279
note('New branch bound to %s' % from_location)
1281
1248
# Switch to the new branch
1282
1249
wt, _ = WorkingTree.open_containing('.')
1288
1255
class cmd_checkout(Command):
1289
__doc__ = """Create a new checkout of an existing branch.
1256
"""Create a new checkout of an existing branch.
1291
1258
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1292
1259
the branch found in '.'. This is useful if you have removed the working tree
1389
1356
class cmd_update(Command):
1390
__doc__ = """Update a tree to have the latest code committed to its branch.
1357
"""Update a tree to have the latest code committed to its branch.
1392
1359
This will perform a merge into the working tree, and may generate
1393
1360
conflicts. If you have any local changes, you will still
1422
1389
branch_location = tree.branch.base
1423
1390
self.add_cleanup(tree.unlock)
1424
1391
# get rid of the final '/' and be ready for display
1425
branch_location = urlutils.unescape_for_display(
1426
branch_location.rstrip('/'),
1392
branch_location = urlutils.unescape_for_display(branch_location[:-1],
1428
1394
existing_pending_merges = tree.get_parent_ids()[1:]
1429
1395
if master is None:
1439
1405
revision_id = branch.last_revision()
1440
1406
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1441
revno = branch.revision_id_to_dotted_revno(revision_id)
1442
note("Tree is up to date at revision %s of branch %s" %
1443
('.'.join(map(str, revno)), branch_location))
1407
revno = branch.revision_id_to_revno(revision_id)
1408
note("Tree is up to date at revision %d of branch %s" %
1409
(revno, branch_location))
1445
1411
view_info = _get_view_info_for_change_reporter(tree)
1446
1412
change_reporter = delta._ChangeReporter(
1458
1424
"bzr update --revision only works"
1459
1425
" for a revision in the branch history"
1460
1426
% (e.revision))
1461
revno = tree.branch.revision_id_to_dotted_revno(
1427
revno = tree.branch.revision_id_to_revno(
1462
1428
_mod_revision.ensure_null(tree.last_revision()))
1463
note('Updated to revision %s of branch %s' %
1464
('.'.join(map(str, revno)), branch_location))
1465
parent_ids = tree.get_parent_ids()
1466
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1429
note('Updated to revision %d of branch %s' %
1430
(revno, branch_location))
1431
if tree.get_parent_ids()[1:] != existing_pending_merges:
1467
1432
note('Your local commits will now show as pending merges with '
1468
1433
"'bzr status', and can be committed with 'bzr commit'.")
1469
1434
if conflicts != 0:
1475
1440
class cmd_info(Command):
1476
__doc__ = """Show information about a working tree, branch or repository.
1441
"""Show information about a working tree, branch or repository.
1478
1443
This command will show all known locations and formats associated to the
1479
1444
tree, branch or repository.
1573
1538
class cmd_file_id(Command):
1574
__doc__ = """Print file_id of a particular file or directory.
1539
"""Print file_id of a particular file or directory.
1576
1541
The file_id is assigned when the file is first added and remains the
1577
1542
same through all revisions where the file exists, even when it is
1595
1560
class cmd_file_path(Command):
1596
__doc__ = """Print path of file_ids to a file or directory.
1561
"""Print path of file_ids to a file or directory.
1598
1563
This prints one line for each directory down to the target,
1599
1564
starting at the branch root.
1661
1626
class cmd_ancestry(Command):
1662
__doc__ = """List all revisions merged into this branch."""
1627
"""List all revisions merged into this branch."""
1664
1629
_see_also = ['log', 'revision-history']
1665
1630
takes_args = ['location?']
1795
1760
class cmd_init_repository(Command):
1796
__doc__ = """Create a shared repository for branches to share storage space.
1761
"""Create a shared repository for branches to share storage space.
1798
1763
New branches created under the repository directory will store their
1799
1764
revisions in the repository, not in the branch directory. For branches
1855
1820
class cmd_diff(Command):
1856
__doc__ = """Show differences in the working tree, between revisions or branches.
1821
"""Show differences in the working tree, between revisions or branches.
1858
1823
If no arguments are given, all changes for the current tree are listed.
1859
1824
If files are given, only the changes in those files are listed.
1945
1910
help='Use this command to compare files.',
1948
RegistryOption('format',
1949
help='Diff format to use.',
1950
lazy_registry=('bzrlib.diff', 'format_registry'),
1951
value_switches=False, title='Diff format'),
1953
1914
aliases = ['di', 'dif']
1954
1915
encoding_type = 'exact'
1956
1917
@display_command
1957
1918
def run(self, revision=None, file_list=None, diff_options=None,
1958
prefix=None, old=None, new=None, using=None, format=None):
1959
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1919
prefix=None, old=None, new=None, using=None):
1920
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1962
1922
if (prefix is None) or (prefix == '0'):
1963
1923
# diff -p0 format
1977
1937
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1938
' one or two revision specifiers')
1980
if using is not None and format is not None:
1981
raise errors.BzrCommandError('--using and --format are mutually '
1984
1940
(old_tree, new_tree,
1985
1941
old_branch, new_branch,
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1942
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1943
file_list, revision, old, new, apply_view=True)
1988
1944
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1945
specific_files=specific_files,
1990
1946
external_diff_options=diff_options,
1991
1947
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1948
extra_trees=extra_trees, using=using)
1996
1951
class cmd_deleted(Command):
1997
__doc__ = """List files deleted in the working tree.
1952
"""List files deleted in the working tree.
1999
1954
# TODO: Show files deleted since a previous revision, or
2000
1955
# between two revisions.
2229
2184
:Tips & tricks:
2231
2186
GUI tools and IDEs are often better at exploring history than command
2232
line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2233
bzr-explorer shell, or the Loggerhead web interface. See the Plugin
2234
Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2235
<http://wiki.bazaar.canonical.com/IDEIntegration>.
2187
line tools. You may prefer qlog or glog from the QBzr and Bzr-Gtk packages
2188
respectively for example. (TortoiseBzr uses qlog for displaying logs.) See
2189
http://bazaar-vcs.org/BzrPlugins and http://bazaar-vcs.org/IDEIntegration.
2191
Web interfaces are often better at exploring history than command line
2192
tools, particularly for branches on servers. You may prefer Loggerhead
2193
or one of its alternatives. See http://bazaar-vcs.org/WebInterface.
2237
2195
You may find it useful to add the aliases below to ``bazaar.conf``::
2299
2257
help='Show changes made in each revision as a patch.'),
2300
2258
Option('include-merges',
2301
2259
help='Show merged revisions like --levels 0 does.'),
2302
Option('exclude-common-ancestry',
2303
help='Display only the revisions that are not part'
2304
' of both ancestries (require -rX..Y)'
2307
2261
encoding_type = 'replace'
2320
2274
show_diff=False,
2321
include_merges=False,
2322
exclude_common_ancestry=False,
2275
include_merges=False):
2324
2276
from bzrlib.log import (
2326
2278
make_log_request_dict,
2327
2279
_get_info_for_log_files,
2329
2281
direction = (forward and 'forward') or 'reverse'
2330
if (exclude_common_ancestry
2331
and (revision is None or len(revision) != 2)):
2332
raise errors.BzrCommandError(
2333
'--exclude-common-ancestry requires -r with two revisions')
2334
2282
if include_merges:
2335
2283
if levels is None:
2429
2377
direction=direction, specific_fileids=file_ids,
2430
2378
start_revision=rev1, end_revision=rev2, limit=limit,
2431
2379
message_search=message, delta_type=delta_type,
2432
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2433
exclude_common_ancestry=exclude_common_ancestry,
2380
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2435
2381
Logger(b, rqst).show(lf)
2456
2402
raise errors.BzrCommandError(
2457
2403
"bzr %s doesn't accept two revisions in different"
2458
2404
" branches." % command_name)
2459
if start_spec.spec is None:
2460
# Avoid loading all the history.
2461
rev1 = RevisionInfo(branch, None, None)
2463
rev1 = start_spec.in_history(branch)
2405
rev1 = start_spec.in_history(branch)
2464
2406
# Avoid loading all of history when we know a missing
2465
2407
# end of range means the last revision ...
2466
2408
if end_spec.spec is None:
2660
2602
After adding, editing or deleting that file either indirectly by
2661
2603
using this command or directly by using an editor, be sure to commit
2664
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2665
the global ignore file can be found in the application data directory as
2666
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2667
Global ignores are not touched by this command. The global ignore file
2668
can be edited directly using an editor.
2670
Patterns prefixed with '!' are exceptions to ignore patterns and take
2671
precedence over regular ignores. Such exceptions are used to specify
2672
files that should be versioned which would otherwise be ignored.
2674
Patterns prefixed with '!!' act as regular ignore patterns, but have
2675
precedence over the '!' exception patterns.
2677
2606
Note: ignore patterns containing shell wildcards must be quoted from
2678
2607
the shell on Unix.
2701
2626
Ignore everything but the "debian" toplevel directory::
2703
2628
bzr ignore "RE:(?!debian/).*"
2705
Ignore everything except the "local" toplevel directory,
2706
but always ignore "*~" autosave files, even under local/::
2709
bzr ignore "!./local"
2713
2631
_see_also = ['status', 'ignored', 'patterns']
2714
2632
takes_args = ['name_pattern*']
2715
2633
takes_options = [
2716
Option('default-rules',
2717
help='Display the default ignore rules that bzr uses.')
2634
Option('old-default-rules',
2635
help='Write out the ignore rules bzr < 0.9 always used.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2638
def run(self, name_pattern_list=None, old_default_rules=None):
2721
2639
from bzrlib import ignores
2722
if default_rules is not None:
2723
# dump the default rules and exit
2724
for pattern in ignores.USER_DEFAULTS:
2725
self.outf.write("%s\n" % pattern)
2640
if old_default_rules is not None:
2641
# dump the rules and exit
2642
for pattern in ignores.OLD_DEFAULTS:
2727
2645
if not name_pattern_list:
2728
2646
raise errors.BzrCommandError("ignore requires at least one "
2729
"NAME_PATTERN or --default-rules.")
2647
"NAME_PATTERN or --old-default-rules")
2730
2648
name_pattern_list = [globbing.normalize_pattern(p)
2731
2649
for p in name_pattern_list]
2732
2650
for name_pattern in name_pattern_list:
2744
2662
if id is not None:
2745
2663
filename = entry[0]
2746
2664
if ignored.match(filename):
2747
matches.append(filename)
2665
matches.append(filename.encode('utf-8'))
2749
2667
if len(matches) > 0:
2750
self.outf.write("Warning: the following files are version controlled and"
2751
" match your ignore pattern:\n%s"
2752
"\nThese files will continue to be version controlled"
2753
" unless you 'bzr remove' them.\n" % ("\n".join(matches),))
2668
print "Warning: the following files are version controlled and" \
2669
" match your ignore pattern:\n%s" \
2670
"\nThese files will continue to be version controlled" \
2671
" unless you 'bzr remove' them." % ("\n".join(matches),)
2756
2674
class cmd_ignored(Command):
2757
__doc__ = """List ignored files and the patterns that matched them.
2675
"""List ignored files and the patterns that matched them.
2759
2677
List all the ignored files and the ignore pattern that caused the file to
2795
2713
revno = int(revno)
2796
2714
except ValueError:
2797
raise errors.BzrCommandError("not a valid revision-number: %r"
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2800
self.outf.write("%s\n" % revid)
2715
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2717
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2803
2720
class cmd_export(Command):
2804
__doc__ = """Export current or past revision to a destination directory or archive.
2721
"""Export current or past revision to a destination directory or archive.
2806
2723
If no revision is specified this exports the last committed revision.
2841
2758
help="Name of the root directory inside the exported file."),
2842
Option('per-file-timestamps',
2843
help='Set modification time of files to that of the last '
2844
'revision in which it was changed.'),
2846
2760
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2761
root=None, filters=False):
2848
2762
from bzrlib.export import export
2850
2764
if branch_or_subdir is None:
2858
2772
rev_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
2860
export(rev_tree, dest, format, root, subdir, filtered=filters,
2861
per_file_timestamps=per_file_timestamps)
2774
export(rev_tree, dest, format, root, subdir, filtered=filters)
2862
2775
except errors.NoSuchExportFormat, e:
2863
2776
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2866
2779
class cmd_cat(Command):
2867
__doc__ = """Write the contents of a file as of a given revision to standard output.
2780
"""Write the contents of a file as of a given revision to standard output.
2869
2782
If no revision is nominated, the last revision is used.
2942
2853
chunks = content.splitlines(True)
2943
2854
content = filtered_output_bytes(chunks, filters,
2944
2855
ContentFilterContext(relpath, rev_tree))
2946
2856
self.outf.writelines(content)
2949
2858
self.outf.write(content)
2952
2861
class cmd_local_time_offset(Command):
2953
__doc__ = """Show the offset in seconds from GMT to local time."""
2862
"""Show the offset in seconds from GMT to local time."""
2955
2864
@display_command
2957
self.outf.write("%s\n" % osutils.local_time_offset())
2866
print osutils.local_time_offset()
2961
2870
class cmd_commit(Command):
2962
__doc__ = """Commit changes into a new revision.
2871
"""Commit changes into a new revision.
2964
2873
An explanatory message needs to be given for each commit. This is
2965
2874
often done by using the --message option (getting the message from the
3073
2982
"the master branch until a normal commit "
3074
2983
"is performed."
3076
Option('show-diff', short_name='p',
3077
2986
help='When no message is supplied, show the diff along'
3078
2987
' with the status summary in the message editor.'),
3159
3068
'(use --file "%(f)s" to take commit message from that file)'
3160
3069
% { 'f': message })
3161
3070
ui.ui_factory.show_warning(warning_msg)
3163
message = message.replace('\r\n', '\n')
3164
message = message.replace('\r', '\n')
3166
raise errors.BzrCommandError(
3167
"please specify either --message or --file")
3169
3072
def get_message(commit_obj):
3170
3073
"""Callback to get commit message"""
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3174
elif message is not None:
3175
my_message = message
3177
# No message supplied: make one up.
3178
# text is the status of the tree
3179
text = make_commit_message_template_encoded(tree,
3074
my_message = message
3075
if my_message is not None and '\r' in my_message:
3076
my_message = my_message.replace('\r\n', '\n')
3077
my_message = my_message.replace('\r', '\n')
3078
if my_message is None and not file:
3079
t = make_commit_message_template_encoded(tree,
3180
3080
selected_list, diff=show_diff,
3181
3081
output_encoding=osutils.get_user_encoding())
3182
# start_message is the template generated from hooks
3183
# XXX: Warning - looks like hooks return unicode,
3184
# make_commit_message_template_encoded returns user encoding.
3185
# We probably want to be using edit_commit_message instead to
3187
3082
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3083
my_message = edit_commit_message_encoded(t,
3189
3084
start_message=start_message)
3190
3085
if my_message is None:
3191
3086
raise errors.BzrCommandError("please specify a commit"
3192
3087
" message with either --message or --file")
3088
elif my_message and file:
3089
raise errors.BzrCommandError(
3090
"please specify either --message or --file")
3092
my_message = codecs.open(file, 'rt',
3093
osutils.get_user_encoding()).read()
3193
3094
if my_message == "":
3194
3095
raise errors.BzrCommandError("empty commit message specified")
3195
3096
return my_message
3207
3108
timezone=offset,
3208
3109
exclude=safe_relpath_files(tree, exclude))
3209
3110
except PointlessCommit:
3111
# FIXME: This should really happen before the file is read in;
3112
# perhaps prepare the commit; get the message; then actually commit
3210
3113
raise errors.BzrCommandError("No changes to commit."
3211
3114
" Use --unchanged to commit anyhow.")
3212
3115
except ConflictsInTree:
3217
3120
raise errors.BzrCommandError("Commit refused because there are"
3218
3121
" unknown files in the working tree.")
3219
3122
except errors.BoundBranchOutOfDate, e:
3220
e.extra_help = ("\n"
3221
'To commit to master branch, run update and then commit.\n'
3222
'You can also pass --local to commit to continue working '
3123
raise errors.BzrCommandError(str(e) + "\n"
3124
'To commit to master branch, run update and then commit.\n'
3125
'You can also pass --local to commit to continue working '
3227
3129
class cmd_check(Command):
3228
__doc__ = """Validate working tree structure, branch consistency and repository history.
3130
"""Validate working tree structure, branch consistency and repository history.
3230
3132
This command checks various invariants about branch and repository storage
3231
3133
to detect data corruption or bzr bugs.
3390
3292
@display_command
3391
3293
def printme(self, branch):
3392
self.outf.write('%s\n' % branch.nick)
3395
3297
class cmd_alias(Command):
3396
__doc__ = """Set/unset and display aliases.
3298
"""Set/unset and display aliases.
3399
3301
Show the current aliases::
3465
3367
class cmd_selftest(Command):
3466
__doc__ = """Run internal test suite.
3368
"""Run internal test suite.
3468
3370
If arguments are given, they are regular expressions that say which tests
3469
3371
should run. Tests matching any expression are run, and other tests are
3513
3415
def get_transport_type(typestring):
3514
3416
"""Parse and return a transport specifier."""
3515
3417
if typestring == "sftp":
3516
from bzrlib.tests import stub_sftp
3517
return stub_sftp.SFTPAbsoluteServer
3418
from bzrlib.transport.sftp import SFTPAbsoluteServer
3419
return SFTPAbsoluteServer
3518
3420
if typestring == "memory":
3519
from bzrlib.tests import test_server
3520
return memory.MemoryServer
3421
from bzrlib.transport.memory import MemoryServer
3521
3423
if typestring == "fakenfs":
3522
from bzrlib.tests import test_server
3523
return test_server.FakeNFSServer
3424
from bzrlib.transport.fakenfs import FakeNFSServer
3425
return FakeNFSServer
3524
3426
msg = "No known transport type %s. Supported types are: sftp\n" %\
3526
3428
raise errors.BzrCommandError(msg)
3610
3512
raise errors.BzrCommandError("subunit not available. subunit "
3611
3513
"needs to be installed to use --subunit.")
3612
3514
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3516
self.additional_selftest_args.setdefault(
3620
3517
'suite_decorators', []).append(parallel)
3670
3567
class cmd_rocks(Command):
3671
__doc__ = """Statement of optimism."""
3568
"""Statement of optimism."""
3675
3572
@display_command
3677
self.outf.write("It sure does!\n")
3574
print "It sure does!"
3680
3577
class cmd_find_merge_base(Command):
3681
__doc__ = """Find and print a base revision for merging two branches."""
3578
"""Find and print a base revision for merging two branches."""
3682
3579
# TODO: Options to specify revisions on either side, as if
3683
3580
# merging only part of the history.
3684
3581
takes_args = ['branch', 'other']
3700
3597
graph = branch1.repository.get_graph(branch2.repository)
3701
3598
base_rev_id = graph.find_unique_lca(last1, last2)
3703
self.outf.write('merge base is revision %s\n' % base_rev_id)
3600
print 'merge base is revision %s' % base_rev_id
3706
3603
class cmd_merge(Command):
3707
__doc__ = """Perform a three-way merge.
3604
"""Perform a three-way merge.
3709
3606
The source of the merge can be specified either in the form of a branch,
3710
3607
or in the form of a path to a file containing a merge directive generated
3739
3636
committed to record the result of the merge.
3741
3638
merge refuses to run if there are any uncommitted changes, unless
3742
--force is given. The --force option can also be used to create a
3743
merge revision which has more than two parents.
3745
If one would like to merge changes from the working tree of the other
3746
branch without merging any committed revisions, the --uncommitted option
3749
3641
To select only some changes to merge, use "merge -i", which will prompt
3750
3642
you to apply each diff hunk and file change, similar to "shelve".
3854
3739
raise errors.BzrCommandError(
3855
3740
'Cannot use -r with merge directives or bundles')
3856
3741
merger, verified = _mod_merge.Merger.from_mergeable(tree,
3859
3744
if merger is None and uncommitted:
3860
3745
if revision is not None and len(revision) > 0:
3861
3746
raise errors.BzrCommandError('Cannot use --uncommitted and'
3862
3747
' --revision at the same time.')
3863
merger = self.get_merger_from_uncommitted(tree, location, None)
3748
merger = self.get_merger_from_uncommitted(tree, location, pb)
3864
3749
allow_pending = False
3866
3751
if merger is None:
3867
3752
merger, allow_pending = self._get_merger_from_branch(tree,
3868
location, revision, remember, possible_transports, None)
3753
location, revision, remember, possible_transports, pb)
3870
3755
merger.merge_type = merge_type
3871
3756
merger.reprocess = reprocess
4097
3982
def run(self, file_list=None, merge_type=None, show_base=False,
4098
3983
reprocess=False):
4099
from bzrlib.conflicts import restore
4100
3984
if merge_type is None:
4101
3985
merge_type = _mod_merge.Merge3Merger
4102
3986
tree, file_list = tree_files(file_list)
4143
4027
# list, we imply that the working tree text has seen and rejected
4144
4028
# all the changes from the other tree, when in fact those changes
4145
4029
# have not yet been seen.
4030
pb = ui.ui_factory.nested_progress_bar()
4146
4031
tree.set_parent_ids(parents[:1])
4148
merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4033
merger = _mod_merge.Merger.from_revision_ids(pb,
4149
4035
merger.interesting_ids = interesting_ids
4150
4036
merger.merge_type = merge_type
4151
4037
merger.show_base = show_base
4162
4049
class cmd_revert(Command):
4163
__doc__ = """Revert files to a previous revision.
4050
"""Revert files to a previous revision.
4165
4052
Giving a list of files will revert only those files. Otherwise, all files
4166
4053
will be reverted. If the revision is not specified with '--revision', the
4185
4072
created as above. Directories containing unknown files will not be
4188
The working tree contains a list of revisions that have been merged but
4189
not yet committed. These revisions will be included as additional parents
4190
of the next commit. Normally, using revert clears that list as well as
4191
reverting the files. If any files are specified, revert leaves the list
4192
of uncommitted merges alone and reverts only the files. Use ``bzr revert
4193
.`` in the tree root to revert all files but keep the recorded merges,
4194
and ``bzr revert --forget-merges`` to clear the pending merge list without
4075
The working tree contains a list of pending merged revisions, which will
4076
be included as parents in the next commit. Normally, revert clears that
4077
list as well as reverting the files. If any files are specified, revert
4078
leaves the pending merge list alone and reverts only the files. Use "bzr
4079
revert ." in the tree root to revert all files but keep the merge record,
4080
and "bzr revert --forget-merges" to clear the pending merge list without
4195
4081
reverting any files.
4197
Using "bzr revert --forget-merges", it is possible to apply all of the
4198
changes from a branch in a single revision. To do this, perform the merge
4199
as desired. Then doing revert with the "--forget-merges" option will keep
4200
the content of the tree as it was, but it will clear the list of pending
4201
merges. The next commit will then contain all of the changes that are
4202
present in the other branch, but without any other parent revisions.
4203
Because this technique forgets where these changes originated, it may
4204
cause additional conflicts on later merges involving the same source and
4083
Using "bzr revert --forget-merges", it is possible to apply the changes
4084
from an arbitrary merge as a single revision. To do this, perform the
4085
merge as desired. Then doing revert with the "--forget-merges" option will
4086
keep the content of the tree as it was, but it will clear the list of
4087
pending merges. The next commit will then contain all of the changes that
4088
would have been in the merge, but without any mention of the other parent
4089
revisions. Because this technique forgets where these changes originated,
4090
it may cause additional conflicts on later merges involving the source and
4205
4091
target branches.
4217
4103
def run(self, revision=None, no_backup=False, file_list=None,
4218
4104
forget_merges=None):
4219
4105
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4221
4107
self.add_cleanup(tree.unlock)
4222
4108
if forget_merges:
4223
4109
tree.set_parent_ids(tree.get_parent_ids()[:1])
4228
4114
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
4229
4115
rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4230
tree.revert(file_list, rev_tree, not no_backup, None,
4231
report_changes=True)
4116
pb = ui.ui_factory.nested_progress_bar()
4118
tree.revert(file_list, rev_tree, not no_backup, pb,
4119
report_changes=True)
4234
4124
class cmd_assert_fail(Command):
4235
__doc__ = """Test reporting of assertion failures"""
4125
"""Test reporting of assertion failures"""
4236
4126
# intended just for use in testing
4377
4264
remote_branch = Branch.open(other_branch)
4378
4265
if remote_branch.base == local_branch.base:
4379
4266
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4268
local_branch.lock_read()
4269
self.add_cleanup(local_branch.unlock)
4384
4270
local_revid_range = _revision_range_to_revid_range(
4385
4271
_get_revision_range(my_revision, local_branch,
4274
remote_branch.lock_read()
4275
self.add_cleanup(remote_branch.unlock)
4388
4276
remote_revid_range = _revision_range_to_revid_range(
4389
4277
_get_revision_range(revision,
4390
4278
remote_branch, self.name()))
4451
4339
class cmd_pack(Command):
4452
__doc__ = """Compress the data within a repository.
4454
This operation compresses the data within a bazaar repository. As
4455
bazaar supports automatic packing of repository, this operation is
4456
normally not required to be done manually.
4458
During the pack operation, bazaar takes a backup of existing repository
4459
data, i.e. pack files. This backup is eventually removed by bazaar
4460
automatically when it is safe to do so. To save disk space by removing
4461
the backed up pack files, the --clean-obsolete-packs option may be
4464
Warning: If you use --clean-obsolete-packs and your machine crashes
4465
during or immediately after repacking, you may be left with a state
4466
where the deletion has been written to disk but the new packs have not
4467
been. In this case the repository may be unusable.
4340
"""Compress the data within a repository."""
4470
4342
_see_also = ['repositories']
4471
4343
takes_args = ['branch_or_repo?']
4473
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4476
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4345
def run(self, branch_or_repo='.'):
4477
4346
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4479
4348
branch = dir.open_branch()
4480
4349
repository = branch.repository
4481
4350
except errors.NotBranchError:
4482
4351
repository = dir.open_repository()
4483
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4486
4355
class cmd_plugins(Command):
4487
__doc__ = """List the installed plugins.
4356
"""List the installed plugins.
4489
4358
This command displays the list of installed plugins including
4490
4359
version of plugin and a short description of each.
4497
4366
adding new commands, providing additional network transports and
4498
4367
customizing log output.
4500
See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
4501
for further information on plugins including where to find them and how to
4502
install them. Instructions are also provided there on how to write new
4503
plugins using the Python programming language.
4369
See the Bazaar web site, http://bazaar-vcs.org, for further
4370
information on plugins including where to find them and how to
4371
install them. Instructions are also provided there on how to
4372
write new plugins using the Python programming language.
4505
4374
takes_options = ['verbose']
4521
4390
doc = '(no description)'
4522
4391
result.append((name_ver, doc, plugin.path()))
4523
4392
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
4531
4400
class cmd_testament(Command):
4532
__doc__ = """Show testament (signing-form) of a revision."""
4401
"""Show testament (signing-form) of a revision."""
4533
4402
takes_options = [
4535
4404
Option('long', help='Produce long-format testament.'),
4563
4432
class cmd_annotate(Command):
4564
__doc__ = """Show the origin of each line in a file.
4433
"""Show the origin of each line in a file.
4566
4435
This prints out the given file with an annotation on the left side
4567
4436
indicating which revision, author and date introduced the change.
4682
4551
class cmd_bind(Command):
4683
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4684
If no branch is supplied, rebind to the last bound location.
4552
"""Convert the current branch into a checkout of the supplied branch.
4686
4554
Once converted into a checkout, commits must succeed on the master branch
4687
4555
before they will be applied to the local branch.
4705
4573
'This format does not remember old locations.')
4707
4575
if location is None:
4708
if b.get_bound_location() is not None:
4709
raise errors.BzrCommandError('Branch is already bound')
4711
raise errors.BzrCommandError('No location supplied '
4712
'and no previous location known')
4576
raise errors.BzrCommandError('No location supplied and no '
4577
'previous location known')
4713
4578
b_other = Branch.open(location)
4715
4580
b.bind(b_other)
4723
4588
class cmd_unbind(Command):
4724
__doc__ = """Convert the current checkout into a regular branch.
4589
"""Convert the current checkout into a regular branch.
4726
4591
After unbinding, the local branch is considered independent and subsequent
4727
4592
commits will be local only.
4740
4605
class cmd_uncommit(Command):
4741
__doc__ = """Remove the last committed revision.
4606
"""Remove the last committed revision.
4743
4608
--verbose will print out what is being removed.
4744
4609
--dry-run will go through all the motions, but not actually
4827
4692
end_revision=last_revno)
4830
self.outf.write('Dry-run, pretending to remove'
4831
' the above revisions.\n')
4695
print 'Dry-run, pretending to remove the above revisions.'
4697
val = raw_input('Press <enter> to continue')
4833
self.outf.write('The above revision(s) will be removed.\n')
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
4699
print 'The above revision(s) will be removed.'
4701
val = raw_input('Are you sure [y/N]? ')
4702
if val.lower() not in ('y', 'yes'):
4840
4706
mutter('Uncommitting from {%s} to {%s}',
4841
4707
last_rev_id, rev_id)
4842
4708
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
4709
revno=revno, local=local)
4844
self.outf.write('You can restore the old tip by running:\n'
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
4710
note('You can restore the old tip by running:\n'
4711
' bzr pull . -r revid:%s', last_rev_id)
4848
4714
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
4715
"""Break a dead lock on a repository, branch or working directory.
4851
4717
CAUTION: Locks should only be broken when you are sure that the process
4852
4718
holding the lock has been stopped.
4854
You can get information on what locks are open via the 'bzr info
4855
[location]' command.
4720
You can get information on what locks are open via the 'bzr info' command.
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
4861
4725
takes_args = ['location?']
4999
4863
class cmd_split(Command):
5000
__doc__ = """Split a subdirectory of a tree into a separate tree.
4864
"""Split a subdirectory of a tree into a separate tree.
5002
4866
This command will produce a target tree in a format that supports
5003
4867
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
5025
4889
class cmd_merge_directive(Command):
5026
__doc__ = """Generate a merge directive for auto-merge tools.
4890
"""Generate a merge directive for auto-merge tools.
5028
4892
A directive requests a merge to be performed, and also provides all the
5029
4893
information necessary to do so. This means it must either include a
5134
4998
directly from the merge directive, without retrieving data from a
5137
`bzr send` creates a compact data set that, when applied using bzr
5138
merge, has the same effect as merging from the source branch.
5140
By default the merge directive is self-contained and can be applied to any
5141
branch containing submit_branch in its ancestory without needing access to
5144
If --no-bundle is specified, then Bazaar doesn't send the contents of the
5145
revisions, but only a structured request to merge from the
5146
public_location. In that case the public_branch is needed and it must be
5147
up-to-date and accessible to the recipient. The public_branch is always
5148
included if known, so that people can check it later.
5150
The submit branch defaults to the parent of the source branch, but can be
5151
overridden. Both submit branch and public branch will be remembered in
5152
branch.conf the first time they are used for a particular branch. The
5153
source branch defaults to that containing the working directory, but can
5154
be changed using --from.
5156
In order to calculate those changes, bzr must analyse the submit branch.
5157
Therefore it is most efficient for the submit branch to be a local mirror.
5158
If a public location is known for the submit_branch, that location is used
5159
in the merge directive.
5161
The default behaviour is to send the merge directive by mail, unless -o is
5162
given, in which case it is sent to a file.
5001
If --no-bundle is specified, then public_branch is needed (and must be
5002
up-to-date), so that the receiver can perform the merge using the
5003
public_branch. The public_branch is always included if known, so that
5004
people can check it later.
5006
The submit branch defaults to the parent, but can be overridden. Both
5007
submit branch and public branch will be remembered if supplied.
5009
If a public_branch is known for the submit_branch, that public submit
5010
branch is used in the merge instructions. This means that a local mirror
5011
can be used as your actual submit branch, once you have set public_branch
5164
5014
Mail is sent using your preferred mail program. This should be transparent
5165
5015
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5186
5036
The merge directives created by bzr send may be applied using bzr merge or
5187
5037
bzr pull by specifying a file containing a merge directive as the location.
5189
bzr send makes extensive use of public locations to map local locations into
5190
URLs that can be used by other people. See `bzr help configuration` to
5191
set them, and use `bzr info` to display them.
5194
5040
encoding_type = 'exact'
5314
5160
class cmd_tag(Command):
5315
__doc__ = """Create, remove or modify a tag naming a revision.
5161
"""Create, remove or modify a tag naming a revision.
5317
5163
Tags give human-meaningful names to revisions. Commands that take a -r
5318
5164
(--revision) option can be given -rtag:X, where X is any previously
5327
5173
To rename a tag (change the name but keep it on the same revsion), run ``bzr
5328
5174
tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5330
If no tag name is specified it will be determined through the
5331
'automatic_tag_name' hook. This can e.g. be used to automatically tag
5332
upstream releases by reading configure.ac. See ``bzr help hooks`` for
5336
5177
_see_also = ['commit', 'tags']
5337
takes_args = ['tag_name?']
5178
takes_args = ['tag_name']
5338
5179
takes_options = [
5339
5180
Option('delete',
5340
5181
help='Delete this tag rather than placing it.',
5373
5212
revision_id = revision[0].as_revision_id(branch)
5375
5214
revision_id = branch.last_revision()
5376
if tag_name is None:
5377
tag_name = branch.automatic_tag_name(revision_id)
5378
if tag_name is None:
5379
raise errors.BzrCommandError(
5380
"Please specify a tag name.")
5381
5215
if (not force) and branch.tags.has_tag(tag_name):
5382
5216
raise errors.TagAlreadyExists(tag_name)
5383
5217
branch.tags.set_tag(tag_name, revision_id)
5552
5386
class cmd_switch(Command):
5553
__doc__ = """Set the branch of a checkout and update.
5387
"""Set the branch of a checkout and update.
5555
5389
For lightweight checkouts, this changes the branch being referenced.
5556
5390
For heavyweight checkouts, this checks that there are no local commits
5572
5406
that of the master.
5575
takes_args = ['to_location?']
5409
takes_args = ['to_location']
5576
5410
takes_options = [Option('force',
5577
5411
help='Switch even if local commits will be lost.'),
5579
5412
Option('create-branch', short_name='b',
5580
5413
help='Create the target branch from this one before'
5581
5414
' switching to it.'),
5584
def run(self, to_location=None, force=False, create_branch=False,
5417
def run(self, to_location, force=False, create_branch=False):
5586
5418
from bzrlib import switch
5587
5419
tree_location = '.'
5588
revision = _get_one_revision('switch', revision)
5589
5420
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
if to_location is None:
5591
if revision is None:
5592
raise errors.BzrCommandError('You must supply either a'
5593
' revision or a location')
5596
5422
branch = control_dir.open_branch()
5597
5423
had_explicit_nick = branch.get_config().has_explicit_nickname()
5611
5437
to_branch = branch.bzrdir.sprout(to_location,
5612
5438
possible_transports=[branch.bzrdir.root_transport],
5613
5439
source_branch=branch).open_branch()
5441
# from_branch = control_dir.open_branch()
5442
# except errors.NotBranchError:
5443
# raise BzrCommandError('Cannot create a branch from this'
5444
# ' location when we cannot open this branch')
5445
# from_branch.bzrdir.sprout(
5616
5449
to_branch = Branch.open(to_location)
5618
5451
this_url = self._get_branch_location(control_dir)
5619
5452
to_branch = Branch.open(
5620
5453
urlutils.join(this_url, '..', to_location))
5621
if revision is not None:
5622
revision = revision.as_revision_id(to_branch)
5623
switch.switch(control_dir, to_branch, force, revision_id=revision)
5454
switch.switch(control_dir, to_branch, force)
5624
5455
if had_explicit_nick:
5625
5456
branch = control_dir.open_branch() #get the new branch!
5626
5457
branch.nick = to_branch.nick
5819
5650
self.outf.write(" <no hooks installed>\n")
5822
class cmd_remove_branch(Command):
5823
__doc__ = """Remove a branch.
5825
This will remove the branch from the specified location but
5826
will keep any working tree or repository in place.
5830
Remove the branch at repo/trunk::
5832
bzr remove-branch repo/trunk
5836
takes_args = ["location?"]
5838
aliases = ["rmbranch"]
5840
def run(self, location=None):
5841
if location is None:
5843
branch = Branch.open_containing(location)[0]
5844
branch.bzrdir.destroy_branch()
5847
5653
class cmd_shelve(Command):
5848
__doc__ = """Temporarily set aside some changes from the current tree.
5654
"""Temporarily set aside some changes from the current tree.
5850
5656
Shelve allows you to temporarily put changes you've made "on the shelf",
5851
5657
ie. out of the way, until a later time when you can bring them back from
5922
5728
class cmd_unshelve(Command):
5923
__doc__ = """Restore shelved changes.
5729
"""Restore shelved changes.
5925
5731
By default, the most recently shelved changes are restored. However if you
5926
5732
specify a shelf by id those changes will be restored instead. This works
5934
5740
enum_switch=False, value_switches=True,
5935
5741
apply="Apply changes and remove from the shelf.",
5936
5742
dry_run="Show changes, but do not apply or remove them.",
5937
preview="Instead of unshelving the changes, show the diff that "
5938
"would result from unshelving.",
5939
5743
delete_only="Delete changes without applying them.",
5940
5744
keep="Apply changes but don't delete them.",
5954
5758
class cmd_clean_tree(Command):
5955
__doc__ = """Remove unwanted files from working tree.
5759
"""Remove unwanted files from working tree.
5957
5761
By default, only unknown files, not ignored files, are deleted. Versioned
5958
5762
files are never deleted.
5988
5792
class cmd_reference(Command):
5989
__doc__ = """list, view and set branch locations for nested trees.
5793
"""list, view and set branch locations for nested trees.
5991
5795
If no arguments are provided, lists the branch locations for nested trees.
5992
5796
If one argument is provided, display the branch location for that tree.
6032
5836
self.outf.write('%s %s\n' % (path, location))
6035
def _register_lazy_builtins():
6036
# register lazy builtins from other modules; called at startup and should
6037
# be only called once.
6038
for (name, aliases, module_name) in [
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
5839
# these get imported and then picked up by the scan for cmd_*
5840
# TODO: Some more consistent way to split command definitions across files;
5841
# we do need to load at least some information about them to know of
5842
# aliases. ideally we would avoid loading the implementation until the
5843
# details were needed.
5844
from bzrlib.cmd_version_info import cmd_version_info
5845
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
5846
from bzrlib.bundle.commands import (
5849
from bzrlib.foreign import cmd_dpush
5850
from bzrlib.sign_my_commits import cmd_sign_my_commits
5851
from bzrlib.weave_commands import cmd_versionedfile_list, \
5852
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
