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):
191
def _open_directory_or_containing_tree_or_branch(filename, directory):
192
"""Open the tree or branch containing the specified file, unless
193
the --directory option is used to specify a different branch."""
194
if directory is not None:
195
return (None, Branch.open(directory), filename)
196
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
235
199
# TODO: Make sure no commands unconditionally use the working directory as a
236
200
# branch. If a filename argument is used, the first of them should be used to
237
201
# specify the branch. (Perhaps this can be factored out into some kind of
286
250
To skip the display of pending merge information altogether, use
287
251
the no-pending option or specify a file/directory.
289
If a revision argument is given, the status is calculated against
290
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'.
293
261
# TODO: --no-recurse, --recurse options
353
321
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
324
def run(self, revision_id=None, revision=None, directory=u'.'):
357
325
if revision_id is not None and revision is not None:
358
326
raise errors.BzrCommandError('You can only supply one of'
359
327
' revision_id or --revision')
360
328
if revision_id is None and revision is None:
361
329
raise errors.BzrCommandError('You must supply either'
362
330
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
332
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
365
334
revisions = b.repository.revisions
366
335
if revisions is None:
511
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'
514
541
class cmd_revno(Command):
515
542
__doc__ = """Show current revision number.
951
976
takes_options = ['remember', 'overwrite', 'revision',
952
977
custom_help('verbose',
953
978
help='Show logs of pulled revisions.'),
979
custom_help('directory',
955
980
help='Branch to pull into, '
956
'rather than the one containing the working directory.',
981
'rather than the one containing the working directory.'),
961
983
help="Perform a local pull in a bound "
962
984
"branch. Local pulls are not applied to "
963
985
"the master branch."
988
help="Show base revision text in conflicts.")
966
990
takes_args = ['location?']
967
991
encoding_type = 'replace'
969
993
def run(self, location=None, remember=False, overwrite=False,
970
994
revision=None, verbose=False,
971
directory=None, local=False):
995
directory=None, local=False,
972
997
# FIXME: too much stuff is in the command class
973
998
revision_id = None
1076
1109
Option('create-prefix',
1077
1110
help='Create the path leading up to the branch '
1078
1111
'if it does not already exist.'),
1112
custom_help('directory',
1080
1113
help='Branch to push from, '
1081
'rather than the one containing the working directory.',
1114
'rather than the one containing the working directory.'),
1085
1115
Option('use-existing-dir',
1086
1116
help='By default push will fail if the target'
1087
1117
' directory exists, but does not already'
1105
1138
def run(self, location=None, remember=False, overwrite=False,
1106
1139
create_prefix=False, verbose=False, revision=None,
1107
1140
use_existing_dir=False, directory=None, stacked_on=None,
1108
stacked=False, strict=None):
1141
stacked=False, strict=None, no_tree=False):
1109
1142
from bzrlib.push import _show_push_branch
1111
1144
if directory is None:
1157
1190
_show_push_branch(br_from, revision_id, location, self.outf,
1158
1191
verbose=verbose, overwrite=overwrite, remember=remember,
1159
1192
stacked_on=stacked_on, create_prefix=create_prefix,
1160
use_existing_dir=use_existing_dir)
1193
use_existing_dir=use_existing_dir, no_tree=no_tree)
1163
1196
class cmd_branch(Command):
1177
1210
_see_also = ['checkout']
1178
1211
takes_args = ['from_location', 'to_location?']
1179
takes_options = ['revision', Option('hardlink',
1180
help='Hard-link working tree files where possible.'),
1212
takes_options = ['revision',
1213
Option('hardlink', help='Hard-link working tree files where possible.'),
1214
Option('files-from', type=str,
1215
help="Get file contents from this tree."),
1181
1216
Option('no-tree',
1182
1217
help="Create a branch without a working-tree."),
1183
1218
Option('switch',
1202
1237
def run(self, from_location, to_location=None, revision=None,
1203
1238
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1239
use_existing_dir=False, switch=False, bind=False,
1205
1241
from bzrlib import switch as _mod_switch
1206
1242
from bzrlib.tag import _merge_tags_if_possible
1207
1243
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1245
if not (hardlink or files_from):
1246
# accelerator_tree is usually slower because you have to read N
1247
# files (no readahead, lots of seeks, etc), but allow the user to
1248
# explicitly request it
1249
accelerator_tree = None
1250
if files_from is not None and files_from != from_location:
1251
accelerator_tree = WorkingTree.open(files_from)
1209
1252
revision = _get_one_revision('branch', revision)
1210
1253
self.add_cleanup(br_from.lock_read().unlock)
1211
1254
if revision is not None:
1318
1361
to_location = branch_location
1319
1362
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1320
1363
branch_location)
1364
if not (hardlink or files_from):
1365
# accelerator_tree is usually slower because you have to read N
1366
# files (no readahead, lots of seeks, etc), but allow the user to
1367
# explicitly request it
1368
accelerator_tree = None
1321
1369
revision = _get_one_revision('checkout', revision)
1322
if files_from is not None:
1370
if files_from is not None and files_from != branch_location:
1323
1371
accelerator_tree = WorkingTree.open(files_from)
1324
1372
if revision is not None:
1325
1373
revision_id = revision.as_revision_id(source)
1381
1429
If you want to discard your local changes, you can just do a
1382
1430
'bzr revert' instead of 'bzr commit' after the update.
1432
If you want to restore a file that has been removed locally, use
1433
'bzr revert' instead of 'bzr update'.
1384
1435
If the tree's branch is bound to a master branch, it will also update
1385
1436
the branch from the master.
1388
1439
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1440
takes_args = ['dir?']
1390
takes_options = ['revision']
1441
takes_options = ['revision',
1443
help="Show base revision text in conflicts."),
1391
1445
aliases = ['up']
1393
def run(self, dir='.', revision=None):
1447
def run(self, dir='.', revision=None, show_base=None):
1394
1448
if revision is not None and len(revision) != 1:
1395
1449
raise errors.BzrCommandError(
1396
1450
"bzr update --revision takes exactly one revision")
1504
1559
class cmd_remove(Command):
1505
1560
__doc__ = """Remove files or directories.
1507
This makes bzr stop tracking changes to the specified files. bzr will delete
1508
them if they can easily be recovered using revert. If no options or
1509
parameters are given bzr will scan for files that are being tracked by bzr
1510
but missing in your tree and stop tracking them for you.
1562
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1563
delete them if they can easily be recovered using revert otherwise they
1564
will be backed up (adding an extention of the form .~#~). If no options or
1565
parameters are given Bazaar will scan for files that are being tracked by
1566
Bazaar but missing in your tree and stop tracking them for you.
1512
1568
takes_args = ['file*']
1513
1569
takes_options = ['verbose',
1515
1571
RegistryOption.from_kwargs('file-deletion-strategy',
1516
1572
'The file deletion mode to be used.',
1517
1573
title='Deletion Strategy', value_switches=True, enum_switch=False,
1518
safe='Only delete files if they can be'
1519
' safely recovered (default).',
1574
safe='Backup changed files (default).',
1520
1575
keep='Delete from bzr but leave the working copy.',
1576
no_backup='Don\'t backup changed files.',
1521
1577
force='Delete all the specified files, even if they can not be '
1522
'recovered and even if they are non-empty directories.')]
1578
'recovered and even if they are non-empty directories. '
1579
'(deprecated, use no-backup)')]
1523
1580
aliases = ['rm', 'del']
1524
1581
encoding_type = 'replace'
1526
1583
def run(self, file_list, verbose=False, new=False,
1527
1584
file_deletion_strategy='safe'):
1528
tree, file_list = tree_files(file_list)
1585
if file_deletion_strategy == 'force':
1586
note("(The --force option is deprecated, rather use --no-backup "
1588
file_deletion_strategy = 'no-backup'
1590
tree, file_list = WorkingTree.open_containing_paths(file_list)
1530
1592
if file_list is not None:
1531
1593
file_list = [f for f in file_list]
1620
1682
_see_also = ['check']
1621
1683
takes_args = ['branch?']
1685
Option('canonicalize-chks',
1686
help='Make sure CHKs are in canonical form (repairs '
1623
def run(self, branch="."):
1691
def run(self, branch=".", canonicalize_chks=False):
1624
1692
from bzrlib.reconcile import reconcile
1625
1693
dir = bzrdir.BzrDir.open(branch)
1694
reconcile(dir, canonicalize_chks=canonicalize_chks)
1629
1697
class cmd_revision_history(Command):
1707
1775
Option('append-revisions-only',
1708
1776
help='Never change revnos or the existing log.'
1709
' Append revisions to it only.')
1777
' Append revisions to it only.'),
1779
'Create a branch without a working tree.')
1711
1781
def run(self, location=None, format=None, append_revisions_only=False,
1712
create_prefix=False):
1782
create_prefix=False, no_tree=False):
1713
1783
if format is None:
1714
1784
format = bzrdir.format_registry.make_bzrdir('default')
1715
1785
if location is None:
1969
2062
old_branch, new_branch,
1970
2063
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
2064
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2065
# GNU diff on Windows uses ANSI encoding for filenames
2066
path_encoding = osutils.get_diff_header_encoding()
1972
2067
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
2068
specific_files=specific_files,
1974
2069
external_diff_options=diff_options,
1975
2070
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
2071
extra_trees=extra_trees,
2072
path_encoding=path_encoding,
1977
2074
format_cls=format)
1987
2084
# level of effort but possibly much less IO. (Or possibly not,
1988
2085
# if the directories are very large...)
1989
2086
_see_also = ['status', 'ls']
1990
takes_options = ['show-ids']
2087
takes_options = ['directory', 'show-ids']
1992
2089
@display_command
1993
def run(self, show_ids=False):
1994
tree = WorkingTree.open_containing(u'.')[0]
2090
def run(self, show_ids=False, directory=u'.'):
2091
tree = WorkingTree.open_containing(directory)[0]
1995
2092
self.add_cleanup(tree.lock_read().unlock)
1996
2093
old = tree.basis_tree()
1997
2094
self.add_cleanup(old.lock_read().unlock)
2012
2109
_see_also = ['status', 'ls']
2015
help='Write an ascii NUL (\\0) separator '
2016
'between files rather than a newline.')
2110
takes_options = ['directory', 'null']
2019
2112
@display_command
2020
def run(self, null=False):
2021
tree = WorkingTree.open_containing(u'.')[0]
2113
def run(self, null=False, directory=u'.'):
2114
tree = WorkingTree.open_containing(directory)[0]
2115
self.add_cleanup(tree.lock_read().unlock)
2022
2116
td = tree.changes_from(tree.basis_tree())
2023
2118
for path, id, kind, text_modified, meta_modified in td.modified:
2025
2120
self.outf.write(path + '\0')
2035
2130
_see_also = ['status', 'ls']
2038
help='Write an ascii NUL (\\0) separator '
2039
'between files rather than a newline.')
2131
takes_options = ['directory', 'null']
2042
2133
@display_command
2043
def run(self, null=False):
2044
wt = WorkingTree.open_containing(u'.')[0]
2134
def run(self, null=False, directory=u'.'):
2135
wt = WorkingTree.open_containing(directory)[0]
2045
2136
self.add_cleanup(wt.lock_read().unlock)
2046
2137
basis = wt.basis_tree()
2047
2138
self.add_cleanup(basis.lock_read().unlock)
2505
2603
help='Recurse into subdirectories.'),
2506
2604
Option('from-root',
2507
2605
help='Print paths relative to the root of the branch.'),
2508
Option('unknown', help='Print unknown files.'),
2606
Option('unknown', short_name='u',
2607
help='Print unknown files.'),
2509
2608
Option('versioned', help='Print versioned files.',
2510
2609
short_name='V'),
2511
Option('ignored', help='Print ignored files.'),
2513
help='Write an ascii NUL (\\0) separator '
2514
'between files rather than a newline.'),
2610
Option('ignored', short_name='i',
2611
help='Print ignored files.'),
2612
Option('kind', short_name='k',
2516
2613
help='List entries of a particular kind: file, directory, symlink.',
2520
2619
@display_command
2521
2620
def run(self, revision=None, verbose=False,
2522
2621
recursive=False, from_root=False,
2523
2622
unknown=False, versioned=False, ignored=False,
2524
null=False, kind=None, show_ids=False, path=None):
2623
null=False, kind=None, show_ids=False, path=None, directory=None):
2526
2625
if kind and kind not in ('file', 'directory', 'symlink'):
2527
2626
raise errors.BzrCommandError('invalid kind specified')
2689
2798
_see_also = ['status', 'ignored', 'patterns']
2690
2799
takes_args = ['name_pattern*']
2800
takes_options = ['directory',
2692
2801
Option('default-rules',
2693
2802
help='Display the default ignore rules that bzr uses.')
2696
def run(self, name_pattern_list=None, default_rules=None):
2805
def run(self, name_pattern_list=None, default_rules=None,
2697
2807
from bzrlib import ignores
2698
2808
if default_rules is not None:
2699
2809
# dump the default rules and exit
2705
2815
"NAME_PATTERN or --default-rules.")
2706
2816
name_pattern_list = [globbing.normalize_pattern(p)
2707
2817
for p in name_pattern_list]
2819
for p in name_pattern_list:
2820
if not globbing.Globster.is_pattern_valid(p):
2821
bad_patterns += ('\n %s' % p)
2823
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2824
ui.ui_factory.show_error(msg)
2825
raise errors.InvalidPattern('')
2708
2826
for name_pattern in name_pattern_list:
2709
2827
if (name_pattern[0] == '/' or
2710
2828
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2711
2829
raise errors.BzrCommandError(
2712
2830
"NAME_PATTERN should not be an absolute path")
2713
tree, relpath = WorkingTree.open_containing(u'.')
2831
tree, relpath = WorkingTree.open_containing(directory)
2714
2832
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2715
2833
ignored = globbing.Globster(name_pattern_list)
2835
self.add_cleanup(tree.lock_read().unlock)
2718
2836
for entry in tree.list_files():
2720
2838
if id is not None:
2721
2839
filename = entry[0]
2722
2840
if ignored.match(filename):
2723
2841
matches.append(filename)
2725
2842
if len(matches) > 0:
2726
2843
self.outf.write("Warning: the following files are version controlled and"
2727
2844
" match your ignore pattern:\n%s"
2743
2860
encoding_type = 'replace'
2744
2861
_see_also = ['ignore', 'ls']
2862
takes_options = ['directory']
2746
2864
@display_command
2748
tree = WorkingTree.open_containing(u'.')[0]
2865
def run(self, directory=u'.'):
2866
tree = WorkingTree.open_containing(directory)[0]
2749
2867
self.add_cleanup(tree.lock_read().unlock)
2750
2868
for path, file_class, kind, file_id, entry in tree.list_files():
2751
2869
if file_class != 'I':
2819
2938
'revision in which it was changed.'),
2821
2940
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2941
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2823
2942
from bzrlib.export import export
2825
2944
if branch_or_subdir is None:
2826
tree = WorkingTree.open_containing(u'.')[0]
2945
tree = WorkingTree.open_containing(directory)[0]
2827
2946
b = tree.branch
2860
2979
@display_command
2861
2980
def run(self, filename, revision=None, name_from_revision=False,
2981
filters=False, directory=None):
2863
2982
if revision is not None and len(revision) != 1:
2864
2983
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2865
2984
" one revision specifier")
2866
2985
tree, branch, relpath = \
2867
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2986
_open_directory_or_containing_tree_or_branch(filename, directory)
2868
2987
self.add_cleanup(branch.lock_read().unlock)
2869
2988
return self._run(tree, branch, relpath, filename, revision,
2870
2989
name_from_revision, filters)
3270
3392
class cmd_upgrade(Command):
3271
__doc__ = """Upgrade branch storage to current format.
3273
The check command or bzr developers may sometimes advise you to run
3274
this command. When the default format has changed you may also be warned
3275
during other operations to upgrade.
3393
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3395
When the default format has changed after a major new release of
3396
Bazaar, you may be informed during certain operations that you
3397
should upgrade. Upgrading to a newer format may improve performance
3398
or make new features available. It may however limit interoperability
3399
with older repositories or with older versions of Bazaar.
3401
If you wish to upgrade to a particular format rather than the
3402
current default, that can be specified using the --format option.
3403
As a consequence, you can use the upgrade command this way to
3404
"downgrade" to an earlier format, though some conversions are
3405
a one way process (e.g. changing from the 1.x default to the
3406
2.x default) so downgrading is not always possible.
3408
A backup.bzr.~#~ directory is created at the start of the conversion
3409
process (where # is a number). By default, this is left there on
3410
completion. If the conversion fails, delete the new .bzr directory
3411
and rename this one back in its place. Use the --clean option to ask
3412
for the backup.bzr directory to be removed on successful conversion.
3413
Alternatively, you can delete it by hand if everything looks good
3416
If the location given is a shared repository, dependent branches
3417
are also converted provided the repository converts successfully.
3418
If the conversion of a branch fails, remaining branches are still
3421
For more information on upgrades, see the Bazaar Upgrade Guide,
3422
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3278
_see_also = ['check']
3425
_see_also = ['check', 'reconcile', 'formats']
3279
3426
takes_args = ['url?']
3280
3427
takes_options = [
3281
RegistryOption('format',
3282
help='Upgrade to a specific format. See "bzr help'
3283
' formats" for details.',
3284
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3285
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3286
value_switches=True, title='Branch format'),
3428
RegistryOption('format',
3429
help='Upgrade to a specific format. See "bzr help'
3430
' formats" for details.',
3431
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3432
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3433
value_switches=True, title='Branch format'),
3435
help='Remove the backup.bzr directory if successful.'),
3437
help="Show what would be done, but don't actually do anything."),
3289
def run(self, url='.', format=None):
3440
def run(self, url='.', format=None, clean=False, dry_run=False):
3290
3441
from bzrlib.upgrade import upgrade
3291
upgrade(url, format)
3442
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3444
if len(exceptions) == 1:
3445
# Compatibility with historical behavior
3294
3451
class cmd_whoami(Command):
3313
3471
encoding_type = 'replace'
3315
3473
@display_command
3316
def run(self, email=False, branch=False, name=None):
3474
def run(self, email=False, branch=False, name=None, directory=None):
3317
3475
if name is None:
3318
# use branch if we're inside one; otherwise global config
3320
c = Branch.open_containing('.')[0].get_config()
3321
except errors.NotBranchError:
3322
c = config.GlobalConfig()
3476
if directory is None:
3477
# use branch if we're inside one; otherwise global config
3479
c = Branch.open_containing(u'.')[0].get_config()
3480
except errors.NotBranchError:
3481
c = _mod_config.GlobalConfig()
3483
c = Branch.open(directory).get_config()
3324
3485
self.outf.write(c.user_email() + '\n')
3326
3487
self.outf.write(c.username() + '\n')
3491
raise errors.BzrCommandError("--email can only be used to display existing "
3329
3494
# display a warning if an email address isn't included in the given name.
3331
config.extract_email_address(name)
3496
_mod_config.extract_email_address(name)
3332
3497
except errors.NoEmailInUsername, e:
3333
3498
warning('"%s" does not seem to contain an email address. '
3334
3499
'This is allowed, but not recommended.', name)
3336
3501
# use global config unless --branch given
3338
c = Branch.open_containing('.')[0].get_config()
3503
if directory is None:
3504
c = Branch.open_containing(u'.')[0].get_config()
3506
c = Branch.open(directory).get_config()
3340
c = config.GlobalConfig()
3508
c = _mod_config.GlobalConfig()
3341
3509
c.set_user_option('email', name)
3409
3578
'bzr alias --remove expects an alias to remove.')
3410
3579
# If alias is not found, print something like:
3411
3580
# unalias: foo: not found
3412
c = config.GlobalConfig()
3581
c = _mod_config.GlobalConfig()
3413
3582
c.unset_alias(alias_name)
3415
3584
@display_command
3416
3585
def print_aliases(self):
3417
3586
"""Print out the defined aliases in a similar format to bash."""
3418
aliases = config.GlobalConfig().get_aliases()
3587
aliases = _mod_config.GlobalConfig().get_aliases()
3419
3588
for key, value in sorted(aliases.iteritems()):
3420
3589
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3510
3682
'throughout the test suite.',
3511
3683
type=get_transport_type),
3512
3684
Option('benchmark',
3513
help='Run the benchmarks rather than selftests.'),
3685
help='Run the benchmarks rather than selftests.',
3514
3687
Option('lsprof-timed',
3515
3688
help='Generate lsprof output for benchmarked'
3516
3689
' sections of code.'),
3517
3690
Option('lsprof-tests',
3518
3691
help='Generate lsprof output for each test.'),
3519
Option('cache-dir', type=str,
3520
help='Cache intermediate benchmark output in this '
3522
3692
Option('first',
3523
3693
help='Run all tests, but run specified tests first.',
3524
3694
short_name='f',
3559
3729
def run(self, testspecs_list=None, verbose=False, one=False,
3560
3730
transport=None, benchmark=None,
3561
lsprof_timed=None, cache_dir=None,
3562
3732
first=False, list_only=False,
3563
3733
randomize=None, exclude=None, strict=False,
3564
3734
load_list=None, debugflag=None, starting_with=None, subunit=False,
3565
3735
parallel=None, lsprof_tests=False):
3566
from bzrlib.tests import selftest
3567
import bzrlib.benchmarks as benchmarks
3568
from bzrlib.benchmarks import tree_creator
3570
# Make deprecation warnings visible, unless -Werror is set
3571
symbol_versioning.activate_deprecation_warnings(override=False)
3573
if cache_dir is not None:
3574
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3736
from bzrlib import tests
3575
3738
if testspecs_list is not None:
3576
3739
pattern = '|'.join(testspecs_list)
3585
3748
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3586
3749
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
3750
# stdout, which would corrupt the subunit stream.
3588
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3751
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3752
# following code can be deleted when it's sufficiently deployed
3753
# -- vila/mgz 20100514
3754
if (sys.platform == "win32"
3755
and getattr(sys.stdout, 'fileno', None) is not None):
3590
3757
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3592
3759
self.additional_selftest_args.setdefault(
3593
3760
'suite_decorators', []).append(parallel)
3595
test_suite_factory = benchmarks.test_suite
3596
# Unless user explicitly asks for quiet, be verbose in benchmarks
3597
verbose = not is_quiet()
3598
# TODO: should possibly lock the history file...
3599
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3602
test_suite_factory = None
3762
raise errors.BzrCommandError(
3763
"--benchmark is no longer supported from bzr 2.2; "
3764
"use bzr-usertest instead")
3765
test_suite_factory = None
3604
3766
selftest_kwargs = {"verbose": verbose,
3605
3767
"pattern": pattern,
3606
3768
"stop_on_failure": one,
3682
3850
with bzr send. If neither is specified, the default is the upstream branch
3683
3851
or the branch most recently merged using --remember.
3685
When merging a branch, by default the tip will be merged. To pick a different
3686
revision, pass --revision. If you specify two values, the first will be used as
3687
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3688
available revisions, like this is commonly referred to as "cherrypicking".
3690
Revision numbers are always relative to the branch being merged.
3692
By default, bzr will try to merge in all new work from the other
3693
branch, automatically determining an appropriate base. If this
3694
fails, you may need to give an explicit base.
3853
When merging from a branch, by default bzr will try to merge in all new
3854
work from the other branch, automatically determining an appropriate base
3855
revision. If this fails, you may need to give an explicit base.
3857
To pick a different ending revision, pass "--revision OTHER". bzr will
3858
try to merge in all new work up to and including revision OTHER.
3860
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3861
through OTHER, excluding BASE but including OTHER, will be merged. If this
3862
causes some revisions to be skipped, i.e. if the destination branch does
3863
not already contain revision BASE, such a merge is commonly referred to as
3866
Revision numbers are always relative to the source branch.
3696
3868
Merge will do its best to combine the changes in two branches, but there
3697
3869
are some kinds of problems only a human can fix. When it encounters those,
3764
3936
' completely merged into the source, pull from the'
3765
3937
' source rather than merging. When this happens,'
3766
3938
' you do not need to commit the result.'),
3939
custom_help('directory',
3768
3940
help='Branch to merge into, '
3769
'rather than the one containing the working directory.',
3941
'rather than the one containing the working directory.'),
3773
3942
Option('preview', help='Instead of merging, show a diff of the'
3775
3944
Option('interactive', help='Select changes interactively.',
3875
4044
def _do_preview(self, merger):
3876
4045
from bzrlib.diff import show_diff_trees
3877
4046
result_tree = self._get_preview(merger)
4047
path_encoding = osutils.get_diff_header_encoding()
3878
4048
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
old_label='', new_label='')
4049
old_label='', new_label='',
4050
path_encoding=path_encoding)
3881
4052
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3882
4053
merger.change_reporter = change_reporter
3962
4133
if ((remember or tree.branch.get_submit_branch() is None) and
3963
4134
user_location is not None):
3964
4135
tree.branch.set_submit_branch(other_branch.base)
3965
_merge_tags_if_possible(other_branch, tree.branch)
4136
# Merge tags (but don't set them in the master branch yet, the user
4137
# might revert this merge). Commit will propagate them.
4138
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3966
4139
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3967
4140
other_revision_id, base_revision_id, other_branch, base_branch)
3968
4141
if other_path != '':
4136
4309
last committed revision is used.
4138
4311
To remove only some changes, without reverting to a prior version, use
4139
merge instead. For example, "merge . --revision -2..-3" will remove the
4140
changes introduced by -2, without affecting the changes introduced by -1.
4141
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4312
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4313
will remove the changes introduced by the second last commit (-2), without
4314
affecting the changes introduced by the last commit (-1). To remove
4315
certain changes on a hunk-by-hunk basis, see the shelve command.
4143
4317
By default, any files that have been manually changed will be backed up
4144
4318
first. (Files changed only by merge are not backed up.) Backup files have
4308
4483
theirs_only=False,
4309
4484
log_format=None, long=False, short=False, line=False,
4310
4485
show_ids=False, verbose=False, this=False, other=False,
4311
include_merges=False, revision=None, my_revision=None):
4486
include_merges=False, revision=None, my_revision=None,
4312
4488
from bzrlib.missing import find_unmerged, iter_log_revisions
4313
4489
def message(s):
4314
4490
if not is_quiet():
4472
4648
@display_command
4473
4649
def run(self, verbose=False):
4474
import bzrlib.plugin
4475
from inspect import getdoc
4477
for name, plugin in bzrlib.plugin.plugins().items():
4478
version = plugin.__version__
4479
if version == 'unknown':
4481
name_ver = '%s %s' % (name, version)
4482
d = getdoc(plugin.module)
4484
doc = d.split('\n')[0]
4486
doc = '(no description)'
4487
result.append((name_ver, doc, plugin.path()))
4488
for name_ver, doc, path in sorted(result):
4489
self.outf.write("%s\n" % name_ver)
4490
self.outf.write(" %s\n" % doc)
4492
self.outf.write(" %s\n" % path)
4493
self.outf.write("\n")
4650
from bzrlib import plugin
4651
self.outf.writelines(
4652
plugin.describe_plugins(show_paths=verbose))
4496
4655
class cmd_testament(Command):
4542
4701
Option('long', help='Show commit date in annotations.'),
4546
4706
encoding_type = 'exact'
4548
4708
@display_command
4549
4709
def run(self, filename, all=False, long=False, revision=None,
4710
show_ids=False, directory=None):
4551
4711
from bzrlib.annotate import annotate_file, annotate_file_tree
4552
4712
wt, branch, relpath = \
4553
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4713
_open_directory_or_containing_tree_or_branch(filename, directory)
4554
4714
if wt is not None:
4555
4715
self.add_cleanup(wt.lock_read().unlock)
4557
4717
self.add_cleanup(branch.lock_read().unlock)
4558
4718
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
4719
self.add_cleanup(tree.lock_read().unlock)
4720
if wt is not None and revision is None:
4561
4721
file_id = wt.path2id(relpath)
4563
4723
file_id = tree.path2id(relpath)
4564
4724
if file_id is None:
4565
4725
raise errors.NotVersionedError(filename)
4566
file_version = tree.inventory[file_id].revision
4567
4726
if wt is not None and revision is None:
4568
4727
# If there is a tree and we're not annotating historical
4569
4728
# versions, annotate the working tree's content.
4570
4729
annotate_file_tree(wt, file_id, self.outf, long, all,
4571
4730
show_ids=show_ids)
4732
file_version = tree.inventory[file_id].revision
4573
4733
annotate_file(branch, file_version, file_id, long, all, self.outf,
4574
4734
show_ids=show_ids)
4581
4741
hidden = True # is this right ?
4582
4742
takes_args = ['revision_id*']
4583
takes_options = ['revision']
4743
takes_options = ['directory', 'revision']
4585
def run(self, revision_id_list=None, revision=None):
4745
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4586
4746
if revision_id_list is not None and revision is not None:
4587
4747
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4588
4748
if revision_id_list is None and revision is None:
4589
4749
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
b = WorkingTree.open_containing(u'.')[0].branch
4750
b = WorkingTree.open_containing(directory)[0].branch
4591
4751
self.add_cleanup(b.lock_write().unlock)
4592
4752
return self._run(b, revision_id_list, revision)
4654
4814
_see_also = ['checkouts', 'unbind']
4655
4815
takes_args = ['location?']
4816
takes_options = ['directory']
4658
def run(self, location=None):
4659
b, relpath = Branch.open_containing(u'.')
4818
def run(self, location=None, directory=u'.'):
4819
b, relpath = Branch.open_containing(directory)
4660
4820
if location is None:
4662
4822
location = b.get_old_bound_location()
4817
4983
bzr break-lock bzr+ssh://example.com/bzr/foo
4984
bzr break-lock --conf ~/.bazaar
4819
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.'),
4821
def run(self, location=None, show=False):
4995
def run(self, location=None, config=False, force=False):
4822
4996
if location is None:
4823
4997
location = u'.'
4824
control, relpath = bzrdir.BzrDir.open_containing(location)
4826
control.break_lock()
4827
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:
4831
5013
class cmd_wait_until_signalled(Command):
4896
5077
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4897
5078
protocol=None):
4898
from bzrlib.transport import get_transport, transport_server_registry
5079
from bzrlib import transport
4899
5080
if directory is None:
4900
5081
directory = os.getcwd()
4901
5082
if protocol is None:
4902
protocol = transport_server_registry.get()
5083
protocol = transport.transport_server_registry.get()
4903
5084
host, port = self.get_host_and_port(port)
4904
5085
url = urlutils.local_path_to_url(directory)
4905
5086
if not allow_writes:
4906
5087
url = 'readonly+' + url
4907
transport = get_transport(url)
4908
protocol(transport, host, port, inet)
5088
t = transport.get_transport(url)
5089
protocol(t, host, port, inet)
4911
5092
class cmd_join(Command):
5022
5204
encoding_type = 'exact'
5024
5206
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5025
sign=False, revision=None, mail_to=None, message=None):
5207
sign=False, revision=None, mail_to=None, message=None,
5026
5209
from bzrlib.revision import ensure_null, NULL_REVISION
5027
5210
include_patch, include_bundle = {
5028
5211
'plain': (False, False),
5029
5212
'diff': (True, False),
5030
5213
'bundle': (True, True),
5032
branch = Branch.open('.')
5215
branch = Branch.open(directory)
5033
5216
stored_submit_branch = branch.get_submit_branch()
5034
5217
if submit_branch is None:
5035
5218
submit_branch = stored_submit_branch
5350
5530
_see_also = ['tag']
5351
5531
takes_options = [
5353
help='Branch whose tags should be displayed.',
5357
RegistryOption.from_kwargs('sort',
5532
custom_help('directory',
5533
help='Branch whose tags should be displayed.'),
5534
RegistryOption('sort',
5358
5535
'Sort tags by different criteria.', title='Sorting',
5359
alpha='Sort tags lexicographically (default).',
5360
time='Sort tags chronologically.',
5536
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5366
5542
@display_command
5543
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5544
from bzrlib.tag import tag_sort_methods
5373
5545
branch, relpath = Branch.open_containing(directory)
5375
5547
tags = branch.tags.get_tag_dict().items()
5384
5556
# only show revisions between revid1 and revid2 (inclusive)
5385
5557
tags = [(tag, revid) for tag, revid in tags if
5386
5558
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]])
5560
sort = tag_sort_methods.get()
5400
5562
if not show_ids:
5401
5563
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
5564
for index, (tag, revid) in enumerate(tags):
5540
5703
def run(self, to_location=None, force=False, create_branch=False,
5704
revision=None, directory=u'.'):
5542
5705
from bzrlib import switch
5706
tree_location = directory
5544
5707
revision = _get_one_revision('switch', revision)
5545
5708
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
5709
if to_location is None:
5547
5710
if revision is None:
5548
5711
raise errors.BzrCommandError('You must supply either a'
5549
5712
' revision or a location')
5713
to_location = tree_location
5552
5715
branch = control_dir.open_branch()
5553
5716
had_explicit_nick = branch.get_config().has_explicit_nickname()
5824
5988
You can put multiple items on the shelf, and by default, 'unshelve' will
5825
5989
restore the most recently shelved changes.
5991
For complicated changes, it is possible to edit the changes in a separate
5992
editor program to decide what the file remaining in the working copy
5993
should look like. To do this, add the configuration option
5995
change_editor = PROGRAM @new_path @old_path
5997
where @new_path is replaced with the path of the new version of the
5998
file and @old_path is replaced with the path of the old version of
5999
the file. The PROGRAM should save the new file with the desired
6000
contents of the file in the working tree.
5828
6004
takes_args = ['file*']
5830
6006
takes_options = [
5832
6009
Option('all', help='Shelve all changes.'),
5839
6016
Option('destroy',
5840
6017
help='Destroy removed changes instead of shelving them.'),
5842
_see_also = ['unshelve']
6019
_see_also = ['unshelve', 'configuration']
5844
6021
def run(self, revision=None, all=False, file_list=None, message=None,
5845
writer=None, list=False, destroy=False):
6022
writer=None, list=False, destroy=False, directory=None):
5847
return self.run_for_list()
6024
return self.run_for_list(directory=directory)
5848
6025
from bzrlib.shelf_ui import Shelver
5849
6026
if writer is None:
5850
6027
writer = bzrlib.option.diff_writer_registry.get()
5852
6029
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
6030
file_list, message, destroy=destroy, directory=directory)
5922
6102
To check what clean-tree will do, use --dry-run.
5924
takes_options = [Option('ignored', help='Delete all ignored files.'),
5925
Option('detritus', help='Delete conflict files, merge'
6104
takes_options = ['directory',
6105
Option('ignored', help='Delete all ignored files.'),
6106
Option('detritus', help='Delete conflict files, merge and revert'
5926
6107
' backups, and failed selftest dirs.'),
5927
6108
Option('unknown',
5928
6109
help='Delete files unknown to bzr (default).'),
5930
6111
' deleting them.'),
5931
6112
Option('force', help='Do not prompt before deleting.')]
5932
6113
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6114
force=False, directory=u'.'):
5934
6115
from bzrlib.clean_tree import clean_tree
5935
6116
if not (unknown or ignored or detritus):
5939
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5940
dry_run=dry_run, no_prompt=force)
6120
clean_tree(directory, unknown=unknown, ignored=ignored,
6121
detritus=detritus, dry_run=dry_run, no_prompt=force)
5943
6124
class cmd_reference(Command):
5992
6173
# be only called once.
5993
6174
for (name, aliases, module_name) in [
5994
6175
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6176
('cmd_config', [], 'bzrlib.config'),
5995
6177
('cmd_dpush', [], 'bzrlib.foreign'),
5996
6178
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
6179
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
6180
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
6181
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6182
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6001
6184
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
