75
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
78
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
79
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]))
81
return internal_tree_files(file_list, default_branch, canonicalize,
88
85
def tree_files_for_add(file_list):
153
150
# XXX: Bad function name; should possibly also be a class method of
154
151
# WorkingTree rather than a function.
152
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
155
153
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
154
apply_view=True):
157
155
"""Convert command-line paths to a WorkingTree and relative paths.
157
Deprecated: use WorkingTree.open_containing_paths instead.
159
159
This is typically used for command-line processors that take one or
160
160
more filenames, and infer the workingtree that contains them.
172
172
: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)
174
return WorkingTree.open_containing_paths(
175
file_list, default_directory='.',
223
180
def _get_view_info_for_change_reporter(tree):
323
280
raise errors.BzrCommandError('bzr status --revision takes exactly'
324
281
' one or two revision specifiers')
326
tree, relfile_list = tree_files(file_list)
283
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
327
284
# Avoid asking for specific files when that is not needed.
328
285
if relfile_list == ['']:
329
286
relfile_list = None
512
469
if (working.has_changes()):
513
470
raise errors.UncommittedChanges(working)
471
if working.get_shelf_manager().last_shelf() is not None:
472
raise errors.ShelvedChanges(working)
515
474
if working.user_url != working.branch.user_url:
516
475
raise errors.BzrCommandError("You cannot remove the working tree"
759
718
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
761
720
revision = _get_one_revision('inventory', revision)
762
work_tree, file_list = tree_files(file_list)
721
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
763
722
self.add_cleanup(work_tree.lock_read().unlock)
764
723
if revision is not None:
765
724
tree = revision.as_tree(work_tree.branch)
831
790
if len(names_list) < 2:
832
791
raise errors.BzrCommandError("missing file argument")
833
tree, rel_names = tree_files(names_list, canonicalize=False)
792
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
834
793
self.add_cleanup(tree.lock_tree_write().unlock)
835
794
self._run(tree, names_list, rel_names, after)
842
801
raise errors.BzrCommandError('--after cannot be specified with'
844
work_tree, file_list = tree_files(names_list, default_branch='.')
803
work_tree, file_list = WorkingTree.open_containing_paths(
804
names_list, default_directory='.')
845
805
self.add_cleanup(work_tree.lock_tree_write().unlock)
846
806
rename_map.RenameMap.guess_renames(work_tree, dry_run)
1176
1136
_see_also = ['checkout']
1177
1137
takes_args = ['from_location', 'to_location?']
1178
takes_options = ['revision', Option('hardlink',
1179
help='Hard-link working tree files where possible.'),
1138
takes_options = ['revision',
1139
Option('hardlink', help='Hard-link working tree files where possible.'),
1140
Option('files-from', type=str,
1141
help="Get file contents from this tree."),
1180
1142
Option('no-tree',
1181
1143
help="Create a branch without a working-tree."),
1182
1144
Option('switch',
1201
1163
def run(self, from_location, to_location=None, revision=None,
1202
1164
hardlink=False, stacked=False, standalone=False, no_tree=False,
1203
use_existing_dir=False, switch=False, bind=False):
1165
use_existing_dir=False, switch=False, bind=False,
1204
1167
from bzrlib import switch as _mod_switch
1205
1168
from bzrlib.tag import _merge_tags_if_possible
1206
1169
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1171
if not (hardlink or files_from):
1172
# accelerator_tree is usually slower because you have to read N
1173
# files (no readahead, lots of seeks, etc), but allow the user to
1174
# explicitly request it
1175
accelerator_tree = None
1176
if files_from is not None and files_from != from_location:
1177
accelerator_tree = WorkingTree.open(files_from)
1208
1178
revision = _get_one_revision('branch', revision)
1209
1179
self.add_cleanup(br_from.lock_read().unlock)
1210
1180
if revision is not None:
1317
1287
to_location = branch_location
1318
1288
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1319
1289
branch_location)
1290
if not (hardlink or files_from):
1291
# accelerator_tree is usually slower because you have to read N
1292
# files (no readahead, lots of seeks, etc), but allow the user to
1293
# explicitly request it
1294
accelerator_tree = None
1320
1295
revision = _get_one_revision('checkout', revision)
1321
if files_from is not None:
1296
if files_from is not None and files_from != branch_location:
1322
1297
accelerator_tree = WorkingTree.open(files_from)
1323
1298
if revision is not None:
1324
1299
revision_id = revision.as_revision_id(source)
1336
1311
except errors.NoWorkingTree:
1337
1312
source.bzrdir.create_workingtree(revision_id)
1341
message = ('Copying history to "%s". '
1342
'To checkout without local history use --lightweight.' % to_location)
1343
ui.ui_factory.show_message(message)
1344
1314
source.create_checkout(to_location, revision_id, lightweight,
1345
1315
accelerator_tree, hardlink)
1530
1500
def run(self, file_list, verbose=False, new=False,
1531
1501
file_deletion_strategy='safe'):
1532
tree, file_list = tree_files(file_list)
1502
tree, file_list = WorkingTree.open_containing_paths(file_list)
1534
1504
if file_list is not None:
1535
1505
file_list = [f for f in file_list]
1914
1884
takes_args = ['file*']
1915
1885
takes_options = [
1916
1886
Option('diff-options', type=str,
1917
help='Pass these options to the external diff program.'),
1887
help='Pass these options to the diff program.'),
1918
1888
Option('prefix', type=str,
1919
1889
short_name='p',
1920
1890
help='Set prefixes added to old and new filenames, as '
1961
1931
'--prefix expects two values separated by a colon'
1962
1932
' (eg "old/:new/")')
1934
if using is not None and diff_options is not None:
1935
raise errors.BzrCommandError(
1936
'--diff-options and --using are mutually exclusive.')
1964
1938
if revision and len(revision) > 2:
1965
1939
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1966
1940
' one or two revision specifiers')
1973
1947
old_branch, new_branch,
1974
1948
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1975
1949
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1950
# GNU diff on Windows uses ANSI encoding for filenames
1951
path_encoding = osutils.get_diff_header_encoding()
1976
1952
return show_diff_trees(old_tree, new_tree, sys.stdout,
1977
1953
specific_files=specific_files,
1978
1954
external_diff_options=diff_options,
1979
1955
old_label=old_label, new_label=new_label,
1980
extra_trees=extra_trees, using=using,
1956
extra_trees=extra_trees,
1957
path_encoding=path_encoding,
1981
1959
format_cls=format)
2720
2698
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2721
2699
ignored = globbing.Globster(name_pattern_list)
2701
self.add_cleanup(tree.lock_read().unlock)
2724
2702
for entry in tree.list_files():
2726
2704
if id is not None:
2727
2705
filename = entry[0]
2728
2706
if ignored.match(filename):
2729
2707
matches.append(filename)
2731
2708
if len(matches) > 0:
2732
2709
self.outf.write("Warning: the following files are version controlled and"
2733
2710
" match your ignore pattern:\n%s"
3110
3087
properties = {}
3112
tree, selected_list = tree_files(selected_list)
3089
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3113
3090
if selected_list == ['']:
3114
3091
# workaround - commit of root of tree should be exactly the same
3115
3092
# as just default commit in that tree, and succeed even though
3150
3127
def get_message(commit_obj):
3151
3128
"""Callback to get commit message"""
3153
my_message = codecs.open(
3154
file, 'rt', osutils.get_user_encoding()).read()
3130
f = codecs.open(file, 'rt', osutils.get_user_encoding())
3132
my_message = f.read()
3155
3135
elif message is not None:
3156
3136
my_message = message
3186
3166
reporter=None, verbose=verbose, revprops=properties,
3187
3167
authors=author, timestamp=commit_stamp,
3188
3168
timezone=offset,
3189
exclude=safe_relpath_files(tree, exclude))
3169
exclude=tree.safe_relpath_files(exclude))
3190
3170
except PointlessCommit:
3191
3171
raise errors.BzrCommandError("No changes to commit."
3192
3172
" Use --unchanged to commit anyhow.")
3312
3292
bzr whoami "Frank Chu <fchu@example.com>"
3314
takes_options = [ Option('email',
3294
takes_options = [ 'directory',
3315
3296
help='Display email address only.'),
3316
3297
Option('branch',
3317
3298
help='Set identity for the current branch instead of '
3321
3302
encoding_type = 'replace'
3323
3304
@display_command
3324
def run(self, email=False, branch=False, name=None):
3305
def run(self, email=False, branch=False, name=None, directory=None):
3325
3306
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()
3307
if directory is None:
3308
# use branch if we're inside one; otherwise global config
3310
c = Branch.open_containing(u'.')[0].get_config()
3311
except errors.NotBranchError:
3312
c = config.GlobalConfig()
3314
c = Branch.open(directory).get_config()
3332
3316
self.outf.write(c.user_email() + '\n')
3344
3328
# use global config unless --branch given
3346
c = Branch.open_containing('.')[0].get_config()
3330
if directory is None:
3331
c = Branch.open_containing(u'.')[0].get_config()
3333
c = Branch.open(directory).get_config()
3348
3335
c = config.GlobalConfig()
3349
3336
c.set_user_option('email', name)
3594
3581
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3595
3582
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3596
3583
# stdout, which would corrupt the subunit stream.
3597
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3584
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3585
# following code can be deleted when it's sufficiently deployed
3586
# -- vila/mgz 20100514
3587
if (sys.platform == "win32"
3588
and getattr(sys.stdout, 'fileno', None) is not None):
3599
3590
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3881
3872
def _do_preview(self, merger):
3882
3873
from bzrlib.diff import show_diff_trees
3883
3874
result_tree = self._get_preview(merger)
3875
path_encoding = osutils.get_diff_header_encoding()
3884
3876
show_diff_trees(merger.this_tree, result_tree, self.outf,
3885
old_label='', new_label='')
3877
old_label='', new_label='',
3878
path_encoding=path_encoding)
3887
3880
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3888
3881
merger.change_reporter = change_reporter
4075
4068
from bzrlib.conflicts import restore
4076
4069
if merge_type is None:
4077
4070
merge_type = _mod_merge.Merge3Merger
4078
tree, file_list = tree_files(file_list)
4071
tree, file_list = WorkingTree.open_containing_paths(file_list)
4079
4072
self.add_cleanup(tree.lock_write().unlock)
4080
4073
parents = tree.get_parent_ids()
4081
4074
if len(parents) != 2:
4192
4185
def run(self, revision=None, no_backup=False, file_list=None,
4193
4186
forget_merges=None):
4194
tree, file_list = tree_files(file_list)
4187
tree, file_list = WorkingTree.open_containing_paths(file_list)
4195
4188
self.add_cleanup(tree.lock_tree_write().unlock)
4196
4189
if forget_merges:
4197
4190
tree.set_parent_ids(tree.get_parent_ids()[:1])
4287
4280
_see_also = ['merge', 'pull']
4288
4281
takes_args = ['other_branch?']
4289
4282
takes_options = [
4290
4284
Option('reverse', 'Reverse the order of revisions.'),
4291
4285
Option('mine-only',
4292
4286
'Display changes in the local branch only.'),
4314
4308
theirs_only=False,
4315
4309
log_format=None, long=False, short=False, line=False,
4316
4310
show_ids=False, verbose=False, this=False, other=False,
4317
include_merges=False, revision=None, my_revision=None):
4311
include_merges=False, revision=None, my_revision=None,
4318
4313
from bzrlib.missing import find_unmerged, iter_log_revisions
4319
4314
def message(s):
4320
4315
if not is_quiet():
4902
4897
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4903
4898
protocol=None):
4904
from bzrlib.transport import get_transport, transport_server_registry
4899
from bzrlib import transport
4905
4900
if directory is None:
4906
4901
directory = os.getcwd()
4907
4902
if protocol is None:
4908
protocol = transport_server_registry.get()
4903
protocol = transport.transport_server_registry.get()
4909
4904
host, port = self.get_host_and_port(port)
4910
4905
url = urlutils.local_path_to_url(directory)
4911
4906
if not allow_writes:
4912
4907
url = 'readonly+' + url
4913
transport = get_transport(url)
4914
protocol(transport, host, port, inet)
4908
t = transport.get_transport(url)
4909
protocol(t, host, port, inet)
4917
4912
class cmd_join(Command):
5028
5024
encoding_type = 'exact'
5030
5026
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5031
sign=False, revision=None, mail_to=None, message=None):
5027
sign=False, revision=None, mail_to=None, message=None,
5032
5029
from bzrlib.revision import ensure_null, NULL_REVISION
5033
5030
include_patch, include_bundle = {
5034
5031
'plain': (False, False),
5035
5032
'diff': (True, False),
5036
5033
'bundle': (True, True),
5038
branch = Branch.open('.')
5035
branch = Branch.open(directory)
5039
5036
stored_submit_branch = branch.get_submit_branch()
5040
5037
if submit_branch is None:
5041
5038
submit_branch = stored_submit_branch
5126
5123
given, in which case it is sent to a file.
5128
5125
Mail is sent using your preferred mail program. This should be transparent
5129
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5126
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5130
5127
If the preferred client can't be found (or used), your editor will be used.
5132
5129
To use a specific mail program, set the mail_client configuration option.
5531
5528
takes_args = ['to_location?']
5532
takes_options = [Option('force',
5529
takes_options = ['directory',
5533
5531
help='Switch even if local commits will be lost.'),
5535
5533
Option('create-branch', short_name='b',
5540
5538
def run(self, to_location=None, force=False, create_branch=False,
5539
revision=None, directory=u'.'):
5542
5540
from bzrlib import switch
5541
tree_location = directory
5544
5542
revision = _get_one_revision('switch', revision)
5545
5543
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
5544
if to_location is None:
5547
5545
if revision is None:
5548
5546
raise errors.BzrCommandError('You must supply either a'
5549
5547
' revision or a location')
5548
to_location = tree_location
5552
5550
branch = control_dir.open_branch()
5553
5551
had_explicit_nick = branch.get_config().has_explicit_nickname()
5691
tree, file_list = tree_files(file_list, apply_view=False)
5689
tree, file_list = WorkingTree.open_containing_paths(file_list,
5692
5691
current_view, view_dict = tree.views.get_view_info()
5693
5692
if name is None:
5694
5693
name = current_view
5842
5842
_see_also = ['unshelve']
5844
5844
def run(self, revision=None, all=False, file_list=None, message=None,
5845
writer=None, list=False, destroy=False):
5845
writer=None, list=False, destroy=False, directory=u'.'):
5847
5847
return self.run_for_list()
5848
5848
from bzrlib.shelf_ui import Shelver
5850
5850
writer = bzrlib.option.diff_writer_registry.get()
5852
5852
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
5853
file_list, message, destroy=destroy, directory=directory)
5885
5885
takes_args = ['shelf_id?']
5886
5886
takes_options = [
5887
5888
RegistryOption.from_kwargs(
5888
5889
'action', help="The action to perform.",
5889
5890
enum_switch=False, value_switches=True,
5898
5899
_see_also = ['shelve']
5900
def run(self, shelf_id=None, action='apply'):
5901
def run(self, shelf_id=None, action='apply', directory=u'.'):
5901
5902
from bzrlib.shelf_ui import Unshelver
5902
unshelver = Unshelver.from_args(shelf_id, action)
5903
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5904
5905
unshelver.run()
added
removed
bzrlib/builtins.py
