75
74
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
77
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
78
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]))
80
return internal_tree_files(file_list, default_branch, canonicalize,
88
84
def tree_files_for_add(file_list):
153
149
# XXX: Bad function name; should possibly also be a class method of
154
150
# WorkingTree rather than a function.
151
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
155
152
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
153
apply_view=True):
157
154
"""Convert command-line paths to a WorkingTree and relative paths.
156
Deprecated: use WorkingTree.open_containing_paths instead.
159
158
This is typically used for command-line processors that take one or
160
159
more filenames, and infer the workingtree that contains them.
172
171
: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)
173
return WorkingTree.open_containing_paths(
174
file_list, default_directory='.',
223
179
def _get_view_info_for_change_reporter(tree):
294
250
To skip the display of pending merge information altogether, use
295
251
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.
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'.
301
261
# TODO: --no-recurse, --recurse options
519
485
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'
522
541
class cmd_revno(Command):
523
542
__doc__ = """Show current revision number.
942
962
match the remote one, use pull --overwrite. This will work even if the two
943
963
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.
965
If there is no default location set, the first pull will set it (use
966
--no-remember to avoid settting it). After that, you can omit the
967
location to use the default. To change the default, use --remember. The
968
value will only be saved if the remote location can be accessed.
950
970
Note: The location can be specified either in the form of a branch,
951
971
or in the form of a path to a file containing a merge directive generated
964
984
"branch. Local pulls are not applied to "
965
985
"the master branch."
988
help="Show base revision text in conflicts.")
968
990
takes_args = ['location?']
969
991
encoding_type = 'replace'
971
def run(self, location=None, remember=False, overwrite=False,
993
def run(self, location=None, remember=None, overwrite=False,
972
994
revision=None, verbose=False,
973
directory=None, local=False):
995
directory=None, local=False,
974
997
# FIXME: too much stuff is in the command class
975
998
revision_id = None
1067
1099
do a merge (see bzr help merge) from the other branch, and commit that.
1068
1100
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.
1102
If there is no default push location set, the first push will set it (use
1103
--no-remember to avoid settting it). After that, you can omit the
1104
location to use the default. To change the default, use --remember. The
1105
value will only be saved if the remote location can be accessed.
1076
1108
_see_also = ['pull', 'update', 'working-trees']
1097
1129
Option('strict',
1098
1130
help='Refuse to push if there are uncommitted changes in'
1099
1131
' the working tree, --no-strict disables the check.'),
1133
help="Don't populate the working tree, even for protocols"
1134
" that support it."),
1101
1136
takes_args = ['location?']
1102
1137
encoding_type = 'replace'
1104
def run(self, location=None, remember=False, overwrite=False,
1139
def run(self, location=None, remember=None, overwrite=False,
1105
1140
create_prefix=False, verbose=False, revision=None,
1106
1141
use_existing_dir=False, directory=None, stacked_on=None,
1107
stacked=False, strict=None):
1142
stacked=False, strict=None, no_tree=False):
1108
1143
from bzrlib.push import _show_push_branch
1110
1145
if directory is None:
1156
1191
_show_push_branch(br_from, revision_id, location, self.outf,
1157
1192
verbose=verbose, overwrite=overwrite, remember=remember,
1158
1193
stacked_on=stacked_on, create_prefix=create_prefix,
1159
use_existing_dir=use_existing_dir)
1194
use_existing_dir=use_existing_dir, no_tree=no_tree)
1162
1197
class cmd_branch(Command):
1172
1207
To retrieve the branch as of a particular revision, supply the --revision
1173
1208
parameter, as in "branch foo/bar -r 5".
1210
The synonyms 'clone' and 'get' for this command are deprecated.
1176
1213
_see_also = ['checkout']
1177
1214
takes_args = ['from_location', 'to_location?']
1178
takes_options = ['revision', Option('hardlink',
1179
help='Hard-link working tree files where possible.'),
1215
takes_options = ['revision',
1216
Option('hardlink', help='Hard-link working tree files where possible.'),
1217
Option('files-from', type=str,
1218
help="Get file contents from this tree."),
1180
1219
Option('no-tree',
1181
1220
help="Create a branch without a working-tree."),
1182
1221
Option('switch',
1201
1240
def run(self, from_location, to_location=None, revision=None,
1202
1241
hardlink=False, stacked=False, standalone=False, no_tree=False,
1203
use_existing_dir=False, switch=False, bind=False):
1242
use_existing_dir=False, switch=False, bind=False,
1204
1244
from bzrlib import switch as _mod_switch
1205
1245
from bzrlib.tag import _merge_tags_if_possible
1246
if self.invoked_as in ['get', 'clone']:
1247
ui.ui_factory.show_user_warning(
1248
'deprecated_command',
1249
deprecated_name=self.invoked_as,
1250
recommended_name='branch',
1251
deprecated_in_version='2.4')
1206
1252
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1254
if not (hardlink or files_from):
1255
# accelerator_tree is usually slower because you have to read N
1256
# files (no readahead, lots of seeks, etc), but allow the user to
1257
# explicitly request it
1258
accelerator_tree = None
1259
if files_from is not None and files_from != from_location:
1260
accelerator_tree = WorkingTree.open(files_from)
1208
1261
revision = _get_one_revision('branch', revision)
1209
1262
self.add_cleanup(br_from.lock_read().unlock)
1210
1263
if revision is not None:
1317
1370
to_location = branch_location
1318
1371
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1319
1372
branch_location)
1373
if not (hardlink or files_from):
1374
# accelerator_tree is usually slower because you have to read N
1375
# files (no readahead, lots of seeks, etc), but allow the user to
1376
# explicitly request it
1377
accelerator_tree = None
1320
1378
revision = _get_one_revision('checkout', revision)
1321
if files_from is not None:
1379
if files_from is not None and files_from != branch_location:
1322
1380
accelerator_tree = WorkingTree.open(files_from)
1323
1381
if revision is not None:
1324
1382
revision_id = revision.as_revision_id(source)
1385
1438
If you want to discard your local changes, you can just do a
1386
1439
'bzr revert' instead of 'bzr commit' after the update.
1441
If you want to restore a file that has been removed locally, use
1442
'bzr revert' instead of 'bzr update'.
1388
1444
If the tree's branch is bound to a master branch, it will also update
1389
1445
the branch from the master.
1392
1448
_see_also = ['pull', 'working-trees', 'status-flags']
1393
1449
takes_args = ['dir?']
1394
takes_options = ['revision']
1450
takes_options = ['revision',
1452
help="Show base revision text in conflicts."),
1395
1454
aliases = ['up']
1397
def run(self, dir='.', revision=None):
1456
def run(self, dir='.', revision=None, show_base=None):
1398
1457
if revision is not None and len(revision) != 1:
1399
1458
raise errors.BzrCommandError(
1400
1459
"bzr update --revision takes exactly one revision")
1508
1568
class cmd_remove(Command):
1509
1569
__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.
1571
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1572
delete them if they can easily be recovered using revert otherwise they
1573
will be backed up (adding an extention of the form .~#~). If no options or
1574
parameters are given Bazaar will scan for files that are being tracked by
1575
Bazaar but missing in your tree and stop tracking them for you.
1516
1577
takes_args = ['file*']
1517
1578
takes_options = ['verbose',
1519
1580
RegistryOption.from_kwargs('file-deletion-strategy',
1520
1581
'The file deletion mode to be used.',
1521
1582
title='Deletion Strategy', value_switches=True, enum_switch=False,
1522
safe='Only delete files if they can be'
1523
' safely recovered (default).',
1583
safe='Backup changed files (default).',
1524
1584
keep='Delete from bzr but leave the working copy.',
1585
no_backup='Don\'t backup changed files.',
1525
1586
force='Delete all the specified files, even if they can not be '
1526
'recovered and even if they are non-empty directories.')]
1587
'recovered and even if they are non-empty directories. '
1588
'(deprecated, use no-backup)')]
1527
1589
aliases = ['rm', 'del']
1528
1590
encoding_type = 'replace'
1530
1592
def run(self, file_list, verbose=False, new=False,
1531
1593
file_deletion_strategy='safe'):
1532
tree, file_list = tree_files(file_list)
1594
if file_deletion_strategy == 'force':
1595
note("(The --force option is deprecated, rather use --no-backup "
1597
file_deletion_strategy = 'no-backup'
1599
tree, file_list = WorkingTree.open_containing_paths(file_list)
1534
1601
if file_list is not None:
1535
1602
file_list = [f for f in file_list]
1624
1691
_see_also = ['check']
1625
1692
takes_args = ['branch?']
1694
Option('canonicalize-chks',
1695
help='Make sure CHKs are in canonical form (repairs '
1627
def run(self, branch="."):
1700
def run(self, branch=".", canonicalize_chks=False):
1628
1701
from bzrlib.reconcile import reconcile
1629
1702
dir = bzrdir.BzrDir.open(branch)
1703
reconcile(dir, canonicalize_chks=canonicalize_chks)
1633
1706
class cmd_revision_history(Command):
1711
1784
Option('append-revisions-only',
1712
1785
help='Never change revnos or the existing log.'
1713
' Append revisions to it only.')
1786
' Append revisions to it only.'),
1788
'Create a branch without a working tree.')
1715
1790
def run(self, location=None, format=None, append_revisions_only=False,
1716
create_prefix=False):
1791
create_prefix=False, no_tree=False):
1717
1792
if format is None:
1718
1793
format = bzrdir.format_registry.make_bzrdir('default')
1719
1794
if location is None:
1973
2071
old_branch, new_branch,
1974
2072
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1975
2073
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2074
# GNU diff on Windows uses ANSI encoding for filenames
2075
path_encoding = osutils.get_diff_header_encoding()
1976
2076
return show_diff_trees(old_tree, new_tree, sys.stdout,
1977
2077
specific_files=specific_files,
1978
2078
external_diff_options=diff_options,
1979
2079
old_label=old_label, new_label=new_label,
1980
extra_trees=extra_trees, using=using,
2080
extra_trees=extra_trees,
2081
path_encoding=path_encoding,
1981
2083
format_cls=format)
2711
2824
"NAME_PATTERN or --default-rules.")
2712
2825
name_pattern_list = [globbing.normalize_pattern(p)
2713
2826
for p in name_pattern_list]
2828
for p in name_pattern_list:
2829
if not globbing.Globster.is_pattern_valid(p):
2830
bad_patterns += ('\n %s' % p)
2832
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2833
ui.ui_factory.show_error(msg)
2834
raise errors.InvalidPattern('')
2714
2835
for name_pattern in name_pattern_list:
2715
2836
if (name_pattern[0] == '/' or
2716
2837
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2994
3115
to trigger updates to external systems like bug trackers. The --fixes
2995
3116
option can be used to record the association between a revision and
2996
3117
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
3120
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3025
3121
takes_args = ['selected*']
3082
3182
def run(self, message=None, file=None, verbose=False, selected_list=None,
3083
3183
unchanged=False, strict=False, local=False, fixes=None,
3084
author=None, show_diff=False, exclude=None, commit_time=None):
3184
author=None, show_diff=False, exclude=None, commit_time=None,
3085
3186
from bzrlib.errors import (
3086
3187
PointlessCommit,
3087
3188
ConflictsInTree,
3101
3202
raise errors.BzrCommandError(
3102
3203
"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
3205
properties = {}
3112
tree, selected_list = tree_files(selected_list)
3207
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3113
3208
if selected_list == ['']:
3114
3209
# workaround - commit of root of tree should be exactly the same
3115
3210
# as just default commit in that tree, and succeed even though
3186
3284
reporter=None, verbose=verbose, revprops=properties,
3187
3285
authors=author, timestamp=commit_stamp,
3188
3286
timezone=offset,
3189
exclude=safe_relpath_files(tree, exclude))
3287
exclude=tree.safe_relpath_files(exclude),
3190
3289
except PointlessCommit:
3191
3290
raise errors.BzrCommandError("No changes to commit."
3192
" Use --unchanged to commit anyhow.")
3291
" Please 'bzr add' the files you want to commit, or use"
3292
" --unchanged to force an empty commit.")
3193
3293
except ConflictsInTree:
3194
3294
raise errors.BzrCommandError('Conflicts detected in working '
3195
3295
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3278
3378
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.
3379
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3381
When the default format has changed after a major new release of
3382
Bazaar, you may be informed during certain operations that you
3383
should upgrade. Upgrading to a newer format may improve performance
3384
or make new features available. It may however limit interoperability
3385
with older repositories or with older versions of Bazaar.
3387
If you wish to upgrade to a particular format rather than the
3388
current default, that can be specified using the --format option.
3389
As a consequence, you can use the upgrade command this way to
3390
"downgrade" to an earlier format, though some conversions are
3391
a one way process (e.g. changing from the 1.x default to the
3392
2.x default) so downgrading is not always possible.
3394
A backup.bzr.~#~ directory is created at the start of the conversion
3395
process (where # is a number). By default, this is left there on
3396
completion. If the conversion fails, delete the new .bzr directory
3397
and rename this one back in its place. Use the --clean option to ask
3398
for the backup.bzr directory to be removed on successful conversion.
3399
Alternatively, you can delete it by hand if everything looks good
3402
If the location given is a shared repository, dependent branches
3403
are also converted provided the repository converts successfully.
3404
If the conversion of a branch fails, remaining branches are still
3407
For more information on upgrades, see the Bazaar Upgrade Guide,
3408
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3286
_see_also = ['check']
3411
_see_also = ['check', 'reconcile', 'formats']
3287
3412
takes_args = ['url?']
3288
3413
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'),
3414
RegistryOption('format',
3415
help='Upgrade to a specific format. See "bzr help'
3416
' formats" for details.',
3417
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3418
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3419
value_switches=True, title='Branch format'),
3421
help='Remove the backup.bzr directory if successful.'),
3423
help="Show what would be done, but don't actually do anything."),
3297
def run(self, url='.', format=None):
3426
def run(self, url='.', format=None, clean=False, dry_run=False):
3298
3427
from bzrlib.upgrade import upgrade
3299
upgrade(url, format)
3428
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3430
if len(exceptions) == 1:
3431
# Compatibility with historical behavior
3302
3437
class cmd_whoami(Command):
3321
3457
encoding_type = 'replace'
3323
3459
@display_command
3324
def run(self, email=False, branch=False, name=None):
3460
def run(self, email=False, branch=False, name=None, directory=None):
3325
3461
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()
3462
if directory is None:
3463
# use branch if we're inside one; otherwise global config
3465
c = Branch.open_containing(u'.')[0].get_config()
3466
except errors.NotBranchError:
3467
c = _mod_config.GlobalConfig()
3469
c = Branch.open(directory).get_config()
3332
3471
self.outf.write(c.user_email() + '\n')
3334
3473
self.outf.write(c.username() + '\n')
3477
raise errors.BzrCommandError("--email can only be used to display existing "
3337
3480
# display a warning if an email address isn't included in the given name.
3339
config.extract_email_address(name)
3482
_mod_config.extract_email_address(name)
3340
3483
except errors.NoEmailInUsername, e:
3341
3484
warning('"%s" does not seem to contain an email address. '
3342
3485
'This is allowed, but not recommended.', name)
3344
3487
# use global config unless --branch given
3346
c = Branch.open_containing('.')[0].get_config()
3489
if directory is None:
3490
c = Branch.open_containing(u'.')[0].get_config()
3492
c = Branch.open(directory).get_config()
3348
c = config.GlobalConfig()
3494
c = _mod_config.GlobalConfig()
3349
3495
c.set_user_option('email', name)
3418
3564
'bzr alias --remove expects an alias to remove.')
3419
3565
# If alias is not found, print something like:
3420
3566
# unalias: foo: not found
3421
c = config.GlobalConfig()
3567
c = _mod_config.GlobalConfig()
3422
3568
c.unset_alias(alias_name)
3424
3570
@display_command
3425
3571
def print_aliases(self):
3426
3572
"""Print out the defined aliases in a similar format to bash."""
3427
aliases = config.GlobalConfig().get_aliases()
3573
aliases = _mod_config.GlobalConfig().get_aliases()
3428
3574
for key, value in sorted(aliases.iteritems()):
3429
3575
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3519
3668
'throughout the test suite.',
3520
3669
type=get_transport_type),
3521
3670
Option('benchmark',
3522
help='Run the benchmarks rather than selftests.'),
3671
help='Run the benchmarks rather than selftests.',
3523
3673
Option('lsprof-timed',
3524
3674
help='Generate lsprof output for benchmarked'
3525
3675
' sections of code.'),
3526
3676
Option('lsprof-tests',
3527
3677
help='Generate lsprof output for each test.'),
3528
Option('cache-dir', type=str,
3529
help='Cache intermediate benchmark output in this '
3531
3678
Option('first',
3532
3679
help='Run all tests, but run specified tests first.',
3533
3680
short_name='f',
3568
3715
def run(self, testspecs_list=None, verbose=False, one=False,
3569
3716
transport=None, benchmark=None,
3570
lsprof_timed=None, cache_dir=None,
3571
3718
first=False, list_only=False,
3572
3719
randomize=None, exclude=None, strict=False,
3573
3720
load_list=None, debugflag=None, starting_with=None, subunit=False,
3574
3721
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)
3722
from bzrlib import tests
3584
3724
if testspecs_list is not None:
3585
3725
pattern = '|'.join(testspecs_list)
3594
3734
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3595
3735
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3596
3736
# stdout, which would corrupt the subunit stream.
3597
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3737
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3738
# following code can be deleted when it's sufficiently deployed
3739
# -- vila/mgz 20100514
3740
if (sys.platform == "win32"
3741
and getattr(sys.stdout, 'fileno', None) is not None):
3599
3743
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3601
3745
self.additional_selftest_args.setdefault(
3602
3746
'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)
3611
test_suite_factory = None
3748
raise errors.BzrCommandError(
3749
"--benchmark is no longer supported from bzr 2.2; "
3750
"use bzr-usertest instead")
3751
test_suite_factory = None
3613
3752
selftest_kwargs = {"verbose": verbose,
3614
3753
"pattern": pattern,
3615
3754
"stop_on_failure": one,
3691
3836
with bzr send. If neither is specified, the default is the upstream branch
3692
3837
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.
3839
When merging from a branch, by default bzr will try to merge in all new
3840
work from the other branch, automatically determining an appropriate base
3841
revision. If this fails, you may need to give an explicit base.
3843
To pick a different ending revision, pass "--revision OTHER". bzr will
3844
try to merge in all new work up to and including revision OTHER.
3846
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3847
through OTHER, excluding BASE but including OTHER, will be merged. If this
3848
causes some revisions to be skipped, i.e. if the destination branch does
3849
not already contain revision BASE, such a merge is commonly referred to as
3850
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
3851
cherrypicks. The changes look like a normal commit, and the history of the
3852
changes from the other branch is not stored in the commit.
3854
Revision numbers are always relative to the source branch.
3705
3856
Merge will do its best to combine the changes in two branches, but there
3706
3857
are some kinds of problems only a human can fix. When it encounters those,
3710
3861
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.
3863
If there is no default branch set, the first merge will set it (use
3864
--no-remember to avoid settting it). After that, you can omit the branch
3865
to use the default. To change the default, use --remember. The value will
3866
only be saved if the remote location can be accessed.
3717
3868
The results of the merge are placed into the destination working
3718
3869
directory, where they can be reviewed (with bzr diff), tested, and then
3785
3936
def run(self, location=None, revision=None, force=False,
3786
merge_type=None, show_base=False, reprocess=None, remember=False,
3937
merge_type=None, show_base=False, reprocess=None, remember=None,
3787
3938
uncommitted=False, pull=False,
3788
3939
directory=None,
3881
4036
def _do_preview(self, merger):
3882
4037
from bzrlib.diff import show_diff_trees
3883
4038
result_tree = self._get_preview(merger)
4039
path_encoding = osutils.get_diff_header_encoding()
3884
4040
show_diff_trees(merger.this_tree, result_tree, self.outf,
3885
old_label='', new_label='')
4041
old_label='', new_label='',
4042
path_encoding=path_encoding)
3887
4044
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3888
4045
merger.change_reporter = change_reporter
3964
4121
if other_revision_id is None:
3965
4122
other_revision_id = _mod_revision.ensure_null(
3966
4123
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):
4124
# Remember where we merge from. We need to remember if:
4125
# - user specify a location (and we don't merge from the parent
4127
# - user ask to remember or there is no previous location set to merge
4128
# from and user didn't ask to *not* remember
4129
if (user_location is not None
4131
or (remember is None
4132
and tree.branch.get_submit_branch() is None)))):
3970
4133
tree.branch.set_submit_branch(other_branch.base)
3971
_merge_tags_if_possible(other_branch, tree.branch)
4134
# Merge tags (but don't set them in the master branch yet, the user
4135
# might revert this merge). Commit will propagate them.
4136
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3972
4137
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3973
4138
other_revision_id, base_revision_id, other_branch, base_branch)
3974
4139
if other_path != '':
4142
4307
last committed revision is used.
4144
4309
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.
4310
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4311
will remove the changes introduced by the second last commit (-2), without
4312
affecting the changes introduced by the last commit (-1). To remove
4313
certain changes on a hunk-by-hunk basis, see the shelve command.
4149
4315
By default, any files that have been manually changed will be backed up
4150
4316
first. (Files changed only by merge are not backed up.) Backup files have
4314
4481
theirs_only=False,
4315
4482
log_format=None, long=False, short=False, line=False,
4316
4483
show_ids=False, verbose=False, this=False, other=False,
4317
include_merges=False, revision=None, my_revision=None):
4484
include_merges=False, revision=None, my_revision=None,
4318
4486
from bzrlib.missing import find_unmerged, iter_log_revisions
4319
4487
def message(s):
4320
4488
if not is_quiet():
4478
4646
@display_command
4479
4647
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")
4648
from bzrlib import plugin
4649
# Don't give writelines a generator as some codecs don't like that
4650
self.outf.writelines(
4651
list(plugin.describe_plugins(show_paths=verbose)))
4502
4654
class cmd_testament(Command):
4564
4718
self.add_cleanup(branch.lock_read().unlock)
4565
4719
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
4720
self.add_cleanup(tree.lock_read().unlock)
4721
if wt is not None and revision is None:
4568
4722
file_id = wt.path2id(relpath)
4570
4724
file_id = tree.path2id(relpath)
4571
4725
if file_id is None:
4572
4726
raise errors.NotVersionedError(filename)
4573
file_version = tree.inventory[file_id].revision
4574
4727
if wt is not None and revision is None:
4575
4728
# If there is a tree and we're not annotating historical
4576
4729
# versions, annotate the working tree's content.
4577
4730
annotate_file_tree(wt, file_id, self.outf, long, all,
4578
4731
show_ids=show_ids)
4580
annotate_file(branch, file_version, file_id, long, all, self.outf,
4733
annotate_file_tree(tree, file_id, self.outf, long, all,
4734
show_ids=show_ids, branch=branch)
4584
4737
class cmd_re_sign(Command):
4824
4983
bzr break-lock bzr+ssh://example.com/bzr/foo
4984
bzr break-lock --conf ~/.bazaar
4826
4987
takes_args = ['location?']
4990
help='LOCATION is the directory where the config lock is.'),
4992
help='Do not ask for confirmation before breaking the lock.'),
4828
def run(self, location=None, show=False):
4995
def run(self, location=None, config=False, force=False):
4829
4996
if location is None:
4830
4997
location = u'.'
4831
control, relpath = bzrdir.BzrDir.open_containing(location)
4833
control.break_lock()
4834
except NotImplementedError:
4999
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5001
{'bzrlib.lockdir.break': True})
5003
conf = _mod_config.LockableConfig(file_name=location)
5006
control, relpath = bzrdir.BzrDir.open_containing(location)
5008
control.break_lock()
5009
except NotImplementedError:
4838
5013
class cmd_wait_until_signalled(Command):
4902
5077
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4903
5078
protocol=None):
4904
from bzrlib.transport import get_transport, transport_server_registry
5079
from bzrlib import transport
4905
5080
if directory is None:
4906
5081
directory = os.getcwd()
4907
5082
if protocol is None:
4908
protocol = transport_server_registry.get()
5083
protocol = transport.transport_server_registry.get()
4909
5084
host, port = self.get_host_and_port(port)
4910
5085
url = urlutils.local_path_to_url(directory)
4911
5086
if not allow_writes:
4912
5087
url = 'readonly+' + url
4913
transport = get_transport(url)
4914
protocol(transport, host, port, inet)
5088
t = transport.get_transport(url)
5089
protocol(t, host, port, inet)
4917
5092
class cmd_join(Command):
5028
5204
encoding_type = 'exact'
5030
5206
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5031
sign=False, revision=None, mail_to=None, message=None):
5207
sign=False, revision=None, mail_to=None, message=None,
5032
5209
from bzrlib.revision import ensure_null, NULL_REVISION
5033
5210
include_patch, include_bundle = {
5034
5211
'plain': (False, False),
5035
5212
'diff': (True, False),
5036
5213
'bundle': (True, True),
5038
branch = Branch.open('.')
5215
branch = Branch.open(directory)
5039
5216
stored_submit_branch = branch.get_submit_branch()
5040
5217
if submit_branch is None:
5041
5218
submit_branch = stored_submit_branch
5117
5294
source branch defaults to that containing the working directory, but can
5118
5295
be changed using --from.
5297
Both the submit branch and the public branch follow the usual behavior with
5298
respect to --remember: If there is no default location set, the first send
5299
will set it (use --no-remember to avoid settting it). After that, you can
5300
omit the location to use the default. To change the default, use
5301
--remember. The value will only be saved if the location can be accessed.
5120
5303
In order to calculate those changes, bzr must analyse the submit branch.
5121
5304
Therefore it is most efficient for the submit branch to be a local mirror.
5122
5305
If a public location is known for the submit_branch, that location is used
5193
5376
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5194
no_patch=False, revision=None, remember=False, output=None,
5377
no_patch=False, revision=None, remember=None, output=None,
5195
5378
format=None, mail_to=None, message=None, body=None,
5196
5379
strict=None, **kwargs):
5197
5380
from bzrlib.send import send
5354
5537
takes_options = [
5355
5538
custom_help('directory',
5356
5539
help='Branch whose tags should be displayed.'),
5357
RegistryOption.from_kwargs('sort',
5540
RegistryOption('sort',
5358
5541
'Sort tags by different criteria.', title='Sorting',
5359
alpha='Sort tags lexicographically (default).',
5360
time='Sort tags chronologically.',
5542
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5366
5548
@display_command
5549
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5550
from bzrlib.tag import tag_sort_methods
5373
5551
branch, relpath = Branch.open_containing(directory)
5375
5553
tags = branch.tags.get_tag_dict().items()
5384
5562
# only show revisions between revid1 and revid2 (inclusive)
5385
5563
tags = [(tag, revid) for tag, revid in tags if
5386
5564
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]])
5566
sort = tag_sort_methods.get()
5400
5568
if not show_ids:
5401
5569
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
5570
for index, (tag, revid) in enumerate(tags):
5540
5709
def run(self, to_location=None, force=False, create_branch=False,
5710
revision=None, directory=u'.'):
5542
5711
from bzrlib import switch
5712
tree_location = directory
5544
5713
revision = _get_one_revision('switch', revision)
5545
5714
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
5715
if to_location is None:
5547
5716
if revision is None:
5548
5717
raise errors.BzrCommandError('You must supply either a'
5549
5718
' revision or a location')
5719
to_location = tree_location
5552
5721
branch = control_dir.open_branch()
5553
5722
had_explicit_nick = branch.get_config().has_explicit_nickname()
5824
5994
You can put multiple items on the shelf, and by default, 'unshelve' will
5825
5995
restore the most recently shelved changes.
5997
For complicated changes, it is possible to edit the changes in a separate
5998
editor program to decide what the file remaining in the working copy
5999
should look like. To do this, add the configuration option
6001
change_editor = PROGRAM @new_path @old_path
6003
where @new_path is replaced with the path of the new version of the
6004
file and @old_path is replaced with the path of the old version of
6005
the file. The PROGRAM should save the new file with the desired
6006
contents of the file in the working tree.
5828
6010
takes_args = ['file*']
5830
6012
takes_options = [
5832
6015
Option('all', help='Shelve all changes.'),
5839
6022
Option('destroy',
5840
6023
help='Destroy removed changes instead of shelving them.'),
5842
_see_also = ['unshelve']
6025
_see_also = ['unshelve', 'configuration']
5844
6027
def run(self, revision=None, all=False, file_list=None, message=None,
5845
writer=None, list=False, destroy=False):
6028
writer=None, list=False, destroy=False, directory=None):
5847
return self.run_for_list()
6030
return self.run_for_list(directory=directory)
5848
6031
from bzrlib.shelf_ui import Shelver
5849
6032
if writer is None:
5850
6033
writer = bzrlib.option.diff_writer_registry.get()
5852
6035
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
6036
file_list, message, destroy=destroy, directory=directory)
5924
6110
takes_options = ['directory',
5925
6111
Option('ignored', help='Delete all ignored files.'),
5926
Option('detritus', help='Delete conflict files, merge'
6112
Option('detritus', help='Delete conflict files, merge and revert'
5927
6113
' backups, and failed selftest dirs.'),
5928
6114
Option('unknown',
5929
6115
help='Delete files unknown to bzr (default).'),
5988
6174
self.outf.write('%s %s\n' % (path, location))
6177
class cmd_export_pot(Command):
6178
__doc__ = """Export command helps and error messages in po format."""
6183
from bzrlib.export_pot import export_pot
6184
export_pot(self.outf)
5991
6187
def _register_lazy_builtins():
5992
6188
# register lazy builtins from other modules; called at startup and should
5993
6189
# be only called once.
5994
6190
for (name, aliases, module_name) in [
5995
6191
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6192
('cmd_config', [], 'bzrlib.config'),
5996
6193
('cmd_dpush', [], 'bzrlib.foreign'),
5997
6194
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5998
6195
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5999
6196
('cmd_conflicts', [], 'bzrlib.conflicts'),
6000
6197
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6198
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6002
6200
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
