250
250
To skip the display of pending merge information altogether, use
251
251
the no-pending option or specify a file/directory.
253
To compare the working directory to a specific revision, pass a
254
single revision to the revision argument.
256
To see which files have changed in a specific revision, or between
257
two revisions, pass a revision range to the revision argument.
258
This will produce the same results as calling 'bzr diff --summarize'.
253
If a revision argument is given, the status is calculated against
254
that revision, or between two revisions if two are provided.
261
257
# TODO: --no-recurse, --recurse options
485
477
d.destroy_workingtree()
488
class cmd_repair_workingtree(Command):
489
__doc__ = """Reset the working tree state file.
491
This is not meant to be used normally, but more as a way to recover from
492
filesystem corruption, etc. This rebuilds the working inventory back to a
493
'known good' state. Any new modifications (adding a file, renaming, etc)
494
will be lost, though modified files will still be detected as such.
496
Most users will want something more like "bzr revert" or "bzr update"
497
unless the state file has become corrupted.
499
By default this attempts to recover the current state by looking at the
500
headers of the state file. If the state file is too corrupted to even do
501
that, you can supply --revision to force the state of the tree.
504
takes_options = ['revision', 'directory',
506
help='Reset the tree even if it doesn\'t appear to be'
511
def run(self, revision=None, directory='.', force=False):
512
tree, _ = WorkingTree.open_containing(directory)
513
self.add_cleanup(tree.lock_tree_write().unlock)
517
except errors.BzrError:
518
pass # There seems to be a real error here, so we'll reset
521
raise errors.BzrCommandError(
522
'The tree does not appear to be corrupt. You probably'
523
' want "bzr revert" instead. Use "--force" if you are'
524
' sure you want to reset the working tree.')
528
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
530
tree.reset_state(revision_ids)
531
except errors.BzrError, e:
532
if revision_ids is None:
533
extra = (', the header appears corrupt, try passing -r -1'
534
' to set the state to the last commit')
537
raise errors.BzrCommandError('failed to reset the tree state'
541
480
class cmd_revno(Command):
542
481
__doc__ = """Show current revision number.
984
923
"branch. Local pulls are not applied to "
985
924
"the master branch."
988
help="Show base revision text in conflicts.")
990
927
takes_args = ['location?']
991
928
encoding_type = 'replace'
993
930
def run(self, location=None, remember=False, overwrite=False,
994
931
revision=None, verbose=False,
995
directory=None, local=False,
932
directory=None, local=False):
997
933
# FIXME: too much stuff is in the command class
998
934
revision_id = None
1242
1168
files_from=None):
1243
1169
from bzrlib import switch as _mod_switch
1244
1170
from bzrlib.tag import _merge_tags_if_possible
1245
if self.invoked_as in ['get', 'clone']:
1246
ui.ui_factory.show_user_warning(
1247
'deprecated_command',
1248
deprecated_name=self.invoked_as,
1249
recommended_name='branch',
1250
deprecated_in_version='2.4')
1251
1171
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1253
1173
if not (hardlink or files_from):
1447
1367
_see_also = ['pull', 'working-trees', 'status-flags']
1448
1368
takes_args = ['dir?']
1449
takes_options = ['revision',
1451
help="Show base revision text in conflicts."),
1369
takes_options = ['revision']
1453
1370
aliases = ['up']
1455
def run(self, dir='.', revision=None, show_base=None):
1372
def run(self, dir='.', revision=None):
1456
1373
if revision is not None and len(revision) != 1:
1457
1374
raise errors.BzrCommandError(
1458
1375
"bzr update --revision takes exactly one revision")
1581
1497
title='Deletion Strategy', value_switches=True, enum_switch=False,
1582
1498
safe='Backup changed files (default).',
1583
1499
keep='Delete from bzr but leave the working copy.',
1584
no_backup='Don\'t backup changed files.',
1585
1500
force='Delete all the specified files, even if they can not be '
1586
'recovered and even if they are non-empty directories. '
1587
'(deprecated, use no-backup)')]
1501
'recovered and even if they are non-empty directories.')]
1588
1502
aliases = ['rm', 'del']
1589
1503
encoding_type = 'replace'
1591
1505
def run(self, file_list, verbose=False, new=False,
1592
1506
file_deletion_strategy='safe'):
1593
if file_deletion_strategy == 'force':
1594
note("(The --force option is deprecated, rather use --no-backup "
1596
file_deletion_strategy = 'no-backup'
1598
1507
tree, file_list = WorkingTree.open_containing_paths(file_list)
1600
1509
if file_list is not None:
1783
1692
Option('append-revisions-only',
1784
1693
help='Never change revnos or the existing log.'
1785
' Append revisions to it only.'),
1787
'Create a branch without a working tree.')
1694
' Append revisions to it only.')
1789
1696
def run(self, location=None, format=None, append_revisions_only=False,
1790
create_prefix=False, no_tree=False):
1697
create_prefix=False):
1791
1698
if format is None:
1792
1699
format = bzrdir.format_registry.make_bzrdir('default')
1793
1700
if location is None:
3114
2990
to trigger updates to external systems like bug trackers. The --fixes
3115
2991
option can be used to record the association between a revision and
3116
2992
one or more bugs. See ``bzr help bugs`` for details.
2994
A selective commit may fail in some cases where the committed
2995
tree would be invalid. Consider::
3000
bzr commit foo -m "committing foo"
3001
bzr mv foo/bar foo/baz
3004
bzr commit foo/bar -m "committing bar but not baz"
3006
In the example above, the last commit will fail by design. This gives
3007
the user the opportunity to decide whether they want to commit the
3008
rename at the same time, separately first, or not at all. (As a general
3009
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3011
# TODO: Run hooks on tree to-be-committed, and after commit.
3013
# TODO: Strict commit that fails if there are deleted files.
3014
# (what does "deleted files" mean ??)
3016
# TODO: Give better message for -s, --summary, used by tla people
3018
# XXX: verbose currently does nothing
3119
3020
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3120
3021
takes_args = ['selected*']
3181
3078
def run(self, message=None, file=None, verbose=False, selected_list=None,
3182
3079
unchanged=False, strict=False, local=False, fixes=None,
3183
author=None, show_diff=False, exclude=None, commit_time=None,
3080
author=None, show_diff=False, exclude=None, commit_time=None):
3185
3081
from bzrlib.errors import (
3186
3082
PointlessCommit,
3187
3083
ConflictsInTree,
3283
3185
reporter=None, verbose=verbose, revprops=properties,
3284
3186
authors=author, timestamp=commit_stamp,
3285
3187
timezone=offset,
3286
exclude=tree.safe_relpath_files(exclude),
3188
exclude=tree.safe_relpath_files(exclude))
3288
3189
except PointlessCommit:
3289
3190
raise errors.BzrCommandError("No changes to commit."
3290
" Please 'bzr add' the files you want to commit, or use"
3291
" --unchanged to force an empty commit.")
3191
" Use --unchanged to commit anyhow.")
3292
3192
except ConflictsInTree:
3293
3193
raise errors.BzrCommandError('Conflicts detected in working '
3294
3194
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3377
3277
class cmd_upgrade(Command):
3378
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3380
When the default format has changed after a major new release of
3381
Bazaar, you may be informed during certain operations that you
3382
should upgrade. Upgrading to a newer format may improve performance
3383
or make new features available. It may however limit interoperability
3384
with older repositories or with older versions of Bazaar.
3386
If you wish to upgrade to a particular format rather than the
3387
current default, that can be specified using the --format option.
3388
As a consequence, you can use the upgrade command this way to
3389
"downgrade" to an earlier format, though some conversions are
3390
a one way process (e.g. changing from the 1.x default to the
3391
2.x default) so downgrading is not always possible.
3393
A backup.bzr.~#~ directory is created at the start of the conversion
3394
process (where # is a number). By default, this is left there on
3395
completion. If the conversion fails, delete the new .bzr directory
3396
and rename this one back in its place. Use the --clean option to ask
3397
for the backup.bzr directory to be removed on successful conversion.
3398
Alternatively, you can delete it by hand if everything looks good
3401
If the location given is a shared repository, dependent branches
3402
are also converted provided the repository converts successfully.
3403
If the conversion of a branch fails, remaining branches are still
3406
For more information on upgrades, see the Bazaar Upgrade Guide,
3407
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3278
__doc__ = """Upgrade branch storage to current format.
3280
The check command or bzr developers may sometimes advise you to run
3281
this command. When the default format has changed you may also be warned
3282
during other operations to upgrade.
3410
_see_also = ['check', 'reconcile', 'formats']
3285
_see_also = ['check']
3411
3286
takes_args = ['url?']
3412
3287
takes_options = [
3413
RegistryOption('format',
3414
help='Upgrade to a specific format. See "bzr help'
3415
' formats" for details.',
3416
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3417
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3418
value_switches=True, title='Branch format'),
3420
help='Remove the backup.bzr directory if successful.'),
3422
help="Show what would be done, but don't actually do anything."),
3288
RegistryOption('format',
3289
help='Upgrade to a specific format. See "bzr help'
3290
' formats" for details.',
3291
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3292
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3293
value_switches=True, title='Branch format'),
3425
def run(self, url='.', format=None, clean=False, dry_run=False):
3296
def run(self, url='.', format=None):
3426
3297
from bzrlib.upgrade import upgrade
3427
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3429
if len(exceptions) == 1:
3430
# Compatibility with historical behavior
3298
upgrade(url, format)
3436
3301
class cmd_whoami(Command):
3835
3696
with bzr send. If neither is specified, the default is the upstream branch
3836
3697
or the branch most recently merged using --remember.
3838
When merging from a branch, by default bzr will try to merge in all new
3839
work from the other branch, automatically determining an appropriate base
3840
revision. If this fails, you may need to give an explicit base.
3842
To pick a different ending revision, pass "--revision OTHER". bzr will
3843
try to merge in all new work up to and including revision OTHER.
3845
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3846
through OTHER, excluding BASE but including OTHER, will be merged. If this
3847
causes some revisions to be skipped, i.e. if the destination branch does
3848
not already contain revision BASE, such a merge is commonly referred to as
3851
Revision numbers are always relative to the source branch.
3699
When merging a branch, by default the tip will be merged. To pick a different
3700
revision, pass --revision. If you specify two values, the first will be used as
3701
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3702
available revisions, like this is commonly referred to as "cherrypicking".
3704
Revision numbers are always relative to the branch being merged.
3706
By default, bzr will try to merge in all new work from the other
3707
branch, automatically determining an appropriate base. If this
3708
fails, you may need to give an explicit base.
3853
3710
Merge will do its best to combine the changes in two branches, but there
3854
3711
are some kinds of problems only a human can fix. When it encounters those,
4118
3975
if ((remember or tree.branch.get_submit_branch() is None) and
4119
3976
user_location is not None):
4120
3977
tree.branch.set_submit_branch(other_branch.base)
4121
# Merge tags (but don't set them in the master branch yet, the user
4122
# might revert this merge). Commit will propagate them.
4123
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3978
_merge_tags_if_possible(other_branch, tree.branch)
4124
3979
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4125
3980
other_revision_id, base_revision_id, other_branch, base_branch)
4126
3981
if other_path != '':
4294
4149
last committed revision is used.
4296
4151
To remove only some changes, without reverting to a prior version, use
4297
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4298
will remove the changes introduced by the second last commit (-2), without
4299
affecting the changes introduced by the last commit (-1). To remove
4300
certain changes on a hunk-by-hunk basis, see the shelve command.
4152
merge instead. For example, "merge . --revision -2..-3" will remove the
4153
changes introduced by -2, without affecting the changes introduced by -1.
4154
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4302
4156
By default, any files that have been manually changed will be backed up
4303
4157
first. (Files changed only by merge are not backed up.) Backup files have
4633
4487
@display_command
4634
4488
def run(self, verbose=False):
4635
from bzrlib import plugin
4636
self.outf.writelines(
4637
plugin.describe_plugins(show_paths=verbose))
4489
import bzrlib.plugin
4490
from inspect import getdoc
4492
for name, plugin in bzrlib.plugin.plugins().items():
4493
version = plugin.__version__
4494
if version == 'unknown':
4496
name_ver = '%s %s' % (name, version)
4497
d = getdoc(plugin.module)
4499
doc = d.split('\n')[0]
4501
doc = '(no description)'
4502
result.append((name_ver, doc, plugin.path()))
4503
for name_ver, doc, path in sorted(result):
4504
self.outf.write("%s\n" % name_ver)
4505
self.outf.write(" %s\n" % doc)
4507
self.outf.write(" %s\n" % path)
4508
self.outf.write("\n")
4640
4511
class cmd_testament(Command):
4704
4573
self.add_cleanup(branch.lock_read().unlock)
4705
4574
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4706
4575
self.add_cleanup(tree.lock_read().unlock)
4707
if wt is not None and revision is None:
4708
4577
file_id = wt.path2id(relpath)
4710
4579
file_id = tree.path2id(relpath)
4711
4580
if file_id is None:
4712
4581
raise errors.NotVersionedError(filename)
4582
file_version = tree.inventory[file_id].revision
4713
4583
if wt is not None and revision is None:
4714
4584
# If there is a tree and we're not annotating historical
4715
4585
# versions, annotate the working tree's content.
4716
4586
annotate_file_tree(wt, file_id, self.outf, long, all,
4717
4587
show_ids=show_ids)
4719
annotate_file_tree(tree, file_id, self.outf, long, all,
4720
show_ids=show_ids, branch=branch)
4589
annotate_file(branch, file_version, file_id, long, all, self.outf,
4723
4593
class cmd_re_sign(Command):
4974
4844
takes_options = [
4975
4845
Option('config',
4976
4846
help='LOCATION is the directory where the config lock is.'),
4978
help='Do not ask for confirmation before breaking the lock.'),
4981
def run(self, location=None, config=False, force=False):
4849
def run(self, location=None, config=False):
4982
4850
if location is None:
4983
4851
location = u'.'
4985
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
4987
{'bzrlib.lockdir.break': True})
4989
4853
conf = _mod_config.LockableConfig(file_name=location)
4990
4854
conf.break_lock()
5517
5381
takes_options = [
5518
5382
custom_help('directory',
5519
5383
help='Branch whose tags should be displayed.'),
5520
RegistryOption('sort',
5384
RegistryOption.from_kwargs('sort',
5521
5385
'Sort tags by different criteria.', title='Sorting',
5522
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5386
alpha='Sort tags lexicographically (default).',
5387
time='Sort tags chronologically.',
5528
5393
@display_command
5529
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5530
from bzrlib.tag import tag_sort_methods
5531
5400
branch, relpath = Branch.open_containing(directory)
5533
5402
tags = branch.tags.get_tag_dict().items()
5542
5411
# only show revisions between revid1 and revid2 (inclusive)
5543
5412
tags = [(tag, revid) for tag, revid in tags if
5544
5413
graph.is_between(revid, revid1, revid2)]
5546
sort = tag_sort_methods.get()
5416
elif sort == 'time':
5418
for tag, revid in tags:
5420
revobj = branch.repository.get_revision(revid)
5421
except errors.NoSuchRevision:
5422
timestamp = sys.maxint # place them at the end
5424
timestamp = revobj.timestamp
5425
timestamps[revid] = timestamp
5426
tags.sort(key=lambda x: timestamps[x[1]])
5548
5427
if not show_ids:
5549
5428
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5550
5429
for index, (tag, revid) in enumerate(tags):
5974
5853
You can put multiple items on the shelf, and by default, 'unshelve' will
5975
5854
restore the most recently shelved changes.
5977
For complicated changes, it is possible to edit the changes in a separate
5978
editor program to decide what the file remaining in the working copy
5979
should look like. To do this, add the configuration option
5981
change_editor = PROGRAM @new_path @old_path
5983
where @new_path is replaced with the path of the new version of the
5984
file and @old_path is replaced with the path of the old version of
5985
the file. The PROGRAM should save the new file with the desired
5986
contents of the file in the working tree.
5990
5857
takes_args = ['file*']
6002
5869
Option('destroy',
6003
5870
help='Destroy removed changes instead of shelving them.'),
6005
_see_also = ['unshelve', 'configuration']
5872
_see_also = ['unshelve']
6007
5874
def run(self, revision=None, all=False, file_list=None, message=None,
6008
writer=None, list=False, destroy=False, directory=None):
5875
writer=None, list=False, destroy=False, directory=u'.'):
6010
return self.run_for_list(directory=directory)
5877
return self.run_for_list()
6011
5878
from bzrlib.shelf_ui import Shelver
6012
5879
if writer is None:
6013
5880
writer = bzrlib.option.diff_writer_registry.get()
6090
5955
takes_options = ['directory',
6091
5956
Option('ignored', help='Delete all ignored files.'),
6092
Option('detritus', help='Delete conflict files, merge and revert'
5957
Option('detritus', help='Delete conflict files, merge'
6093
5958
' backups, and failed selftest dirs.'),
6094
5959
Option('unknown',
6095
5960
help='Delete files unknown to bzr (default).'),
6154
6019
self.outf.write('%s %s\n' % (path, location))
6157
class cmd_export_pot(Command):
6158
__doc__ = """Export command helps and error messages in po format."""
6163
from bzrlib.export_pot import export_pot
6164
export_pot(self.outf)
6167
6022
def _register_lazy_builtins():
6168
6023
# register lazy builtins from other modules; called at startup and should
6169
6024
# be only called once.
6170
6025
for (name, aliases, module_name) in [
6171
6026
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6172
('cmd_config', [], 'bzrlib.config'),
6173
6027
('cmd_dpush', [], 'bzrlib.foreign'),
6174
6028
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6175
6029
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6176
6030
('cmd_conflicts', [], 'bzrlib.conflicts'),
6177
6031
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6178
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6180
6033
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
