73
71
_parse_revision_str,
75
73
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
79
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
80
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
82
return internal_tree_files(file_list, default_branch, canonicalize,
88
86
def tree_files_for_add(file_list):
153
151
# XXX: Bad function name; should possibly also be a class method of
154
152
# WorkingTree rather than a function.
153
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
155
154
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
155
apply_view=True):
157
156
"""Convert command-line paths to a WorkingTree and relative paths.
158
Deprecated: use WorkingTree.open_containing_paths instead.
159
160
This is typically used for command-line processors that take one or
160
161
more filenames, and infer the workingtree that contains them.
172
173
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
175
return WorkingTree.open_containing_paths(
176
file_list, default_directory='.',
223
181
def _get_view_info_for_change_reporter(tree):
294
252
To skip the display of pending merge information altogether, use
295
253
the no-pending option or specify a file/directory.
297
If a revision argument is given, the status is calculated against
298
that revision, or between two revisions if two are provided.
255
To compare the working directory to a specific revision, pass a
256
single revision to the revision argument.
258
To see which files have changed in a specific revision, or between
259
two revisions, pass a revision range to the revision argument.
260
This will produce the same results as calling 'bzr diff --summarize'.
301
263
# TODO: --no-recurse, --recurse options
519
487
d.destroy_workingtree()
490
class cmd_repair_workingtree(Command):
491
__doc__ = """Reset the working tree state file.
493
This is not meant to be used normally, but more as a way to recover from
494
filesystem corruption, etc. This rebuilds the working inventory back to a
495
'known good' state. Any new modifications (adding a file, renaming, etc)
496
will be lost, though modified files will still be detected as such.
498
Most users will want something more like "bzr revert" or "bzr update"
499
unless the state file has become corrupted.
501
By default this attempts to recover the current state by looking at the
502
headers of the state file. If the state file is too corrupted to even do
503
that, you can supply --revision to force the state of the tree.
506
takes_options = ['revision', 'directory',
508
help='Reset the tree even if it doesn\'t appear to be'
513
def run(self, revision=None, directory='.', force=False):
514
tree, _ = WorkingTree.open_containing(directory)
515
self.add_cleanup(tree.lock_tree_write().unlock)
519
except errors.BzrError:
520
pass # There seems to be a real error here, so we'll reset
523
raise errors.BzrCommandError(
524
'The tree does not appear to be corrupt. You probably'
525
' want "bzr revert" instead. Use "--force" if you are'
526
' sure you want to reset the working tree.')
530
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
532
tree.reset_state(revision_ids)
533
except errors.BzrError, e:
534
if revision_ids is None:
535
extra = (', the header appears corrupt, try passing -r -1'
536
' to set the state to the last commit')
539
raise errors.BzrCommandError('failed to reset the tree state'
522
543
class cmd_revno(Command):
523
544
__doc__ = """Show current revision number.
942
964
match the remote one, use pull --overwrite. This will work even if the two
943
965
branches have diverged.
945
If there is no default location set, the first pull will set it. After
946
that, you can omit the location to use the default. To change the
947
default, use --remember. The value will only be saved if the remote
948
location can be accessed.
967
If there is no default location set, the first pull will set it (use
968
--no-remember to avoid settting it). After that, you can omit the
969
location to use the default. To change the default, use --remember. The
970
value will only be saved if the remote location can be accessed.
950
972
Note: The location can be specified either in the form of a branch,
951
973
or in the form of a path to a file containing a merge directive generated
964
986
"branch. Local pulls are not applied to "
965
987
"the master branch."
990
help="Show base revision text in conflicts.")
968
992
takes_args = ['location?']
969
993
encoding_type = 'replace'
971
def run(self, location=None, remember=False, overwrite=False,
995
def run(self, location=None, remember=None, overwrite=False,
972
996
revision=None, verbose=False,
973
directory=None, local=False):
997
directory=None, local=False,
974
999
# FIXME: too much stuff is in the command class
975
1000
revision_id = None
976
1001
mergeable = None
1067
1101
do a merge (see bzr help merge) from the other branch, and commit that.
1068
1102
After that you will be able to do a push without '--overwrite'.
1070
If there is no default push location set, the first push will set it.
1071
After that, you can omit the location to use the default. To change the
1072
default, use --remember. The value will only be saved if the remote
1073
location can be accessed.
1104
If there is no default push location set, the first push will set it (use
1105
--no-remember to avoid settting it). After that, you can omit the
1106
location to use the default. To change the default, use --remember. The
1107
value will only be saved if the remote location can be accessed.
1076
1110
_see_also = ['pull', 'update', 'working-trees']
1097
1131
Option('strict',
1098
1132
help='Refuse to push if there are uncommitted changes in'
1099
1133
' the working tree, --no-strict disables the check.'),
1135
help="Don't populate the working tree, even for protocols"
1136
" that support it."),
1101
1138
takes_args = ['location?']
1102
1139
encoding_type = 'replace'
1104
def run(self, location=None, remember=False, overwrite=False,
1141
def run(self, location=None, remember=None, overwrite=False,
1105
1142
create_prefix=False, verbose=False, revision=None,
1106
1143
use_existing_dir=False, directory=None, stacked_on=None,
1107
stacked=False, strict=None):
1144
stacked=False, strict=None, no_tree=False):
1108
1145
from bzrlib.push import _show_push_branch
1110
1147
if directory is None:
1156
1193
_show_push_branch(br_from, revision_id, location, self.outf,
1157
1194
verbose=verbose, overwrite=overwrite, remember=remember,
1158
1195
stacked_on=stacked_on, create_prefix=create_prefix,
1159
use_existing_dir=use_existing_dir)
1196
use_existing_dir=use_existing_dir, no_tree=no_tree)
1162
1199
class cmd_branch(Command):
1172
1209
To retrieve the branch as of a particular revision, supply the --revision
1173
1210
parameter, as in "branch foo/bar -r 5".
1212
The synonyms 'clone' and 'get' for this command are deprecated.
1176
1215
_see_also = ['checkout']
1177
1216
takes_args = ['from_location', 'to_location?']
1178
takes_options = ['revision', Option('hardlink',
1179
help='Hard-link working tree files where possible.'),
1217
takes_options = ['revision',
1218
Option('hardlink', help='Hard-link working tree files where possible.'),
1219
Option('files-from', type=str,
1220
help="Get file contents from this tree."),
1180
1221
Option('no-tree',
1181
1222
help="Create a branch without a working-tree."),
1182
1223
Option('switch',
1201
1242
def run(self, from_location, to_location=None, revision=None,
1202
1243
hardlink=False, stacked=False, standalone=False, no_tree=False,
1203
use_existing_dir=False, switch=False, bind=False):
1244
use_existing_dir=False, switch=False, bind=False,
1204
1246
from bzrlib import switch as _mod_switch
1205
1247
from bzrlib.tag import _merge_tags_if_possible
1248
if self.invoked_as in ['get', 'clone']:
1249
ui.ui_factory.show_user_warning(
1250
'deprecated_command',
1251
deprecated_name=self.invoked_as,
1252
recommended_name='branch',
1253
deprecated_in_version='2.4')
1206
1254
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1256
if not (hardlink or files_from):
1257
# accelerator_tree is usually slower because you have to read N
1258
# files (no readahead, lots of seeks, etc), but allow the user to
1259
# explicitly request it
1260
accelerator_tree = None
1261
if files_from is not None and files_from != from_location:
1262
accelerator_tree = WorkingTree.open(files_from)
1208
1263
revision = _get_one_revision('branch', revision)
1209
1264
self.add_cleanup(br_from.lock_read().unlock)
1210
1265
if revision is not None:
1317
1372
to_location = branch_location
1318
1373
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1319
1374
branch_location)
1375
if not (hardlink or files_from):
1376
# accelerator_tree is usually slower because you have to read N
1377
# files (no readahead, lots of seeks, etc), but allow the user to
1378
# explicitly request it
1379
accelerator_tree = None
1320
1380
revision = _get_one_revision('checkout', revision)
1321
if files_from is not None:
1381
if files_from is not None and files_from != branch_location:
1322
1382
accelerator_tree = WorkingTree.open(files_from)
1323
1383
if revision is not None:
1324
1384
revision_id = revision.as_revision_id(source)
1385
1440
If you want to discard your local changes, you can just do a
1386
1441
'bzr revert' instead of 'bzr commit' after the update.
1443
If you want to restore a file that has been removed locally, use
1444
'bzr revert' instead of 'bzr update'.
1388
1446
If the tree's branch is bound to a master branch, it will also update
1389
1447
the branch from the master.
1392
1450
_see_also = ['pull', 'working-trees', 'status-flags']
1393
1451
takes_args = ['dir?']
1394
takes_options = ['revision']
1452
takes_options = ['revision',
1454
help="Show base revision text in conflicts."),
1395
1456
aliases = ['up']
1397
def run(self, dir='.', revision=None):
1458
def run(self, dir='.', revision=None, show_base=None):
1398
1459
if revision is not None and len(revision) != 1:
1399
1460
raise errors.BzrCommandError(
1400
1461
"bzr update --revision takes exactly one revision")
1508
1570
class cmd_remove(Command):
1509
1571
__doc__ = """Remove files or directories.
1511
This makes bzr stop tracking changes to the specified files. bzr will delete
1512
them if they can easily be recovered using revert. If no options or
1513
parameters are given bzr will scan for files that are being tracked by bzr
1514
but missing in your tree and stop tracking them for you.
1573
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1574
delete them if they can easily be recovered using revert otherwise they
1575
will be backed up (adding an extention of the form .~#~). If no options or
1576
parameters are given Bazaar will scan for files that are being tracked by
1577
Bazaar but missing in your tree and stop tracking them for you.
1516
1579
takes_args = ['file*']
1517
1580
takes_options = ['verbose',
1519
1582
RegistryOption.from_kwargs('file-deletion-strategy',
1520
1583
'The file deletion mode to be used.',
1521
1584
title='Deletion Strategy', value_switches=True, enum_switch=False,
1522
safe='Only delete files if they can be'
1523
' safely recovered (default).',
1585
safe='Backup changed files (default).',
1524
1586
keep='Delete from bzr but leave the working copy.',
1587
no_backup='Don\'t backup changed files.',
1525
1588
force='Delete all the specified files, even if they can not be '
1526
'recovered and even if they are non-empty directories.')]
1589
'recovered and even if they are non-empty directories. '
1590
'(deprecated, use no-backup)')]
1527
1591
aliases = ['rm', 'del']
1528
1592
encoding_type = 'replace'
1530
1594
def run(self, file_list, verbose=False, new=False,
1531
1595
file_deletion_strategy='safe'):
1532
tree, file_list = tree_files(file_list)
1596
if file_deletion_strategy == 'force':
1597
note("(The --force option is deprecated, rather use --no-backup "
1599
file_deletion_strategy = 'no-backup'
1601
tree, file_list = WorkingTree.open_containing_paths(file_list)
1534
1603
if file_list is not None:
1535
1604
file_list = [f for f in file_list]
1624
1693
_see_also = ['check']
1625
1694
takes_args = ['branch?']
1696
Option('canonicalize-chks',
1697
help='Make sure CHKs are in canonical form (repairs '
1627
def run(self, branch="."):
1702
def run(self, branch=".", canonicalize_chks=False):
1628
1703
from bzrlib.reconcile import reconcile
1629
1704
dir = bzrdir.BzrDir.open(branch)
1705
reconcile(dir, canonicalize_chks=canonicalize_chks)
1633
1708
class cmd_revision_history(Command):
1711
1786
Option('append-revisions-only',
1712
1787
help='Never change revnos or the existing log.'
1713
' Append revisions to it only.')
1788
' Append revisions to it only.'),
1790
'Create a branch without a working tree.')
1715
1792
def run(self, location=None, format=None, append_revisions_only=False,
1716
create_prefix=False):
1793
create_prefix=False, no_tree=False):
1717
1794
if format is None:
1718
1795
format = bzrdir.format_registry.make_bzrdir('default')
1719
1796
if location is None:
1973
2073
old_branch, new_branch,
1974
2074
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1975
2075
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2076
# GNU diff on Windows uses ANSI encoding for filenames
2077
path_encoding = osutils.get_diff_header_encoding()
1976
2078
return show_diff_trees(old_tree, new_tree, sys.stdout,
1977
2079
specific_files=specific_files,
1978
2080
external_diff_options=diff_options,
1979
2081
old_label=old_label, new_label=new_label,
1980
extra_trees=extra_trees, using=using,
2082
extra_trees=extra_trees,
2083
path_encoding=path_encoding,
1981
2085
format_cls=format)
2711
2826
"NAME_PATTERN or --default-rules.")
2712
2827
name_pattern_list = [globbing.normalize_pattern(p)
2713
2828
for p in name_pattern_list]
2830
for p in name_pattern_list:
2831
if not globbing.Globster.is_pattern_valid(p):
2832
bad_patterns += ('\n %s' % p)
2834
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2835
ui.ui_factory.show_error(msg)
2836
raise errors.InvalidPattern('')
2714
2837
for name_pattern in name_pattern_list:
2715
2838
if (name_pattern[0] == '/' or
2716
2839
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2994
3117
to trigger updates to external systems like bug trackers. The --fixes
2995
3118
option can be used to record the association between a revision and
2996
3119
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.)
3015
# TODO: Run hooks on tree to-be-committed, and after commit.
3017
# TODO: Strict commit that fails if there are deleted files.
3018
# (what does "deleted files" mean ??)
3020
# TODO: Give better message for -s, --summary, used by tla people
3022
# XXX: verbose currently does nothing
3024
3122
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3025
3123
takes_args = ['selected*']
3082
3184
def run(self, message=None, file=None, verbose=False, selected_list=None,
3083
3185
unchanged=False, strict=False, local=False, fixes=None,
3084
author=None, show_diff=False, exclude=None, commit_time=None):
3186
author=None, show_diff=False, exclude=None, commit_time=None,
3085
3188
from bzrlib.errors import (
3086
3189
PointlessCommit,
3087
3190
ConflictsInTree,
3101
3204
raise errors.BzrCommandError(
3102
3205
"Could not parse --commit-time: " + str(e))
3104
# TODO: Need a blackbox test for invoking the external editor; may be
3105
# slightly problematic to run this cross-platform.
3107
# TODO: do more checks that the commit will succeed before
3108
# spending the user's valuable time typing a commit message.
3110
3207
properties = {}
3112
tree, selected_list = tree_files(selected_list)
3209
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3113
3210
if selected_list == ['']:
3114
3211
# workaround - commit of root of tree should be exactly the same
3115
3212
# as just default commit in that tree, and succeed even though
3186
3286
reporter=None, verbose=verbose, revprops=properties,
3187
3287
authors=author, timestamp=commit_stamp,
3188
3288
timezone=offset,
3189
exclude=safe_relpath_files(tree, exclude))
3289
exclude=tree.safe_relpath_files(exclude),
3190
3291
except PointlessCommit:
3191
3292
raise errors.BzrCommandError("No changes to commit."
3192
" Use --unchanged to commit anyhow.")
3293
" Please 'bzr add' the files you want to commit, or use"
3294
" --unchanged to force an empty commit.")
3193
3295
except ConflictsInTree:
3194
3296
raise errors.BzrCommandError('Conflicts detected in working '
3195
3297
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3278
3380
class cmd_upgrade(Command):
3279
__doc__ = """Upgrade branch storage to current format.
3281
The check command or bzr developers may sometimes advise you to run
3282
this command. When the default format has changed you may also be warned
3283
during other operations to upgrade.
3381
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3383
When the default format has changed after a major new release of
3384
Bazaar, you may be informed during certain operations that you
3385
should upgrade. Upgrading to a newer format may improve performance
3386
or make new features available. It may however limit interoperability
3387
with older repositories or with older versions of Bazaar.
3389
If you wish to upgrade to a particular format rather than the
3390
current default, that can be specified using the --format option.
3391
As a consequence, you can use the upgrade command this way to
3392
"downgrade" to an earlier format, though some conversions are
3393
a one way process (e.g. changing from the 1.x default to the
3394
2.x default) so downgrading is not always possible.
3396
A backup.bzr.~#~ directory is created at the start of the conversion
3397
process (where # is a number). By default, this is left there on
3398
completion. If the conversion fails, delete the new .bzr directory
3399
and rename this one back in its place. Use the --clean option to ask
3400
for the backup.bzr directory to be removed on successful conversion.
3401
Alternatively, you can delete it by hand if everything looks good
3404
If the location given is a shared repository, dependent branches
3405
are also converted provided the repository converts successfully.
3406
If the conversion of a branch fails, remaining branches are still
3409
For more information on upgrades, see the Bazaar Upgrade Guide,
3410
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3286
_see_also = ['check']
3413
_see_also = ['check', 'reconcile', 'formats']
3287
3414
takes_args = ['url?']
3288
3415
takes_options = [
3289
RegistryOption('format',
3290
help='Upgrade to a specific format. See "bzr help'
3291
' formats" for details.',
3292
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3293
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3294
value_switches=True, title='Branch format'),
3416
RegistryOption('format',
3417
help='Upgrade to a specific format. See "bzr help'
3418
' formats" for details.',
3419
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3420
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3421
value_switches=True, title='Branch format'),
3423
help='Remove the backup.bzr directory if successful.'),
3425
help="Show what would be done, but don't actually do anything."),
3297
def run(self, url='.', format=None):
3428
def run(self, url='.', format=None, clean=False, dry_run=False):
3298
3429
from bzrlib.upgrade import upgrade
3299
upgrade(url, format)
3430
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3432
if len(exceptions) == 1:
3433
# Compatibility with historical behavior
3302
3439
class cmd_whoami(Command):
3321
3459
encoding_type = 'replace'
3323
3461
@display_command
3324
def run(self, email=False, branch=False, name=None):
3462
def run(self, email=False, branch=False, name=None, directory=None):
3325
3463
if name is None:
3326
# use branch if we're inside one; otherwise global config
3328
c = Branch.open_containing('.')[0].get_config()
3329
except errors.NotBranchError:
3330
c = config.GlobalConfig()
3464
if directory is None:
3465
# use branch if we're inside one; otherwise global config
3467
c = Branch.open_containing(u'.')[0].get_config()
3468
except errors.NotBranchError:
3469
c = _mod_config.GlobalConfig()
3471
c = Branch.open(directory).get_config()
3332
3473
self.outf.write(c.user_email() + '\n')
3334
3475
self.outf.write(c.username() + '\n')
3479
raise errors.BzrCommandError("--email can only be used to display existing "
3337
3482
# display a warning if an email address isn't included in the given name.
3339
config.extract_email_address(name)
3484
_mod_config.extract_email_address(name)
3340
3485
except errors.NoEmailInUsername, e:
3341
3486
warning('"%s" does not seem to contain an email address. '
3342
3487
'This is allowed, but not recommended.', name)
3344
3489
# use global config unless --branch given
3346
c = Branch.open_containing('.')[0].get_config()
3491
if directory is None:
3492
c = Branch.open_containing(u'.')[0].get_config()
3494
c = Branch.open(directory).get_config()
3348
c = config.GlobalConfig()
3496
c = _mod_config.GlobalConfig()
3349
3497
c.set_user_option('email', name)
3418
3566
'bzr alias --remove expects an alias to remove.')
3419
3567
# If alias is not found, print something like:
3420
3568
# unalias: foo: not found
3421
c = config.GlobalConfig()
3569
c = _mod_config.GlobalConfig()
3422
3570
c.unset_alias(alias_name)
3424
3572
@display_command
3425
3573
def print_aliases(self):
3426
3574
"""Print out the defined aliases in a similar format to bash."""
3427
aliases = config.GlobalConfig().get_aliases()
3575
aliases = _mod_config.GlobalConfig().get_aliases()
3428
3576
for key, value in sorted(aliases.iteritems()):
3429
3577
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3497
3648
if typestring == "sftp":
3498
3649
from bzrlib.tests import stub_sftp
3499
3650
return stub_sftp.SFTPAbsoluteServer
3500
if typestring == "memory":
3651
elif typestring == "memory":
3501
3652
from bzrlib.tests import test_server
3502
3653
return memory.MemoryServer
3503
if typestring == "fakenfs":
3654
elif typestring == "fakenfs":
3504
3655
from bzrlib.tests import test_server
3505
3656
return test_server.FakeNFSServer
3506
3657
msg = "No known transport type %s. Supported types are: sftp\n" %\
3519
3670
'throughout the test suite.',
3520
3671
type=get_transport_type),
3521
3672
Option('benchmark',
3522
help='Run the benchmarks rather than selftests.'),
3673
help='Run the benchmarks rather than selftests.',
3523
3675
Option('lsprof-timed',
3524
3676
help='Generate lsprof output for benchmarked'
3525
3677
' sections of code.'),
3526
3678
Option('lsprof-tests',
3527
3679
help='Generate lsprof output for each test.'),
3528
Option('cache-dir', type=str,
3529
help='Cache intermediate benchmark output in this '
3531
3680
Option('first',
3532
3681
help='Run all tests, but run specified tests first.',
3533
3682
short_name='f',
3542
3691
Option('randomize', type=str, argname="SEED",
3543
3692
help='Randomize the order of tests using the given'
3544
3693
' seed or "now" for the current time.'),
3545
Option('exclude', type=str, argname="PATTERN",
3547
help='Exclude tests that match this regular'
3694
ListOption('exclude', type=str, argname="PATTERN",
3696
help='Exclude tests that match this regular'
3549
3698
Option('subunit',
3550
3699
help='Output test progress via subunit.'),
3551
3700
Option('strict', help='Fail on missing dependencies or '
3568
3717
def run(self, testspecs_list=None, verbose=False, one=False,
3569
3718
transport=None, benchmark=None,
3570
lsprof_timed=None, cache_dir=None,
3571
3720
first=False, list_only=False,
3572
3721
randomize=None, exclude=None, strict=False,
3573
3722
load_list=None, debugflag=None, starting_with=None, subunit=False,
3574
3723
parallel=None, lsprof_tests=False):
3575
from bzrlib.tests import selftest
3576
import bzrlib.benchmarks as benchmarks
3577
from bzrlib.benchmarks import tree_creator
3579
# Make deprecation warnings visible, unless -Werror is set
3580
symbol_versioning.activate_deprecation_warnings(override=False)
3582
if cache_dir is not None:
3583
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3724
from bzrlib import tests
3584
3726
if testspecs_list is not None:
3585
3727
pattern = '|'.join(testspecs_list)
3594
3736
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3595
3737
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3596
3738
# stdout, which would corrupt the subunit stream.
3597
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3739
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3740
# following code can be deleted when it's sufficiently deployed
3741
# -- vila/mgz 20100514
3742
if (sys.platform == "win32"
3743
and getattr(sys.stdout, 'fileno', None) is not None):
3599
3745
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3601
3747
self.additional_selftest_args.setdefault(
3602
3748
'suite_decorators', []).append(parallel)
3604
test_suite_factory = benchmarks.test_suite
3605
# Unless user explicitly asks for quiet, be verbose in benchmarks
3606
verbose = not is_quiet()
3607
# TODO: should possibly lock the history file...
3608
benchfile = open(".perf_history", "at", buffering=1)
3609
self.add_cleanup(benchfile.close)
3750
raise errors.BzrCommandError(
3751
"--benchmark is no longer supported from bzr 2.2; "
3752
"use bzr-usertest instead")
3753
test_suite_factory = None
3755
exclude_pattern = None
3611
test_suite_factory = None
3757
exclude_pattern = '(' + '|'.join(exclude) + ')'
3613
3758
selftest_kwargs = {"verbose": verbose,
3614
3759
"pattern": pattern,
3615
3760
"stop_on_failure": one,
3617
3762
"test_suite_factory": test_suite_factory,
3618
3763
"lsprof_timed": lsprof_timed,
3619
3764
"lsprof_tests": lsprof_tests,
3620
"bench_history": benchfile,
3621
3765
"matching_tests_first": first,
3622
3766
"list_only": list_only,
3623
3767
"random_seed": randomize,
3624
"exclude_pattern": exclude,
3768
"exclude_pattern": exclude_pattern,
3625
3769
"strict": strict,
3626
3770
"load_list": load_list,
3627
3771
"debug_flags": debugflag,
3628
3772
"starting_with": starting_with
3630
3774
selftest_kwargs.update(self.additional_selftest_args)
3631
result = selftest(**selftest_kwargs)
3776
# Make deprecation warnings visible, unless -Werror is set
3777
cleanup = symbol_versioning.activate_deprecation_warnings(
3780
result = tests.selftest(**selftest_kwargs)
3632
3783
return int(not result)
3689
3840
The source of the merge can be specified either in the form of a branch,
3690
3841
or in the form of a path to a file containing a merge directive generated
3691
3842
with bzr send. If neither is specified, the default is the upstream branch
3692
or the branch most recently merged using --remember.
3694
When merging a branch, by default the tip will be merged. To pick a different
3695
revision, pass --revision. If you specify two values, the first will be used as
3696
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3697
available revisions, like this is commonly referred to as "cherrypicking".
3699
Revision numbers are always relative to the branch being merged.
3701
By default, bzr will try to merge in all new work from the other
3702
branch, automatically determining an appropriate base. If this
3703
fails, you may need to give an explicit base.
3843
or the branch most recently merged using --remember. The source of the
3844
merge may also be specified in the form of a path to a file in another
3845
branch: in this case, only the modifications to that file are merged into
3846
the current working tree.
3848
When merging from a branch, by default bzr will try to merge in all new
3849
work from the other branch, automatically determining an appropriate base
3850
revision. If this fails, you may need to give an explicit base.
3852
To pick a different ending revision, pass "--revision OTHER". bzr will
3853
try to merge in all new work up to and including revision OTHER.
3855
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3856
through OTHER, excluding BASE but including OTHER, will be merged. If this
3857
causes some revisions to be skipped, i.e. if the destination branch does
3858
not already contain revision BASE, such a merge is commonly referred to as
3859
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
3860
cherrypicks. The changes look like a normal commit, and the history of the
3861
changes from the other branch is not stored in the commit.
3863
Revision numbers are always relative to the source branch.
3705
3865
Merge will do its best to combine the changes in two branches, but there
3706
3866
are some kinds of problems only a human can fix. When it encounters those,
3710
3870
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3712
If there is no default branch set, the first merge will set it. After
3713
that, you can omit the branch to use the default. To change the
3714
default, use --remember. The value will only be saved if the remote
3715
location can be accessed.
3872
If there is no default branch set, the first merge will set it (use
3873
--no-remember to avoid settting it). After that, you can omit the branch
3874
to use the default. To change the default, use --remember. The value will
3875
only be saved if the remote location can be accessed.
3717
3877
The results of the merge are placed into the destination working
3718
3878
directory, where they can be reviewed (with bzr diff), tested, and then
3719
3879
committed to record the result of the merge.
3721
3881
merge refuses to run if there are any uncommitted changes, unless
3722
--force is given. The --force option can also be used to create a
3882
--force is given. If --force is given, then the changes from the source
3883
will be merged with the current working tree, including any uncommitted
3884
changes in the tree. The --force option can also be used to create a
3723
3885
merge revision which has more than two parents.
3725
3887
If one would like to merge changes from the working tree of the other
3785
3947
def run(self, location=None, revision=None, force=False,
3786
merge_type=None, show_base=False, reprocess=None, remember=False,
3948
merge_type=None, show_base=False, reprocess=None, remember=None,
3787
3949
uncommitted=False, pull=False,
3788
3950
directory=None,
3849
4015
self.sanity_check_merger(merger)
3850
4016
if (merger.base_rev_id == merger.other_rev_id and
3851
4017
merger.other_rev_id is not None):
4018
# check if location is a nonexistent file (and not a branch) to
4019
# disambiguate the 'Nothing to do'
4020
if merger.interesting_files:
4021
if not merger.other_tree.has_filename(
4022
merger.interesting_files[0]):
4023
note("merger: " + str(merger))
4024
raise errors.PathsDoNotExist([location])
3852
4025
note('Nothing to do.')
4027
if pull and not preview:
3855
4028
if merger.interesting_files is not None:
3856
4029
raise errors.BzrCommandError('Cannot pull individual files')
3857
4030
if (merger.base_rev_id == tree.last_revision()):
3881
4054
def _do_preview(self, merger):
3882
4055
from bzrlib.diff import show_diff_trees
3883
4056
result_tree = self._get_preview(merger)
4057
path_encoding = osutils.get_diff_header_encoding()
3884
4058
show_diff_trees(merger.this_tree, result_tree, self.outf,
3885
old_label='', new_label='')
4059
old_label='', new_label='',
4060
path_encoding=path_encoding)
3887
4062
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3888
4063
merger.change_reporter = change_reporter
3964
4139
if other_revision_id is None:
3965
4140
other_revision_id = _mod_revision.ensure_null(
3966
4141
other_branch.last_revision())
3967
# Remember where we merge from
3968
if ((remember or tree.branch.get_submit_branch() is None) and
3969
user_location is not None):
4142
# Remember where we merge from. We need to remember if:
4143
# - user specify a location (and we don't merge from the parent
4145
# - user ask to remember or there is no previous location set to merge
4146
# from and user didn't ask to *not* remember
4147
if (user_location is not None
4149
or (remember is None
4150
and tree.branch.get_submit_branch() is None)))):
3970
4151
tree.branch.set_submit_branch(other_branch.base)
3971
_merge_tags_if_possible(other_branch, tree.branch)
4152
# Merge tags (but don't set them in the master branch yet, the user
4153
# might revert this merge). Commit will propagate them.
4154
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3972
4155
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3973
4156
other_revision_id, base_revision_id, other_branch, base_branch)
3974
4157
if other_path != '':
4142
4325
last committed revision is used.
4144
4327
To remove only some changes, without reverting to a prior version, use
4145
merge instead. For example, "merge . --revision -2..-3" will remove the
4146
changes introduced by -2, without affecting the changes introduced by -1.
4147
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4328
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4329
will remove the changes introduced by the second last commit (-2), without
4330
affecting the changes introduced by the last commit (-1). To remove
4331
certain changes on a hunk-by-hunk basis, see the shelve command.
4149
4333
By default, any files that have been manually changed will be backed up
4150
4334
first. (Files changed only by merge are not backed up.) Backup files have
4314
4499
theirs_only=False,
4315
4500
log_format=None, long=False, short=False, line=False,
4316
4501
show_ids=False, verbose=False, this=False, other=False,
4317
include_merges=False, revision=None, my_revision=None):
4502
include_merges=False, revision=None, my_revision=None,
4318
4504
from bzrlib.missing import find_unmerged, iter_log_revisions
4319
4505
def message(s):
4320
4506
if not is_quiet():
4478
4664
@display_command
4479
4665
def run(self, verbose=False):
4480
import bzrlib.plugin
4481
from inspect import getdoc
4483
for name, plugin in bzrlib.plugin.plugins().items():
4484
version = plugin.__version__
4485
if version == 'unknown':
4487
name_ver = '%s %s' % (name, version)
4488
d = getdoc(plugin.module)
4490
doc = d.split('\n')[0]
4492
doc = '(no description)'
4493
result.append((name_ver, doc, plugin.path()))
4494
for name_ver, doc, path in sorted(result):
4495
self.outf.write("%s\n" % name_ver)
4496
self.outf.write(" %s\n" % doc)
4498
self.outf.write(" %s\n" % path)
4499
self.outf.write("\n")
4666
from bzrlib import plugin
4667
# Don't give writelines a generator as some codecs don't like that
4668
self.outf.writelines(
4669
list(plugin.describe_plugins(show_paths=verbose)))
4502
4672
class cmd_testament(Command):
4564
4736
self.add_cleanup(branch.lock_read().unlock)
4565
4737
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
4738
self.add_cleanup(tree.lock_read().unlock)
4739
if wt is not None and revision is None:
4568
4740
file_id = wt.path2id(relpath)
4570
4742
file_id = tree.path2id(relpath)
4571
4743
if file_id is None:
4572
4744
raise errors.NotVersionedError(filename)
4573
file_version = tree.inventory[file_id].revision
4574
4745
if wt is not None and revision is None:
4575
4746
# If there is a tree and we're not annotating historical
4576
4747
# versions, annotate the working tree's content.
4577
4748
annotate_file_tree(wt, file_id, self.outf, long, all,
4578
4749
show_ids=show_ids)
4580
annotate_file(branch, file_version, file_id, long, all, self.outf,
4751
annotate_file_tree(tree, file_id, self.outf, long, all,
4752
show_ids=show_ids, branch=branch)
4584
4755
class cmd_re_sign(Command):
4824
5001
bzr break-lock bzr+ssh://example.com/bzr/foo
5002
bzr break-lock --conf ~/.bazaar
4826
5005
takes_args = ['location?']
5008
help='LOCATION is the directory where the config lock is.'),
5010
help='Do not ask for confirmation before breaking the lock.'),
4828
def run(self, location=None, show=False):
5013
def run(self, location=None, config=False, force=False):
4829
5014
if location is None:
4830
5015
location = u'.'
4831
control, relpath = bzrdir.BzrDir.open_containing(location)
4833
control.break_lock()
4834
except NotImplementedError:
5017
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5019
{'bzrlib.lockdir.break': True})
5021
conf = _mod_config.LockableConfig(file_name=location)
5024
control, relpath = bzrdir.BzrDir.open_containing(location)
5026
control.break_lock()
5027
except NotImplementedError:
4838
5031
class cmd_wait_until_signalled(Command):
4902
5095
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4903
5096
protocol=None):
4904
from bzrlib.transport import get_transport, transport_server_registry
5097
from bzrlib import transport
4905
5098
if directory is None:
4906
5099
directory = os.getcwd()
4907
5100
if protocol is None:
4908
protocol = transport_server_registry.get()
5101
protocol = transport.transport_server_registry.get()
4909
5102
host, port = self.get_host_and_port(port)
4910
5103
url = urlutils.local_path_to_url(directory)
4911
5104
if not allow_writes:
4912
5105
url = 'readonly+' + url
4913
transport = get_transport(url)
4914
protocol(transport, host, port, inet)
5106
t = transport.get_transport(url)
5107
protocol(t, host, port, inet)
4917
5110
class cmd_join(Command):
5028
5222
encoding_type = 'exact'
5030
5224
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5031
sign=False, revision=None, mail_to=None, message=None):
5225
sign=False, revision=None, mail_to=None, message=None,
5032
5227
from bzrlib.revision import ensure_null, NULL_REVISION
5033
5228
include_patch, include_bundle = {
5034
5229
'plain': (False, False),
5035
5230
'diff': (True, False),
5036
5231
'bundle': (True, True),
5038
branch = Branch.open('.')
5233
branch = Branch.open(directory)
5039
5234
stored_submit_branch = branch.get_submit_branch()
5040
5235
if submit_branch is None:
5041
5236
submit_branch = stored_submit_branch
5117
5312
source branch defaults to that containing the working directory, but can
5118
5313
be changed using --from.
5315
Both the submit branch and the public branch follow the usual behavior with
5316
respect to --remember: If there is no default location set, the first send
5317
will set it (use --no-remember to avoid settting it). After that, you can
5318
omit the location to use the default. To change the default, use
5319
--remember. The value will only be saved if the location can be accessed.
5120
5321
In order to calculate those changes, bzr must analyse the submit branch.
5121
5322
Therefore it is most efficient for the submit branch to be a local mirror.
5122
5323
If a public location is known for the submit_branch, that location is used
5193
5394
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5194
no_patch=False, revision=None, remember=False, output=None,
5395
no_patch=False, revision=None, remember=None, output=None,
5195
5396
format=None, mail_to=None, message=None, body=None,
5196
5397
strict=None, **kwargs):
5197
5398
from bzrlib.send import send
5354
5555
takes_options = [
5355
5556
custom_help('directory',
5356
5557
help='Branch whose tags should be displayed.'),
5357
RegistryOption.from_kwargs('sort',
5558
RegistryOption('sort',
5358
5559
'Sort tags by different criteria.', title='Sorting',
5359
alpha='Sort tags lexicographically (default).',
5360
time='Sort tags chronologically.',
5560
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5366
5566
@display_command
5567
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5568
from bzrlib.tag import tag_sort_methods
5373
5569
branch, relpath = Branch.open_containing(directory)
5375
5571
tags = branch.tags.get_tag_dict().items()
5384
5580
# only show revisions between revid1 and revid2 (inclusive)
5385
5581
tags = [(tag, revid) for tag, revid in tags if
5386
5582
graph.is_between(revid, revid1, revid2)]
5389
elif sort == 'time':
5391
for tag, revid in tags:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
5584
sort = tag_sort_methods.get()
5400
5586
if not show_ids:
5401
5587
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
5588
for index, (tag, revid) in enumerate(tags):
5540
5727
def run(self, to_location=None, force=False, create_branch=False,
5728
revision=None, directory=u'.'):
5542
5729
from bzrlib import switch
5730
tree_location = directory
5544
5731
revision = _get_one_revision('switch', revision)
5545
5732
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
5733
if to_location is None:
5547
5734
if revision is None:
5548
5735
raise errors.BzrCommandError('You must supply either a'
5549
5736
' revision or a location')
5737
to_location = tree_location
5552
5739
branch = control_dir.open_branch()
5553
5740
had_explicit_nick = branch.get_config().has_explicit_nickname()
5824
6012
You can put multiple items on the shelf, and by default, 'unshelve' will
5825
6013
restore the most recently shelved changes.
6015
For complicated changes, it is possible to edit the changes in a separate
6016
editor program to decide what the file remaining in the working copy
6017
should look like. To do this, add the configuration option
6019
change_editor = PROGRAM @new_path @old_path
6021
where @new_path is replaced with the path of the new version of the
6022
file and @old_path is replaced with the path of the old version of
6023
the file. The PROGRAM should save the new file with the desired
6024
contents of the file in the working tree.
5828
6028
takes_args = ['file*']
5830
6030
takes_options = [
5832
6033
Option('all', help='Shelve all changes.'),
5839
6040
Option('destroy',
5840
6041
help='Destroy removed changes instead of shelving them.'),
5842
_see_also = ['unshelve']
6043
_see_also = ['unshelve', 'configuration']
5844
6045
def run(self, revision=None, all=False, file_list=None, message=None,
5845
writer=None, list=False, destroy=False):
6046
writer=None, list=False, destroy=False, directory=None):
5847
return self.run_for_list()
6048
return self.run_for_list(directory=directory)
5848
6049
from bzrlib.shelf_ui import Shelver
5849
6050
if writer is None:
5850
6051
writer = bzrlib.option.diff_writer_registry.get()
5852
6053
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
6054
file_list, message, destroy=destroy, directory=directory)
5924
6128
takes_options = ['directory',
5925
6129
Option('ignored', help='Delete all ignored files.'),
5926
Option('detritus', help='Delete conflict files, merge'
6130
Option('detritus', help='Delete conflict files, merge and revert'
5927
6131
' backups, and failed selftest dirs.'),
5928
6132
Option('unknown',
5929
6133
help='Delete files unknown to bzr (default).'),
5988
6192
self.outf.write('%s %s\n' % (path, location))
6195
class cmd_export_pot(Command):
6196
__doc__ = """Export command helps and error messages in po format."""
6201
from bzrlib.export_pot import export_pot
6202
export_pot(self.outf)
5991
6205
def _register_lazy_builtins():
5992
6206
# register lazy builtins from other modules; called at startup and should
5993
6207
# be only called once.
5994
6208
for (name, aliases, module_name) in [
5995
6209
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6210
('cmd_config', [], 'bzrlib.config'),
5996
6211
('cmd_dpush', [], 'bzrlib.foreign'),
5997
6212
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5998
6213
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5999
6214
('cmd_conflicts', [], 'bzrlib.conflicts'),
6000
6215
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6216
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6002
6218
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
