75
74
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
77
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
80
return internal_tree_files(file_list, default_branch, canonicalize,
88
84
def tree_files_for_add(file_list):
153
149
# XXX: Bad function name; should possibly also be a class method of
154
150
# WorkingTree rather than a function.
151
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
155
152
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
153
apply_view=True):
157
154
"""Convert command-line paths to a WorkingTree and relative paths.
156
Deprecated: use WorkingTree.open_containing_paths instead.
159
158
This is typically used for command-line processors that take one or
160
159
more filenames, and infer the workingtree that contains them.
172
171
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
173
return WorkingTree.open_containing_paths(
174
file_list, default_directory='.',
223
179
def _get_view_info_for_change_reporter(tree):
191
def _open_directory_or_containing_tree_or_branch(filename, directory):
192
"""Open the tree or branch containing the specified file, unless
193
the --directory option is used to specify a different branch."""
194
if directory is not None:
195
return (None, Branch.open(directory), filename)
196
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
235
199
# TODO: Make sure no commands unconditionally use the working directory as a
236
200
# branch. If a filename argument is used, the first of them should be used to
237
201
# specify the branch. (Perhaps this can be factored out into some kind of
315
279
raise errors.BzrCommandError('bzr status --revision takes exactly'
316
280
' one or two revision specifiers')
318
tree, relfile_list = tree_files(file_list)
282
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
319
283
# Avoid asking for specific files when that is not needed.
320
284
if relfile_list == ['']:
321
285
relfile_list = None
353
317
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
320
def run(self, revision_id=None, revision=None, directory=u'.'):
357
321
if revision_id is not None and revision is not None:
358
322
raise errors.BzrCommandError('You can only supply one of'
359
323
' revision_id or --revision')
360
324
if revision_id is None and revision is None:
361
325
raise errors.BzrCommandError('You must supply either'
362
326
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
327
b = WorkingTree.open_containing(directory)[0].branch
365
329
revisions = b.repository.revisions
366
330
if revisions is None:
504
468
if (working.has_changes()):
505
469
raise errors.UncommittedChanges(working)
470
if working.get_shelf_manager().last_shelf() is not None:
471
raise errors.ShelvedChanges(working)
507
473
if working.user_url != working.branch.user_url:
508
474
raise errors.BzrCommandError("You cannot remove the working tree"
530
496
wt = WorkingTree.open_containing(location)[0]
497
self.add_cleanup(wt.lock_read().unlock)
532
498
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
499
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
500
revid = wt.last_revision()
537
502
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
540
505
revno = ".".join(str(n) for n in revno_t)
542
507
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
508
self.add_cleanup(b.lock_read().unlock)
545
509
revno = b.revno()
546
510
self.cleanup_now()
547
511
self.outf.write(str(revno) + '\n')
554
518
takes_args = ['revision_info*']
555
519
takes_options = [
521
custom_help('directory',
558
522
help='Branch to examine, '
559
'rather than the one containing the working directory.',
523
'rather than the one containing the working directory.'),
563
524
Option('tree', help='Show revno of working tree'),
571
532
wt = WorkingTree.open_containing(directory)[0]
574
self.add_cleanup(wt.unlock)
534
self.add_cleanup(wt.lock_read().unlock)
575
535
except (errors.NoWorkingTree, errors.NotLocalUrl):
577
537
b = Branch.open_containing(directory)[0]
579
self.add_cleanup(b.unlock)
538
self.add_cleanup(b.lock_read().unlock)
580
539
revision_ids = []
581
540
if revision is not None:
582
541
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
681
640
should_print=(not is_quiet()))
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
643
self.add_cleanup(base_tree.lock_read().unlock)
686
644
tree, file_list = tree_files_for_add(file_list)
687
645
added, ignored = tree.smart_add(file_list, not
688
646
no_recurse, action=action, save=not dry_run)
759
717
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
761
719
revision = _get_one_revision('inventory', revision)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
720
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
721
self.add_cleanup(work_tree.lock_read().unlock)
765
722
if revision is not None:
766
723
tree = revision.as_tree(work_tree.branch)
768
725
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
726
self.add_cleanup(tree.lock_read().unlock)
833
789
if len(names_list) < 2:
834
790
raise errors.BzrCommandError("missing file argument")
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
791
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
792
self.add_cleanup(tree.lock_tree_write().unlock)
838
793
self._run(tree, names_list, rel_names, after)
840
795
def run_auto(self, names_list, after, dry_run):
845
800
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
802
work_tree, file_list = WorkingTree.open_containing_paths(
803
names_list, default_directory='.')
804
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
805
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
807
def _run(self, tree, names_list, rel_names, after):
960
915
takes_options = ['remember', 'overwrite', 'revision',
961
916
custom_help('verbose',
962
917
help='Show logs of pulled revisions.'),
918
custom_help('directory',
964
919
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
920
'rather than the one containing the working directory.'),
970
922
help="Perform a local pull in a bound "
971
923
"branch. Local pulls are not applied to "
987
939
tree_to = WorkingTree.open_containing(directory)[0]
988
940
branch_to = tree_to.branch
990
self.add_cleanup(tree_to.unlock)
941
self.add_cleanup(tree_to.lock_write().unlock)
991
942
except errors.NoWorkingTree:
993
944
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
945
self.add_cleanup(branch_to.lock_write().unlock)
997
947
if local and not branch_to.get_bound_location():
998
948
raise errors.LocalRequiresBoundBranch()
1030
980
branch_from = Branch.open(location,
1031
981
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
982
self.add_cleanup(branch_from.lock_read().unlock)
1035
984
if branch_to.get_parent() is None or remember:
1036
985
branch_to.set_parent(branch_from.base)
1088
1037
Option('create-prefix',
1089
1038
help='Create the path leading up to the branch '
1090
1039
'if it does not already exist.'),
1040
custom_help('directory',
1092
1041
help='Branch to push from, '
1093
'rather than the one containing the working directory.',
1042
'rather than the one containing the working directory.'),
1097
1043
Option('use-existing-dir',
1098
1044
help='By default push will fail if the target'
1099
1045
' directory exists, but does not already'
1189
1135
_see_also = ['checkout']
1190
1136
takes_args = ['from_location', 'to_location?']
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1137
takes_options = ['revision',
1138
Option('hardlink', help='Hard-link working tree files where possible.'),
1139
Option('files-from', type=str,
1140
help="Get file contents from this tree."),
1193
1141
Option('no-tree',
1194
1142
help="Create a branch without a working-tree."),
1195
1143
Option('switch',
1214
1162
def run(self, from_location, to_location=None, revision=None,
1215
1163
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1164
use_existing_dir=False, switch=False, bind=False,
1217
1166
from bzrlib import switch as _mod_switch
1218
1167
from bzrlib.tag import _merge_tags_if_possible
1219
1168
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1170
if not (hardlink or files_from):
1171
# accelerator_tree is usually slower because you have to read N
1172
# files (no readahead, lots of seeks, etc), but allow the user to
1173
# explicitly request it
1174
accelerator_tree = None
1175
if files_from is not None and files_from != from_location:
1176
accelerator_tree = WorkingTree.open(files_from)
1221
1177
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1178
self.add_cleanup(br_from.lock_read().unlock)
1224
1179
if revision is not None:
1225
1180
revision_id = revision.as_revision_id(br_from)
1331
1286
to_location = branch_location
1332
1287
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1333
1288
branch_location)
1289
if not (hardlink or files_from):
1290
# accelerator_tree is usually slower because you have to read N
1291
# files (no readahead, lots of seeks, etc), but allow the user to
1292
# explicitly request it
1293
accelerator_tree = None
1334
1294
revision = _get_one_revision('checkout', revision)
1335
if files_from is not None:
1295
if files_from is not None and files_from != branch_location:
1336
1296
accelerator_tree = WorkingTree.open(files_from)
1337
1297
if revision is not None:
1338
1298
revision_id = revision.as_revision_id(source)
1366
1326
@display_command
1367
1327
def run(self, dir=u'.'):
1368
1328
tree = WorkingTree.open_containing(dir)[0]
1370
self.add_cleanup(tree.unlock)
1329
self.add_cleanup(tree.lock_read().unlock)
1371
1330
new_inv = tree.inventory
1372
1331
old_tree = tree.basis_tree()
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1332
self.add_cleanup(old_tree.lock_read().unlock)
1375
1333
old_inv = old_tree.inventory
1377
1335
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1415
1373
master = branch.get_master_branch(
1416
1374
possible_transports=possible_transports)
1417
1375
if master is not None:
1419
1376
branch_location = master.base
1379
branch_location = tree.branch.base
1421
1380
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1381
self.add_cleanup(tree.unlock)
1424
1382
# get rid of the final '/' and be ready for display
1425
1383
branch_location = urlutils.unescape_for_display(
1541
1499
def run(self, file_list, verbose=False, new=False,
1542
1500
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1501
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1503
if file_list is not None:
1546
1504
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1506
self.add_cleanup(tree.lock_write().unlock)
1550
1507
# Heuristics should probably all move into tree.remove_smart or
1926
1883
takes_args = ['file*']
1927
1884
takes_options = [
1928
1885
Option('diff-options', type=str,
1929
help='Pass these options to the external diff program.'),
1886
help='Pass these options to the diff program.'),
1930
1887
Option('prefix', type=str,
1931
1888
short_name='p',
1932
1889
help='Set prefixes added to old and new filenames, as '
1973
1930
'--prefix expects two values separated by a colon'
1974
1931
' (eg "old/:new/")')
1933
if using is not None and diff_options is not None:
1934
raise errors.BzrCommandError(
1935
'--diff-options and --using are mutually exclusive.')
1976
1937
if revision and len(revision) > 2:
1977
1938
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1939
' one or two revision specifiers')
1985
1946
old_branch, new_branch,
1986
1947
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
1948
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1949
# GNU diff on Windows uses ANSI encoding for filenames
1950
path_encoding = osutils.get_diff_header_encoding()
1988
1951
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1952
specific_files=specific_files,
1990
1953
external_diff_options=diff_options,
1991
1954
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1955
extra_trees=extra_trees,
1956
path_encoding=path_encoding,
1993
1958
format_cls=format)
2003
1968
# level of effort but possibly much less IO. (Or possibly not,
2004
1969
# if the directories are very large...)
2005
1970
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
1971
takes_options = ['directory', 'show-ids']
2008
1973
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
1974
def run(self, show_ids=False, directory=u'.'):
1975
tree = WorkingTree.open_containing(directory)[0]
1976
self.add_cleanup(tree.lock_read().unlock)
2013
1977
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
1978
self.add_cleanup(old.lock_read().unlock)
2016
1979
for path, ie in old.inventory.iter_entries():
2017
1980
if not tree.has_id(ie.file_id):
2018
1981
self.outf.write(path)
2030
1993
_see_also = ['status', 'ls']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
1994
takes_options = ['directory', 'null']
2037
1996
@display_command
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
1997
def run(self, null=False, directory=u'.'):
1998
tree = WorkingTree.open_containing(directory)[0]
2040
1999
td = tree.changes_from(tree.basis_tree())
2041
2000
for path, id, kind, text_modified, meta_modified in td.modified:
2053
2012
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2013
takes_options = ['directory', 'null']
2060
2015
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2016
def run(self, null=False, directory=u'.'):
2017
wt = WorkingTree.open_containing(directory)[0]
2018
self.add_cleanup(wt.lock_read().unlock)
2065
2019
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2020
self.add_cleanup(basis.lock_read().unlock)
2068
2021
basis_inv = basis.inventory
2069
2022
inv = wt.inventory
2070
2023
for file_id in inv:
2073
2026
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2028
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2029
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2032
self.outf.write(path + '\0')
2279
2232
help='Show just the specified revision.'
2280
2233
' See also "help revisionspec".'),
2235
RegistryOption('authors',
2236
'What names to list as authors - first, all or committer.',
2238
lazy_registry=('bzrlib.log', 'author_list_registry'),
2282
2240
Option('levels',
2283
2241
short_name='n',
2284
2242
help='Number of levels to display - 0 for all, 1 for flat.',
2353
2312
# find the file ids to log and check for directory filtering
2354
2313
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2314
revision, file_list, self.add_cleanup)
2357
2315
for relpath, file_id, kind in file_info_list:
2358
2316
if file_id is None:
2359
2317
raise errors.BzrCommandError(
2378
2336
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
2337
b = dir.open_branch()
2381
self.add_cleanup(b.unlock)
2338
self.add_cleanup(b.lock_read().unlock)
2382
2339
rev1, rev2 = _get_revision_range(revision, b, self.name())
2384
2341
# Decide on the type of delta & diff filtering to use
2404
2361
show_timezone=timezone,
2405
2362
delta_format=get_verbosity_level(),
2407
show_advice=levels is None)
2364
show_advice=levels is None,
2365
author_list_handler=authors)
2409
2367
# Choose the algorithm for doing the logging. It's annoying
2410
2368
# having multiple code paths like this but necessary until
2508
2466
tree, relpath = WorkingTree.open_containing(filename)
2509
2467
file_id = tree.path2id(relpath)
2510
2468
b = tree.branch
2512
self.add_cleanup(b.unlock)
2469
self.add_cleanup(b.lock_read().unlock)
2513
2470
touching_revs = log.find_touching_revisions(b, file_id)
2514
2471
for revno, revision_id, what in touching_revs:
2515
2472
self.outf.write("%6d %s\n" % (revno, what))
2528
2485
help='Recurse into subdirectories.'),
2529
2486
Option('from-root',
2530
2487
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2488
Option('unknown', short_name='u',
2489
help='Print unknown files.'),
2532
2490
Option('versioned', help='Print versioned files.',
2533
2491
short_name='V'),
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2492
Option('ignored', short_name='i',
2493
help='Print ignored files.'),
2494
Option('kind', short_name='k',
2539
2495
help='List entries of a particular kind: file, directory, symlink.',
2543
2501
@display_command
2544
2502
def run(self, revision=None, verbose=False,
2545
2503
recursive=False, from_root=False,
2546
2504
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2505
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2507
if kind and kind not in ('file', 'directory', 'symlink'):
2550
2508
raise errors.BzrCommandError('invalid kind specified')
2562
2520
raise errors.BzrCommandError('cannot specify both --from-root'
2565
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2523
tree, branch, relpath = \
2524
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2568
2526
# Calculate the prefix to use
2584
2542
view_str = views.view_display_str(view_files)
2585
2543
note("Ignoring files outside view. View is %s" % view_str)
2588
self.add_cleanup(tree.unlock)
2545
self.add_cleanup(tree.lock_read().unlock)
2589
2546
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
2547
from_dir=relpath, recursive=recursive):
2591
2548
# Apply additional masking
2640
2597
_see_also = ['ls']
2598
takes_options = ['directory']
2642
2600
@display_command
2644
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2601
def run(self, directory=u'.'):
2602
for f in WorkingTree.open_containing(directory)[0].unknowns():
2645
2603
self.outf.write(osutils.quotefn(f) + '\n')
2713
2671
_see_also = ['status', 'ignored', 'patterns']
2714
2672
takes_args = ['name_pattern*']
2673
takes_options = ['directory',
2716
2674
Option('default-rules',
2717
2675
help='Display the default ignore rules that bzr uses.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2678
def run(self, name_pattern_list=None, default_rules=None,
2721
2680
from bzrlib import ignores
2722
2681
if default_rules is not None:
2723
2682
# dump the default rules and exit
2729
2688
"NAME_PATTERN or --default-rules.")
2730
2689
name_pattern_list = [globbing.normalize_pattern(p)
2731
2690
for p in name_pattern_list]
2692
for p in name_pattern_list:
2693
if not globbing.Globster.is_pattern_valid(p):
2694
bad_patterns += ('\n %s' % p)
2696
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2697
ui.ui_factory.show_error(msg)
2698
raise errors.InvalidPattern('')
2732
2699
for name_pattern in name_pattern_list:
2733
2700
if (name_pattern[0] == '/' or
2734
2701
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
2702
raise errors.BzrCommandError(
2736
2703
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
2704
tree, relpath = WorkingTree.open_containing(directory)
2738
2705
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
2706
ignored = globbing.Globster(name_pattern_list)
2708
self.add_cleanup(tree.lock_read().unlock)
2742
2709
for entry in tree.list_files():
2744
2711
if id is not None:
2745
2712
filename = entry[0]
2746
2713
if ignored.match(filename):
2747
2714
matches.append(filename)
2749
2715
if len(matches) > 0:
2750
2716
self.outf.write("Warning: the following files are version controlled and"
2751
2717
" match your ignore pattern:\n%s"
2767
2733
encoding_type = 'replace'
2768
2734
_see_also = ['ignore', 'ls']
2735
takes_options = ['directory']
2770
2737
@display_command
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
2738
def run(self, directory=u'.'):
2739
tree = WorkingTree.open_containing(directory)[0]
2740
self.add_cleanup(tree.lock_read().unlock)
2775
2741
for path, file_class, kind, file_id, entry in tree.list_files():
2776
2742
if file_class != 'I':
2790
2756
takes_args = ['revno']
2757
takes_options = ['directory']
2792
2759
@display_command
2793
def run(self, revno):
2760
def run(self, revno, directory=u'.'):
2795
2762
revno = int(revno)
2796
2763
except ValueError:
2797
2764
raise errors.BzrCommandError("not a valid revision-number: %r"
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2766
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2800
2767
self.outf.write("%s\n" % revid)
2829
2796
================= =========================
2831
2798
takes_args = ['dest', 'branch_or_subdir?']
2799
takes_options = ['directory',
2833
2800
Option('format',
2834
2801
help="Type of file to export to.",
2844
2811
'revision in which it was changed.'),
2846
2813
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2814
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2848
2815
from bzrlib.export import export
2850
2817
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
2818
tree = WorkingTree.open_containing(directory)[0]
2852
2819
b = tree.branch
2875
2842
_see_also = ['ls']
2843
takes_options = ['directory',
2877
2844
Option('name-from-revision', help='The path name in the old tree.'),
2878
2845
Option('filters', help='Apply content filters to display the '
2879
2846
'convenience form.'),
2885
2852
@display_command
2886
2853
def run(self, filename, revision=None, name_from_revision=False,
2854
filters=False, directory=None):
2888
2855
if revision is not None and len(revision) != 1:
2889
2856
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
2857
" one revision specifier")
2891
2858
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
2859
_open_directory_or_containing_tree_or_branch(filename, directory)
2860
self.add_cleanup(branch.lock_read().unlock)
2895
2861
return self._run(tree, branch, relpath, filename, revision,
2896
2862
name_from_revision, filters)
2900
2866
if tree is None:
2901
2867
tree = b.basis_tree()
2902
2868
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2869
self.add_cleanup(rev_tree.lock_read().unlock)
2906
2871
old_file_id = rev_tree.path2id(relpath)
3129
3094
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3096
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3097
if selected_list == ['']:
3133
3098
# workaround - commit of root of tree should be exactly the same
3134
3099
# as just default commit in that tree, and succeed even though
3169
3134
def get_message(commit_obj):
3170
3135
"""Callback to get commit message"""
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3139
my_message = f.read().decode(osutils.get_user_encoding())
3174
3142
elif message is not None:
3175
3143
my_message = message
3205
3173
reporter=None, verbose=verbose, revprops=properties,
3206
3174
authors=author, timestamp=commit_stamp,
3207
3175
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3176
exclude=tree.safe_relpath_files(exclude))
3209
3177
except PointlessCommit:
3210
3178
raise errors.BzrCommandError("No changes to commit."
3211
3179
" Use --unchanged to commit anyhow.")
3331
3299
bzr whoami "Frank Chu <fchu@example.com>"
3333
takes_options = [ Option('email',
3301
takes_options = [ 'directory',
3334
3303
help='Display email address only.'),
3335
3304
Option('branch',
3336
3305
help='Set identity for the current branch instead of '
3340
3309
encoding_type = 'replace'
3342
3311
@display_command
3343
def run(self, email=False, branch=False, name=None):
3312
def run(self, email=False, branch=False, name=None, directory=None):
3344
3313
if name is None:
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()
3314
if directory is None:
3315
# use branch if we're inside one; otherwise global config
3317
c = Branch.open_containing(u'.')[0].get_config()
3318
except errors.NotBranchError:
3319
c = config.GlobalConfig()
3321
c = Branch.open(directory).get_config()
3351
3323
self.outf.write(c.user_email() + '\n')
3363
3335
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3337
if directory is None:
3338
c = Branch.open_containing(u'.')[0].get_config()
3340
c = Branch.open(directory).get_config()
3367
3342
c = config.GlobalConfig()
3368
3343
c.set_user_option('email', name)
3381
3356
_see_also = ['info']
3382
3357
takes_args = ['nickname?']
3383
def run(self, nickname=None):
3384
branch = Branch.open_containing(u'.')[0]
3358
takes_options = ['directory']
3359
def run(self, nickname=None, directory=u'.'):
3360
branch = Branch.open_containing(directory)[0]
3385
3361
if nickname is None:
3386
3362
self.printme(branch)
3537
3513
'throughout the test suite.',
3538
3514
type=get_transport_type),
3539
3515
Option('benchmark',
3540
help='Run the benchmarks rather than selftests.'),
3516
help='Run the benchmarks rather than selftests.',
3541
3518
Option('lsprof-timed',
3542
3519
help='Generate lsprof output for benchmarked'
3543
3520
' sections of code.'),
3544
3521
Option('lsprof-tests',
3545
3522
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3549
3523
Option('first',
3550
3524
help='Run all tests, but run specified tests first.',
3551
3525
short_name='f',
3586
3560
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3561
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
3563
first=False, list_only=False,
3590
3564
randomize=None, exclude=None, strict=False,
3591
3565
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
3566
parallel=None, lsprof_tests=False):
3593
3567
from bzrlib.tests import selftest
3594
import bzrlib.benchmarks as benchmarks
3595
from bzrlib.benchmarks import tree_creator
3597
3569
# Make deprecation warnings visible, unless -Werror is set
3598
3570
symbol_versioning.activate_deprecation_warnings(override=False)
3600
if cache_dir is not None:
3601
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3602
3572
if testspecs_list is not None:
3603
3573
pattern = '|'.join(testspecs_list)
3612
3582
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3583
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3584
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3585
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3586
# following code can be deleted when it's sufficiently deployed
3587
# -- vila/mgz 20100514
3588
if (sys.platform == "win32"
3589
and getattr(sys.stdout, 'fileno', None) is not None):
3617
3591
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3593
self.additional_selftest_args.setdefault(
3620
3594
'suite_decorators', []).append(parallel)
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
3596
raise errors.BzrCommandError(
3597
"--benchmark is no longer supported from bzr 2.2; "
3598
"use bzr-usertest instead")
3599
test_suite_factory = None
3631
3600
selftest_kwargs = {"verbose": verbose,
3632
3601
"pattern": pattern,
3633
3602
"stop_on_failure": one,
3635
3604
"test_suite_factory": test_suite_factory,
3636
3605
"lsprof_timed": lsprof_timed,
3637
3606
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
3607
"matching_tests_first": first,
3640
3608
"list_only": list_only,
3641
3609
"random_seed": randomize,
3691
3659
branch1 = Branch.open_containing(branch)[0]
3692
3660
branch2 = Branch.open_containing(other)[0]
3694
self.add_cleanup(branch1.unlock)
3696
self.add_cleanup(branch2.unlock)
3661
self.add_cleanup(branch1.lock_read().unlock)
3662
self.add_cleanup(branch2.lock_read().unlock)
3697
3663
last1 = ensure_null(branch1.last_revision())
3698
3664
last2 = ensure_null(branch2.last_revision())
3793
3759
' completely merged into the source, pull from the'
3794
3760
' source rather than merging. When this happens,'
3795
3761
' you do not need to commit the result.'),
3762
custom_help('directory',
3797
3763
help='Branch to merge into, '
3798
'rather than the one containing the working directory.',
3764
'rather than the one containing the working directory.'),
3802
3765
Option('preview', help='Instead of merging, show a diff of the'
3804
3767
Option('interactive', help='Select changes interactively.',
3837
3800
unversioned_filter=tree.is_ignored, view_info=view_info)
3838
3801
pb = ui.ui_factory.nested_progress_bar()
3839
3802
self.add_cleanup(pb.finished)
3841
self.add_cleanup(tree.unlock)
3803
self.add_cleanup(tree.lock_write().unlock)
3842
3804
if location is not None:
3844
3806
mergeable = bundle.read_mergeable_from_url(location,
3905
3867
def _do_preview(self, merger):
3906
3868
from bzrlib.diff import show_diff_trees
3907
3869
result_tree = self._get_preview(merger)
3870
path_encoding = osutils.get_diff_header_encoding()
3908
3871
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
3872
old_label='', new_label='',
3873
path_encoding=path_encoding)
3911
3875
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
3876
merger.change_reporter = change_reporter
4099
4063
from bzrlib.conflicts import restore
4100
4064
if merge_type is None:
4101
4065
merge_type = _mod_merge.Merge3Merger
4102
tree, file_list = tree_files(file_list)
4104
self.add_cleanup(tree.unlock)
4066
tree, file_list = WorkingTree.open_containing_paths(file_list)
4067
self.add_cleanup(tree.lock_write().unlock)
4105
4068
parents = tree.get_parent_ids()
4106
4069
if len(parents) != 2:
4107
4070
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4217
4180
def run(self, revision=None, no_backup=False, file_list=None,
4218
4181
forget_merges=None):
4219
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4182
tree, file_list = WorkingTree.open_containing_paths(file_list)
4183
self.add_cleanup(tree.lock_tree_write().unlock)
4222
4184
if forget_merges:
4223
4185
tree.set_parent_ids(tree.get_parent_ids()[:1])
4313
4275
_see_also = ['merge', 'pull']
4314
4276
takes_args = ['other_branch?']
4315
4277
takes_options = [
4316
4279
Option('reverse', 'Reverse the order of revisions.'),
4317
4280
Option('mine-only',
4318
4281
'Display changes in the local branch only.'),
4340
4303
theirs_only=False,
4341
4304
log_format=None, long=False, short=False, line=False,
4342
4305
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4306
include_merges=False, revision=None, my_revision=None,
4344
4308
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4309
def message(s):
4346
4310
if not is_quiet():
4359
4323
elif theirs_only:
4360
4324
restrict = 'remote'
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4326
local_branch = Branch.open_containing(directory)[0]
4327
self.add_cleanup(local_branch.lock_read().unlock)
4366
4329
parent = local_branch.get_parent()
4367
4330
if other_branch is None:
4378
4341
if remote_branch.base == local_branch.base:
4379
4342
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4344
self.add_cleanup(remote_branch.lock_read().unlock)
4384
4346
local_revid_range = _revision_range_to_revid_range(
4385
4347
_get_revision_range(my_revision, local_branch,
4440
4402
message("Branches are up to date.\n")
4441
4403
self.cleanup_now()
4442
4404
if not status_code and parent is None and other_branch is not None:
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4405
self.add_cleanup(local_branch.lock_write().unlock)
4445
4406
# handle race conditions - a parent might be set while we run.
4446
4407
if local_branch.get_parent() is None:
4447
4408
local_branch.set_parent(remote_branch.base)
4578
4538
Option('long', help='Show commit date in annotations.'),
4582
4543
encoding_type = 'exact'
4584
4545
@display_command
4585
4546
def run(self, filename, all=False, long=False, revision=None,
4547
show_ids=False, directory=None):
4587
4548
from bzrlib.annotate import annotate_file, annotate_file_tree
4588
4549
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4550
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4551
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4552
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4554
self.add_cleanup(branch.lock_read().unlock)
4596
4555
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4556
self.add_cleanup(tree.lock_read().unlock)
4599
4557
if wt is not None:
4600
4558
file_id = wt.path2id(relpath)
4620
4578
hidden = True # is this right ?
4621
4579
takes_args = ['revision_id*']
4622
takes_options = ['revision']
4580
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
4582
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4583
if revision_id_list is not None and revision is not None:
4626
4584
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4627
4585
if revision_id_list is None and revision is None:
4628
4586
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
4587
b = WorkingTree.open_containing(directory)[0].branch
4588
self.add_cleanup(b.lock_write().unlock)
4632
4589
return self._run(b, revision_id_list, revision)
4634
4591
def _run(self, b, revision_id_list, revision):
4694
4651
_see_also = ['checkouts', 'unbind']
4695
4652
takes_args = ['location?']
4653
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4655
def run(self, location=None, directory=u'.'):
4656
b, relpath = Branch.open_containing(directory)
4700
4657
if location is None:
4702
4659
location = b.get_old_bound_location()
4730
4687
_see_also = ['checkouts', 'bind']
4731
4688
takes_args = []
4689
takes_options = ['directory']
4735
b, relpath = Branch.open_containing(u'.')
4691
def run(self, directory=u'.'):
4692
b, relpath = Branch.open_containing(directory)
4736
4693
if not b.unbind():
4737
4694
raise errors.BzrCommandError('Local branch is not bound')
4784
4741
b = control.open_branch()
4786
4743
if tree is not None:
4788
self.add_cleanup(tree.unlock)
4744
self.add_cleanup(tree.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4746
self.add_cleanup(b.lock_write().unlock)
4792
4747
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4794
4749
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4902
4857
'result in a dynamically allocated port. The default port '
4903
4858
'depends on the protocol.',
4906
help='Serve contents of this directory.',
4860
custom_help('directory',
4861
help='Serve contents of this directory.'),
4908
4862
Option('allow-writes',
4909
4863
help='By default the server is a readonly server. Supplying '
4910
4864
'--allow-writes enables write access to the contents of '
4938
4892
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4939
4893
protocol=None):
4940
from bzrlib.transport import get_transport, transport_server_registry
4894
from bzrlib import transport
4941
4895
if directory is None:
4942
4896
directory = os.getcwd()
4943
4897
if protocol is None:
4944
protocol = transport_server_registry.get()
4898
protocol = transport.transport_server_registry.get()
4945
4899
host, port = self.get_host_and_port(port)
4946
4900
url = urlutils.local_path_to_url(directory)
4947
4901
if not allow_writes:
4948
4902
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
4903
t = transport.get_transport(url)
4904
protocol(t, host, port, inet)
4953
4907
class cmd_join(Command):
5064
5019
encoding_type = 'exact'
5066
5021
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5067
sign=False, revision=None, mail_to=None, message=None):
5022
sign=False, revision=None, mail_to=None, message=None,
5068
5024
from bzrlib.revision import ensure_null, NULL_REVISION
5069
5025
include_patch, include_bundle = {
5070
5026
'plain': (False, False),
5071
5027
'diff': (True, False),
5072
5028
'bundle': (True, True),
5074
branch = Branch.open('.')
5030
branch = Branch.open(directory)
5075
5031
stored_submit_branch = branch.get_submit_branch()
5076
5032
if submit_branch is None:
5077
5033
submit_branch = stored_submit_branch
5162
5118
given, in which case it is sent to a file.
5164
5120
Mail is sent using your preferred mail program. This should be transparent
5165
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5121
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5166
5122
If the preferred client can't be found (or used), your editor will be used.
5168
5124
To use a specific mail program, set the mail_client configuration option.
5339
5295
Option('delete',
5340
5296
help='Delete this tag rather than placing it.',
5343
help='Branch in which to place the tag.',
5298
custom_help('directory',
5299
help='Branch in which to place the tag.'),
5347
5300
Option('force',
5348
5301
help='Replace existing tags.',
5359
5312
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5313
self.add_cleanup(branch.lock_write().unlock)
5363
5315
if tag_name is None:
5364
5316
raise errors.BzrCommandError("No tag specified to delete.")
5393
5345
_see_also = ['tag']
5394
5346
takes_options = [
5396
help='Branch whose tags should be displayed.',
5347
custom_help('directory',
5348
help='Branch whose tags should be displayed.'),
5400
5349
RegistryOption.from_kwargs('sort',
5401
5350
'Sort tags by different criteria.', title='Sorting',
5402
5351
alpha='Sort tags lexicographically (default).',
5423
self.add_cleanup(branch.unlock)
5371
self.add_cleanup(branch.lock_read().unlock)
5425
5373
graph = branch.repository.get_graph()
5426
5374
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5575
5523
takes_args = ['to_location?']
5576
takes_options = [Option('force',
5524
takes_options = ['directory',
5577
5526
help='Switch even if local commits will be lost.'),
5579
5528
Option('create-branch', short_name='b',
5584
5533
def run(self, to_location=None, force=False, create_branch=False,
5534
revision=None, directory=u'.'):
5586
5535
from bzrlib import switch
5536
tree_location = directory
5588
5537
revision = _get_one_revision('switch', revision)
5589
5538
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
5539
if to_location is None:
5591
5540
if revision is None:
5592
5541
raise errors.BzrCommandError('You must supply either a'
5593
5542
' revision or a location')
5543
to_location = tree_location
5596
5545
branch = control_dir.open_branch()
5597
5546
had_explicit_nick = branch.get_config().has_explicit_nickname()
5735
tree, file_list = tree_files(file_list, apply_view=False)
5684
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
5686
current_view, view_dict = tree.views.get_view_info()
5737
5687
if name is None:
5738
5688
name = current_view
5886
5837
_see_also = ['unshelve']
5888
5839
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
5840
writer=None, list=False, destroy=False, directory=u'.'):
5891
5842
return self.run_for_list()
5892
5843
from bzrlib.shelf_ui import Shelver
5894
5845
writer = bzrlib.option.diff_writer_registry.get()
5896
5847
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
5848
file_list, message, destroy=destroy, directory=directory)
5905
5856
def run_for_list(self):
5906
5857
tree = WorkingTree.open_containing('.')[0]
5908
self.add_cleanup(tree.unlock)
5858
self.add_cleanup(tree.lock_read().unlock)
5909
5859
manager = tree.get_shelf_manager()
5910
5860
shelves = manager.active_shelves()
5911
5861
if len(shelves) == 0:
5930
5880
takes_args = ['shelf_id?']
5931
5881
takes_options = [
5932
5883
RegistryOption.from_kwargs(
5933
5884
'action', help="The action to perform.",
5934
5885
enum_switch=False, value_switches=True,
5943
5894
_see_also = ['shelve']
5945
def run(self, shelf_id=None, action='apply'):
5896
def run(self, shelf_id=None, action='apply', directory=u'.'):
5946
5897
from bzrlib.shelf_ui import Unshelver
5947
unshelver = Unshelver.from_args(shelf_id, action)
5898
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5949
5900
unshelver.run()
5967
5918
To check what clean-tree will do, use --dry-run.
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5920
takes_options = ['directory',
5921
Option('ignored', help='Delete all ignored files.'),
5970
5922
Option('detritus', help='Delete conflict files, merge'
5971
5923
' backups, and failed selftest dirs.'),
5972
5924
Option('unknown',
5975
5927
' deleting them.'),
5976
5928
Option('force', help='Do not prompt before deleting.')]
5977
5929
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5930
force=False, directory=u'.'):
5979
5931
from bzrlib.clean_tree import clean_tree
5980
5932
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
5936
clean_tree(directory, unknown=unknown, ignored=ignored,
5937
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
5940
class cmd_reference(Command):
added
removed
bzrlib/builtins.py
