« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 5218
- compare with another revision
- download diff
- download tarball
- view history from revision 5218
- Committer: Canonical.com Patch Queue Manager
- Date: 2010-05-07 11:50:28 UTC
- mfrom: (5147.4.7 more-colo)
- Revision ID: pqm@pqm.ubuntu.com-20100507115028-tuuxmnormm8oetw6
(vila, for jelmer) Pass the colocated branch name along in more places,
add extra tests.
add extra tests.
- files added:
- bzrlib/tests/blackbox/test_deleted.py
- files removed:
- bzrlib/tests/matchers.py
- files modified:
- NEWS
added
removed
bzrlib/builtins.py
232
232
return view_info
233
233
234
234
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)
241
242
235
243
# TODO: Make sure no commands unconditionally use the working directory as a
236
244
# branch. If a filename argument is used, the first of them should be used to
237
245
# specify the branch. (Perhaps this can be factored out into some kind of
340
348
341
349
hidden = True
342
350
takes_args = ['revision_id?']
343
takes_options = ['revision']
351
takes_options = ['directory', 'revision']
344
352
# cat-revision is more for frontends so should be exact
345
353
encoding = 'strict'
346
354
353
361
self.outf.write(revtext.decode('utf-8'))
354
362
355
363
@display_command
356
def run(self, revision_id=None, revision=None):
364
def run(self, revision_id=None, revision=None, directory=u'.'):
357
365
if revision_id is not None and revision is not None:
358
366
raise errors.BzrCommandError('You can only supply one of'
359
367
' revision_id or --revision')
360
368
if revision_id is None and revision is None:
361
369
raise errors.BzrCommandError('You must supply either'
362
370
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
371
b = WorkingTree.open_containing(directory)[0].branch
364
372
365
373
revisions = b.repository.revisions
366
374
if revisions is None:
528
536
if tree:
529
537
try:
530
538
wt = WorkingTree.open_containing(location)[0]
531
self.add_cleanup(wt.lock_read().unlock)
539
wt.lock_read()
532
540
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
541
raise errors.NoWorkingTree(location)
542
self.add_cleanup(wt.unlock)
534
543
revid = wt.last_revision()
535
544
try:
536
545
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
539
548
revno = ".".join(str(n) for n in revno_t)
540
549
else:
541
550
b = Branch.open_containing(location)[0]
542
self.add_cleanup(b.lock_read().unlock)
551
b.lock_read()
552
self.add_cleanup(b.unlock)
543
553
revno = b.revno()
544
554
self.cleanup_now()
545
555
self.outf.write(str(revno) + '\n')
552
562
takes_args = ['revision_info*']
553
563
takes_options = [
554
564
'revision',
555
Option('directory',
565
custom_help('directory',
556
566
help='Branch to examine, '
557
'rather than the one containing the working directory.',
558
short_name='d',
559
type=unicode,
560
),
567
'rather than the one containing the working directory.'),
561
568
Option('tree', help='Show revno of working tree'),
562
569
]
563
570
568
575
try:
569
576
wt = WorkingTree.open_containing(directory)[0]
570
577
b = wt.branch
571
self.add_cleanup(wt.lock_read().unlock)
578
wt.lock_read()
579
self.add_cleanup(wt.unlock)
572
580
except (errors.NoWorkingTree, errors.NotLocalUrl):
573
581
wt = None
574
582
b = Branch.open_containing(directory)[0]
575
self.add_cleanup(b.lock_read().unlock)
583
b.lock_read()
584
self.add_cleanup(b.unlock)
576
585
revision_ids = []
577
586
if revision is not None:
578
587
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
677
686
should_print=(not is_quiet()))
678
687
679
688
if base_tree:
680
self.add_cleanup(base_tree.lock_read().unlock)
689
base_tree.lock_read()
690
self.add_cleanup(base_tree.unlock)
681
691
tree, file_list = tree_files_for_add(file_list)
682
692
added, ignored = tree.smart_add(file_list, not
683
693
no_recurse, action=action, save=not dry_run)
755
765
756
766
revision = _get_one_revision('inventory', revision)
757
767
work_tree, file_list = tree_files(file_list)
758
self.add_cleanup(work_tree.lock_read().unlock)
768
work_tree.lock_read()
769
self.add_cleanup(work_tree.unlock)
759
770
if revision is not None:
760
771
tree = revision.as_tree(work_tree.branch)
761
772
762
773
extra_trees = [work_tree]
763
self.add_cleanup(tree.lock_read().unlock)
774
tree.lock_read()
775
self.add_cleanup(tree.unlock)
764
776
else:
765
777
tree = work_tree
766
778
extra_trees = []
826
838
if len(names_list) < 2:
827
839
raise errors.BzrCommandError("missing file argument")
828
840
tree, rel_names = tree_files(names_list, canonicalize=False)
829
self.add_cleanup(tree.lock_tree_write().unlock)
841
tree.lock_tree_write()
842
self.add_cleanup(tree.unlock)
830
843
self._run(tree, names_list, rel_names, after)
831
844
832
845
def run_auto(self, names_list, after, dry_run):
837
850
raise errors.BzrCommandError('--after cannot be specified with'
838
851
' --auto.')
839
852
work_tree, file_list = tree_files(names_list, default_branch='.')
840
self.add_cleanup(work_tree.lock_tree_write().unlock)
853
work_tree.lock_tree_write()
854
self.add_cleanup(work_tree.unlock)
841
855
rename_map.RenameMap.guess_renames(work_tree, dry_run)
842
856
843
857
def _run(self, tree, names_list, rel_names, after):
951
965
takes_options = ['remember', 'overwrite', 'revision',
952
966
custom_help('verbose',
953
967
help='Show logs of pulled revisions.'),
954
Option('directory',
968
custom_help('directory',
955
969
help='Branch to pull into, '
956
'rather than the one containing the working directory.',
957
short_name='d',
958
type=unicode,
959
),
970
'rather than the one containing the working directory.'),
960
971
Option('local',
961
972
help="Perform a local pull in a bound "
962
973
"branch. Local pulls are not applied to "
977
988
try:
978
989
tree_to = WorkingTree.open_containing(directory)[0]
979
990
branch_to = tree_to.branch
980
self.add_cleanup(tree_to.lock_write().unlock)
991
tree_to.lock_write()
992
self.add_cleanup(tree_to.unlock)
981
993
except errors.NoWorkingTree:
982
994
tree_to = None
983
995
branch_to = Branch.open_containing(directory)[0]
984
self.add_cleanup(branch_to.lock_write().unlock)
996
branch_to.lock_write()
997
self.add_cleanup(branch_to.unlock)
985
998
986
999
if local and not branch_to.get_bound_location():
987
1000
raise errors.LocalRequiresBoundBranch()
1018
1031
else:
1019
1032
branch_from = Branch.open(location,
1020
1033
possible_transports=possible_transports)
1021
self.add_cleanup(branch_from.lock_read().unlock)
1034
branch_from.lock_read()
1035
self.add_cleanup(branch_from.unlock)
1022
1036
1023
1037
if branch_to.get_parent() is None or remember:
1024
1038
branch_to.set_parent(branch_from.base)
1076
1090
Option('create-prefix',
1077
1091
help='Create the path leading up to the branch '
1078
1092
'if it does not already exist.'),
1079
Option('directory',
1093
custom_help('directory',
1080
1094
help='Branch to push from, '
1081
'rather than the one containing the working directory.',
1082
short_name='d',
1083
type=unicode,
1084
),
1095
'rather than the one containing the working directory.'),
1085
1096
Option('use-existing-dir',
1086
1097
help='By default push will fail if the target'
1087
1098
' directory exists, but does not already'
1207
1218
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1208
1219
from_location)
1209
1220
revision = _get_one_revision('branch', revision)
1210
self.add_cleanup(br_from.lock_read().unlock)
1221
br_from.lock_read()
1222
self.add_cleanup(br_from.unlock)
1211
1223
if revision is not None:
1212
1224
revision_id = revision.as_revision_id(br_from)
1213
1225
else:
1337
1349
except errors.NoWorkingTree:
1338
1350
source.bzrdir.create_workingtree(revision_id)
1339
1351
return
1352
1353
if not lightweight:
1354
message = ('Copying history to "%s". '
1355
'To checkout without local history use --lightweight.' % to_location)
1356
ui.ui_factory.show_message(message)
1340
1357
source.create_checkout(to_location, revision_id, lightweight,
1341
1358
accelerator_tree, hardlink)
1342
1359
1353
1370
@display_command
1354
1371
def run(self, dir=u'.'):
1355
1372
tree = WorkingTree.open_containing(dir)[0]
1356
self.add_cleanup(tree.lock_read().unlock)
1373
tree.lock_read()
1374
self.add_cleanup(tree.unlock)
1357
1375
new_inv = tree.inventory
1358
1376
old_tree = tree.basis_tree()
1359
self.add_cleanup(old_tree.lock_read().unlock)
1377
old_tree.lock_read()
1378
self.add_cleanup(old_tree.unlock)
1360
1379
old_inv = old_tree.inventory
1361
1380
renames = []
1362
1381
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1400
1419
master = branch.get_master_branch(
1401
1420
possible_transports=possible_transports)
1402
1421
if master is not None:
1422
tree.lock_write()
1403
1423
branch_location = master.base
1404
tree.lock_write()
1405
1424
else:
1425
tree.lock_tree_write()
1406
1426
branch_location = tree.branch.base
1407
tree.lock_tree_write()
1408
1427
self.add_cleanup(tree.unlock)
1409
1428
# get rid of the final '/' and be ready for display
1410
1429
branch_location = urlutils.unescape_for_display(
1530
1549
if file_list is not None:
1531
1550
file_list = [f for f in file_list]
1532
1551
1533
self.add_cleanup(tree.lock_write().unlock)
1552
tree.lock_write()
1553
self.add_cleanup(tree.unlock)
1534
1554
# Heuristics should probably all move into tree.remove_smart or
1535
1555
# some such?
1536
1556
if new:
1987
2007
# level of effort but possibly much less IO. (Or possibly not,
1988
2008
# if the directories are very large...)
1989
2009
_see_also = ['status', 'ls']
1990
takes_options = ['show-ids']
2010
takes_options = ['directory', 'show-ids']
1991
2011
1992
2012
@display_command
1993
def run(self, show_ids=False):
1994
tree = WorkingTree.open_containing(u'.')[0]
1995
self.add_cleanup(tree.lock_read().unlock)
2013
def run(self, show_ids=False, directory=u'.'):
2014
tree = WorkingTree.open_containing(directory)[0]
2015
tree.lock_read()
2016
self.add_cleanup(tree.unlock)
1996
2017
old = tree.basis_tree()
1997
self.add_cleanup(old.lock_read().unlock)
2018
old.lock_read()
2019
self.add_cleanup(old.unlock)
1998
2020
for path, ie in old.inventory.iter_entries():
1999
2021
if not tree.has_id(ie.file_id):
2000
2022
self.outf.write(path)
2010
2032
2011
2033
hidden = True
2012
2034
_see_also = ['status', 'ls']
2013
takes_options = [
2014
Option('null',
2015
help='Write an ascii NUL (\\0) separator '
2016
'between files rather than a newline.')
2017
]
2035
takes_options = ['directory', 'null']
2018
2036
2019
2037
@display_command
2020
def run(self, null=False):
2021
tree = WorkingTree.open_containing(u'.')[0]
2038
def run(self, null=False, directory=u'.'):
2039
tree = WorkingTree.open_containing(directory)[0]
2022
2040
td = tree.changes_from(tree.basis_tree())
2023
2041
for path, id, kind, text_modified, meta_modified in td.modified:
2024
2042
if null:
2033
2051
2034
2052
hidden = True
2035
2053
_see_also = ['status', 'ls']
2036
takes_options = [
2037
Option('null',
2038
help='Write an ascii NUL (\\0) separator '
2039
'between files rather than a newline.')
2040
]
2054
takes_options = ['directory', 'null']
2041
2055
2042
2056
@display_command
2043
def run(self, null=False):
2044
wt = WorkingTree.open_containing(u'.')[0]
2045
self.add_cleanup(wt.lock_read().unlock)
2057
def run(self, null=False, directory=u'.'):
2058
wt = WorkingTree.open_containing(directory)[0]
2059
wt.lock_read()
2060
self.add_cleanup(wt.unlock)
2046
2061
basis = wt.basis_tree()
2047
self.add_cleanup(basis.lock_read().unlock)
2062
basis.lock_read()
2063
self.add_cleanup(basis.unlock)
2048
2064
basis_inv = basis.inventory
2049
2065
inv = wt.inventory
2050
2066
for file_id in inv:
2053
2069
if inv.is_root(file_id) and len(basis_inv) == 0:
2054
2070
continue
2055
2071
path = inv.id2path(file_id)
2056
if not os.access(osutils.abspath(path), os.F_OK):
2072
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2057
2073
continue
2058
2074
if null:
2059
2075
self.outf.write(path + '\0')
2259
2275
help='Show just the specified revision.'
2260
2276
' See also "help revisionspec".'),
2261
2277
'log-format',
2278
RegistryOption('authors',
2279
'What names to list as authors - first, all or committer.',
2280
title='Authors',
2281
lazy_registry=('bzrlib.log', 'author_list_registry'),
2282
),
2262
2283
Option('levels',
2263
2284
short_name='n',
2264
2285
help='Number of levels to display - 0 for all, 1 for flat.',
2299
2320
limit=None,
2300
2321
show_diff=False,
2301
2322
include_merges=False,
2323
authors=None,
2302
2324
exclude_common_ancestry=False,
2303
2325
):
2304
2326
from bzrlib.log import (
2332
2354
if file_list:
2333
2355
# find the file ids to log and check for directory filtering
2334
2356
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2335
revision, file_list, self.add_cleanup)
2357
revision, file_list)
2358
self.add_cleanup(b.unlock)
2336
2359
for relpath, file_id, kind in file_info_list:
2337
2360
if file_id is None:
2338
2361
raise errors.BzrCommandError(
2356
2379
location = '.'
2357
2380
dir, relpath = bzrdir.BzrDir.open_containing(location)
2358
2381
b = dir.open_branch()
2359
self.add_cleanup(b.lock_read().unlock)
2382
b.lock_read()
2383
self.add_cleanup(b.unlock)
2360
2384
rev1, rev2 = _get_revision_range(revision, b, self.name())
2361
2385
2362
2386
# Decide on the type of delta & diff filtering to use
2382
2406
show_timezone=timezone,
2383
2407
delta_format=get_verbosity_level(),
2384
2408
levels=levels,
2385
show_advice=levels is None)
2409
show_advice=levels is None,
2410
author_list_handler=authors)
2386
2411
2387
2412
# Choose the algorithm for doing the logging. It's annoying
2388
2413
# having multiple code paths like this but necessary until
2486
2511
tree, relpath = WorkingTree.open_containing(filename)
2487
2512
file_id = tree.path2id(relpath)
2488
2513
b = tree.branch
2489
self.add_cleanup(b.lock_read().unlock)
2514
b.lock_read()
2515
self.add_cleanup(b.unlock)
2490
2516
touching_revs = log.find_touching_revisions(b, file_id)
2491
2517
for revno, revision_id, what in touching_revs:
2492
2518
self.outf.write("%6d %s\n" % (revno, what))
2505
2531
help='Recurse into subdirectories.'),
2506
2532
Option('from-root',
2507
2533
help='Print paths relative to the root of the branch.'),
2508
Option('unknown', help='Print unknown files.'),
2534
Option('unknown', short_name='u',
2535
help='Print unknown files.'),
2509
2536
Option('versioned', help='Print versioned files.',
2510
2537
short_name='V'),
2511
Option('ignored', help='Print ignored files.'),
2512
Option('null',
2513
help='Write an ascii NUL (\\0) separator '
2514
'between files rather than a newline.'),
2515
Option('kind',
2538
Option('ignored', short_name='i',
2539
help='Print ignored files.'),
2540
Option('kind', short_name='k',
2516
2541
help='List entries of a particular kind: file, directory, symlink.',
2517
2542
type=unicode),
2543
'null',
2518
2544
'show-ids',
2545
'directory',
2519
2546
]
2520
2547
@display_command
2521
2548
def run(self, revision=None, verbose=False,
2522
2549
recursive=False, from_root=False,
2523
2550
unknown=False, versioned=False, ignored=False,
2524
null=False, kind=None, show_ids=False, path=None):
2551
null=False, kind=None, show_ids=False, path=None, directory=None):
2525
2552
2526
2553
if kind and kind not in ('file', 'directory', 'symlink'):
2527
2554
raise errors.BzrCommandError('invalid kind specified')
2539
2566
raise errors.BzrCommandError('cannot specify both --from-root'
2540
2567
' and PATH')
2541
2568
fs_path = path
2542
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2543
fs_path)
2569
tree, branch, relpath = \
2570
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2544
2571
2545
2572
# Calculate the prefix to use
2546
2573
prefix = None
2561
2588
view_str = views.view_display_str(view_files)
2562
2589
note("Ignoring files outside view. View is %s" % view_str)
2563
2590
2564
self.add_cleanup(tree.lock_read().unlock)
2591
tree.lock_read()
2592
self.add_cleanup(tree.unlock)
2565
2593
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2566
2594
from_dir=relpath, recursive=recursive):
2567
2595
# Apply additional masking
2614
2642
2615
2643
hidden = True
2616
2644
_see_also = ['ls']
2645
takes_options = ['directory']
2617
2646
2618
2647
@display_command
2619
def run(self):
2620
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2648
def run(self, directory=u'.'):
2649
for f in WorkingTree.open_containing(directory)[0].unknowns():
2621
2650
self.outf.write(osutils.quotefn(f) + '\n')
2622
2651
2623
2652
2688
2717
2689
2718
_see_also = ['status', 'ignored', 'patterns']
2690
2719
takes_args = ['name_pattern*']
2691
takes_options = [
2720
takes_options = ['directory',
2692
2721
Option('default-rules',
2693
2722
help='Display the default ignore rules that bzr uses.')
2694
2723
]
2695
2724
2696
def run(self, name_pattern_list=None, default_rules=None):
2725
def run(self, name_pattern_list=None, default_rules=None,
2726
directory=u'.'):
2697
2727
from bzrlib import ignores
2698
2728
if default_rules is not None:
2699
2729
# dump the default rules and exit
2710
2740
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2711
2741
raise errors.BzrCommandError(
2712
2742
"NAME_PATTERN should not be an absolute path")
2713
tree, relpath = WorkingTree.open_containing(u'.')
2743
tree, relpath = WorkingTree.open_containing(directory)
2714
2744
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2715
2745
ignored = globbing.Globster(name_pattern_list)
2716
2746
matches = []
2742
2772
2743
2773
encoding_type = 'replace'
2744
2774
_see_also = ['ignore', 'ls']
2775
takes_options = ['directory']
2745
2776
2746
2777
@display_command
2747
def run(self):
2748
tree = WorkingTree.open_containing(u'.')[0]
2749
self.add_cleanup(tree.lock_read().unlock)
2778
def run(self, directory=u'.'):
2779
tree = WorkingTree.open_containing(directory)[0]
2780
tree.lock_read()
2781
self.add_cleanup(tree.unlock)
2750
2782
for path, file_class, kind, file_id, entry in tree.list_files():
2751
2783
if file_class != 'I':
2752
2784
continue
2763
2795
"""
2764
2796
hidden = True
2765
2797
takes_args = ['revno']
2798
takes_options = ['directory']
2766
2799
2767
2800
@display_command
2768
def run(self, revno):
2801
def run(self, revno, directory=u'.'):
2769
2802
try:
2770
2803
revno = int(revno)
2771
2804
except ValueError:
2772
2805
raise errors.BzrCommandError("not a valid revision-number: %r"
2773
2806
% revno)
2774
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2807
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2775
2808
self.outf.write("%s\n" % revid)
2776
2809
2777
2810
2804
2837
================= =========================
2805
2838
"""
2806
2839
takes_args = ['dest', 'branch_or_subdir?']
2807
takes_options = [
2840
takes_options = ['directory',
2808
2841
Option('format',
2809
2842
help="Type of file to export to.",
2810
2843
type=unicode),
2819
2852
'revision in which it was changed.'),
2820
2853
]
2821
2854
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2855
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2823
2856
from bzrlib.export import export
2824
2857
2825
2858
if branch_or_subdir is None:
2826
tree = WorkingTree.open_containing(u'.')[0]
2859
tree = WorkingTree.open_containing(directory)[0]
2827
2860
b = tree.branch
2828
2861
subdir = None
2829
2862
else:
2848
2881
"""
2849
2882
2850
2883
_see_also = ['ls']
2851
takes_options = [
2884
takes_options = ['directory',
2852
2885
Option('name-from-revision', help='The path name in the old tree.'),
2853
2886
Option('filters', help='Apply content filters to display the '
2854
2887
'convenience form.'),
2859
2892
2860
2893
@display_command
2861
2894
def run(self, filename, revision=None, name_from_revision=False,
2862
filters=False):
2895
filters=False, directory=None):
2863
2896
if revision is not None and len(revision) != 1:
2864
2897
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2865
2898
" one revision specifier")
2866
2899
tree, branch, relpath = \
2867
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2868
self.add_cleanup(branch.lock_read().unlock)
2900
_open_directory_or_containing_tree_or_branch(filename, directory)
2901
branch.lock_read()
2902
self.add_cleanup(branch.unlock)
2869
2903
return self._run(tree, branch, relpath, filename, revision,
2870
2904
name_from_revision, filters)
2871
2905
2874
2908
if tree is None:
2875
2909
tree = b.basis_tree()
2876
2910
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2877
self.add_cleanup(rev_tree.lock_read().unlock)
2911
rev_tree.lock_read()
2912
self.add_cleanup(rev_tree.unlock)
2878
2913
2879
2914
old_file_id = rev_tree.path2id(relpath)
2880
2915
3353
3388
3354
3389
_see_also = ['info']
3355
3390
takes_args = ['nickname?']
3356
def run(self, nickname=None):
3357
branch = Branch.open_containing(u'.')[0]
3391
takes_options = ['directory']
3392
def run(self, nickname=None, directory=u'.'):
3393
branch = Branch.open_containing(directory)[0]
3358
3394
if nickname is None:
3359
3395
self.printme(branch)
3360
3396
else:
3663
3699
3664
3700
branch1 = Branch.open_containing(branch)[0]
3665
3701
branch2 = Branch.open_containing(other)[0]
3666
self.add_cleanup(branch1.lock_read().unlock)
3667
self.add_cleanup(branch2.lock_read().unlock)
3702
branch1.lock_read()
3703
self.add_cleanup(branch1.unlock)
3704
branch2.lock_read()
3705
self.add_cleanup(branch2.unlock)
3668
3706
last1 = ensure_null(branch1.last_revision())
3669
3707
last2 = ensure_null(branch2.last_revision())
3670
3708
3764
3802
' completely merged into the source, pull from the'
3765
3803
' source rather than merging. When this happens,'
3766
3804
' you do not need to commit the result.'),
3767
Option('directory',
3805
custom_help('directory',
3768
3806
help='Branch to merge into, '
3769
'rather than the one containing the working directory.',
3770
short_name='d',
3771
type=unicode,
3772
),
3807
'rather than the one containing the working directory.'),
3773
3808
Option('preview', help='Instead of merging, show a diff of the'
3774
3809
' merge.'),
3775
3810
Option('interactive', help='Select changes interactively.',
3808
3843
unversioned_filter=tree.is_ignored, view_info=view_info)
3809
3844
pb = ui.ui_factory.nested_progress_bar()
3810
3845
self.add_cleanup(pb.finished)
3811
self.add_cleanup(tree.lock_write().unlock)
3846
tree.lock_write()
3847
self.add_cleanup(tree.unlock)
3812
3848
if location is not None:
3813
3849
try:
3814
3850
mergeable = bundle.read_mergeable_from_url(location,
4070
4106
if merge_type is None:
4071
4107
merge_type = _mod_merge.Merge3Merger
4072
4108
tree, file_list = tree_files(file_list)
4073
self.add_cleanup(tree.lock_write().unlock)
4109
tree.lock_write()
4110
self.add_cleanup(tree.unlock)
4074
4111
parents = tree.get_parent_ids()
4075
4112
if len(parents) != 2:
4076
4113
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4186
4223
def run(self, revision=None, no_backup=False, file_list=None,
4187
4224
forget_merges=None):
4188
4225
tree, file_list = tree_files(file_list)
4189
self.add_cleanup(tree.lock_tree_write().unlock)
4226
tree.lock_tree_write()
4227
self.add_cleanup(tree.unlock)
4190
4228
if forget_merges:
4191
4229
tree.set_parent_ids(tree.get_parent_ids()[:1])
4192
4230
else:
4328
4366
restrict = 'remote'
4329
4367
4330
4368
local_branch = Branch.open_containing(u".")[0]
4331
self.add_cleanup(local_branch.lock_read().unlock)
4369
local_branch.lock_read()
4370
self.add_cleanup(local_branch.unlock)
4332
4371
4333
4372
parent = local_branch.get_parent()
4334
4373
if other_branch is None:
4345
4384
if remote_branch.base == local_branch.base:
4346
4385
remote_branch = local_branch
4347
4386
else:
4348
self.add_cleanup(remote_branch.lock_read().unlock)
4387
remote_branch.lock_read()
4388
self.add_cleanup(remote_branch.unlock)
4349
4389
4350
4390
local_revid_range = _revision_range_to_revid_range(
4351
4391
_get_revision_range(my_revision, local_branch,
4406
4446
message("Branches are up to date.\n")
4407
4447
self.cleanup_now()
4408
4448
if not status_code and parent is None and other_branch is not None:
4409
self.add_cleanup(local_branch.lock_write().unlock)
4449
local_branch.lock_write()
4450
self.add_cleanup(local_branch.unlock)
4410
4451
# handle race conditions - a parent might be set while we run.
4411
4452
if local_branch.get_parent() is None:
4412
4453
local_branch.set_parent(remote_branch.base)
4512
4553
b = Branch.open_containing(branch)[0]
4513
4554
else:
4514
4555
b = Branch.open(branch)
4515
self.add_cleanup(b.lock_read().unlock)
4556
b.lock_read()
4557
self.add_cleanup(b.unlock)
4516
4558
if revision is None:
4517
4559
rev_id = b.last_revision()
4518
4560
else:
4542
4584
Option('long', help='Show commit date in annotations.'),
4543
4585
'revision',
4544
4586
'show-ids',
4587
'directory',
4545
4588
]
4546
4589
encoding_type = 'exact'
4547
4590
4548
4591
@display_command
4549
4592
def run(self, filename, all=False, long=False, revision=None,
4550
show_ids=False):
4593
show_ids=False, directory=None):
4551
4594
from bzrlib.annotate import annotate_file, annotate_file_tree
4552
4595
wt, branch, relpath = \
4553
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4596
_open_directory_or_containing_tree_or_branch(filename, directory)
4554
4597
if wt is not None:
4555
self.add_cleanup(wt.lock_read().unlock)
4598
wt.lock_read()
4599
self.add_cleanup(wt.unlock)
4556
4600
else:
4557
self.add_cleanup(branch.lock_read().unlock)
4601
branch.lock_read()
4602
self.add_cleanup(branch.unlock)
4558
4603
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
self.add_cleanup(tree.lock_read().unlock)
4604
tree.lock_read()
4605
self.add_cleanup(tree.unlock)
4560
4606
if wt is not None:
4561
4607
file_id = wt.path2id(relpath)
4562
4608
else:
4580
4626
4581
4627
hidden = True # is this right ?
4582
4628
takes_args = ['revision_id*']
4583
takes_options = ['revision']
4629
takes_options = ['directory', 'revision']
4584
4630
4585
def run(self, revision_id_list=None, revision=None):
4631
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4586
4632
if revision_id_list is not None and revision is not None:
4587
4633
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4588
4634
if revision_id_list is None and revision is None:
4589
4635
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
b = WorkingTree.open_containing(u'.')[0].branch
4591
self.add_cleanup(b.lock_write().unlock)
4636
b = WorkingTree.open_containing(directory)[0].branch
4637
b.lock_write()
4638
self.add_cleanup(b.unlock)
4592
4639
return self._run(b, revision_id_list, revision)
4593
4640
4594
4641
def _run(self, b, revision_id_list, revision):
4653
4700
4654
4701
_see_also = ['checkouts', 'unbind']
4655
4702
takes_args = ['location?']
4656
takes_options = []
4703
takes_options = ['directory']
4657
4704
4658
def run(self, location=None):
4659
b, relpath = Branch.open_containing(u'.')
4705
def run(self, location=None, directory=u'.'):
4706
b, relpath = Branch.open_containing(directory)
4660
4707
if location is None:
4661
4708
try:
4662
4709
location = b.get_old_bound_location()
4689
4736
4690
4737
_see_also = ['checkouts', 'bind']
4691
4738
takes_args = []
4692
takes_options = []
4739
takes_options = ['directory']
4693
4740
4694
def run(self):
4695
b, relpath = Branch.open_containing(u'.')
4741
def run(self, directory=u'.'):
4742
b, relpath = Branch.open_containing(directory)
4696
4743
if not b.unbind():
4697
4744
raise errors.BzrCommandError('Local branch is not bound')
4698
4745
4744
4791
b = control.open_branch()
4745
4792
4746
4793
if tree is not None:
4747
self.add_cleanup(tree.lock_write().unlock)
4794
tree.lock_write()
4795
self.add_cleanup(tree.unlock)
4748
4796
else:
4749
self.add_cleanup(b.lock_write().unlock)
4797
b.lock_write()
4798
self.add_cleanup(b.unlock)
4750
4799
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4751
4800
4752
4801
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4860
4909
'result in a dynamically allocated port. The default port '
4861
4910
'depends on the protocol.',
4862
4911
type=str),
4863
Option('directory',
4864
help='Serve contents of this directory.',
4865
type=unicode),
4912
custom_help('directory',
4913
help='Serve contents of this directory.'),
4866
4914
Option('allow-writes',
4867
4915
help='By default the server is a readonly server. Supplying '
4868
4916
'--allow-writes enables write access to the contents of '
5297
5345
Option('delete',
5298
5346
help='Delete this tag rather than placing it.',
5299
5347
),
5300
Option('directory',
5301
help='Branch in which to place the tag.',
5302
short_name='d',
5303
type=unicode,
5304
),
5348
custom_help('directory',
5349
help='Branch in which to place the tag.'),
5305
5350
Option('force',
5306
5351
help='Replace existing tags.',
5307
5352
),
5315
5360
revision=None,
5316
5361
):
5317
5362
branch, relpath = Branch.open_containing(directory)
5318
self.add_cleanup(branch.lock_write().unlock)
5363
branch.lock_write()
5364
self.add_cleanup(branch.unlock)
5319
5365
if delete:
5320
5366
if tag_name is None:
5321
5367
raise errors.BzrCommandError("No tag specified to delete.")
5349
5395
5350
5396
_see_also = ['tag']
5351
5397
takes_options = [
5352
Option('directory',
5353
help='Branch whose tags should be displayed.',
5354
short_name='d',
5355
type=unicode,
5356
),
5398
custom_help('directory',
5399
help='Branch whose tags should be displayed.'),
5357
5400
RegistryOption.from_kwargs('sort',
5358
5401
'Sort tags by different criteria.', title='Sorting',
5359
5402
alpha='Sort tags lexicographically (default).',
5376
5419
if not tags:
5377
5420
return
5378
5421
5379
self.add_cleanup(branch.lock_read().unlock)
5422
branch.lock_read()
5423
self.add_cleanup(branch.unlock)
5380
5424
if revision:
5381
5425
graph = branch.repository.get_graph()
5382
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5860
5904
5861
5905
def run_for_list(self):
5862
5906
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5907
tree.lock_read()
5908
self.add_cleanup(tree.unlock)
5864
5909
manager = tree.get_shelf_manager()
5865
5910
shelves = manager.active_shelves()
5866
5911
if len(shelves) == 0:
5921
5966
5922
5967
To check what clean-tree will do, use --dry-run.
5923
5968
"""
5924
takes_options = [Option('ignored', help='Delete all ignored files.'),
5969
takes_options = ['directory',
5970
Option('ignored', help='Delete all ignored files.'),
5925
5971
Option('detritus', help='Delete conflict files, merge'
5926
5972
' backups, and failed selftest dirs.'),
5927
5973
Option('unknown',
5930
5976
' deleting them.'),
5931
5977
Option('force', help='Do not prompt before deleting.')]
5932
5978
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5933
force=False):
5979
force=False, directory=u'.'):
5934
5980
from bzrlib.clean_tree import clean_tree
5935
5981
if not (unknown or ignored or detritus):
5936
5982
unknown = True
5937
5983
if dry_run:
5938
5984
force = True
5939
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5940
dry_run=dry_run, no_prompt=force)
5985
clean_tree(directory, unknown=unknown, ignored=ignored,
5986
detritus=detritus, dry_run=dry_run, no_prompt=force)
5941
5987
5942
5988
5943
5989
class cmd_reference(Command):
Loggerhead is a web-based interface for Breezy
Version: 2.0.1