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 added:
- contrib/bash/bzr
- files removed:
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- 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:
1352
1366
@display_command
1353
1367
def run(self, dir=u'.'):
1354
1368
tree = WorkingTree.open_containing(dir)[0]
1355
self.add_cleanup(tree.lock_read().unlock)
1369
tree.lock_read()
1370
self.add_cleanup(tree.unlock)
1356
1371
new_inv = tree.inventory
1357
1372
old_tree = tree.basis_tree()
1358
self.add_cleanup(old_tree.lock_read().unlock)
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1359
1375
old_inv = old_tree.inventory
1360
1376
renames = []
1361
1377
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1399
1415
master = branch.get_master_branch(
1400
1416
possible_transports=possible_transports)
1401
1417
if master is not None:
1418
tree.lock_write()
1402
1419
branch_location = master.base
1403
tree.lock_write()
1404
1420
else:
1421
tree.lock_tree_write()
1405
1422
branch_location = tree.branch.base
1406
tree.lock_tree_write()
1407
1423
self.add_cleanup(tree.unlock)
1408
1424
# get rid of the final '/' and be ready for display
1409
1425
branch_location = urlutils.unescape_for_display(
1529
1545
if file_list is not None:
1530
1546
file_list = [f for f in file_list]
1531
1547
1532
self.add_cleanup(tree.lock_write().unlock)
1548
tree.lock_write()
1549
self.add_cleanup(tree.unlock)
1533
1550
# Heuristics should probably all move into tree.remove_smart or
1534
1551
# some such?
1535
1552
if new:
1986
2003
# level of effort but possibly much less IO. (Or possibly not,
1987
2004
# if the directories are very large...)
1988
2005
_see_also = ['status', 'ls']
1989
takes_options = ['directory', 'show-ids']
2006
takes_options = ['show-ids']
1990
2007
1991
2008
@display_command
1992
def run(self, show_ids=False, directory=u'.'):
1993
tree = WorkingTree.open_containing(directory)[0]
1994
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)
1995
2013
old = tree.basis_tree()
1996
self.add_cleanup(old.lock_read().unlock)
2014
old.lock_read()
2015
self.add_cleanup(old.unlock)
1997
2016
for path, ie in old.inventory.iter_entries():
1998
2017
if not tree.has_id(ie.file_id):
1999
2018
self.outf.write(path)
2009
2028
2010
2029
hidden = True
2011
2030
_see_also = ['status', 'ls']
2012
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
]
2013
2036
2014
2037
@display_command
2015
def run(self, null=False, directory=u'.'):
2016
tree = WorkingTree.open_containing(directory)[0]
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2017
2040
td = tree.changes_from(tree.basis_tree())
2018
2041
for path, id, kind, text_modified, meta_modified in td.modified:
2019
2042
if null:
2028
2051
2029
2052
hidden = True
2030
2053
_see_also = ['status', 'ls']
2031
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
]
2032
2059
2033
2060
@display_command
2034
def run(self, null=False, directory=u'.'):
2035
wt = WorkingTree.open_containing(directory)[0]
2036
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)
2037
2065
basis = wt.basis_tree()
2038
self.add_cleanup(basis.lock_read().unlock)
2066
basis.lock_read()
2067
self.add_cleanup(basis.unlock)
2039
2068
basis_inv = basis.inventory
2040
2069
inv = wt.inventory
2041
2070
for file_id in inv:
2044
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2045
2074
continue
2046
2075
path = inv.id2path(file_id)
2047
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2076
if not os.access(osutils.abspath(path), os.F_OK):
2048
2077
continue
2049
2078
if null:
2050
2079
self.outf.write(path + '\0')
2250
2279
help='Show just the specified revision.'
2251
2280
' See also "help revisionspec".'),
2252
2281
'log-format',
2253
RegistryOption('authors',
2254
'What names to list as authors - first, all or committer.',
2255
title='Authors',
2256
lazy_registry=('bzrlib.log', 'author_list_registry'),
2257
),
2258
2282
Option('levels',
2259
2283
short_name='n',
2260
2284
help='Number of levels to display - 0 for all, 1 for flat.',
2295
2319
limit=None,
2296
2320
show_diff=False,
2297
2321
include_merges=False,
2298
authors=None,
2299
2322
exclude_common_ancestry=False,
2300
2323
):
2301
2324
from bzrlib.log import (
2329
2352
if file_list:
2330
2353
# find the file ids to log and check for directory filtering
2331
2354
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2332
revision, file_list, self.add_cleanup)
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2333
2357
for relpath, file_id, kind in file_info_list:
2334
2358
if file_id is None:
2335
2359
raise errors.BzrCommandError(
2353
2377
location = '.'
2354
2378
dir, relpath = bzrdir.BzrDir.open_containing(location)
2355
2379
b = dir.open_branch()
2356
self.add_cleanup(b.lock_read().unlock)
2380
b.lock_read()
2381
self.add_cleanup(b.unlock)
2357
2382
rev1, rev2 = _get_revision_range(revision, b, self.name())
2358
2383
2359
2384
# Decide on the type of delta & diff filtering to use
2379
2404
show_timezone=timezone,
2380
2405
delta_format=get_verbosity_level(),
2381
2406
levels=levels,
2382
show_advice=levels is None,
2383
author_list_handler=authors)
2407
show_advice=levels is None)
2384
2408
2385
2409
# Choose the algorithm for doing the logging. It's annoying
2386
2410
# having multiple code paths like this but necessary until
2484
2508
tree, relpath = WorkingTree.open_containing(filename)
2485
2509
file_id = tree.path2id(relpath)
2486
2510
b = tree.branch
2487
self.add_cleanup(b.lock_read().unlock)
2511
b.lock_read()
2512
self.add_cleanup(b.unlock)
2488
2513
touching_revs = log.find_touching_revisions(b, file_id)
2489
2514
for revno, revision_id, what in touching_revs:
2490
2515
self.outf.write("%6d %s\n" % (revno, what))
2503
2528
help='Recurse into subdirectories.'),
2504
2529
Option('from-root',
2505
2530
help='Print paths relative to the root of the branch.'),
2506
Option('unknown', short_name='u',
2507
help='Print unknown files.'),
2531
Option('unknown', help='Print unknown files.'),
2508
2532
Option('versioned', help='Print versioned files.',
2509
2533
short_name='V'),
2510
Option('ignored', short_name='i',
2511
help='Print ignored files.'),
2512
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',
2513
2539
help='List entries of a particular kind: file, directory, symlink.',
2514
2540
type=unicode),
2515
'null',
2516
2541
'show-ids',
2517
'directory',
2518
2542
]
2519
2543
@display_command
2520
2544
def run(self, revision=None, verbose=False,
2521
2545
recursive=False, from_root=False,
2522
2546
unknown=False, versioned=False, ignored=False,
2523
null=False, kind=None, show_ids=False, path=None, directory=None):
2547
null=False, kind=None, show_ids=False, path=None):
2524
2548
2525
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2526
2550
raise errors.BzrCommandError('invalid kind specified')
2538
2562
raise errors.BzrCommandError('cannot specify both --from-root'
2539
2563
' and PATH')
2540
2564
fs_path = path
2541
tree, branch, relpath = \
2542
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2565
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2566
fs_path)
2543
2567
2544
2568
# Calculate the prefix to use
2545
2569
prefix = None
2560
2584
view_str = views.view_display_str(view_files)
2561
2585
note("Ignoring files outside view. View is %s" % view_str)
2562
2586
2563
self.add_cleanup(tree.lock_read().unlock)
2587
tree.lock_read()
2588
self.add_cleanup(tree.unlock)
2564
2589
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2565
2590
from_dir=relpath, recursive=recursive):
2566
2591
# Apply additional masking
2613
2638
2614
2639
hidden = True
2615
2640
_see_also = ['ls']
2616
takes_options = ['directory']
2617
2641
2618
2642
@display_command
2619
def run(self, directory=u'.'):
2620
for f in WorkingTree.open_containing(directory)[0].unknowns():
2643
def run(self):
2644
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2621
2645
self.outf.write(osutils.quotefn(f) + '\n')
2622
2646
2623
2647
2688
2712
2689
2713
_see_also = ['status', 'ignored', 'patterns']
2690
2714
takes_args = ['name_pattern*']
2691
takes_options = ['directory',
2715
takes_options = [
2692
2716
Option('default-rules',
2693
2717
help='Display the default ignore rules that bzr uses.')
2694
2718
]
2695
2719
2696
def run(self, name_pattern_list=None, default_rules=None,
2697
directory=u'.'):
2720
def run(self, name_pattern_list=None, default_rules=None):
2698
2721
from bzrlib import ignores
2699
2722
if default_rules is not None:
2700
2723
# dump the default rules and exit
2711
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2712
2735
raise errors.BzrCommandError(
2713
2736
"NAME_PATTERN should not be an absolute path")
2714
tree, relpath = WorkingTree.open_containing(directory)
2737
tree, relpath = WorkingTree.open_containing(u'.')
2715
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2716
2739
ignored = globbing.Globster(name_pattern_list)
2717
2740
matches = []
2743
2766
2744
2767
encoding_type = 'replace'
2745
2768
_see_also = ['ignore', 'ls']
2746
takes_options = ['directory']
2747
2769
2748
2770
@display_command
2749
def run(self, directory=u'.'):
2750
tree = WorkingTree.open_containing(directory)[0]
2751
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)
2752
2775
for path, file_class, kind, file_id, entry in tree.list_files():
2753
2776
if file_class != 'I':
2754
2777
continue
2765
2788
"""
2766
2789
hidden = True
2767
2790
takes_args = ['revno']
2768
takes_options = ['directory']
2769
2791
2770
2792
@display_command
2771
def run(self, revno, directory=u'.'):
2793
def run(self, revno):
2772
2794
try:
2773
2795
revno = int(revno)
2774
2796
except ValueError:
2775
2797
raise errors.BzrCommandError("not a valid revision-number: %r"
2776
2798
% revno)
2777
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2778
2800
self.outf.write("%s\n" % revid)
2779
2801
2780
2802
2807
2829
================= =========================
2808
2830
"""
2809
2831
takes_args = ['dest', 'branch_or_subdir?']
2810
takes_options = ['directory',
2832
takes_options = [
2811
2833
Option('format',
2812
2834
help="Type of file to export to.",
2813
2835
type=unicode),
2822
2844
'revision in which it was changed.'),
2823
2845
]
2824
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2825
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2847
root=None, filters=False, per_file_timestamps=False):
2826
2848
from bzrlib.export import export
2827
2849
2828
2850
if branch_or_subdir is None:
2829
tree = WorkingTree.open_containing(directory)[0]
2851
tree = WorkingTree.open_containing(u'.')[0]
2830
2852
b = tree.branch
2831
2853
subdir = None
2832
2854
else:
2851
2873
"""
2852
2874
2853
2875
_see_also = ['ls']
2854
takes_options = ['directory',
2876
takes_options = [
2855
2877
Option('name-from-revision', help='The path name in the old tree.'),
2856
2878
Option('filters', help='Apply content filters to display the '
2857
2879
'convenience form.'),
2862
2884
2863
2885
@display_command
2864
2886
def run(self, filename, revision=None, name_from_revision=False,
2865
filters=False, directory=None):
2887
filters=False):
2866
2888
if revision is not None and len(revision) != 1:
2867
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2868
2890
" one revision specifier")
2869
2891
tree, branch, relpath = \
2870
_open_directory_or_containing_tree_or_branch(filename, directory)
2871
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)
2872
2895
return self._run(tree, branch, relpath, filename, revision,
2873
2896
name_from_revision, filters)
2874
2897
2877
2900
if tree is None:
2878
2901
tree = b.basis_tree()
2879
2902
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2880
self.add_cleanup(rev_tree.lock_read().unlock)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2881
2905
2882
2906
old_file_id = rev_tree.path2id(relpath)
2883
2907
3356
3380
3357
3381
_see_also = ['info']
3358
3382
takes_args = ['nickname?']
3359
takes_options = ['directory']
3360
def run(self, nickname=None, directory=u'.'):
3361
branch = Branch.open_containing(directory)[0]
3383
def run(self, nickname=None):
3384
branch = Branch.open_containing(u'.')[0]
3362
3385
if nickname is None:
3363
3386
self.printme(branch)
3364
3387
else:
3589
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3590
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3591
3614
# stdout, which would corrupt the subunit stream.
3592
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3593
# following code can be deleted when it's sufficiently deployed
3594
# -- vila/mgz 20100514
3595
if (sys.platform == "win32"
3596
and getattr(sys.stdout, 'fileno', None) is not None):
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3597
3616
import msvcrt
3598
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3599
3618
if parallel:
3671
3690
3672
3691
branch1 = Branch.open_containing(branch)[0]
3673
3692
branch2 = Branch.open_containing(other)[0]
3674
self.add_cleanup(branch1.lock_read().unlock)
3675
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)
3676
3697
last1 = ensure_null(branch1.last_revision())
3677
3698
last2 = ensure_null(branch2.last_revision())
3678
3699
3772
3793
' completely merged into the source, pull from the'
3773
3794
' source rather than merging. When this happens,'
3774
3795
' you do not need to commit the result.'),
3775
custom_help('directory',
3796
Option('directory',
3776
3797
help='Branch to merge into, '
3777
'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
),
3778
3802
Option('preview', help='Instead of merging, show a diff of the'
3779
3803
' merge.'),
3780
3804
Option('interactive', help='Select changes interactively.',
3813
3837
unversioned_filter=tree.is_ignored, view_info=view_info)
3814
3838
pb = ui.ui_factory.nested_progress_bar()
3815
3839
self.add_cleanup(pb.finished)
3816
self.add_cleanup(tree.lock_write().unlock)
3840
tree.lock_write()
3841
self.add_cleanup(tree.unlock)
3817
3842
if location is not None:
3818
3843
try:
3819
3844
mergeable = bundle.read_mergeable_from_url(location,
4075
4100
if merge_type is None:
4076
4101
merge_type = _mod_merge.Merge3Merger
4077
4102
tree, file_list = tree_files(file_list)
4078
self.add_cleanup(tree.lock_write().unlock)
4103
tree.lock_write()
4104
self.add_cleanup(tree.unlock)
4079
4105
parents = tree.get_parent_ids()
4080
4106
if len(parents) != 2:
4081
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4191
4217
def run(self, revision=None, no_backup=False, file_list=None,
4192
4218
forget_merges=None):
4193
4219
tree, file_list = tree_files(file_list)
4194
self.add_cleanup(tree.lock_tree_write().unlock)
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4195
4222
if forget_merges:
4196
4223
tree.set_parent_ids(tree.get_parent_ids()[:1])
4197
4224
else:
4333
4360
restrict = 'remote'
4334
4361
4335
4362
local_branch = Branch.open_containing(u".")[0]
4336
self.add_cleanup(local_branch.lock_read().unlock)
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4337
4365
4338
4366
parent = local_branch.get_parent()
4339
4367
if other_branch is None:
4350
4378
if remote_branch.base == local_branch.base:
4351
4379
remote_branch = local_branch
4352
4380
else:
4353
self.add_cleanup(remote_branch.lock_read().unlock)
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4354
4383
4355
4384
local_revid_range = _revision_range_to_revid_range(
4356
4385
_get_revision_range(my_revision, local_branch,
4411
4440
message("Branches are up to date.\n")
4412
4441
self.cleanup_now()
4413
4442
if not status_code and parent is None and other_branch is not None:
4414
self.add_cleanup(local_branch.lock_write().unlock)
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4415
4445
# handle race conditions - a parent might be set while we run.
4416
4446
if local_branch.get_parent() is None:
4417
4447
local_branch.set_parent(remote_branch.base)
4517
4547
b = Branch.open_containing(branch)[0]
4518
4548
else:
4519
4549
b = Branch.open(branch)
4520
self.add_cleanup(b.lock_read().unlock)
4550
b.lock_read()
4551
self.add_cleanup(b.unlock)
4521
4552
if revision is None:
4522
4553
rev_id = b.last_revision()
4523
4554
else:
4547
4578
Option('long', help='Show commit date in annotations.'),
4548
4579
'revision',
4549
4580
'show-ids',
4550
'directory',
4551
4581
]
4552
4582
encoding_type = 'exact'
4553
4583
4554
4584
@display_command
4555
4585
def run(self, filename, all=False, long=False, revision=None,
4556
show_ids=False, directory=None):
4586
show_ids=False):
4557
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4558
4588
wt, branch, relpath = \
4559
_open_directory_or_containing_tree_or_branch(filename, directory)
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4560
4590
if wt is not None:
4561
self.add_cleanup(wt.lock_read().unlock)
4591
wt.lock_read()
4592
self.add_cleanup(wt.unlock)
4562
4593
else:
4563
self.add_cleanup(branch.lock_read().unlock)
4594
branch.lock_read()
4595
self.add_cleanup(branch.unlock)
4564
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4565
self.add_cleanup(tree.lock_read().unlock)
4597
tree.lock_read()
4598
self.add_cleanup(tree.unlock)
4566
4599
if wt is not None:
4567
4600
file_id = wt.path2id(relpath)
4568
4601
else:
4586
4619
4587
4620
hidden = True # is this right ?
4588
4621
takes_args = ['revision_id*']
4589
takes_options = ['directory', 'revision']
4622
takes_options = ['revision']
4590
4623
4591
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4624
def run(self, revision_id_list=None, revision=None):
4592
4625
if revision_id_list is not None and revision is not None:
4593
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4594
4627
if revision_id_list is None and revision is None:
4595
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4596
b = WorkingTree.open_containing(directory)[0].branch
4597
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)
4598
4632
return self._run(b, revision_id_list, revision)
4599
4633
4600
4634
def _run(self, b, revision_id_list, revision):
4659
4693
4660
4694
_see_also = ['checkouts', 'unbind']
4661
4695
takes_args = ['location?']
4662
takes_options = ['directory']
4696
takes_options = []
4663
4697
4664
def run(self, location=None, directory=u'.'):
4665
b, relpath = Branch.open_containing(directory)
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4666
4700
if location is None:
4667
4701
try:
4668
4702
location = b.get_old_bound_location()
4695
4729
4696
4730
_see_also = ['checkouts', 'bind']
4697
4731
takes_args = []
4698
takes_options = ['directory']
4732
takes_options = []
4699
4733
4700
def run(self, directory=u'.'):
4701
b, relpath = Branch.open_containing(directory)
4734
def run(self):
4735
b, relpath = Branch.open_containing(u'.')
4702
4736
if not b.unbind():
4703
4737
raise errors.BzrCommandError('Local branch is not bound')
4704
4738
4750
4784
b = control.open_branch()
4751
4785
4752
4786
if tree is not None:
4753
self.add_cleanup(tree.lock_write().unlock)
4787
tree.lock_write()
4788
self.add_cleanup(tree.unlock)
4754
4789
else:
4755
self.add_cleanup(b.lock_write().unlock)
4790
b.lock_write()
4791
self.add_cleanup(b.unlock)
4756
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4757
4793
4758
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4866
4902
'result in a dynamically allocated port. The default port '
4867
4903
'depends on the protocol.',
4868
4904
type=str),
4869
custom_help('directory',
4870
help='Serve contents of this directory.'),
4905
Option('directory',
4906
help='Serve contents of this directory.',
4907
type=unicode),
4871
4908
Option('allow-writes',
4872
4909
help='By default the server is a readonly server. Supplying '
4873
4910
'--allow-writes enables write access to the contents of '
5302
5339
Option('delete',
5303
5340
help='Delete this tag rather than placing it.',
5304
5341
),
5305
custom_help('directory',
5306
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
),
5307
5347
Option('force',
5308
5348
help='Replace existing tags.',
5309
5349
),
5317
5357
revision=None,
5318
5358
):
5319
5359
branch, relpath = Branch.open_containing(directory)
5320
self.add_cleanup(branch.lock_write().unlock)
5360
branch.lock_write()
5361
self.add_cleanup(branch.unlock)
5321
5362
if delete:
5322
5363
if tag_name is None:
5323
5364
raise errors.BzrCommandError("No tag specified to delete.")
5351
5392
5352
5393
_see_also = ['tag']
5353
5394
takes_options = [
5354
custom_help('directory',
5355
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
),
5356
5400
RegistryOption.from_kwargs('sort',
5357
5401
'Sort tags by different criteria.', title='Sorting',
5358
5402
alpha='Sort tags lexicographically (default).',
5375
5419
if not tags:
5376
5420
return
5377
5421
5378
self.add_cleanup(branch.lock_read().unlock)
5422
branch.lock_read()
5423
self.add_cleanup(branch.unlock)
5379
5424
if revision:
5380
5425
graph = branch.repository.get_graph()
5381
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5859
5904
5860
5905
def run_for_list(self):
5861
5906
tree = WorkingTree.open_containing('.')[0]
5862
self.add_cleanup(tree.lock_read().unlock)
5907
tree.lock_read()
5908
self.add_cleanup(tree.unlock)
5863
5909
manager = tree.get_shelf_manager()
5864
5910
shelves = manager.active_shelves()
5865
5911
if len(shelves) == 0:
5920
5966
5921
5967
To check what clean-tree will do, use --dry-run.
5922
5968
"""
5923
takes_options = ['directory',
5924
Option('ignored', help='Delete all ignored files.'),
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5925
5970
Option('detritus', help='Delete conflict files, merge'
5926
5971
' backups, and failed selftest dirs.'),
5927
5972
Option('unknown',
5930
5975
' deleting them.'),
5931
5976
Option('force', help='Do not prompt before deleting.')]
5932
5977
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5933
force=False, directory=u'.'):
5978
force=False):
5934
5979
from bzrlib.clean_tree import clean_tree
5935
5980
if not (unknown or ignored or detritus):
5936
5981
unknown = True
5937
5982
if dry_run:
5938
5983
force = True
5939
clean_tree(directory, unknown=unknown, ignored=ignored,
5940
detritus=detritus, dry_run=dry_run, no_prompt=force)
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
5941
5986
5942
5987
5943
5988
class cmd_reference(Command):
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0