180
180
view_str = views.view_display_str(view_files)
181
181
note("Ignoring files outside view. View is %s" % view_str)
182
182
return tree, file_list
183
tree = WorkingTree.open_containing(file_list[0])[0]
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
185
apply_view=apply_view)
235
def _open_directory_or_containing_tree_or_branch(filename, directory):
236
"""Open the tree or branch containing the specified file, unless
237
the --directory option is used to specify a different branch."""
238
if directory is not None:
239
return (None, Branch.open(directory), filename)
240
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
243
235
# TODO: Make sure no commands unconditionally use the working directory as a
244
236
# branch. If a filename argument is used, the first of them should be used to
245
237
# specify the branch. (Perhaps this can be factored out into some kind of
350
342
takes_args = ['revision_id?']
351
takes_options = ['directory', 'revision']
343
takes_options = ['revision']
352
344
# cat-revision is more for frontends so should be exact
353
345
encoding = 'strict'
361
353
self.outf.write(revtext.decode('utf-8'))
364
def run(self, revision_id=None, revision=None, directory=u'.'):
356
def run(self, revision_id=None, revision=None):
365
357
if revision_id is not None and revision is not None:
366
358
raise errors.BzrCommandError('You can only supply one of'
367
359
' revision_id or --revision')
368
360
if revision_id is None and revision is None:
369
361
raise errors.BzrCommandError('You must supply either'
370
362
' --revision or a revision_id')
371
b = WorkingTree.open_containing(directory)[0].branch
363
b = WorkingTree.open_containing(u'.')[0].branch
373
365
revisions = b.repository.revisions
374
366
if revisions is None:
491
483
takes_options = [
493
485
help='Remove the working tree even if it has '
494
'uncommitted or shelved changes.'),
486
'uncommitted changes.'),
497
489
def run(self, location_list, force=False):
512
504
if (working.has_changes()):
513
505
raise errors.UncommittedChanges(working)
514
if working.get_shelf_manager().last_shelf() is not None:
515
raise errors.ShelvedChanges(working)
517
507
if working.user_url != working.branch.user_url:
518
508
raise errors.BzrCommandError("You cannot remove the working tree"
540
530
wt = WorkingTree.open_containing(location)[0]
541
self.add_cleanup(wt.lock_read().unlock)
542
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
543
533
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
544
535
revid = wt.last_revision()
546
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
549
540
revno = ".".join(str(n) for n in revno_t)
551
542
b = Branch.open_containing(location)[0]
552
self.add_cleanup(b.lock_read().unlock)
544
self.add_cleanup(b.unlock)
553
545
revno = b.revno()
554
546
self.cleanup_now()
555
547
self.outf.write(str(revno) + '\n')
562
554
takes_args = ['revision_info*']
563
555
takes_options = [
565
custom_help('directory',
566
558
help='Branch to examine, '
567
'rather than the one containing the working directory.'),
559
'rather than the one containing the working directory.',
568
563
Option('tree', help='Show revno of working tree'),
576
571
wt = WorkingTree.open_containing(directory)[0]
578
self.add_cleanup(wt.lock_read().unlock)
574
self.add_cleanup(wt.unlock)
579
575
except (errors.NoWorkingTree, errors.NotLocalUrl):
581
577
b = Branch.open_containing(directory)[0]
582
self.add_cleanup(b.lock_read().unlock)
579
self.add_cleanup(b.unlock)
583
580
revision_ids = []
584
581
if revision is not None:
585
582
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
684
681
should_print=(not is_quiet()))
687
self.add_cleanup(base_tree.lock_read().unlock)
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
688
686
tree, file_list = tree_files_for_add(file_list)
689
687
added, ignored = tree.smart_add(file_list, not
690
688
no_recurse, action=action, save=not dry_run)
763
761
revision = _get_one_revision('inventory', revision)
764
762
work_tree, file_list = tree_files(file_list)
765
self.add_cleanup(work_tree.lock_read().unlock)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
766
765
if revision is not None:
767
766
tree = revision.as_tree(work_tree.branch)
769
768
extra_trees = [work_tree]
770
self.add_cleanup(tree.lock_read().unlock)
770
self.add_cleanup(tree.unlock)
833
833
if len(names_list) < 2:
834
834
raise errors.BzrCommandError("missing file argument")
835
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
self.add_cleanup(tree.lock_tree_write().unlock)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
837
838
self._run(tree, names_list, rel_names, after)
839
840
def run_auto(self, names_list, after, dry_run):
844
845
raise errors.BzrCommandError('--after cannot be specified with'
846
847
work_tree, file_list = tree_files(names_list, default_branch='.')
847
self.add_cleanup(work_tree.lock_tree_write().unlock)
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
848
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
850
852
def _run(self, tree, names_list, rel_names, after):
958
960
takes_options = ['remember', 'overwrite', 'revision',
959
961
custom_help('verbose',
960
962
help='Show logs of pulled revisions.'),
961
custom_help('directory',
962
964
help='Branch to pull into, '
963
'rather than the one containing the working directory.'),
965
'rather than the one containing the working directory.',
965
970
help="Perform a local pull in a bound "
966
971
"branch. Local pulls are not applied to "
982
987
tree_to = WorkingTree.open_containing(directory)[0]
983
988
branch_to = tree_to.branch
984
self.add_cleanup(tree_to.lock_write().unlock)
990
self.add_cleanup(tree_to.unlock)
985
991
except errors.NoWorkingTree:
987
993
branch_to = Branch.open_containing(directory)[0]
988
self.add_cleanup(branch_to.lock_write().unlock)
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
990
997
if local and not branch_to.get_bound_location():
991
998
raise errors.LocalRequiresBoundBranch()
1023
1030
branch_from = Branch.open(location,
1024
1031
possible_transports=possible_transports)
1025
self.add_cleanup(branch_from.lock_read().unlock)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1027
1035
if branch_to.get_parent() is None or remember:
1028
1036
branch_to.set_parent(branch_from.base)
1080
1088
Option('create-prefix',
1081
1089
help='Create the path leading up to the branch '
1082
1090
'if it does not already exist.'),
1083
custom_help('directory',
1084
1092
help='Branch to push from, '
1085
'rather than the one containing the working directory.'),
1093
'rather than the one containing the working directory.',
1086
1097
Option('use-existing-dir',
1087
1098
help='By default push will fail if the target'
1088
1099
' directory exists, but does not already'
1122
1133
revision_id = None
1123
1134
if tree is not None and revision_id is None:
1124
tree.check_changed_or_out_of_date(
1125
strict, 'push_strict',
1126
more_error='Use --no-strict to force the push.',
1127
more_warning='Uncommitted changes will not be pushed.')
1135
tree.warn_if_changed_or_out_of_date(
1136
strict, 'push_strict', 'Use --no-strict to force the push.')
1128
1137
# Get the stacked_on branch, if any
1129
1138
if stacked_on is not None:
1130
1139
stacked_on = urlutils.normalize_url(stacked_on)
1208
1217
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1210
1219
revision = _get_one_revision('branch', revision)
1211
self.add_cleanup(br_from.lock_read().unlock)
1221
self.add_cleanup(br_from.unlock)
1212
1222
if revision is not None:
1213
1223
revision_id = revision.as_revision_id(br_from)
1354
1364
@display_command
1355
1365
def run(self, dir=u'.'):
1356
1366
tree = WorkingTree.open_containing(dir)[0]
1357
self.add_cleanup(tree.lock_read().unlock)
1368
self.add_cleanup(tree.unlock)
1358
1369
new_inv = tree.inventory
1359
1370
old_tree = tree.basis_tree()
1360
self.add_cleanup(old_tree.lock_read().unlock)
1371
old_tree.lock_read()
1372
self.add_cleanup(old_tree.unlock)
1361
1373
old_inv = old_tree.inventory
1363
1375
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1401
1413
master = branch.get_master_branch(
1402
1414
possible_transports=possible_transports)
1403
1415
if master is not None:
1404
1417
branch_location = master.base
1419
tree.lock_tree_write()
1407
1420
branch_location = tree.branch.base
1408
tree.lock_tree_write()
1409
1421
self.add_cleanup(tree.unlock)
1410
1422
# get rid of the final '/' and be ready for display
1411
1423
branch_location = urlutils.unescape_for_display(
1531
1543
if file_list is not None:
1532
1544
file_list = [f for f in file_list]
1534
self.add_cleanup(tree.lock_write().unlock)
1547
self.add_cleanup(tree.unlock)
1535
1548
# Heuristics should probably all move into tree.remove_smart or
1970
1983
old_branch, new_branch,
1971
1984
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1972
1985
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1973
# GNU diff on Windows uses ANSI encoding for filenames
1974
path_encoding = osutils.get_diff_header_encoding()
1975
1986
return show_diff_trees(old_tree, new_tree, sys.stdout,
1976
1987
specific_files=specific_files,
1977
1988
external_diff_options=diff_options,
1978
1989
old_label=old_label, new_label=new_label,
1979
extra_trees=extra_trees,
1980
path_encoding=path_encoding,
1990
extra_trees=extra_trees, using=using,
1982
1991
format_cls=format)
1992
2001
# level of effort but possibly much less IO. (Or possibly not,
1993
2002
# if the directories are very large...)
1994
2003
_see_also = ['status', 'ls']
1995
takes_options = ['directory', 'show-ids']
2004
takes_options = ['show-ids']
1997
2006
@display_command
1998
def run(self, show_ids=False, directory=u'.'):
1999
tree = WorkingTree.open_containing(directory)[0]
2000
self.add_cleanup(tree.lock_read().unlock)
2007
def run(self, show_ids=False):
2008
tree = WorkingTree.open_containing(u'.')[0]
2010
self.add_cleanup(tree.unlock)
2001
2011
old = tree.basis_tree()
2002
self.add_cleanup(old.lock_read().unlock)
2013
self.add_cleanup(old.unlock)
2003
2014
for path, ie in old.inventory.iter_entries():
2004
2015
if not tree.has_id(ie.file_id):
2005
2016
self.outf.write(path)
2017
2028
_see_also = ['status', 'ls']
2018
takes_options = ['directory', 'null']
2031
help='Write an ascii NUL (\\0) separator '
2032
'between files rather than a newline.')
2020
2035
@display_command
2021
def run(self, null=False, directory=u'.'):
2022
tree = WorkingTree.open_containing(directory)[0]
2036
def run(self, null=False):
2037
tree = WorkingTree.open_containing(u'.')[0]
2023
2038
td = tree.changes_from(tree.basis_tree())
2024
2039
for path, id, kind, text_modified, meta_modified in td.modified:
2036
2051
_see_also = ['status', 'ls']
2037
takes_options = ['directory', 'null']
2054
help='Write an ascii NUL (\\0) separator '
2055
'between files rather than a newline.')
2039
2058
@display_command
2040
def run(self, null=False, directory=u'.'):
2041
wt = WorkingTree.open_containing(directory)[0]
2042
self.add_cleanup(wt.lock_read().unlock)
2059
def run(self, null=False):
2060
wt = WorkingTree.open_containing(u'.')[0]
2062
self.add_cleanup(wt.unlock)
2043
2063
basis = wt.basis_tree()
2044
self.add_cleanup(basis.lock_read().unlock)
2065
self.add_cleanup(basis.unlock)
2045
2066
basis_inv = basis.inventory
2046
2067
inv = wt.inventory
2047
2068
for file_id in inv:
2050
2071
if inv.is_root(file_id) and len(basis_inv) == 0:
2052
2073
path = inv.id2path(file_id)
2053
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2074
if not os.access(osutils.abspath(path), os.F_OK):
2056
2077
self.outf.write(path + '\0')
2256
2277
help='Show just the specified revision.'
2257
2278
' See also "help revisionspec".'),
2259
RegistryOption('authors',
2260
'What names to list as authors - first, all or committer.',
2262
lazy_registry=('bzrlib.log', 'author_list_registry'),
2264
2280
Option('levels',
2265
2281
short_name='n',
2266
2282
help='Number of levels to display - 0 for all, 1 for flat.',
2336
2351
# find the file ids to log and check for directory filtering
2337
2352
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2338
revision, file_list, self.add_cleanup)
2353
revision, file_list)
2354
self.add_cleanup(b.unlock)
2339
2355
for relpath, file_id, kind in file_info_list:
2340
2356
if file_id is None:
2341
2357
raise errors.BzrCommandError(
2360
2376
dir, relpath = bzrdir.BzrDir.open_containing(location)
2361
2377
b = dir.open_branch()
2362
self.add_cleanup(b.lock_read().unlock)
2379
self.add_cleanup(b.unlock)
2363
2380
rev1, rev2 = _get_revision_range(revision, b, self.name())
2365
2382
# Decide on the type of delta & diff filtering to use
2385
2402
show_timezone=timezone,
2386
2403
delta_format=get_verbosity_level(),
2388
show_advice=levels is None,
2389
author_list_handler=authors)
2405
show_advice=levels is None)
2391
2407
# Choose the algorithm for doing the logging. It's annoying
2392
2408
# having multiple code paths like this but necessary until
2490
2506
tree, relpath = WorkingTree.open_containing(filename)
2491
2507
file_id = tree.path2id(relpath)
2492
2508
b = tree.branch
2493
self.add_cleanup(b.lock_read().unlock)
2510
self.add_cleanup(b.unlock)
2494
2511
touching_revs = log.find_touching_revisions(b, file_id)
2495
2512
for revno, revision_id, what in touching_revs:
2496
2513
self.outf.write("%6d %s\n" % (revno, what))
2509
2526
help='Recurse into subdirectories.'),
2510
2527
Option('from-root',
2511
2528
help='Print paths relative to the root of the branch.'),
2512
Option('unknown', short_name='u',
2513
help='Print unknown files.'),
2529
Option('unknown', help='Print unknown files.'),
2514
2530
Option('versioned', help='Print versioned files.',
2515
2531
short_name='V'),
2516
Option('ignored', short_name='i',
2517
help='Print ignored files.'),
2518
Option('kind', short_name='k',
2532
Option('ignored', help='Print ignored files.'),
2534
help='Write an ascii NUL (\\0) separator '
2535
'between files rather than a newline.'),
2519
2537
help='List entries of a particular kind: file, directory, symlink.',
2525
2541
@display_command
2526
2542
def run(self, revision=None, verbose=False,
2527
2543
recursive=False, from_root=False,
2528
2544
unknown=False, versioned=False, ignored=False,
2529
null=False, kind=None, show_ids=False, path=None, directory=None):
2545
null=False, kind=None, show_ids=False, path=None):
2531
2547
if kind and kind not in ('file', 'directory', 'symlink'):
2532
2548
raise errors.BzrCommandError('invalid kind specified')
2544
2560
raise errors.BzrCommandError('cannot specify both --from-root'
2547
tree, branch, relpath = \
2548
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2563
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2550
2566
# Calculate the prefix to use
2566
2582
view_str = views.view_display_str(view_files)
2567
2583
note("Ignoring files outside view. View is %s" % view_str)
2569
self.add_cleanup(tree.lock_read().unlock)
2586
self.add_cleanup(tree.unlock)
2570
2587
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2571
2588
from_dir=relpath, recursive=recursive):
2572
2589
# Apply additional masking
2621
2638
_see_also = ['ls']
2622
takes_options = ['directory']
2624
2640
@display_command
2625
def run(self, directory=u'.'):
2626
for f in WorkingTree.open_containing(directory)[0].unknowns():
2642
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2627
2643
self.outf.write(osutils.quotefn(f) + '\n')
2695
2711
_see_also = ['status', 'ignored', 'patterns']
2696
2712
takes_args = ['name_pattern*']
2697
takes_options = ['directory',
2698
2714
Option('default-rules',
2699
2715
help='Display the default ignore rules that bzr uses.')
2702
def run(self, name_pattern_list=None, default_rules=None,
2718
def run(self, name_pattern_list=None, default_rules=None):
2704
2719
from bzrlib import ignores
2705
2720
if default_rules is not None:
2706
2721
# dump the default rules and exit
2712
2727
"NAME_PATTERN or --default-rules.")
2713
2728
name_pattern_list = [globbing.normalize_pattern(p)
2714
2729
for p in name_pattern_list]
2716
for p in name_pattern_list:
2717
if not globbing.Globster.is_pattern_valid(p):
2718
bad_patterns += ('\n %s' % p)
2720
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2721
ui.ui_factory.show_error(msg)
2722
raise errors.InvalidPattern('')
2723
2730
for name_pattern in name_pattern_list:
2724
2731
if (name_pattern[0] == '/' or
2725
2732
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2726
2733
raise errors.BzrCommandError(
2727
2734
"NAME_PATTERN should not be an absolute path")
2728
tree, relpath = WorkingTree.open_containing(directory)
2735
tree, relpath = WorkingTree.open_containing(u'.')
2729
2736
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2730
2737
ignored = globbing.Globster(name_pattern_list)
2732
self.add_cleanup(tree.lock_read().unlock)
2733
2740
for entry in tree.list_files():
2735
2742
if id is not None:
2736
2743
filename = entry[0]
2737
2744
if ignored.match(filename):
2738
2745
matches.append(filename)
2739
2747
if len(matches) > 0:
2740
2748
self.outf.write("Warning: the following files are version controlled and"
2741
2749
" match your ignore pattern:\n%s"
2757
2765
encoding_type = 'replace'
2758
2766
_see_also = ['ignore', 'ls']
2759
takes_options = ['directory']
2761
2768
@display_command
2762
def run(self, directory=u'.'):
2763
tree = WorkingTree.open_containing(directory)[0]
2764
self.add_cleanup(tree.lock_read().unlock)
2770
tree = WorkingTree.open_containing(u'.')[0]
2772
self.add_cleanup(tree.unlock)
2765
2773
for path, file_class, kind, file_id, entry in tree.list_files():
2766
2774
if file_class != 'I':
2780
2788
takes_args = ['revno']
2781
takes_options = ['directory']
2783
2790
@display_command
2784
def run(self, revno, directory=u'.'):
2791
def run(self, revno):
2786
2793
revno = int(revno)
2787
2794
except ValueError:
2788
2795
raise errors.BzrCommandError("not a valid revision-number: %r"
2790
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2797
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2791
2798
self.outf.write("%s\n" % revid)
2820
2827
================= =========================
2822
2829
takes_args = ['dest', 'branch_or_subdir?']
2823
takes_options = ['directory',
2824
2831
Option('format',
2825
2832
help="Type of file to export to.",
2835
2842
'revision in which it was changed.'),
2837
2844
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2838
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2845
root=None, filters=False, per_file_timestamps=False):
2839
2846
from bzrlib.export import export
2841
2848
if branch_or_subdir is None:
2842
tree = WorkingTree.open_containing(directory)[0]
2849
tree = WorkingTree.open_containing(u'.')[0]
2843
2850
b = tree.branch
2866
2873
_see_also = ['ls']
2867
takes_options = ['directory',
2868
2875
Option('name-from-revision', help='The path name in the old tree.'),
2869
2876
Option('filters', help='Apply content filters to display the '
2870
2877
'convenience form.'),
2876
2883
@display_command
2877
2884
def run(self, filename, revision=None, name_from_revision=False,
2878
filters=False, directory=None):
2879
2886
if revision is not None and len(revision) != 1:
2880
2887
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2881
2888
" one revision specifier")
2882
2889
tree, branch, relpath = \
2883
_open_directory_or_containing_tree_or_branch(filename, directory)
2884
self.add_cleanup(branch.lock_read().unlock)
2890
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2892
self.add_cleanup(branch.unlock)
2885
2893
return self._run(tree, branch, relpath, filename, revision,
2886
2894
name_from_revision, filters)
2890
2898
if tree is None:
2891
2899
tree = b.basis_tree()
2892
2900
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2893
self.add_cleanup(rev_tree.lock_read().unlock)
2901
rev_tree.lock_read()
2902
self.add_cleanup(rev_tree.unlock)
2895
2904
old_file_id = rev_tree.path2id(relpath)
3062
3071
"the master branch until a normal commit "
3063
3072
"is performed."
3065
Option('show-diff', short_name='p',
3066
3075
help='When no message is supplied, show the diff along'
3067
3076
' with the status summary in the message editor.'),
3158
3167
def get_message(commit_obj):
3159
3168
"""Callback to get commit message"""
3161
f = codecs.open(file, 'rt', osutils.get_user_encoding())
3163
my_message = f.read()
3170
my_message = codecs.open(
3171
file, 'rt', osutils.get_user_encoding()).read()
3166
3172
elif message is not None:
3167
3173
my_message = message
3323
3329
bzr whoami "Frank Chu <fchu@example.com>"
3325
takes_options = [ 'directory',
3331
takes_options = [ Option('email',
3327
3332
help='Display email address only.'),
3328
3333
Option('branch',
3329
3334
help='Set identity for the current branch instead of '
3333
3338
encoding_type = 'replace'
3335
3340
@display_command
3336
def run(self, email=False, branch=False, name=None, directory=None):
3341
def run(self, email=False, branch=False, name=None):
3337
3342
if name is None:
3338
if directory is None:
3339
# use branch if we're inside one; otherwise global config
3341
c = Branch.open_containing(u'.')[0].get_config()
3342
except errors.NotBranchError:
3343
c = config.GlobalConfig()
3345
c = Branch.open(directory).get_config()
3343
# use branch if we're inside one; otherwise global config
3345
c = Branch.open_containing('.')[0].get_config()
3346
except errors.NotBranchError:
3347
c = config.GlobalConfig()
3347
3349
self.outf.write(c.user_email() + '\n')
3359
3361
# use global config unless --branch given
3361
if directory is None:
3362
c = Branch.open_containing(u'.')[0].get_config()
3364
c = Branch.open(directory).get_config()
3363
c = Branch.open_containing('.')[0].get_config()
3366
3365
c = config.GlobalConfig()
3367
3366
c.set_user_option('email', name)
3380
3379
_see_also = ['info']
3381
3380
takes_args = ['nickname?']
3382
takes_options = ['directory']
3383
def run(self, nickname=None, directory=u'.'):
3384
branch = Branch.open_containing(directory)[0]
3381
def run(self, nickname=None):
3382
branch = Branch.open_containing(u'.')[0]
3385
3383
if nickname is None:
3386
3384
self.printme(branch)
3537
3535
'throughout the test suite.',
3538
3536
type=get_transport_type),
3539
3537
Option('benchmark',
3540
help='Run the benchmarks rather than selftests.',
3538
help='Run the benchmarks rather than selftests.'),
3542
3539
Option('lsprof-timed',
3543
3540
help='Generate lsprof output for benchmarked'
3544
3541
' sections of code.'),
3545
3542
Option('lsprof-tests',
3546
3543
help='Generate lsprof output for each test.'),
3544
Option('cache-dir', type=str,
3545
help='Cache intermediate benchmark output in this '
3547
3547
Option('first',
3548
3548
help='Run all tests, but run specified tests first.',
3549
3549
short_name='f',
3584
3584
def run(self, testspecs_list=None, verbose=False, one=False,
3585
3585
transport=None, benchmark=None,
3586
lsprof_timed=None, cache_dir=None,
3587
3587
first=False, list_only=False,
3588
3588
randomize=None, exclude=None, strict=False,
3589
3589
load_list=None, debugflag=None, starting_with=None, subunit=False,
3590
3590
parallel=None, lsprof_tests=False):
3591
3591
from bzrlib.tests import selftest
3592
import bzrlib.benchmarks as benchmarks
3593
from bzrlib.benchmarks import tree_creator
3593
3595
# Make deprecation warnings visible, unless -Werror is set
3594
3596
symbol_versioning.activate_deprecation_warnings(override=False)
3598
if cache_dir is not None:
3599
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3596
3600
if testspecs_list is not None:
3597
3601
pattern = '|'.join(testspecs_list)
3606
3610
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3607
3611
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3608
3612
# stdout, which would corrupt the subunit stream.
3609
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3610
# following code can be deleted when it's sufficiently deployed
3611
# -- vila/mgz 20100514
3612
if (sys.platform == "win32"
3613
and getattr(sys.stdout, 'fileno', None) is not None):
3613
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3615
3615
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3617
3617
self.additional_selftest_args.setdefault(
3618
3618
'suite_decorators', []).append(parallel)
3620
raise errors.BzrCommandError(
3621
"--benchmark is no longer supported from bzr 2.2; "
3622
"use bzr-usertest instead")
3623
test_suite_factory = None
3620
test_suite_factory = benchmarks.test_suite
3621
# Unless user explicitly asks for quiet, be verbose in benchmarks
3622
verbose = not is_quiet()
3623
# TODO: should possibly lock the history file...
3624
benchfile = open(".perf_history", "at", buffering=1)
3625
self.add_cleanup(benchfile.close)
3627
test_suite_factory = None
3624
3629
selftest_kwargs = {"verbose": verbose,
3625
3630
"pattern": pattern,
3626
3631
"stop_on_failure": one,
3628
3633
"test_suite_factory": test_suite_factory,
3629
3634
"lsprof_timed": lsprof_timed,
3630
3635
"lsprof_tests": lsprof_tests,
3636
"bench_history": benchfile,
3631
3637
"matching_tests_first": first,
3632
3638
"list_only": list_only,
3633
3639
"random_seed": randomize,
3683
3689
branch1 = Branch.open_containing(branch)[0]
3684
3690
branch2 = Branch.open_containing(other)[0]
3685
self.add_cleanup(branch1.lock_read().unlock)
3686
self.add_cleanup(branch2.lock_read().unlock)
3692
self.add_cleanup(branch1.unlock)
3694
self.add_cleanup(branch2.unlock)
3687
3695
last1 = ensure_null(branch1.last_revision())
3688
3696
last2 = ensure_null(branch2.last_revision())
3783
3791
' completely merged into the source, pull from the'
3784
3792
' source rather than merging. When this happens,'
3785
3793
' you do not need to commit the result.'),
3786
custom_help('directory',
3787
3795
help='Branch to merge into, '
3788
'rather than the one containing the working directory.'),
3796
'rather than the one containing the working directory.',
3789
3800
Option('preview', help='Instead of merging, show a diff of the'
3791
3802
Option('interactive', help='Select changes interactively.',
3824
3835
unversioned_filter=tree.is_ignored, view_info=view_info)
3825
3836
pb = ui.ui_factory.nested_progress_bar()
3826
3837
self.add_cleanup(pb.finished)
3827
self.add_cleanup(tree.lock_write().unlock)
3839
self.add_cleanup(tree.unlock)
3828
3840
if location is not None:
3830
3842
mergeable = bundle.read_mergeable_from_url(location,
3891
3903
def _do_preview(self, merger):
3892
3904
from bzrlib.diff import show_diff_trees
3893
3905
result_tree = self._get_preview(merger)
3894
path_encoding = osutils.get_diff_header_encoding()
3895
3906
show_diff_trees(merger.this_tree, result_tree, self.outf,
3896
old_label='', new_label='',
3897
path_encoding=path_encoding)
3907
old_label='', new_label='')
3899
3909
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3900
3910
merger.change_reporter = change_reporter
4088
4098
if merge_type is None:
4089
4099
merge_type = _mod_merge.Merge3Merger
4090
4100
tree, file_list = tree_files(file_list)
4091
self.add_cleanup(tree.lock_write().unlock)
4102
self.add_cleanup(tree.unlock)
4092
4103
parents = tree.get_parent_ids()
4093
4104
if len(parents) != 2:
4094
4105
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4204
4215
def run(self, revision=None, no_backup=False, file_list=None,
4205
4216
forget_merges=None):
4206
4217
tree, file_list = tree_files(file_list)
4207
self.add_cleanup(tree.lock_tree_write().unlock)
4218
tree.lock_tree_write()
4219
self.add_cleanup(tree.unlock)
4208
4220
if forget_merges:
4209
4221
tree.set_parent_ids(tree.get_parent_ids()[:1])
4299
4311
_see_also = ['merge', 'pull']
4300
4312
takes_args = ['other_branch?']
4301
4313
takes_options = [
4303
4314
Option('reverse', 'Reverse the order of revisions.'),
4304
4315
Option('mine-only',
4305
4316
'Display changes in the local branch only.'),
4327
4338
theirs_only=False,
4328
4339
log_format=None, long=False, short=False, line=False,
4329
4340
show_ids=False, verbose=False, this=False, other=False,
4330
include_merges=False, revision=None, my_revision=None,
4341
include_merges=False, revision=None, my_revision=None):
4332
4342
from bzrlib.missing import find_unmerged, iter_log_revisions
4333
4343
def message(s):
4334
4344
if not is_quiet():
4347
4357
elif theirs_only:
4348
4358
restrict = 'remote'
4350
local_branch = Branch.open_containing(directory)[0]
4351
self.add_cleanup(local_branch.lock_read().unlock)
4360
local_branch = Branch.open_containing(u".")[0]
4361
local_branch.lock_read()
4362
self.add_cleanup(local_branch.unlock)
4353
4364
parent = local_branch.get_parent()
4354
4365
if other_branch is None:
4365
4376
if remote_branch.base == local_branch.base:
4366
4377
remote_branch = local_branch
4368
self.add_cleanup(remote_branch.lock_read().unlock)
4379
remote_branch.lock_read()
4380
self.add_cleanup(remote_branch.unlock)
4370
4382
local_revid_range = _revision_range_to_revid_range(
4371
4383
_get_revision_range(my_revision, local_branch,
4426
4438
message("Branches are up to date.\n")
4427
4439
self.cleanup_now()
4428
4440
if not status_code and parent is None and other_branch is not None:
4429
self.add_cleanup(local_branch.lock_write().unlock)
4441
local_branch.lock_write()
4442
self.add_cleanup(local_branch.unlock)
4430
4443
# handle race conditions - a parent might be set while we run.
4431
4444
if local_branch.get_parent() is None:
4432
4445
local_branch.set_parent(remote_branch.base)
4562
4576
Option('long', help='Show commit date in annotations.'),
4567
4580
encoding_type = 'exact'
4569
4582
@display_command
4570
4583
def run(self, filename, all=False, long=False, revision=None,
4571
show_ids=False, directory=None):
4572
4585
from bzrlib.annotate import annotate_file, annotate_file_tree
4573
4586
wt, branch, relpath = \
4574
_open_directory_or_containing_tree_or_branch(filename, directory)
4587
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4575
4588
if wt is not None:
4576
self.add_cleanup(wt.lock_read().unlock)
4590
self.add_cleanup(wt.unlock)
4578
self.add_cleanup(branch.lock_read().unlock)
4593
self.add_cleanup(branch.unlock)
4579
4594
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4580
self.add_cleanup(tree.lock_read().unlock)
4596
self.add_cleanup(tree.unlock)
4581
4597
if wt is not None:
4582
4598
file_id = wt.path2id(relpath)
4602
4618
hidden = True # is this right ?
4603
4619
takes_args = ['revision_id*']
4604
takes_options = ['directory', 'revision']
4620
takes_options = ['revision']
4606
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4622
def run(self, revision_id_list=None, revision=None):
4607
4623
if revision_id_list is not None and revision is not None:
4608
4624
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4609
4625
if revision_id_list is None and revision is None:
4610
4626
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4611
b = WorkingTree.open_containing(directory)[0].branch
4612
self.add_cleanup(b.lock_write().unlock)
4627
b = WorkingTree.open_containing(u'.')[0].branch
4629
self.add_cleanup(b.unlock)
4613
4630
return self._run(b, revision_id_list, revision)
4615
4632
def _run(self, b, revision_id_list, revision):
4663
4680
class cmd_bind(Command):
4664
4681
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4665
If no branch is supplied, rebind to the last bound location.
4667
4683
Once converted into a checkout, commits must succeed on the master branch
4668
4684
before they will be applied to the local branch.
4675
4691
_see_also = ['checkouts', 'unbind']
4676
4692
takes_args = ['location?']
4677
takes_options = ['directory']
4679
def run(self, location=None, directory=u'.'):
4680
b, relpath = Branch.open_containing(directory)
4695
def run(self, location=None):
4696
b, relpath = Branch.open_containing(u'.')
4681
4697
if location is None:
4683
4699
location = b.get_old_bound_location()
4711
4727
_see_also = ['checkouts', 'bind']
4712
4728
takes_args = []
4713
takes_options = ['directory']
4715
def run(self, directory=u'.'):
4716
b, relpath = Branch.open_containing(directory)
4732
b, relpath = Branch.open_containing(u'.')
4717
4733
if not b.unbind():
4718
4734
raise errors.BzrCommandError('Local branch is not bound')
4765
4781
b = control.open_branch()
4767
4783
if tree is not None:
4768
self.add_cleanup(tree.lock_write().unlock)
4785
self.add_cleanup(tree.unlock)
4770
self.add_cleanup(b.lock_write().unlock)
4788
self.add_cleanup(b.unlock)
4771
4789
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4773
4791
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4881
4899
'result in a dynamically allocated port. The default port '
4882
4900
'depends on the protocol.',
4884
custom_help('directory',
4885
help='Serve contents of this directory.'),
4903
help='Serve contents of this directory.',
4886
4905
Option('allow-writes',
4887
4906
help='By default the server is a readonly server. Supplying '
4888
4907
'--allow-writes enables write access to the contents of '
4916
4935
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4917
4936
protocol=None):
4918
from bzrlib import transport
4937
from bzrlib.transport import get_transport, transport_server_registry
4919
4938
if directory is None:
4920
4939
directory = os.getcwd()
4921
4940
if protocol is None:
4922
protocol = transport.transport_server_registry.get()
4941
protocol = transport_server_registry.get()
4923
4942
host, port = self.get_host_and_port(port)
4924
4943
url = urlutils.local_path_to_url(directory)
4925
4944
if not allow_writes:
4926
4945
url = 'readonly+' + url
4927
t = transport.get_transport(url)
4928
protocol(t, host, port, inet)
4946
transport = get_transport(url)
4947
protocol(transport, host, port, inet)
4931
4950
class cmd_join(Command):
5043
5061
encoding_type = 'exact'
5045
5063
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5046
sign=False, revision=None, mail_to=None, message=None,
5064
sign=False, revision=None, mail_to=None, message=None):
5048
5065
from bzrlib.revision import ensure_null, NULL_REVISION
5049
5066
include_patch, include_bundle = {
5050
5067
'plain': (False, False),
5051
5068
'diff': (True, False),
5052
5069
'bundle': (True, True),
5054
branch = Branch.open(directory)
5071
branch = Branch.open('.')
5055
5072
stored_submit_branch = branch.get_submit_branch()
5056
5073
if submit_branch is None:
5057
5074
submit_branch = stored_submit_branch
5142
5159
given, in which case it is sent to a file.
5144
5161
Mail is sent using your preferred mail program. This should be transparent
5145
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5162
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5146
5163
If the preferred client can't be found (or used), your editor will be used.
5148
5165
To use a specific mail program, set the mail_client configuration option.
5319
5336
Option('delete',
5320
5337
help='Delete this tag rather than placing it.',
5322
custom_help('directory',
5323
help='Branch in which to place the tag.'),
5340
help='Branch in which to place the tag.',
5324
5344
Option('force',
5325
5345
help='Replace existing tags.',
5336
5356
branch, relpath = Branch.open_containing(directory)
5337
self.add_cleanup(branch.lock_write().unlock)
5358
self.add_cleanup(branch.unlock)
5339
5360
if tag_name is None:
5340
5361
raise errors.BzrCommandError("No tag specified to delete.")
5369
5390
_see_also = ['tag']
5370
5391
takes_options = [
5371
custom_help('directory',
5372
help='Branch whose tags should be displayed.'),
5393
help='Branch whose tags should be displayed.',
5373
5397
RegistryOption.from_kwargs('sort',
5374
5398
'Sort tags by different criteria.', title='Sorting',
5375
5399
alpha='Sort tags lexicographically (default).',
5395
self.add_cleanup(branch.lock_read().unlock)
5420
self.add_cleanup(branch.unlock)
5397
5422
graph = branch.repository.get_graph()
5398
5423
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5547
5572
takes_args = ['to_location?']
5548
takes_options = ['directory',
5573
takes_options = [Option('force',
5550
5574
help='Switch even if local commits will be lost.'),
5552
5576
Option('create-branch', short_name='b',
5557
5581
def run(self, to_location=None, force=False, create_branch=False,
5558
revision=None, directory=u'.'):
5559
5583
from bzrlib import switch
5560
tree_location = directory
5561
5585
revision = _get_one_revision('switch', revision)
5562
5586
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5563
5587
if to_location is None:
5564
5588
if revision is None:
5565
5589
raise errors.BzrCommandError('You must supply either a'
5566
5590
' revision or a location')
5567
to_location = tree_location
5569
5593
branch = control_dir.open_branch()
5570
5594
had_explicit_nick = branch.get_config().has_explicit_nickname()
5860
5883
_see_also = ['unshelve']
5862
5885
def run(self, revision=None, all=False, file_list=None, message=None,
5863
writer=None, list=False, destroy=False, directory=u'.'):
5886
writer=None, list=False, destroy=False):
5865
5888
return self.run_for_list()
5866
5889
from bzrlib.shelf_ui import Shelver
5868
5891
writer = bzrlib.option.diff_writer_registry.get()
5870
5893
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5871
file_list, message, destroy=destroy, directory=directory)
5894
file_list, message, destroy=destroy)
5879
5902
def run_for_list(self):
5880
5903
tree = WorkingTree.open_containing('.')[0]
5881
self.add_cleanup(tree.lock_read().unlock)
5905
self.add_cleanup(tree.unlock)
5882
5906
manager = tree.get_shelf_manager()
5883
5907
shelves = manager.active_shelves()
5884
5908
if len(shelves) == 0:
5903
5927
takes_args = ['shelf_id?']
5904
5928
takes_options = [
5906
5929
RegistryOption.from_kwargs(
5907
5930
'action', help="The action to perform.",
5908
5931
enum_switch=False, value_switches=True,
5917
5940
_see_also = ['shelve']
5919
def run(self, shelf_id=None, action='apply', directory=u'.'):
5942
def run(self, shelf_id=None, action='apply'):
5920
5943
from bzrlib.shelf_ui import Unshelver
5921
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5944
unshelver = Unshelver.from_args(shelf_id, action)
5923
5946
unshelver.run()
5941
5964
To check what clean-tree will do, use --dry-run.
5943
takes_options = ['directory',
5944
Option('ignored', help='Delete all ignored files.'),
5966
takes_options = [Option('ignored', help='Delete all ignored files.'),
5945
5967
Option('detritus', help='Delete conflict files, merge'
5946
5968
' backups, and failed selftest dirs.'),
5947
5969
Option('unknown',
5950
5972
' deleting them.'),
5951
5973
Option('force', help='Do not prompt before deleting.')]
5952
5974
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5953
force=False, directory=u'.'):
5954
5976
from bzrlib.clean_tree import clean_tree
5955
5977
if not (unknown or ignored or detritus):
5959
clean_tree(directory, unknown=unknown, ignored=ignored,
5960
detritus=detritus, dry_run=dry_run, no_prompt=force)
5981
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5982
dry_run=dry_run, no_prompt=force)
5963
5985
class cmd_reference(Command):
added
removed
bzrlib/builtins.py
