74
75
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,
80
return internal_tree_files(file_list, default_branch, canonicalize,
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]))
84
88
def tree_files_for_add(file_list):
149
153
# XXX: Bad function name; should possibly also be a class method of
150
154
# WorkingTree rather than a function.
151
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
152
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
153
156
apply_view=True):
154
157
"""Convert command-line paths to a WorkingTree and relative paths.
156
Deprecated: use WorkingTree.open_containing_paths instead.
158
159
This is typically used for command-line processors that take one or
159
160
more filenames, and infer the workingtree that contains them.
171
172
:return: workingtree, [relative_paths]
173
return WorkingTree.open_containing_paths(
174
file_list, default_directory='.',
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)
179
223
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)
199
235
# TODO: Make sure no commands unconditionally use the working directory as a
200
236
# branch. If a filename argument is used, the first of them should be used to
201
237
# specify the branch. (Perhaps this can be factored out into some kind of
250
286
To skip the display of pending merge information altogether, use
251
287
the no-pending option or specify a file/directory.
253
To compare the working directory to a specific revision, pass a
254
single revision to the revision argument.
256
To see which files have changed in a specific revision, or between
257
two revisions, pass a revision range to the revision argument.
258
This will produce the same results as calling 'bzr diff --summarize'.
289
If a revision argument is given, the status is calculated against
290
that revision, or between two revisions if two are provided.
261
293
# TODO: --no-recurse, --recurse options
321
353
self.outf.write(revtext.decode('utf-8'))
324
def run(self, revision_id=None, revision=None, directory=u'.'):
356
def run(self, revision_id=None, revision=None):
325
357
if revision_id is not None and revision is not None:
326
358
raise errors.BzrCommandError('You can only supply one of'
327
359
' revision_id or --revision')
328
360
if revision_id is None and revision is None:
329
361
raise errors.BzrCommandError('You must supply either'
330
362
' --revision or a revision_id')
331
b = WorkingTree.open_containing(directory)[0].branch
363
b = WorkingTree.open_containing(u'.')[0].branch
333
365
revisions = b.repository.revisions
334
366
if revisions is None:
721
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
723
761
revision = _get_one_revision('inventory', revision)
724
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
725
self.add_cleanup(work_tree.lock_read().unlock)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
726
765
if revision is not None:
727
766
tree = revision.as_tree(work_tree.branch)
729
768
extra_trees = [work_tree]
730
self.add_cleanup(tree.lock_read().unlock)
770
self.add_cleanup(tree.unlock)
793
833
if len(names_list) < 2:
794
834
raise errors.BzrCommandError("missing file argument")
795
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
796
self.add_cleanup(tree.lock_tree_write().unlock)
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
797
838
self._run(tree, names_list, rel_names, after)
799
840
def run_auto(self, names_list, after, dry_run):
804
845
raise errors.BzrCommandError('--after cannot be specified with'
806
work_tree, file_list = WorkingTree.open_containing_paths(
807
names_list, default_directory='.')
808
self.add_cleanup(work_tree.lock_tree_write().unlock)
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
809
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
811
852
def _run(self, tree, names_list, rel_names, after):
919
960
takes_options = ['remember', 'overwrite', 'revision',
920
961
custom_help('verbose',
921
962
help='Show logs of pulled revisions.'),
922
custom_help('directory',
923
964
help='Branch to pull into, '
924
'rather than the one containing the working directory.'),
965
'rather than the one containing the working directory.',
926
970
help="Perform a local pull in a bound "
927
971
"branch. Local pulls are not applied to "
928
972
"the master branch."
931
help="Show base revision text in conflicts.")
933
975
takes_args = ['location?']
934
976
encoding_type = 'replace'
936
978
def run(self, location=None, remember=False, overwrite=False,
937
979
revision=None, verbose=False,
938
directory=None, local=False,
980
directory=None, local=False):
940
981
# FIXME: too much stuff is in the command class
941
982
revision_id = None
946
987
tree_to = WorkingTree.open_containing(directory)[0]
947
988
branch_to = tree_to.branch
948
self.add_cleanup(tree_to.lock_write().unlock)
990
self.add_cleanup(tree_to.unlock)
949
991
except errors.NoWorkingTree:
951
993
branch_to = Branch.open_containing(directory)[0]
952
self.add_cleanup(branch_to.lock_write().unlock)
954
if tree_to is None and show_base:
955
raise errors.BzrCommandError("Need working tree for --show-base.")
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
957
997
if local and not branch_to.get_bound_location():
958
998
raise errors.LocalRequiresBoundBranch()
1048
1088
Option('create-prefix',
1049
1089
help='Create the path leading up to the branch '
1050
1090
'if it does not already exist.'),
1051
custom_help('directory',
1052
1092
help='Branch to push from, '
1053
'rather than the one containing the working directory.'),
1093
'rather than the one containing the working directory.',
1054
1097
Option('use-existing-dir',
1055
1098
help='By default push will fail if the target'
1056
1099
' directory exists, but does not already'
1077
1117
def run(self, location=None, remember=False, overwrite=False,
1078
1118
create_prefix=False, verbose=False, revision=None,
1079
1119
use_existing_dir=False, directory=None, stacked_on=None,
1080
stacked=False, strict=None, no_tree=False):
1120
stacked=False, strict=None):
1081
1121
from bzrlib.push import _show_push_branch
1083
1123
if directory is None:
1129
1169
_show_push_branch(br_from, revision_id, location, self.outf,
1130
1170
verbose=verbose, overwrite=overwrite, remember=remember,
1131
1171
stacked_on=stacked_on, create_prefix=create_prefix,
1132
use_existing_dir=use_existing_dir, no_tree=no_tree)
1172
use_existing_dir=use_existing_dir)
1135
1175
class cmd_branch(Command):
1149
1189
_see_also = ['checkout']
1150
1190
takes_args = ['from_location', 'to_location?']
1151
takes_options = ['revision',
1152
Option('hardlink', help='Hard-link working tree files where possible.'),
1153
Option('files-from', type=str,
1154
help="Get file contents from this tree."),
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1155
1193
Option('no-tree',
1156
1194
help="Create a branch without a working-tree."),
1157
1195
Option('switch',
1176
1214
def run(self, from_location, to_location=None, revision=None,
1177
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1178
use_existing_dir=False, switch=False, bind=False,
1216
use_existing_dir=False, switch=False, bind=False):
1180
1217
from bzrlib import switch as _mod_switch
1181
1218
from bzrlib.tag import _merge_tags_if_possible
1182
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1184
if not (hardlink or files_from):
1185
# accelerator_tree is usually slower because you have to read N
1186
# files (no readahead, lots of seeks, etc), but allow the user to
1187
# explicitly request it
1188
accelerator_tree = None
1189
if files_from is not None and files_from != from_location:
1190
accelerator_tree = WorkingTree.open(files_from)
1191
1221
revision = _get_one_revision('branch', revision)
1192
self.add_cleanup(br_from.lock_read().unlock)
1223
self.add_cleanup(br_from.unlock)
1193
1224
if revision is not None:
1194
1225
revision_id = revision.as_revision_id(br_from)
1300
1331
to_location = branch_location
1301
1332
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1302
1333
branch_location)
1303
if not (hardlink or files_from):
1304
# accelerator_tree is usually slower because you have to read N
1305
# files (no readahead, lots of seeks, etc), but allow the user to
1306
# explicitly request it
1307
accelerator_tree = None
1308
1334
revision = _get_one_revision('checkout', revision)
1309
if files_from is not None and files_from != branch_location:
1335
if files_from is not None:
1310
1336
accelerator_tree = WorkingTree.open(files_from)
1311
1337
if revision is not None:
1312
1338
revision_id = revision.as_revision_id(source)
1368
1396
If you want to discard your local changes, you can just do a
1369
1397
'bzr revert' instead of 'bzr commit' after the update.
1371
If you want to restore a file that has been removed locally, use
1372
'bzr revert' instead of 'bzr update'.
1374
1399
If the tree's branch is bound to a master branch, it will also update
1375
1400
the branch from the master.
1378
1403
_see_also = ['pull', 'working-trees', 'status-flags']
1379
1404
takes_args = ['dir?']
1380
takes_options = ['revision',
1382
help="Show base revision text in conflicts."),
1405
takes_options = ['revision']
1384
1406
aliases = ['up']
1386
def run(self, dir='.', revision=None, show_base=None):
1408
def run(self, dir='.', revision=None):
1387
1409
if revision is not None and len(revision) != 1:
1388
1410
raise errors.BzrCommandError(
1389
1411
"bzr update --revision takes exactly one revision")
1498
1519
class cmd_remove(Command):
1499
1520
__doc__ = """Remove files or directories.
1501
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1502
delete them if they can easily be recovered using revert otherwise they
1503
will be backed up (adding an extention of the form .~#~). If no options or
1504
parameters are given Bazaar will scan for files that are being tracked by
1505
Bazaar but missing in your tree and stop tracking them for you.
1522
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
them if they can easily be recovered using revert. If no options or
1524
parameters are given bzr will scan for files that are being tracked by bzr
1525
but missing in your tree and stop tracking them for you.
1507
1527
takes_args = ['file*']
1508
1528
takes_options = ['verbose',
1510
1530
RegistryOption.from_kwargs('file-deletion-strategy',
1511
1531
'The file deletion mode to be used.',
1512
1532
title='Deletion Strategy', value_switches=True, enum_switch=False,
1513
safe='Backup changed files (default).',
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1514
1535
keep='Delete from bzr but leave the working copy.',
1515
no_backup='Don\'t backup changed files.',
1516
1536
force='Delete all the specified files, even if they can not be '
1517
'recovered and even if they are non-empty directories. '
1518
'(deprecated, use no-backup)')]
1537
'recovered and even if they are non-empty directories.')]
1519
1538
aliases = ['rm', 'del']
1520
1539
encoding_type = 'replace'
1522
1541
def run(self, file_list, verbose=False, new=False,
1523
1542
file_deletion_strategy='safe'):
1524
if file_deletion_strategy == 'force':
1525
note("(The --force option is deprecated, rather use --no-backup "
1527
file_deletion_strategy = 'no-backup'
1529
tree, file_list = WorkingTree.open_containing_paths(file_list)
1543
tree, file_list = tree_files(file_list)
1531
1545
if file_list is not None:
1532
1546
file_list = [f for f in file_list]
1534
self.add_cleanup(tree.lock_write().unlock)
1549
self.add_cleanup(tree.unlock)
1535
1550
# Heuristics should probably all move into tree.remove_smart or
1621
1636
_see_also = ['check']
1622
1637
takes_args = ['branch?']
1624
Option('canonicalize-chks',
1625
help='Make sure CHKs are in canonical form (repairs '
1630
def run(self, branch=".", canonicalize_chks=False):
1639
def run(self, branch="."):
1631
1640
from bzrlib.reconcile import reconcile
1632
1641
dir = bzrdir.BzrDir.open(branch)
1633
reconcile(dir, canonicalize_chks=canonicalize_chks)
1636
1645
class cmd_revision_history(Command):
1714
1723
Option('append-revisions-only',
1715
1724
help='Never change revnos or the existing log.'
1716
' Append revisions to it only.'),
1718
'Create a branch without a working tree.')
1725
' Append revisions to it only.')
1720
1727
def run(self, location=None, format=None, append_revisions_only=False,
1721
create_prefix=False, no_tree=False):
1728
create_prefix=False):
1722
1729
if format is None:
1723
1730
format = bzrdir.format_registry.make_bzrdir('default')
1724
1731
if location is None:
2000
1985
old_branch, new_branch,
2001
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2002
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2003
# GNU diff on Windows uses ANSI encoding for filenames
2004
path_encoding = osutils.get_diff_header_encoding()
2005
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2006
1989
specific_files=specific_files,
2007
1990
external_diff_options=diff_options,
2008
1991
old_label=old_label, new_label=new_label,
2009
extra_trees=extra_trees,
2010
path_encoding=path_encoding,
1992
extra_trees=extra_trees, using=using,
2012
1993
format_cls=format)
2022
2003
# level of effort but possibly much less IO. (Or possibly not,
2023
2004
# if the directories are very large...)
2024
2005
_see_also = ['status', 'ls']
2025
takes_options = ['directory', 'show-ids']
2006
takes_options = ['show-ids']
2027
2008
@display_command
2028
def run(self, show_ids=False, directory=u'.'):
2029
tree = WorkingTree.open_containing(directory)[0]
2030
self.add_cleanup(tree.lock_read().unlock)
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2031
2013
old = tree.basis_tree()
2032
self.add_cleanup(old.lock_read().unlock)
2015
self.add_cleanup(old.unlock)
2033
2016
for path, ie in old.inventory.iter_entries():
2034
2017
if not tree.has_id(ie.file_id):
2035
2018
self.outf.write(path)
2047
2030
_see_also = ['status', 'ls']
2048
takes_options = ['directory', 'null']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2050
2037
@display_command
2051
def run(self, null=False, directory=u'.'):
2052
tree = WorkingTree.open_containing(directory)[0]
2053
self.add_cleanup(tree.lock_read().unlock)
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2054
2040
td = tree.changes_from(tree.basis_tree())
2056
2041
for path, id, kind, text_modified, meta_modified in td.modified:
2058
2043
self.outf.write(path + '\0')
2068
2053
_see_also = ['status', 'ls']
2069
takes_options = ['directory', 'null']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2071
2060
@display_command
2072
def run(self, null=False, directory=u'.'):
2073
wt = WorkingTree.open_containing(directory)[0]
2074
self.add_cleanup(wt.lock_read().unlock)
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2075
2065
basis = wt.basis_tree()
2076
self.add_cleanup(basis.lock_read().unlock)
2067
self.add_cleanup(basis.unlock)
2077
2068
basis_inv = basis.inventory
2078
2069
inv = wt.inventory
2079
2070
for file_id in inv:
2541
2528
help='Recurse into subdirectories.'),
2542
2529
Option('from-root',
2543
2530
help='Print paths relative to the root of the branch.'),
2544
Option('unknown', short_name='u',
2545
help='Print unknown files.'),
2531
Option('unknown', help='Print unknown files.'),
2546
2532
Option('versioned', help='Print versioned files.',
2547
2533
short_name='V'),
2548
Option('ignored', short_name='i',
2549
help='Print ignored files.'),
2550
Option('kind', short_name='k',
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2551
2539
help='List entries of a particular kind: file, directory, symlink.',
2557
2543
@display_command
2558
2544
def run(self, revision=None, verbose=False,
2559
2545
recursive=False, from_root=False,
2560
2546
unknown=False, versioned=False, ignored=False,
2561
null=False, kind=None, show_ids=False, path=None, directory=None):
2547
null=False, kind=None, show_ids=False, path=None):
2563
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2564
2550
raise errors.BzrCommandError('invalid kind specified')
2736
2713
_see_also = ['status', 'ignored', 'patterns']
2737
2714
takes_args = ['name_pattern*']
2738
takes_options = ['directory',
2739
2716
Option('default-rules',
2740
2717
help='Display the default ignore rules that bzr uses.')
2743
def run(self, name_pattern_list=None, default_rules=None,
2720
def run(self, name_pattern_list=None, default_rules=None):
2745
2721
from bzrlib import ignores
2746
2722
if default_rules is not None:
2747
2723
# dump the default rules and exit
2753
2729
"NAME_PATTERN or --default-rules.")
2754
2730
name_pattern_list = [globbing.normalize_pattern(p)
2755
2731
for p in name_pattern_list]
2757
for p in name_pattern_list:
2758
if not globbing.Globster.is_pattern_valid(p):
2759
bad_patterns += ('\n %s' % p)
2761
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2762
ui.ui_factory.show_error(msg)
2763
raise errors.InvalidPattern('')
2764
2732
for name_pattern in name_pattern_list:
2765
2733
if (name_pattern[0] == '/' or
2766
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2767
2735
raise errors.BzrCommandError(
2768
2736
"NAME_PATTERN should not be an absolute path")
2769
tree, relpath = WorkingTree.open_containing(directory)
2737
tree, relpath = WorkingTree.open_containing(u'.')
2770
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2771
2739
ignored = globbing.Globster(name_pattern_list)
2773
self.add_cleanup(tree.lock_read().unlock)
2774
2742
for entry in tree.list_files():
2776
2744
if id is not None:
2777
2745
filename = entry[0]
2778
2746
if ignored.match(filename):
2779
2747
matches.append(filename)
2780
2749
if len(matches) > 0:
2781
2750
self.outf.write("Warning: the following files are version controlled and"
2782
2751
" match your ignore pattern:\n%s"
2798
2767
encoding_type = 'replace'
2799
2768
_see_also = ['ignore', 'ls']
2800
takes_options = ['directory']
2802
2770
@display_command
2803
def run(self, directory=u'.'):
2804
tree = WorkingTree.open_containing(directory)[0]
2805
self.add_cleanup(tree.lock_read().unlock)
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
2806
2775
for path, file_class, kind, file_id, entry in tree.list_files():
2807
2776
if file_class != 'I':
2876
2844
'revision in which it was changed.'),
2878
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2879
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2847
root=None, filters=False, per_file_timestamps=False):
2880
2848
from bzrlib.export import export
2882
2850
if branch_or_subdir is None:
2883
tree = WorkingTree.open_containing(directory)[0]
2851
tree = WorkingTree.open_containing(u'.')[0]
2884
2852
b = tree.branch
2917
2885
@display_command
2918
2886
def run(self, filename, revision=None, name_from_revision=False,
2919
filters=False, directory=None):
2920
2888
if revision is not None and len(revision) != 1:
2921
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2922
2890
" one revision specifier")
2923
2891
tree, branch, relpath = \
2924
_open_directory_or_containing_tree_or_branch(filename, directory)
2925
self.add_cleanup(branch.lock_read().unlock)
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
2926
2895
return self._run(tree, branch, relpath, filename, revision,
2927
2896
name_from_revision, filters)
3330
3297
class cmd_upgrade(Command):
3331
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3333
When the default format has changed after a major new release of
3334
Bazaar, you may be informed during certain operations that you
3335
should upgrade. Upgrading to a newer format may improve performance
3336
or make new features available. It may however limit interoperability
3337
with older repositories or with older versions of Bazaar.
3339
If you wish to upgrade to a particular format rather than the
3340
current default, that can be specified using the --format option.
3341
As a consequence, you can use the upgrade command this way to
3342
"downgrade" to an earlier format, though some conversions are
3343
a one way process (e.g. changing from the 1.x default to the
3344
2.x default) so downgrading is not always possible.
3346
A backup.bzr.~#~ directory is created at the start of the conversion
3347
process (where # is a number). By default, this is left there on
3348
completion. If the conversion fails, delete the new .bzr directory
3349
and rename this one back in its place. Use the --clean option to ask
3350
for the backup.bzr directory to be removed on successful conversion.
3351
Alternatively, you can delete it by hand if everything looks good
3354
If the location given is a shared repository, dependent branches
3355
are also converted provided the repository converts successfully.
3356
If the conversion of a branch fails, remaining branches are still
3359
For more information on upgrades, see the Bazaar Upgrade Guide,
3360
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3298
__doc__ = """Upgrade branch storage to current format.
3300
The check command or bzr developers may sometimes advise you to run
3301
this command. When the default format has changed you may also be warned
3302
during other operations to upgrade.
3363
_see_also = ['check', 'reconcile', 'formats']
3305
_see_also = ['check']
3364
3306
takes_args = ['url?']
3365
3307
takes_options = [
3366
RegistryOption('format',
3367
help='Upgrade to a specific format. See "bzr help'
3368
' formats" for details.',
3369
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3370
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3371
value_switches=True, title='Branch format'),
3373
help='Remove the backup.bzr directory if successful.'),
3375
help="Show what would be done, but don't actually do anything."),
3308
RegistryOption('format',
3309
help='Upgrade to a specific format. See "bzr help'
3310
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3313
value_switches=True, title='Branch format'),
3378
def run(self, url='.', format=None, clean=False, dry_run=False):
3316
def run(self, url='.', format=None):
3379
3317
from bzrlib.upgrade import upgrade
3380
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3382
if len(exceptions) == 1:
3383
# Compatibility with historical behavior
3318
upgrade(url, format)
3389
3321
class cmd_whoami(Command):
3409
3340
encoding_type = 'replace'
3411
3342
@display_command
3412
def run(self, email=False, branch=False, name=None, directory=None):
3343
def run(self, email=False, branch=False, name=None):
3413
3344
if name is None:
3414
if directory is None:
3415
# use branch if we're inside one; otherwise global config
3417
c = Branch.open_containing(u'.')[0].get_config()
3418
except errors.NotBranchError:
3419
c = _mod_config.GlobalConfig()
3421
c = Branch.open(directory).get_config()
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3423
3351
self.outf.write(c.user_email() + '\n')
3428
3356
# display a warning if an email address isn't included in the given name.
3430
_mod_config.extract_email_address(name)
3358
config.extract_email_address(name)
3431
3359
except errors.NoEmailInUsername, e:
3432
3360
warning('"%s" does not seem to contain an email address. '
3433
3361
'This is allowed, but not recommended.', name)
3435
3363
# use global config unless --branch given
3437
if directory is None:
3438
c = Branch.open_containing(u'.')[0].get_config()
3440
c = Branch.open(directory).get_config()
3365
c = Branch.open_containing('.')[0].get_config()
3442
c = _mod_config.GlobalConfig()
3367
c = config.GlobalConfig()
3443
3368
c.set_user_option('email', name)
3512
3436
'bzr alias --remove expects an alias to remove.')
3513
3437
# If alias is not found, print something like:
3514
3438
# unalias: foo: not found
3515
c = _mod_config.GlobalConfig()
3439
c = config.GlobalConfig()
3516
3440
c.unset_alias(alias_name)
3518
3442
@display_command
3519
3443
def print_aliases(self):
3520
3444
"""Print out the defined aliases in a similar format to bash."""
3521
aliases = _mod_config.GlobalConfig().get_aliases()
3445
aliases = config.GlobalConfig().get_aliases()
3522
3446
for key, value in sorted(aliases.iteritems()):
3523
3447
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3616
3537
'throughout the test suite.',
3617
3538
type=get_transport_type),
3618
3539
Option('benchmark',
3619
help='Run the benchmarks rather than selftests.',
3540
help='Run the benchmarks rather than selftests.'),
3621
3541
Option('lsprof-timed',
3622
3542
help='Generate lsprof output for benchmarked'
3623
3543
' sections of code.'),
3624
3544
Option('lsprof-tests',
3625
3545
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3626
3549
Option('first',
3627
3550
help='Run all tests, but run specified tests first.',
3628
3551
short_name='f',
3663
3586
def run(self, testspecs_list=None, verbose=False, one=False,
3664
3587
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3666
3589
first=False, list_only=False,
3667
3590
randomize=None, exclude=None, strict=False,
3668
3591
load_list=None, debugflag=None, starting_with=None, subunit=False,
3669
3592
parallel=None, lsprof_tests=False):
3670
from bzrlib import tests
3593
from bzrlib.tests import selftest
3594
import bzrlib.benchmarks as benchmarks
3595
from bzrlib.benchmarks import tree_creator
3597
# Make deprecation warnings visible, unless -Werror is set
3598
symbol_versioning.activate_deprecation_warnings(override=False)
3600
if cache_dir is not None:
3601
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3672
3602
if testspecs_list is not None:
3673
3603
pattern = '|'.join(testspecs_list)
3682
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3683
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3684
3614
# stdout, which would corrupt the subunit stream.
3685
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3686
# following code can be deleted when it's sufficiently deployed
3687
# -- vila/mgz 20100514
3688
if (sys.platform == "win32"
3689
and getattr(sys.stdout, 'fileno', None) is not None):
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3691
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3693
3619
self.additional_selftest_args.setdefault(
3694
3620
'suite_decorators', []).append(parallel)
3696
raise errors.BzrCommandError(
3697
"--benchmark is no longer supported from bzr 2.2; "
3698
"use bzr-usertest instead")
3699
test_suite_factory = None
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3629
test_suite_factory = None
3700
3631
selftest_kwargs = {"verbose": verbose,
3701
3632
"pattern": pattern,
3702
3633
"stop_on_failure": one,
3784
3711
with bzr send. If neither is specified, the default is the upstream branch
3785
3712
or the branch most recently merged using --remember.
3787
When merging from a branch, by default bzr will try to merge in all new
3788
work from the other branch, automatically determining an appropriate base
3789
revision. If this fails, you may need to give an explicit base.
3791
To pick a different ending revision, pass "--revision OTHER". bzr will
3792
try to merge in all new work up to and including revision OTHER.
3794
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3795
through OTHER, excluding BASE but including OTHER, will be merged. If this
3796
causes some revisions to be skipped, i.e. if the destination branch does
3797
not already contain revision BASE, such a merge is commonly referred to as
3800
Revision numbers are always relative to the source branch.
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3719
Revision numbers are always relative to the branch being merged.
3721
By default, bzr will try to merge in all new work from the other
3722
branch, automatically determining an appropriate base. If this
3723
fails, you may need to give an explicit base.
3802
3725
Merge will do its best to combine the changes in two branches, but there
3803
3726
are some kinds of problems only a human can fix. When it encounters those,
3870
3793
' completely merged into the source, pull from the'
3871
3794
' source rather than merging. When this happens,'
3872
3795
' you do not need to commit the result.'),
3873
custom_help('directory',
3874
3797
help='Branch to merge into, '
3875
'rather than the one containing the working directory.'),
3798
'rather than the one containing the working directory.',
3876
3802
Option('preview', help='Instead of merging, show a diff of the'
3878
3804
Option('interactive', help='Select changes interactively.',
3978
3905
def _do_preview(self, merger):
3979
3906
from bzrlib.diff import show_diff_trees
3980
3907
result_tree = self._get_preview(merger)
3981
path_encoding = osutils.get_diff_header_encoding()
3982
3908
show_diff_trees(merger.this_tree, result_tree, self.outf,
3983
old_label='', new_label='',
3984
path_encoding=path_encoding)
3909
old_label='', new_label='')
3986
3911
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3987
3912
merger.change_reporter = change_reporter
4067
3992
if ((remember or tree.branch.get_submit_branch() is None) and
4068
3993
user_location is not None):
4069
3994
tree.branch.set_submit_branch(other_branch.base)
4070
# Merge tags (but don't set them in the master branch yet, the user
4071
# might revert this merge). Commit will propagate them.
4072
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4073
3996
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4074
3997
other_revision_id, base_revision_id, other_branch, base_branch)
4075
3998
if other_path != '':
4243
4167
last committed revision is used.
4245
4169
To remove only some changes, without reverting to a prior version, use
4246
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4247
will remove the changes introduced by the second last commit (-2), without
4248
affecting the changes introduced by the last commit (-1). To remove
4249
certain changes on a hunk-by-hunk basis, see the shelve command.
4170
merge instead. For example, "merge . --revision -2..-3" will remove the
4171
changes introduced by -2, without affecting the changes introduced by -1.
4172
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4251
4174
By default, any files that have been manually changed will be backed up
4252
4175
first. (Files changed only by merge are not backed up.) Backup files have
4417
4340
theirs_only=False,
4418
4341
log_format=None, long=False, short=False, line=False,
4419
4342
show_ids=False, verbose=False, this=False, other=False,
4420
include_merges=False, revision=None, my_revision=None,
4343
include_merges=False, revision=None, my_revision=None):
4422
4344
from bzrlib.missing import find_unmerged, iter_log_revisions
4423
4345
def message(s):
4424
4346
if not is_quiet():
4652
4578
Option('long', help='Show commit date in annotations.'),
4657
4582
encoding_type = 'exact'
4659
4584
@display_command
4660
4585
def run(self, filename, all=False, long=False, revision=None,
4661
show_ids=False, directory=None):
4662
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4663
4588
wt, branch, relpath = \
4664
_open_directory_or_containing_tree_or_branch(filename, directory)
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4665
4590
if wt is not None:
4666
self.add_cleanup(wt.lock_read().unlock)
4592
self.add_cleanup(wt.unlock)
4668
self.add_cleanup(branch.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4669
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4670
self.add_cleanup(tree.lock_read().unlock)
4598
self.add_cleanup(tree.unlock)
4671
4599
if wt is not None:
4672
4600
file_id = wt.path2id(relpath)
4692
4620
hidden = True # is this right ?
4693
4621
takes_args = ['revision_id*']
4694
takes_options = ['directory', 'revision']
4622
takes_options = ['revision']
4696
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4624
def run(self, revision_id_list=None, revision=None):
4697
4625
if revision_id_list is not None and revision is not None:
4698
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4699
4627
if revision_id_list is None and revision is None:
4700
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4701
b = WorkingTree.open_containing(directory)[0].branch
4702
self.add_cleanup(b.lock_write().unlock)
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
4703
4632
return self._run(b, revision_id_list, revision)
4705
4634
def _run(self, b, revision_id_list, revision):
4765
4694
_see_also = ['checkouts', 'unbind']
4766
4695
takes_args = ['location?']
4767
takes_options = ['directory']
4769
def run(self, location=None, directory=u'.'):
4770
b, relpath = Branch.open_containing(directory)
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4771
4700
if location is None:
4773
4702
location = b.get_old_bound_location()
4855
4784
b = control.open_branch()
4857
4786
if tree is not None:
4858
self.add_cleanup(tree.lock_write().unlock)
4788
self.add_cleanup(tree.unlock)
4860
self.add_cleanup(b.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4861
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4863
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4934
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
4935
bzr break-lock --conf ~/.bazaar
4938
4861
takes_args = ['location?']
4941
help='LOCATION is the directory where the config lock is.'),
4943
help='Do not ask for confirmation before breaking the lock.'),
4946
def run(self, location=None, config=False, force=False):
4863
def run(self, location=None, show=False):
4947
4864
if location is None:
4948
4865
location = u'.'
4950
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
4952
{'bzrlib.lockdir.break': True})
4954
conf = _mod_config.LockableConfig(file_name=location)
4957
control, relpath = bzrdir.BzrDir.open_containing(location)
4959
control.break_lock()
4960
except NotImplementedError:
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
4964
4873
class cmd_wait_until_signalled(Command):
5028
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5029
4939
protocol=None):
5030
from bzrlib import transport
4940
from bzrlib.transport import get_transport, transport_server_registry
5031
4941
if directory is None:
5032
4942
directory = os.getcwd()
5033
4943
if protocol is None:
5034
protocol = transport.transport_server_registry.get()
4944
protocol = transport_server_registry.get()
5035
4945
host, port = self.get_host_and_port(port)
5036
4946
url = urlutils.local_path_to_url(directory)
5037
4947
if not allow_writes:
5038
4948
url = 'readonly+' + url
5039
t = transport.get_transport(url)
5040
protocol(t, host, port, inet)
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5043
4953
class cmd_join(Command):
5155
5064
encoding_type = 'exact'
5157
5066
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5158
sign=False, revision=None, mail_to=None, message=None,
5067
sign=False, revision=None, mail_to=None, message=None):
5160
5068
from bzrlib.revision import ensure_null, NULL_REVISION
5161
5069
include_patch, include_bundle = {
5162
5070
'plain': (False, False),
5163
5071
'diff': (True, False),
5164
5072
'bundle': (True, True),
5166
branch = Branch.open(directory)
5074
branch = Branch.open('.')
5167
5075
stored_submit_branch = branch.get_submit_branch()
5168
5076
if submit_branch is None:
5169
5077
submit_branch = stored_submit_branch
5481
5393
_see_also = ['tag']
5482
5394
takes_options = [
5483
custom_help('directory',
5484
help='Branch whose tags should be displayed.'),
5485
RegistryOption('sort',
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5486
5401
'Sort tags by different criteria.', title='Sorting',
5487
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5493
5409
@display_command
5494
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5495
from bzrlib.tag import tag_sort_methods
5496
5416
branch, relpath = Branch.open_containing(directory)
5498
5418
tags = branch.tags.get_tag_dict().items()
5502
self.add_cleanup(branch.lock_read().unlock)
5423
self.add_cleanup(branch.unlock)
5504
5425
graph = branch.repository.get_graph()
5505
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5507
5428
# only show revisions between revid1 and revid2 (inclusive)
5508
5429
tags = [(tag, revid) for tag, revid in tags if
5509
5430
graph.is_between(revid, revid1, revid2)]
5511
sort = tag_sort_methods.get()
5433
elif sort == 'time':
5435
for tag, revid in tags:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
5513
5444
if not show_ids:
5514
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5515
5446
for index, (tag, revid) in enumerate(tags):
5654
5584
def run(self, to_location=None, force=False, create_branch=False,
5655
revision=None, directory=u'.'):
5656
5586
from bzrlib import switch
5657
tree_location = directory
5658
5588
revision = _get_one_revision('switch', revision)
5659
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5660
5590
if to_location is None:
5661
5591
if revision is None:
5662
5592
raise errors.BzrCommandError('You must supply either a'
5663
5593
' revision or a location')
5664
to_location = tree_location
5666
5596
branch = control_dir.open_branch()
5667
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
5939
5868
You can put multiple items on the shelf, and by default, 'unshelve' will
5940
5869
restore the most recently shelved changes.
5942
For complicated changes, it is possible to edit the changes in a separate
5943
editor program to decide what the file remaining in the working copy
5944
should look like. To do this, add the configuration option
5946
change_editor = PROGRAM @new_path @old_path
5948
where @new_path is replaced with the path of the new version of the
5949
file and @old_path is replaced with the path of the old version of
5950
the file. The PROGRAM should save the new file with the desired
5951
contents of the file in the working tree.
5955
5872
takes_args = ['file*']
5957
5874
takes_options = [
5960
5876
Option('all', help='Shelve all changes.'),
5967
5883
Option('destroy',
5968
5884
help='Destroy removed changes instead of shelving them.'),
5970
_see_also = ['unshelve', 'configuration']
5886
_see_also = ['unshelve']
5972
5888
def run(self, revision=None, all=False, file_list=None, message=None,
5973
writer=None, list=False, destroy=False, directory=None):
5889
writer=None, list=False, destroy=False):
5975
return self.run_for_list(directory=directory)
5891
return self.run_for_list()
5976
5892
from bzrlib.shelf_ui import Shelver
5977
5893
if writer is None:
5978
5894
writer = bzrlib.option.diff_writer_registry.get()
5980
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5981
file_list, message, destroy=destroy, directory=directory)
5897
file_list, message, destroy=destroy)
6053
5967
To check what clean-tree will do, use --dry-run.
6055
takes_options = ['directory',
6056
Option('ignored', help='Delete all ignored files.'),
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
6057
5970
Option('detritus', help='Delete conflict files, merge'
6058
5971
' backups, and failed selftest dirs.'),
6059
5972
Option('unknown',
6062
5975
' deleting them.'),
6063
5976
Option('force', help='Do not prompt before deleting.')]
6064
5977
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6065
force=False, directory=u'.'):
6066
5979
from bzrlib.clean_tree import clean_tree
6067
5980
if not (unknown or ignored or detritus):
6071
clean_tree(directory, unknown=unknown, ignored=ignored,
6072
detritus=detritus, dry_run=dry_run, no_prompt=force)
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6075
5988
class cmd_reference(Command):
6124
6037
# be only called once.
6125
6038
for (name, aliases, module_name) in [
6126
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6127
('cmd_config', [], 'bzrlib.config'),
6128
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6129
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6130
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6131
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6132
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6133
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6135
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
