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