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):
192
def _open_directory_or_containing_tree_or_branch(filename, directory):
193
"""Open the tree or branch containing the specified file, unless
194
the --directory option is used to specify a different branch."""
195
if directory is not None:
196
return (None, Branch.open(directory), filename)
197
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
235
200
# TODO: Make sure no commands unconditionally use the working directory as a
236
201
# branch. If a filename argument is used, the first of them should be used to
237
202
# specify the branch. (Perhaps this can be factored out into some kind of
315
280
raise errors.BzrCommandError('bzr status --revision takes exactly'
316
281
' one or two revision specifiers')
318
tree, relfile_list = tree_files(file_list)
283
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
319
284
# Avoid asking for specific files when that is not needed.
320
285
if relfile_list == ['']:
321
286
relfile_list = None
353
318
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
321
def run(self, revision_id=None, revision=None, directory=u'.'):
357
322
if revision_id is not None and revision is not None:
358
323
raise errors.BzrCommandError('You can only supply one of'
359
324
' revision_id or --revision')
360
325
if revision_id is None and revision is None:
361
326
raise errors.BzrCommandError('You must supply either'
362
327
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
328
b = WorkingTree.open_containing(directory)[0].branch
365
330
revisions = b.repository.revisions
366
331
if revisions is None:
504
469
if (working.has_changes()):
505
470
raise errors.UncommittedChanges(working)
471
if working.get_shelf_manager().last_shelf() is not None:
472
raise errors.ShelvedChanges(working)
507
474
if working.user_url != working.branch.user_url:
508
475
raise errors.BzrCommandError("You cannot remove the working tree"
552
519
takes_args = ['revision_info*']
553
520
takes_options = [
522
custom_help('directory',
556
523
help='Branch to examine, '
557
'rather than the one containing the working directory.',
524
'rather than the one containing the working directory.'),
561
525
Option('tree', help='Show revno of working tree'),
754
718
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
756
720
revision = _get_one_revision('inventory', revision)
757
work_tree, file_list = tree_files(file_list)
721
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
758
722
self.add_cleanup(work_tree.lock_read().unlock)
759
723
if revision is not None:
760
724
tree = revision.as_tree(work_tree.branch)
826
790
if len(names_list) < 2:
827
791
raise errors.BzrCommandError("missing file argument")
828
tree, rel_names = tree_files(names_list, canonicalize=False)
792
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
829
793
self.add_cleanup(tree.lock_tree_write().unlock)
830
794
self._run(tree, names_list, rel_names, after)
837
801
raise errors.BzrCommandError('--after cannot be specified with'
839
work_tree, file_list = tree_files(names_list, default_branch='.')
803
work_tree, file_list = WorkingTree.open_containing_paths(
804
names_list, default_directory='.')
840
805
self.add_cleanup(work_tree.lock_tree_write().unlock)
841
806
rename_map.RenameMap.guess_renames(work_tree, dry_run)
951
916
takes_options = ['remember', 'overwrite', 'revision',
952
917
custom_help('verbose',
953
918
help='Show logs of pulled revisions.'),
919
custom_help('directory',
955
920
help='Branch to pull into, '
956
'rather than the one containing the working directory.',
921
'rather than the one containing the working directory.'),
961
923
help="Perform a local pull in a bound "
962
924
"branch. Local pulls are not applied to "
1076
1038
Option('create-prefix',
1077
1039
help='Create the path leading up to the branch '
1078
1040
'if it does not already exist.'),
1041
custom_help('directory',
1080
1042
help='Branch to push from, '
1081
'rather than the one containing the working directory.',
1043
'rather than the one containing the working directory.'),
1085
1044
Option('use-existing-dir',
1086
1045
help='By default push will fail if the target'
1087
1046
' directory exists, but does not already'
1177
1136
_see_also = ['checkout']
1178
1137
takes_args = ['from_location', 'to_location?']
1179
takes_options = ['revision', Option('hardlink',
1180
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."),
1181
1142
Option('no-tree',
1182
1143
help="Create a branch without a working-tree."),
1183
1144
Option('switch',
1202
1163
def run(self, from_location, to_location=None, revision=None,
1203
1164
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1165
use_existing_dir=False, switch=False, bind=False,
1205
1167
from bzrlib import switch as _mod_switch
1206
1168
from bzrlib.tag import _merge_tags_if_possible
1207
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)
1209
1178
revision = _get_one_revision('branch', revision)
1210
1179
self.add_cleanup(br_from.lock_read().unlock)
1211
1180
if revision is not None:
1318
1287
to_location = branch_location
1319
1288
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1320
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
1321
1295
revision = _get_one_revision('checkout', revision)
1322
if files_from is not None:
1296
if files_from is not None and files_from != branch_location:
1323
1297
accelerator_tree = WorkingTree.open(files_from)
1324
1298
if revision is not None:
1325
1299
revision_id = revision.as_revision_id(source)
1526
1500
def run(self, file_list, verbose=False, new=False,
1527
1501
file_deletion_strategy='safe'):
1528
tree, file_list = tree_files(file_list)
1502
tree, file_list = WorkingTree.open_containing_paths(file_list)
1530
1504
if file_list is not None:
1531
1505
file_list = [f for f in file_list]
1910
1884
takes_args = ['file*']
1911
1885
takes_options = [
1912
1886
Option('diff-options', type=str,
1913
help='Pass these options to the external diff program.'),
1887
help='Pass these options to the diff program.'),
1914
1888
Option('prefix', type=str,
1915
1889
short_name='p',
1916
1890
help='Set prefixes added to old and new filenames, as '
1957
1931
'--prefix expects two values separated by a colon'
1958
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.')
1960
1938
if revision and len(revision) > 2:
1961
1939
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1940
' one or two revision specifiers')
1969
1947
old_branch, new_branch,
1970
1948
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
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()
1972
1952
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1953
specific_files=specific_files,
1974
1954
external_diff_options=diff_options,
1975
1955
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1956
extra_trees=extra_trees,
1957
path_encoding=path_encoding,
1977
1959
format_cls=format)
1987
1969
# level of effort but possibly much less IO. (Or possibly not,
1988
1970
# if the directories are very large...)
1989
1971
_see_also = ['status', 'ls']
1990
takes_options = ['show-ids']
1972
takes_options = ['directory', 'show-ids']
1992
1974
@display_command
1993
def run(self, show_ids=False):
1994
tree = WorkingTree.open_containing(u'.')[0]
1975
def run(self, show_ids=False, directory=u'.'):
1976
tree = WorkingTree.open_containing(directory)[0]
1995
1977
self.add_cleanup(tree.lock_read().unlock)
1996
1978
old = tree.basis_tree()
1997
1979
self.add_cleanup(old.lock_read().unlock)
2012
1994
_see_also = ['status', 'ls']
2015
help='Write an ascii NUL (\\0) separator '
2016
'between files rather than a newline.')
1995
takes_options = ['directory', 'null']
2019
1997
@display_command
2020
def run(self, null=False):
2021
tree = WorkingTree.open_containing(u'.')[0]
1998
def run(self, null=False, directory=u'.'):
1999
tree = WorkingTree.open_containing(directory)[0]
2022
2000
td = tree.changes_from(tree.basis_tree())
2023
2001
for path, id, kind, text_modified, meta_modified in td.modified:
2035
2013
_see_also = ['status', 'ls']
2038
help='Write an ascii NUL (\\0) separator '
2039
'between files rather than a newline.')
2014
takes_options = ['directory', 'null']
2042
2016
@display_command
2043
def run(self, null=False):
2044
wt = WorkingTree.open_containing(u'.')[0]
2017
def run(self, null=False, directory=u'.'):
2018
wt = WorkingTree.open_containing(directory)[0]
2045
2019
self.add_cleanup(wt.lock_read().unlock)
2046
2020
basis = wt.basis_tree()
2047
2021
self.add_cleanup(basis.lock_read().unlock)
2053
2027
if inv.is_root(file_id) and len(basis_inv) == 0:
2055
2029
path = inv.id2path(file_id)
2056
if not os.access(osutils.abspath(path), os.F_OK):
2030
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2059
2033
self.outf.write(path + '\0')
2259
2233
help='Show just the specified revision.'
2260
2234
' See also "help revisionspec".'),
2236
RegistryOption('authors',
2237
'What names to list as authors - first, all or committer.',
2239
lazy_registry=('bzrlib.log', 'author_list_registry'),
2262
2241
Option('levels',
2263
2242
short_name='n',
2264
2243
help='Number of levels to display - 0 for all, 1 for flat.',
2382
2362
show_timezone=timezone,
2383
2363
delta_format=get_verbosity_level(),
2385
show_advice=levels is None)
2365
show_advice=levels is None,
2366
author_list_handler=authors)
2387
2368
# Choose the algorithm for doing the logging. It's annoying
2388
2369
# having multiple code paths like this but necessary until
2505
2486
help='Recurse into subdirectories.'),
2506
2487
Option('from-root',
2507
2488
help='Print paths relative to the root of the branch.'),
2508
Option('unknown', help='Print unknown files.'),
2489
Option('unknown', short_name='u',
2490
help='Print unknown files.'),
2509
2491
Option('versioned', help='Print versioned files.',
2510
2492
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.'),
2493
Option('ignored', short_name='i',
2494
help='Print ignored files.'),
2495
Option('kind', short_name='k',
2516
2496
help='List entries of a particular kind: file, directory, symlink.',
2520
2502
@display_command
2521
2503
def run(self, revision=None, verbose=False,
2522
2504
recursive=False, from_root=False,
2523
2505
unknown=False, versioned=False, ignored=False,
2524
null=False, kind=None, show_ids=False, path=None):
2506
null=False, kind=None, show_ids=False, path=None, directory=None):
2526
2508
if kind and kind not in ('file', 'directory', 'symlink'):
2527
2509
raise errors.BzrCommandError('invalid kind specified')
2539
2521
raise errors.BzrCommandError('cannot specify both --from-root'
2542
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2524
tree, branch, relpath = \
2525
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2545
2527
# Calculate the prefix to use
2616
2598
_see_also = ['ls']
2599
takes_options = ['directory']
2618
2601
@display_command
2620
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2602
def run(self, directory=u'.'):
2603
for f in WorkingTree.open_containing(directory)[0].unknowns():
2621
2604
self.outf.write(osutils.quotefn(f) + '\n')
2689
2672
_see_also = ['status', 'ignored', 'patterns']
2690
2673
takes_args = ['name_pattern*']
2674
takes_options = ['directory',
2692
2675
Option('default-rules',
2693
2676
help='Display the default ignore rules that bzr uses.')
2696
def run(self, name_pattern_list=None, default_rules=None):
2679
def run(self, name_pattern_list=None, default_rules=None,
2697
2681
from bzrlib import ignores
2698
2682
if default_rules is not None:
2699
2683
# dump the default rules and exit
2710
2694
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2711
2695
raise errors.BzrCommandError(
2712
2696
"NAME_PATTERN should not be an absolute path")
2713
tree, relpath = WorkingTree.open_containing(u'.')
2697
tree, relpath = WorkingTree.open_containing(directory)
2714
2698
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2715
2699
ignored = globbing.Globster(name_pattern_list)
2701
self.add_cleanup(tree.lock_read().unlock)
2718
2702
for entry in tree.list_files():
2720
2704
if id is not None:
2721
2705
filename = entry[0]
2722
2706
if ignored.match(filename):
2723
2707
matches.append(filename)
2725
2708
if len(matches) > 0:
2726
2709
self.outf.write("Warning: the following files are version controlled and"
2727
2710
" match your ignore pattern:\n%s"
2743
2726
encoding_type = 'replace'
2744
2727
_see_also = ['ignore', 'ls']
2728
takes_options = ['directory']
2746
2730
@display_command
2748
tree = WorkingTree.open_containing(u'.')[0]
2731
def run(self, directory=u'.'):
2732
tree = WorkingTree.open_containing(directory)[0]
2749
2733
self.add_cleanup(tree.lock_read().unlock)
2750
2734
for path, file_class, kind, file_id, entry in tree.list_files():
2751
2735
if file_class != 'I':
2765
2749
takes_args = ['revno']
2750
takes_options = ['directory']
2767
2752
@display_command
2768
def run(self, revno):
2753
def run(self, revno, directory=u'.'):
2770
2755
revno = int(revno)
2771
2756
except ValueError:
2772
2757
raise errors.BzrCommandError("not a valid revision-number: %r"
2774
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2759
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2775
2760
self.outf.write("%s\n" % revid)
2804
2789
================= =========================
2806
2791
takes_args = ['dest', 'branch_or_subdir?']
2792
takes_options = ['directory',
2808
2793
Option('format',
2809
2794
help="Type of file to export to.",
2819
2804
'revision in which it was changed.'),
2821
2806
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2807
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2823
2808
from bzrlib.export import export
2825
2810
if branch_or_subdir is None:
2826
tree = WorkingTree.open_containing(u'.')[0]
2811
tree = WorkingTree.open_containing(directory)[0]
2827
2812
b = tree.branch
2850
2835
_see_also = ['ls']
2836
takes_options = ['directory',
2852
2837
Option('name-from-revision', help='The path name in the old tree.'),
2853
2838
Option('filters', help='Apply content filters to display the '
2854
2839
'convenience form.'),
2860
2845
@display_command
2861
2846
def run(self, filename, revision=None, name_from_revision=False,
2847
filters=False, directory=None):
2863
2848
if revision is not None and len(revision) != 1:
2864
2849
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2865
2850
" one revision specifier")
2866
2851
tree, branch, relpath = \
2867
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2852
_open_directory_or_containing_tree_or_branch(filename, directory)
2868
2853
self.add_cleanup(branch.lock_read().unlock)
2869
2854
return self._run(tree, branch, relpath, filename, revision,
2870
2855
name_from_revision, filters)
3102
3087
properties = {}
3104
tree, selected_list = tree_files(selected_list)
3089
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3105
3090
if selected_list == ['']:
3106
3091
# workaround - commit of root of tree should be exactly the same
3107
3092
# as just default commit in that tree, and succeed even though
3142
3127
def get_message(commit_obj):
3143
3128
"""Callback to get commit message"""
3145
my_message = codecs.open(
3146
file, 'rt', osutils.get_user_encoding()).read()
3130
f = codecs.open(file, 'rt', osutils.get_user_encoding())
3132
my_message = f.read()
3147
3135
elif message is not None:
3148
3136
my_message = message
3178
3166
reporter=None, verbose=verbose, revprops=properties,
3179
3167
authors=author, timestamp=commit_stamp,
3180
3168
timezone=offset,
3181
exclude=safe_relpath_files(tree, exclude))
3169
exclude=tree.safe_relpath_files(exclude))
3182
3170
except PointlessCommit:
3183
3171
raise errors.BzrCommandError("No changes to commit."
3184
3172
" Use --unchanged to commit anyhow.")
3304
3292
bzr whoami "Frank Chu <fchu@example.com>"
3306
takes_options = [ Option('email',
3294
takes_options = [ 'directory',
3307
3296
help='Display email address only.'),
3308
3297
Option('branch',
3309
3298
help='Set identity for the current branch instead of '
3313
3302
encoding_type = 'replace'
3315
3304
@display_command
3316
def run(self, email=False, branch=False, name=None):
3305
def run(self, email=False, branch=False, name=None, directory=None):
3317
3306
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()
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()
3324
3316
self.outf.write(c.user_email() + '\n')
3336
3328
# use global config unless --branch given
3338
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()
3340
3335
c = config.GlobalConfig()
3341
3336
c.set_user_option('email', name)
3354
3349
_see_also = ['info']
3355
3350
takes_args = ['nickname?']
3356
def run(self, nickname=None):
3357
branch = Branch.open_containing(u'.')[0]
3351
takes_options = ['directory']
3352
def run(self, nickname=None, directory=u'.'):
3353
branch = Branch.open_containing(directory)[0]
3358
3354
if nickname is None:
3359
3355
self.printme(branch)
3585
3581
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3586
3582
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
3583
# stdout, which would corrupt the subunit stream.
3588
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):
3590
3590
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3764
3764
' completely merged into the source, pull from the'
3765
3765
' source rather than merging. When this happens,'
3766
3766
' you do not need to commit the result.'),
3767
custom_help('directory',
3768
3768
help='Branch to merge into, '
3769
'rather than the one containing the working directory.',
3769
'rather than the one containing the working directory.'),
3773
3770
Option('preview', help='Instead of merging, show a diff of the'
3775
3772
Option('interactive', help='Select changes interactively.',
3875
3872
def _do_preview(self, merger):
3876
3873
from bzrlib.diff import show_diff_trees
3877
3874
result_tree = self._get_preview(merger)
3875
path_encoding = osutils.get_diff_header_encoding()
3878
3876
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
old_label='', new_label='')
3877
old_label='', new_label='',
3878
path_encoding=path_encoding)
3881
3880
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3882
3881
merger.change_reporter = change_reporter
4069
4068
from bzrlib.conflicts import restore
4070
4069
if merge_type is None:
4071
4070
merge_type = _mod_merge.Merge3Merger
4072
tree, file_list = tree_files(file_list)
4071
tree, file_list = WorkingTree.open_containing_paths(file_list)
4073
4072
self.add_cleanup(tree.lock_write().unlock)
4074
4073
parents = tree.get_parent_ids()
4075
4074
if len(parents) != 2:
4186
4185
def run(self, revision=None, no_backup=False, file_list=None,
4187
4186
forget_merges=None):
4188
tree, file_list = tree_files(file_list)
4187
tree, file_list = WorkingTree.open_containing_paths(file_list)
4189
4188
self.add_cleanup(tree.lock_tree_write().unlock)
4190
4189
if forget_merges:
4191
4190
tree.set_parent_ids(tree.get_parent_ids()[:1])
4281
4280
_see_also = ['merge', 'pull']
4282
4281
takes_args = ['other_branch?']
4283
4282
takes_options = [
4284
4284
Option('reverse', 'Reverse the order of revisions.'),
4285
4285
Option('mine-only',
4286
4286
'Display changes in the local branch only.'),
4308
4308
theirs_only=False,
4309
4309
log_format=None, long=False, short=False, line=False,
4310
4310
show_ids=False, verbose=False, this=False, other=False,
4311
include_merges=False, revision=None, my_revision=None):
4311
include_merges=False, revision=None, my_revision=None,
4312
4313
from bzrlib.missing import find_unmerged, iter_log_revisions
4313
4314
def message(s):
4314
4315
if not is_quiet():
4542
4543
Option('long', help='Show commit date in annotations.'),
4546
4548
encoding_type = 'exact'
4548
4550
@display_command
4549
4551
def run(self, filename, all=False, long=False, revision=None,
4552
show_ids=False, directory=None):
4551
4553
from bzrlib.annotate import annotate_file, annotate_file_tree
4552
4554
wt, branch, relpath = \
4553
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4555
_open_directory_or_containing_tree_or_branch(filename, directory)
4554
4556
if wt is not None:
4555
4557
self.add_cleanup(wt.lock_read().unlock)
4581
4583
hidden = True # is this right ?
4582
4584
takes_args = ['revision_id*']
4583
takes_options = ['revision']
4585
takes_options = ['directory', 'revision']
4585
def run(self, revision_id_list=None, revision=None):
4587
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4586
4588
if revision_id_list is not None and revision is not None:
4587
4589
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4588
4590
if revision_id_list is None and revision is None:
4589
4591
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
b = WorkingTree.open_containing(u'.')[0].branch
4592
b = WorkingTree.open_containing(directory)[0].branch
4591
4593
self.add_cleanup(b.lock_write().unlock)
4592
4594
return self._run(b, revision_id_list, revision)
4654
4656
_see_also = ['checkouts', 'unbind']
4655
4657
takes_args = ['location?']
4658
takes_options = ['directory']
4658
def run(self, location=None):
4659
b, relpath = Branch.open_containing(u'.')
4660
def run(self, location=None, directory=u'.'):
4661
b, relpath = Branch.open_containing(directory)
4660
4662
if location is None:
4662
4664
location = b.get_old_bound_location()
4690
4692
_see_also = ['checkouts', 'bind']
4691
4693
takes_args = []
4694
takes_options = ['directory']
4695
b, relpath = Branch.open_containing(u'.')
4696
def run(self, directory=u'.'):
4697
b, relpath = Branch.open_containing(directory)
4696
4698
if not b.unbind():
4697
4699
raise errors.BzrCommandError('Local branch is not bound')
4860
4862
'result in a dynamically allocated port. The default port '
4861
4863
'depends on the protocol.',
4864
help='Serve contents of this directory.',
4865
custom_help('directory',
4866
help='Serve contents of this directory.'),
4866
4867
Option('allow-writes',
4867
4868
help='By default the server is a readonly server. Supplying '
4868
4869
'--allow-writes enables write access to the contents of '
4896
4897
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4897
4898
protocol=None):
4898
from bzrlib.transport import get_transport, transport_server_registry
4899
from bzrlib import transport
4899
4900
if directory is None:
4900
4901
directory = os.getcwd()
4901
4902
if protocol is None:
4902
protocol = transport_server_registry.get()
4903
protocol = transport.transport_server_registry.get()
4903
4904
host, port = self.get_host_and_port(port)
4904
4905
url = urlutils.local_path_to_url(directory)
4905
4906
if not allow_writes:
4906
4907
url = 'readonly+' + url
4907
transport = get_transport(url)
4908
protocol(transport, host, port, inet)
4908
t = transport.get_transport(url)
4909
protocol(t, host, port, inet)
4911
4912
class cmd_join(Command):
5022
5024
encoding_type = 'exact'
5024
5026
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5025
sign=False, revision=None, mail_to=None, message=None):
5027
sign=False, revision=None, mail_to=None, message=None,
5026
5029
from bzrlib.revision import ensure_null, NULL_REVISION
5027
5030
include_patch, include_bundle = {
5028
5031
'plain': (False, False),
5029
5032
'diff': (True, False),
5030
5033
'bundle': (True, True),
5032
branch = Branch.open('.')
5035
branch = Branch.open(directory)
5033
5036
stored_submit_branch = branch.get_submit_branch()
5034
5037
if submit_branch is None:
5035
5038
submit_branch = stored_submit_branch
5120
5123
given, in which case it is sent to a file.
5122
5125
Mail is sent using your preferred mail program. This should be transparent
5123
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.
5124
5127
If the preferred client can't be found (or used), your editor will be used.
5126
5129
To use a specific mail program, set the mail_client configuration option.
5297
5300
Option('delete',
5298
5301
help='Delete this tag rather than placing it.',
5301
help='Branch in which to place the tag.',
5303
custom_help('directory',
5304
help='Branch in which to place the tag.'),
5305
5305
Option('force',
5306
5306
help='Replace existing tags.',
5350
5350
_see_also = ['tag']
5351
5351
takes_options = [
5353
help='Branch whose tags should be displayed.',
5352
custom_help('directory',
5353
help='Branch whose tags should be displayed.'),
5357
5354
RegistryOption.from_kwargs('sort',
5358
5355
'Sort tags by different criteria.', title='Sorting',
5359
5356
alpha='Sort tags lexicographically (default).',
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()
5922
5923
To check what clean-tree will do, use --dry-run.
5924
takes_options = [Option('ignored', help='Delete all ignored files.'),
5925
takes_options = ['directory',
5926
Option('ignored', help='Delete all ignored files.'),
5925
5927
Option('detritus', help='Delete conflict files, merge'
5926
5928
' backups, and failed selftest dirs.'),
5927
5929
Option('unknown',
5930
5932
' deleting them.'),
5931
5933
Option('force', help='Do not prompt before deleting.')]
5932
5934
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5935
force=False, directory=u'.'):
5934
5936
from bzrlib.clean_tree import clean_tree
5935
5937
if not (unknown or ignored or detritus):
5939
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5940
dry_run=dry_run, no_prompt=force)
5941
clean_tree(directory, unknown=unknown, ignored=ignored,
5942
detritus=detritus, dry_run=dry_run, no_prompt=force)
5943
5945
class cmd_reference(Command):
added
removed
bzrlib/builtins.py
