To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 5200.3.2
- compare with another revision
- download diff
- download tarball
- view history from revision 5200.3.2
- Committer: Robert Collins
- Date: 2010-05-06 11:08:10 UTC
- mto: This revision was merged to the branch mainline in revision 5223.
- Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.
- files removed:
- bzrlib/tests/blackbox/test_deleted.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
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
348
340
349
341
hidden = True
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'
354
346
361
353
self.outf.write(revtext.decode('utf-8'))
362
354
363
355
@display_command
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
372
364
373
365
revisions = b.repository.revisions
374
366
if revisions is None:
536
528
if tree:
537
529
try:
538
530
wt = WorkingTree.open_containing(location)[0]
539
self.add_cleanup(wt.lock_read().unlock)
531
wt.lock_read()
540
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
541
533
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
542
535
revid = wt.last_revision()
543
536
try:
544
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
547
540
revno = ".".join(str(n) for n in revno_t)
548
541
else:
549
542
b = Branch.open_containing(location)[0]
550
self.add_cleanup(b.lock_read().unlock)
543
b.lock_read()
544
self.add_cleanup(b.unlock)
551
545
revno = b.revno()
552
546
self.cleanup_now()
553
547
self.outf.write(str(revno) + '\n')
560
554
takes_args = ['revision_info*']
561
555
takes_options = [
562
556
'revision',
563
custom_help('directory',
557
Option('directory',
564
558
help='Branch to examine, '
565
'rather than the one containing the working directory.'),
559
'rather than the one containing the working directory.',
560
short_name='d',
561
type=unicode,
562
),
566
563
Option('tree', help='Show revno of working tree'),
567
564
]
568
565
573
570
try:
574
571
wt = WorkingTree.open_containing(directory)[0]
575
572
b = wt.branch
576
self.add_cleanup(wt.lock_read().unlock)
573
wt.lock_read()
574
self.add_cleanup(wt.unlock)
577
575
except (errors.NoWorkingTree, errors.NotLocalUrl):
578
576
wt = None
579
577
b = Branch.open_containing(directory)[0]
580
self.add_cleanup(b.lock_read().unlock)
578
b.lock_read()
579
self.add_cleanup(b.unlock)
581
580
revision_ids = []
582
581
if revision is not None:
583
582
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
682
681
should_print=(not is_quiet()))
683
682
684
683
if base_tree:
685
self.add_cleanup(base_tree.lock_read().unlock)
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
686
686
tree, file_list = tree_files_for_add(file_list)
687
687
added, ignored = tree.smart_add(file_list, not
688
688
no_recurse, action=action, save=not dry_run)
760
760
761
761
revision = _get_one_revision('inventory', revision)
762
762
work_tree, file_list = tree_files(file_list)
763
self.add_cleanup(work_tree.lock_read().unlock)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
764
765
if revision is not None:
765
766
tree = revision.as_tree(work_tree.branch)
766
767
767
768
extra_trees = [work_tree]
768
self.add_cleanup(tree.lock_read().unlock)
769
tree.lock_read()
770
self.add_cleanup(tree.unlock)
769
771
else:
770
772
tree = work_tree
771
773
extra_trees = []
831
833
if len(names_list) < 2:
832
834
raise errors.BzrCommandError("missing file argument")
833
835
tree, rel_names = tree_files(names_list, canonicalize=False)
834
self.add_cleanup(tree.lock_tree_write().unlock)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
835
838
self._run(tree, names_list, rel_names, after)
836
839
837
840
def run_auto(self, names_list, after, dry_run):
842
845
raise errors.BzrCommandError('--after cannot be specified with'
843
846
' --auto.')
844
847
work_tree, file_list = tree_files(names_list, default_branch='.')
845
self.add_cleanup(work_tree.lock_tree_write().unlock)
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
846
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
847
851
848
852
def _run(self, tree, names_list, rel_names, after):
956
960
takes_options = ['remember', 'overwrite', 'revision',
957
961
custom_help('verbose',
958
962
help='Show logs of pulled revisions.'),
959
custom_help('directory',
963
Option('directory',
960
964
help='Branch to pull into, '
961
'rather than the one containing the working directory.'),
965
'rather than the one containing the working directory.',
966
short_name='d',
967
type=unicode,
968
),
962
969
Option('local',
963
970
help="Perform a local pull in a bound "
964
971
"branch. Local pulls are not applied to "
979
986
try:
980
987
tree_to = WorkingTree.open_containing(directory)[0]
981
988
branch_to = tree_to.branch
982
self.add_cleanup(tree_to.lock_write().unlock)
989
tree_to.lock_write()
990
self.add_cleanup(tree_to.unlock)
983
991
except errors.NoWorkingTree:
984
992
tree_to = None
985
993
branch_to = Branch.open_containing(directory)[0]
986
self.add_cleanup(branch_to.lock_write().unlock)
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
987
996
988
997
if local and not branch_to.get_bound_location():
989
998
raise errors.LocalRequiresBoundBranch()
1020
1029
else:
1021
1030
branch_from = Branch.open(location,
1022
1031
possible_transports=possible_transports)
1023
self.add_cleanup(branch_from.lock_read().unlock)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1024
1034
1025
1035
if branch_to.get_parent() is None or remember:
1026
1036
branch_to.set_parent(branch_from.base)
1078
1088
Option('create-prefix',
1079
1089
help='Create the path leading up to the branch '
1080
1090
'if it does not already exist.'),
1081
custom_help('directory',
1091
Option('directory',
1082
1092
help='Branch to push from, '
1083
'rather than the one containing the working directory.'),
1093
'rather than the one containing the working directory.',
1094
short_name='d',
1095
type=unicode,
1096
),
1084
1097
Option('use-existing-dir',
1085
1098
help='By default push will fail if the target'
1086
1099
' directory exists, but does not already'
1206
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1207
1220
from_location)
1208
1221
revision = _get_one_revision('branch', revision)
1209
self.add_cleanup(br_from.lock_read().unlock)
1222
br_from.lock_read()
1223
self.add_cleanup(br_from.unlock)
1210
1224
if revision is not None:
1211
1225
revision_id = revision.as_revision_id(br_from)
1212
1226
else:
1336
1350
except errors.NoWorkingTree:
1337
1351
source.bzrdir.create_workingtree(revision_id)
1338
1352
return
1339
1340
if not lightweight:
1341
message = ('Copying history to "%s". '
1342
'To checkout without local history use --lightweight.' % to_location)
1343
ui.ui_factory.show_message(message)
1344
1353
source.create_checkout(to_location, revision_id, lightweight,
1345
1354
accelerator_tree, hardlink)
1346
1355
1357
1366
@display_command
1358
1367
def run(self, dir=u'.'):
1359
1368
tree = WorkingTree.open_containing(dir)[0]
1360
self.add_cleanup(tree.lock_read().unlock)
1369
tree.lock_read()
1370
self.add_cleanup(tree.unlock)
1361
1371
new_inv = tree.inventory
1362
1372
old_tree = tree.basis_tree()
1363
self.add_cleanup(old_tree.lock_read().unlock)
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1364
1375
old_inv = old_tree.inventory
1365
1376
renames = []
1366
1377
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1404
1415
master = branch.get_master_branch(
1405
1416
possible_transports=possible_transports)
1406
1417
if master is not None:
1418
tree.lock_write()
1407
1419
branch_location = master.base
1408
tree.lock_write()
1409
1420
else:
1421
tree.lock_tree_write()
1410
1422
branch_location = tree.branch.base
1411
tree.lock_tree_write()
1412
1423
self.add_cleanup(tree.unlock)
1413
1424
# get rid of the final '/' and be ready for display
1414
1425
branch_location = urlutils.unescape_for_display(
1534
1545
if file_list is not None:
1535
1546
file_list = [f for f in file_list]
1536
1547
1537
self.add_cleanup(tree.lock_write().unlock)
1548
tree.lock_write()
1549
self.add_cleanup(tree.unlock)
1538
1550
# Heuristics should probably all move into tree.remove_smart or
1539
1551
# some such?
1540
1552
if new:
1991
2003
# level of effort but possibly much less IO. (Or possibly not,
1992
2004
# if the directories are very large...)
1993
2005
_see_also = ['status', 'ls']
1994
takes_options = ['directory', 'show-ids']
2006
takes_options = ['show-ids']
1995
2007
1996
2008
@display_command
1997
def run(self, show_ids=False, directory=u'.'):
1998
tree = WorkingTree.open_containing(directory)[0]
1999
self.add_cleanup(tree.lock_read().unlock)
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2011
tree.lock_read()
2012
self.add_cleanup(tree.unlock)
2000
2013
old = tree.basis_tree()
2001
self.add_cleanup(old.lock_read().unlock)
2014
old.lock_read()
2015
self.add_cleanup(old.unlock)
2002
2016
for path, ie in old.inventory.iter_entries():
2003
2017
if not tree.has_id(ie.file_id):
2004
2018
self.outf.write(path)
2014
2028
2015
2029
hidden = True
2016
2030
_see_also = ['status', 'ls']
2017
takes_options = ['directory', 'null']
2031
takes_options = [
2032
Option('null',
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2035
]
2018
2036
2019
2037
@display_command
2020
def run(self, null=False, directory=u'.'):
2021
tree = WorkingTree.open_containing(directory)[0]
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[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 = ['directory', 'null']
2054
takes_options = [
2055
Option('null',
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2058
]
2037
2059
2038
2060
@display_command
2039
def run(self, null=False, directory=u'.'):
2040
wt = WorkingTree.open_containing(directory)[0]
2041
self.add_cleanup(wt.lock_read().unlock)
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2063
wt.lock_read()
2064
self.add_cleanup(wt.unlock)
2042
2065
basis = wt.basis_tree()
2043
self.add_cleanup(basis.lock_read().unlock)
2066
basis.lock_read()
2067
self.add_cleanup(basis.unlock)
2044
2068
basis_inv = basis.inventory
2045
2069
inv = wt.inventory
2046
2070
for file_id in inv:
2049
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2050
2074
continue
2051
2075
path = inv.id2path(file_id)
2052
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2076
if not os.access(osutils.abspath(path), os.F_OK):
2053
2077
continue
2054
2078
if null:
2055
2079
self.outf.write(path + '\0')
2255
2279
help='Show just the specified revision.'
2256
2280
' See also "help revisionspec".'),
2257
2281
'log-format',
2258
RegistryOption('authors',
2259
'What names to list as authors - first, all or committer.',
2260
title='Authors',
2261
lazy_registry=('bzrlib.log', 'author_list_registry'),
2262
),
2263
2282
Option('levels',
2264
2283
short_name='n',
2265
2284
help='Number of levels to display - 0 for all, 1 for flat.',
2300
2319
limit=None,
2301
2320
show_diff=False,
2302
2321
include_merges=False,
2303
authors=None,
2304
2322
exclude_common_ancestry=False,
2305
2323
):
2306
2324
from bzrlib.log import (
2334
2352
if file_list:
2335
2353
# find the file ids to log and check for directory filtering
2336
2354
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2337
revision, file_list, self.add_cleanup)
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2338
2357
for relpath, file_id, kind in file_info_list:
2339
2358
if file_id is None:
2340
2359
raise errors.BzrCommandError(
2358
2377
location = '.'
2359
2378
dir, relpath = bzrdir.BzrDir.open_containing(location)
2360
2379
b = dir.open_branch()
2361
self.add_cleanup(b.lock_read().unlock)
2380
b.lock_read()
2381
self.add_cleanup(b.unlock)
2362
2382
rev1, rev2 = _get_revision_range(revision, b, self.name())
2363
2383
2364
2384
# Decide on the type of delta & diff filtering to use
2384
2404
show_timezone=timezone,
2385
2405
delta_format=get_verbosity_level(),
2386
2406
levels=levels,
2387
show_advice=levels is None,
2388
author_list_handler=authors)
2407
show_advice=levels is None)
2389
2408
2390
2409
# Choose the algorithm for doing the logging. It's annoying
2391
2410
# having multiple code paths like this but necessary until
2489
2508
tree, relpath = WorkingTree.open_containing(filename)
2490
2509
file_id = tree.path2id(relpath)
2491
2510
b = tree.branch
2492
self.add_cleanup(b.lock_read().unlock)
2511
b.lock_read()
2512
self.add_cleanup(b.unlock)
2493
2513
touching_revs = log.find_touching_revisions(b, file_id)
2494
2514
for revno, revision_id, what in touching_revs:
2495
2515
self.outf.write("%6d %s\n" % (revno, what))
2508
2528
help='Recurse into subdirectories.'),
2509
2529
Option('from-root',
2510
2530
help='Print paths relative to the root of the branch.'),
2511
Option('unknown', short_name='u',
2512
help='Print unknown files.'),
2531
Option('unknown', help='Print unknown files.'),
2513
2532
Option('versioned', help='Print versioned files.',
2514
2533
short_name='V'),
2515
Option('ignored', short_name='i',
2516
help='Print ignored files.'),
2517
Option('kind', short_name='k',
2534
Option('ignored', help='Print ignored files.'),
2535
Option('null',
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2538
Option('kind',
2518
2539
help='List entries of a particular kind: file, directory, symlink.',
2519
2540
type=unicode),
2520
'null',
2521
2541
'show-ids',
2522
'directory',
2523
2542
]
2524
2543
@display_command
2525
2544
def run(self, revision=None, verbose=False,
2526
2545
recursive=False, from_root=False,
2527
2546
unknown=False, versioned=False, ignored=False,
2528
null=False, kind=None, show_ids=False, path=None, directory=None):
2547
null=False, kind=None, show_ids=False, path=None):
2529
2548
2530
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2531
2550
raise errors.BzrCommandError('invalid kind specified')
2543
2562
raise errors.BzrCommandError('cannot specify both --from-root'
2544
2563
' and PATH')
2545
2564
fs_path = path
2546
tree, branch, relpath = \
2547
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2565
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2566
fs_path)
2548
2567
2549
2568
# Calculate the prefix to use
2550
2569
prefix = None
2565
2584
view_str = views.view_display_str(view_files)
2566
2585
note("Ignoring files outside view. View is %s" % view_str)
2567
2586
2568
self.add_cleanup(tree.lock_read().unlock)
2587
tree.lock_read()
2588
self.add_cleanup(tree.unlock)
2569
2589
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2570
2590
from_dir=relpath, recursive=recursive):
2571
2591
# Apply additional masking
2618
2638
2619
2639
hidden = True
2620
2640
_see_also = ['ls']
2621
takes_options = ['directory']
2622
2641
2623
2642
@display_command
2624
def run(self, directory=u'.'):
2625
for f in WorkingTree.open_containing(directory)[0].unknowns():
2643
def run(self):
2644
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2626
2645
self.outf.write(osutils.quotefn(f) + '\n')
2627
2646
2628
2647
2693
2712
2694
2713
_see_also = ['status', 'ignored', 'patterns']
2695
2714
takes_args = ['name_pattern*']
2696
takes_options = ['directory',
2715
takes_options = [
2697
2716
Option('default-rules',
2698
2717
help='Display the default ignore rules that bzr uses.')
2699
2718
]
2700
2719
2701
def run(self, name_pattern_list=None, default_rules=None,
2702
directory=u'.'):
2720
def run(self, name_pattern_list=None, default_rules=None):
2703
2721
from bzrlib import ignores
2704
2722
if default_rules is not None:
2705
2723
# dump the default rules and exit
2716
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2717
2735
raise errors.BzrCommandError(
2718
2736
"NAME_PATTERN should not be an absolute path")
2719
tree, relpath = WorkingTree.open_containing(directory)
2737
tree, relpath = WorkingTree.open_containing(u'.')
2720
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2721
2739
ignored = globbing.Globster(name_pattern_list)
2722
2740
matches = []
2748
2766
2749
2767
encoding_type = 'replace'
2750
2768
_see_also = ['ignore', 'ls']
2751
takes_options = ['directory']
2752
2769
2753
2770
@display_command
2754
def run(self, directory=u'.'):
2755
tree = WorkingTree.open_containing(directory)[0]
2756
self.add_cleanup(tree.lock_read().unlock)
2771
def run(self):
2772
tree = WorkingTree.open_containing(u'.')[0]
2773
tree.lock_read()
2774
self.add_cleanup(tree.unlock)
2757
2775
for path, file_class, kind, file_id, entry in tree.list_files():
2758
2776
if file_class != 'I':
2759
2777
continue
2770
2788
"""
2771
2789
hidden = True
2772
2790
takes_args = ['revno']
2773
takes_options = ['directory']
2774
2791
2775
2792
@display_command
2776
def run(self, revno, directory=u'.'):
2793
def run(self, revno):
2777
2794
try:
2778
2795
revno = int(revno)
2779
2796
except ValueError:
2780
2797
raise errors.BzrCommandError("not a valid revision-number: %r"
2781
2798
% revno)
2782
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2783
2800
self.outf.write("%s\n" % revid)
2784
2801
2785
2802
2812
2829
================= =========================
2813
2830
"""
2814
2831
takes_args = ['dest', 'branch_or_subdir?']
2815
takes_options = ['directory',
2832
takes_options = [
2816
2833
Option('format',
2817
2834
help="Type of file to export to.",
2818
2835
type=unicode),
2827
2844
'revision in which it was changed.'),
2828
2845
]
2829
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2830
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2847
root=None, filters=False, per_file_timestamps=False):
2831
2848
from bzrlib.export import export
2832
2849
2833
2850
if branch_or_subdir is None:
2834
tree = WorkingTree.open_containing(directory)[0]
2851
tree = WorkingTree.open_containing(u'.')[0]
2835
2852
b = tree.branch
2836
2853
subdir = None
2837
2854
else:
2856
2873
"""
2857
2874
2858
2875
_see_also = ['ls']
2859
takes_options = ['directory',
2876
takes_options = [
2860
2877
Option('name-from-revision', help='The path name in the old tree.'),
2861
2878
Option('filters', help='Apply content filters to display the '
2862
2879
'convenience form.'),
2867
2884
2868
2885
@display_command
2869
2886
def run(self, filename, revision=None, name_from_revision=False,
2870
filters=False, directory=None):
2887
filters=False):
2871
2888
if revision is not None and len(revision) != 1:
2872
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2873
2890
" one revision specifier")
2874
2891
tree, branch, relpath = \
2875
_open_directory_or_containing_tree_or_branch(filename, directory)
2876
self.add_cleanup(branch.lock_read().unlock)
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2893
branch.lock_read()
2894
self.add_cleanup(branch.unlock)
2877
2895
return self._run(tree, branch, relpath, filename, revision,
2878
2896
name_from_revision, filters)
2879
2897
2882
2900
if tree is None:
2883
2901
tree = b.basis_tree()
2884
2902
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2885
self.add_cleanup(rev_tree.lock_read().unlock)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2886
2905
2887
2906
old_file_id = rev_tree.path2id(relpath)
2888
2907
3361
3380
3362
3381
_see_also = ['info']
3363
3382
takes_args = ['nickname?']
3364
takes_options = ['directory']
3365
def run(self, nickname=None, directory=u'.'):
3366
branch = Branch.open_containing(directory)[0]
3383
def run(self, nickname=None):
3384
branch = Branch.open_containing(u'.')[0]
3367
3385
if nickname is None:
3368
3386
self.printme(branch)
3369
3387
else:
3672
3690
3673
3691
branch1 = Branch.open_containing(branch)[0]
3674
3692
branch2 = Branch.open_containing(other)[0]
3675
self.add_cleanup(branch1.lock_read().unlock)
3676
self.add_cleanup(branch2.lock_read().unlock)
3693
branch1.lock_read()
3694
self.add_cleanup(branch1.unlock)
3695
branch2.lock_read()
3696
self.add_cleanup(branch2.unlock)
3677
3697
last1 = ensure_null(branch1.last_revision())
3678
3698
last2 = ensure_null(branch2.last_revision())
3679
3699
3773
3793
' completely merged into the source, pull from the'
3774
3794
' source rather than merging. When this happens,'
3775
3795
' you do not need to commit the result.'),
3776
custom_help('directory',
3796
Option('directory',
3777
3797
help='Branch to merge into, '
3778
'rather than the one containing the working directory.'),
3798
'rather than the one containing the working directory.',
3799
short_name='d',
3800
type=unicode,
3801
),
3779
3802
Option('preview', help='Instead of merging, show a diff of the'
3780
3803
' merge.'),
3781
3804
Option('interactive', help='Select changes interactively.',
3814
3837
unversioned_filter=tree.is_ignored, view_info=view_info)
3815
3838
pb = ui.ui_factory.nested_progress_bar()
3816
3839
self.add_cleanup(pb.finished)
3817
self.add_cleanup(tree.lock_write().unlock)
3840
tree.lock_write()
3841
self.add_cleanup(tree.unlock)
3818
3842
if location is not None:
3819
3843
try:
3820
3844
mergeable = bundle.read_mergeable_from_url(location,
4076
4100
if merge_type is None:
4077
4101
merge_type = _mod_merge.Merge3Merger
4078
4102
tree, file_list = tree_files(file_list)
4079
self.add_cleanup(tree.lock_write().unlock)
4103
tree.lock_write()
4104
self.add_cleanup(tree.unlock)
4080
4105
parents = tree.get_parent_ids()
4081
4106
if len(parents) != 2:
4082
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4192
4217
def run(self, revision=None, no_backup=False, file_list=None,
4193
4218
forget_merges=None):
4194
4219
tree, file_list = tree_files(file_list)
4195
self.add_cleanup(tree.lock_tree_write().unlock)
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4196
4222
if forget_merges:
4197
4223
tree.set_parent_ids(tree.get_parent_ids()[:1])
4198
4224
else:
4334
4360
restrict = 'remote'
4335
4361
4336
4362
local_branch = Branch.open_containing(u".")[0]
4337
self.add_cleanup(local_branch.lock_read().unlock)
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4338
4365
4339
4366
parent = local_branch.get_parent()
4340
4367
if other_branch is None:
4351
4378
if remote_branch.base == local_branch.base:
4352
4379
remote_branch = local_branch
4353
4380
else:
4354
self.add_cleanup(remote_branch.lock_read().unlock)
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4355
4383
4356
4384
local_revid_range = _revision_range_to_revid_range(
4357
4385
_get_revision_range(my_revision, local_branch,
4412
4440
message("Branches are up to date.\n")
4413
4441
self.cleanup_now()
4414
4442
if not status_code and parent is None and other_branch is not None:
4415
self.add_cleanup(local_branch.lock_write().unlock)
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4416
4445
# handle race conditions - a parent might be set while we run.
4417
4446
if local_branch.get_parent() is None:
4418
4447
local_branch.set_parent(remote_branch.base)
4518
4547
b = Branch.open_containing(branch)[0]
4519
4548
else:
4520
4549
b = Branch.open(branch)
4521
self.add_cleanup(b.lock_read().unlock)
4550
b.lock_read()
4551
self.add_cleanup(b.unlock)
4522
4552
if revision is None:
4523
4553
rev_id = b.last_revision()
4524
4554
else:
4548
4578
Option('long', help='Show commit date in annotations.'),
4549
4579
'revision',
4550
4580
'show-ids',
4551
'directory',
4552
4581
]
4553
4582
encoding_type = 'exact'
4554
4583
4555
4584
@display_command
4556
4585
def run(self, filename, all=False, long=False, revision=None,
4557
show_ids=False, directory=None):
4586
show_ids=False):
4558
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4559
4588
wt, branch, relpath = \
4560
_open_directory_or_containing_tree_or_branch(filename, directory)
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4561
4590
if wt is not None:
4562
self.add_cleanup(wt.lock_read().unlock)
4591
wt.lock_read()
4592
self.add_cleanup(wt.unlock)
4563
4593
else:
4564
self.add_cleanup(branch.lock_read().unlock)
4594
branch.lock_read()
4595
self.add_cleanup(branch.unlock)
4565
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
self.add_cleanup(tree.lock_read().unlock)
4597
tree.lock_read()
4598
self.add_cleanup(tree.unlock)
4567
4599
if wt is not None:
4568
4600
file_id = wt.path2id(relpath)
4569
4601
else:
4587
4619
4588
4620
hidden = True # is this right ?
4589
4621
takes_args = ['revision_id*']
4590
takes_options = ['directory', 'revision']
4622
takes_options = ['revision']
4591
4623
4592
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4624
def run(self, revision_id_list=None, revision=None):
4593
4625
if revision_id_list is not None and revision is not None:
4594
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4595
4627
if revision_id_list is None and revision is None:
4596
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4597
b = WorkingTree.open_containing(directory)[0].branch
4598
self.add_cleanup(b.lock_write().unlock)
4629
b = WorkingTree.open_containing(u'.')[0].branch
4630
b.lock_write()
4631
self.add_cleanup(b.unlock)
4599
4632
return self._run(b, revision_id_list, revision)
4600
4633
4601
4634
def _run(self, b, revision_id_list, revision):
4660
4693
4661
4694
_see_also = ['checkouts', 'unbind']
4662
4695
takes_args = ['location?']
4663
takes_options = ['directory']
4696
takes_options = []
4664
4697
4665
def run(self, location=None, directory=u'.'):
4666
b, relpath = Branch.open_containing(directory)
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4667
4700
if location is None:
4668
4701
try:
4669
4702
location = b.get_old_bound_location()
4696
4729
4697
4730
_see_also = ['checkouts', 'bind']
4698
4731
takes_args = []
4699
takes_options = ['directory']
4732
takes_options = []
4700
4733
4701
def run(self, directory=u'.'):
4702
b, relpath = Branch.open_containing(directory)
4734
def run(self):
4735
b, relpath = Branch.open_containing(u'.')
4703
4736
if not b.unbind():
4704
4737
raise errors.BzrCommandError('Local branch is not bound')
4705
4738
4751
4784
b = control.open_branch()
4752
4785
4753
4786
if tree is not None:
4754
self.add_cleanup(tree.lock_write().unlock)
4787
tree.lock_write()
4788
self.add_cleanup(tree.unlock)
4755
4789
else:
4756
self.add_cleanup(b.lock_write().unlock)
4790
b.lock_write()
4791
self.add_cleanup(b.unlock)
4757
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4758
4793
4759
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4867
4902
'result in a dynamically allocated port. The default port '
4868
4903
'depends on the protocol.',
4869
4904
type=str),
4870
custom_help('directory',
4871
help='Serve contents of this directory.'),
4905
Option('directory',
4906
help='Serve contents of this directory.',
4907
type=unicode),
4872
4908
Option('allow-writes',
4873
4909
help='By default the server is a readonly server. Supplying '
4874
4910
'--allow-writes enables write access to the contents of '
5303
5339
Option('delete',
5304
5340
help='Delete this tag rather than placing it.',
5305
5341
),
5306
custom_help('directory',
5307
help='Branch in which to place the tag.'),
5342
Option('directory',
5343
help='Branch in which to place the tag.',
5344
short_name='d',
5345
type=unicode,
5346
),
5308
5347
Option('force',
5309
5348
help='Replace existing tags.',
5310
5349
),
5318
5357
revision=None,
5319
5358
):
5320
5359
branch, relpath = Branch.open_containing(directory)
5321
self.add_cleanup(branch.lock_write().unlock)
5360
branch.lock_write()
5361
self.add_cleanup(branch.unlock)
5322
5362
if delete:
5323
5363
if tag_name is None:
5324
5364
raise errors.BzrCommandError("No tag specified to delete.")
5352
5392
5353
5393
_see_also = ['tag']
5354
5394
takes_options = [
5355
custom_help('directory',
5356
help='Branch whose tags should be displayed.'),
5395
Option('directory',
5396
help='Branch whose tags should be displayed.',
5397
short_name='d',
5398
type=unicode,
5399
),
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 = ['directory',
5925
Option('ignored', help='Delete all ignored files.'),
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5926
5970
Option('detritus', help='Delete conflict files, merge'
5927
5971
' backups, and failed selftest dirs.'),
5928
5972
Option('unknown',
5931
5975
' deleting them.'),
5932
5976
Option('force', help='Do not prompt before deleting.')]
5933
5977
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
force=False, directory=u'.'):
5978
force=False):
5935
5979
from bzrlib.clean_tree import clean_tree
5936
5980
if not (unknown or ignored or detritus):
5937
5981
unknown = True
5938
5982
if dry_run:
5939
5983
force = True
5940
clean_tree(directory, unknown=unknown, ignored=ignored,
5941
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)
5942
5986
5943
5987
5944
5988
class cmd_reference(Command):
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0