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 5258.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 5258.1.1
- Committer: Alexander Belchenko
- Date: 2010-05-26 15:58:08 UTC
- mfrom: (4797.57.10 diff)
- mto: (5303.2.1 integration)
- mto: This revision was merged to the branch mainline in revision 5305.
- Revision ID: bialix@ukr.net-20100526155808-n34lx9kyiw0zuutb
merge diff header work from my 2.1 branch
- files added:
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- files removed:
- contrib/bash/bzr
- 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
wt.lock_read()
539
self.add_cleanup(wt.lock_read().unlock)
532
540
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
541
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
542
revid = wt.last_revision()
536
543
try:
537
544
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
540
547
revno = ".".join(str(n) for n in revno_t)
541
548
else:
542
549
b = Branch.open_containing(location)[0]
543
b.lock_read()
544
self.add_cleanup(b.unlock)
550
self.add_cleanup(b.lock_read().unlock)
545
551
revno = b.revno()
546
552
self.cleanup_now()
547
553
self.outf.write(str(revno) + '\n')
554
560
takes_args = ['revision_info*']
555
561
takes_options = [
556
562
'revision',
557
Option('directory',
563
custom_help('directory',
558
564
help='Branch to examine, '
559
'rather than the one containing the working directory.',
560
short_name='d',
561
type=unicode,
562
),
565
'rather than the one containing the working directory.'),
563
566
Option('tree', help='Show revno of working tree'),
564
567
]
565
568
570
573
try:
571
574
wt = WorkingTree.open_containing(directory)[0]
572
575
b = wt.branch
573
wt.lock_read()
574
self.add_cleanup(wt.unlock)
576
self.add_cleanup(wt.lock_read().unlock)
575
577
except (errors.NoWorkingTree, errors.NotLocalUrl):
576
578
wt = None
577
579
b = Branch.open_containing(directory)[0]
578
b.lock_read()
579
self.add_cleanup(b.unlock)
580
self.add_cleanup(b.lock_read().unlock)
580
581
revision_ids = []
581
582
if revision is not None:
582
583
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
681
682
should_print=(not is_quiet()))
682
683
683
684
if base_tree:
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
685
self.add_cleanup(base_tree.lock_read().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
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
763
self.add_cleanup(work_tree.lock_read().unlock)
765
764
if revision is not None:
766
765
tree = revision.as_tree(work_tree.branch)
767
766
768
767
extra_trees = [work_tree]
769
tree.lock_read()
770
self.add_cleanup(tree.unlock)
768
self.add_cleanup(tree.lock_read().unlock)
771
769
else:
772
770
tree = work_tree
773
771
extra_trees = []
833
831
if len(names_list) < 2:
834
832
raise errors.BzrCommandError("missing file argument")
835
833
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
834
self.add_cleanup(tree.lock_tree_write().unlock)
838
835
self._run(tree, names_list, rel_names, after)
839
836
840
837
def run_auto(self, names_list, after, dry_run):
845
842
raise errors.BzrCommandError('--after cannot be specified with'
846
843
' --auto.')
847
844
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
845
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
846
rename_map.RenameMap.guess_renames(work_tree, dry_run)
851
847
852
848
def _run(self, tree, names_list, rel_names, after):
960
956
takes_options = ['remember', 'overwrite', 'revision',
961
957
custom_help('verbose',
962
958
help='Show logs of pulled revisions.'),
963
Option('directory',
959
custom_help('directory',
964
960
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
966
short_name='d',
967
type=unicode,
968
),
961
'rather than the one containing the working directory.'),
969
962
Option('local',
970
963
help="Perform a local pull in a bound "
971
964
"branch. Local pulls are not applied to "
986
979
try:
987
980
tree_to = WorkingTree.open_containing(directory)[0]
988
981
branch_to = tree_to.branch
989
tree_to.lock_write()
990
self.add_cleanup(tree_to.unlock)
982
self.add_cleanup(tree_to.lock_write().unlock)
991
983
except errors.NoWorkingTree:
992
984
tree_to = None
993
985
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
986
self.add_cleanup(branch_to.lock_write().unlock)
996
987
997
988
if local and not branch_to.get_bound_location():
998
989
raise errors.LocalRequiresBoundBranch()
1029
1020
else:
1030
1021
branch_from = Branch.open(location,
1031
1022
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1023
self.add_cleanup(branch_from.lock_read().unlock)
1034
1024
1035
1025
if branch_to.get_parent() is None or remember:
1036
1026
branch_to.set_parent(branch_from.base)
1088
1078
Option('create-prefix',
1089
1079
help='Create the path leading up to the branch '
1090
1080
'if it does not already exist.'),
1091
Option('directory',
1081
custom_help('directory',
1092
1082
help='Branch to push from, '
1093
'rather than the one containing the working directory.',
1094
short_name='d',
1095
type=unicode,
1096
),
1083
'rather than the one containing the working directory.'),
1097
1084
Option('use-existing-dir',
1098
1085
help='By default push will fail if the target'
1099
1086
' directory exists, but does not already'
1219
1206
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1220
1207
from_location)
1221
1208
revision = _get_one_revision('branch', revision)
1222
br_from.lock_read()
1223
self.add_cleanup(br_from.unlock)
1209
self.add_cleanup(br_from.lock_read().unlock)
1224
1210
if revision is not None:
1225
1211
revision_id = revision.as_revision_id(br_from)
1226
1212
else:
1366
1352
@display_command
1367
1353
def run(self, dir=u'.'):
1368
1354
tree = WorkingTree.open_containing(dir)[0]
1369
tree.lock_read()
1370
self.add_cleanup(tree.unlock)
1355
self.add_cleanup(tree.lock_read().unlock)
1371
1356
new_inv = tree.inventory
1372
1357
old_tree = tree.basis_tree()
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1358
self.add_cleanup(old_tree.lock_read().unlock)
1375
1359
old_inv = old_tree.inventory
1376
1360
renames = []
1377
1361
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1415
1399
master = branch.get_master_branch(
1416
1400
possible_transports=possible_transports)
1417
1401
if master is not None:
1418
tree.lock_write()
1419
1402
branch_location = master.base
1403
tree.lock_write()
1420
1404
else:
1405
branch_location = tree.branch.base
1421
1406
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1407
self.add_cleanup(tree.unlock)
1424
1408
# get rid of the final '/' and be ready for display
1425
1409
branch_location = urlutils.unescape_for_display(
1545
1529
if file_list is not None:
1546
1530
file_list = [f for f in file_list]
1547
1531
1548
tree.lock_write()
1549
self.add_cleanup(tree.unlock)
1532
self.add_cleanup(tree.lock_write().unlock)
1550
1533
# Heuristics should probably all move into tree.remove_smart or
1551
1534
# some such?
1552
1535
if new:
1985
1968
old_branch, new_branch,
1986
1969
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
1970
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1971
# GNU diff on Windows uses ANSI encoding for filenames
1972
path_encoding = osutils.get_diff_header_encoding()
1988
1973
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1974
specific_files=specific_files,
1990
1975
external_diff_options=diff_options,
1991
1976
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1977
extra_trees=extra_trees,
1978
path_encoding=path_encoding,
1979
using=using,
1993
1980
format_cls=format)
1994
1981
1995
1982
2003
1990
# level of effort but possibly much less IO. (Or possibly not,
2004
1991
# if the directories are very large...)
2005
1992
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
1993
takes_options = ['directory', 'show-ids']
2007
1994
2008
1995
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2011
tree.lock_read()
2012
self.add_cleanup(tree.unlock)
1996
def run(self, show_ids=False, directory=u'.'):
1997
tree = WorkingTree.open_containing(directory)[0]
1998
self.add_cleanup(tree.lock_read().unlock)
2013
1999
old = tree.basis_tree()
2014
old.lock_read()
2015
self.add_cleanup(old.unlock)
2000
self.add_cleanup(old.lock_read().unlock)
2016
2001
for path, ie in old.inventory.iter_entries():
2017
2002
if not tree.has_id(ie.file_id):
2018
2003
self.outf.write(path)
2028
2013
2029
2014
hidden = True
2030
2015
_see_also = ['status', 'ls']
2031
takes_options = [
2032
Option('null',
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2035
]
2016
takes_options = ['directory', 'null']
2036
2017
2037
2018
@display_command
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2019
def run(self, null=False, directory=u'.'):
2020
tree = WorkingTree.open_containing(directory)[0]
2040
2021
td = tree.changes_from(tree.basis_tree())
2041
2022
for path, id, kind, text_modified, meta_modified in td.modified:
2042
2023
if null:
2051
2032
2052
2033
hidden = True
2053
2034
_see_also = ['status', 'ls']
2054
takes_options = [
2055
Option('null',
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2058
]
2035
takes_options = ['directory', 'null']
2059
2036
2060
2037
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2063
wt.lock_read()
2064
self.add_cleanup(wt.unlock)
2038
def run(self, null=False, directory=u'.'):
2039
wt = WorkingTree.open_containing(directory)[0]
2040
self.add_cleanup(wt.lock_read().unlock)
2065
2041
basis = wt.basis_tree()
2066
basis.lock_read()
2067
self.add_cleanup(basis.unlock)
2042
self.add_cleanup(basis.lock_read().unlock)
2068
2043
basis_inv = basis.inventory
2069
2044
inv = wt.inventory
2070
2045
for file_id in inv:
2073
2048
if inv.is_root(file_id) and len(basis_inv) == 0:
2074
2049
continue
2075
2050
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2051
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2077
2052
continue
2078
2053
if null:
2079
2054
self.outf.write(path + '\0')
2279
2254
help='Show just the specified revision.'
2280
2255
' See also "help revisionspec".'),
2281
2256
'log-format',
2257
RegistryOption('authors',
2258
'What names to list as authors - first, all or committer.',
2259
title='Authors',
2260
lazy_registry=('bzrlib.log', 'author_list_registry'),
2261
),
2282
2262
Option('levels',
2283
2263
short_name='n',
2284
2264
help='Number of levels to display - 0 for all, 1 for flat.',
2319
2299
limit=None,
2320
2300
show_diff=False,
2321
2301
include_merges=False,
2302
authors=None,
2322
2303
exclude_common_ancestry=False,
2323
2304
):
2324
2305
from bzrlib.log import (
2352
2333
if file_list:
2353
2334
# find the file ids to log and check for directory filtering
2354
2335
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2336
revision, file_list, self.add_cleanup)
2357
2337
for relpath, file_id, kind in file_info_list:
2358
2338
if file_id is None:
2359
2339
raise errors.BzrCommandError(
2377
2357
location = '.'
2378
2358
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
2359
b = dir.open_branch()
2380
b.lock_read()
2381
self.add_cleanup(b.unlock)
2360
self.add_cleanup(b.lock_read().unlock)
2382
2361
rev1, rev2 = _get_revision_range(revision, b, self.name())
2383
2362
2384
2363
# Decide on the type of delta & diff filtering to use
2404
2383
show_timezone=timezone,
2405
2384
delta_format=get_verbosity_level(),
2406
2385
levels=levels,
2407
show_advice=levels is None)
2386
show_advice=levels is None,
2387
author_list_handler=authors)
2408
2388
2409
2389
# Choose the algorithm for doing the logging. It's annoying
2410
2390
# having multiple code paths like this but necessary until
2508
2488
tree, relpath = WorkingTree.open_containing(filename)
2509
2489
file_id = tree.path2id(relpath)
2510
2490
b = tree.branch
2511
b.lock_read()
2512
self.add_cleanup(b.unlock)
2491
self.add_cleanup(b.lock_read().unlock)
2513
2492
touching_revs = log.find_touching_revisions(b, file_id)
2514
2493
for revno, revision_id, what in touching_revs:
2515
2494
self.outf.write("%6d %s\n" % (revno, what))
2528
2507
help='Recurse into subdirectories.'),
2529
2508
Option('from-root',
2530
2509
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2510
Option('unknown', short_name='u',
2511
help='Print unknown files.'),
2532
2512
Option('versioned', help='Print versioned files.',
2533
2513
short_name='V'),
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',
2514
Option('ignored', short_name='i',
2515
help='Print ignored files.'),
2516
Option('kind', short_name='k',
2539
2517
help='List entries of a particular kind: file, directory, symlink.',
2540
2518
type=unicode),
2519
'null',
2541
2520
'show-ids',
2521
'directory',
2542
2522
]
2543
2523
@display_command
2544
2524
def run(self, revision=None, verbose=False,
2545
2525
recursive=False, from_root=False,
2546
2526
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2527
null=False, kind=None, show_ids=False, path=None, directory=None):
2548
2528
2549
2529
if kind and kind not in ('file', 'directory', 'symlink'):
2550
2530
raise errors.BzrCommandError('invalid kind specified')
2562
2542
raise errors.BzrCommandError('cannot specify both --from-root'
2563
2543
' and PATH')
2564
2544
fs_path = path
2565
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2566
fs_path)
2545
tree, branch, relpath = \
2546
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2567
2547
2568
2548
# Calculate the prefix to use
2569
2549
prefix = None
2584
2564
view_str = views.view_display_str(view_files)
2585
2565
note("Ignoring files outside view. View is %s" % view_str)
2586
2566
2587
tree.lock_read()
2588
self.add_cleanup(tree.unlock)
2567
self.add_cleanup(tree.lock_read().unlock)
2589
2568
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
2569
from_dir=relpath, recursive=recursive):
2591
2570
# Apply additional masking
2638
2617
2639
2618
hidden = True
2640
2619
_see_also = ['ls']
2620
takes_options = ['directory']
2641
2621
2642
2622
@display_command
2643
def run(self):
2644
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2623
def run(self, directory=u'.'):
2624
for f in WorkingTree.open_containing(directory)[0].unknowns():
2645
2625
self.outf.write(osutils.quotefn(f) + '\n')
2646
2626
2647
2627
2712
2692
2713
2693
_see_also = ['status', 'ignored', 'patterns']
2714
2694
takes_args = ['name_pattern*']
2715
takes_options = [
2695
takes_options = ['directory',
2716
2696
Option('default-rules',
2717
2697
help='Display the default ignore rules that bzr uses.')
2718
2698
]
2719
2699
2720
def run(self, name_pattern_list=None, default_rules=None):
2700
def run(self, name_pattern_list=None, default_rules=None,
2701
directory=u'.'):
2721
2702
from bzrlib import ignores
2722
2703
if default_rules is not None:
2723
2704
# dump the default rules and exit
2734
2715
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
2716
raise errors.BzrCommandError(
2736
2717
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
2718
tree, relpath = WorkingTree.open_containing(directory)
2738
2719
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
2720
ignored = globbing.Globster(name_pattern_list)
2740
2721
matches = []
2766
2747
2767
2748
encoding_type = 'replace'
2768
2749
_see_also = ['ignore', 'ls']
2750
takes_options = ['directory']
2769
2751
2770
2752
@display_command
2771
def run(self):
2772
tree = WorkingTree.open_containing(u'.')[0]
2773
tree.lock_read()
2774
self.add_cleanup(tree.unlock)
2753
def run(self, directory=u'.'):
2754
tree = WorkingTree.open_containing(directory)[0]
2755
self.add_cleanup(tree.lock_read().unlock)
2775
2756
for path, file_class, kind, file_id, entry in tree.list_files():
2776
2757
if file_class != 'I':
2777
2758
continue
2788
2769
"""
2789
2770
hidden = True
2790
2771
takes_args = ['revno']
2772
takes_options = ['directory']
2791
2773
2792
2774
@display_command
2793
def run(self, revno):
2775
def run(self, revno, directory=u'.'):
2794
2776
try:
2795
2777
revno = int(revno)
2796
2778
except ValueError:
2797
2779
raise errors.BzrCommandError("not a valid revision-number: %r"
2798
2780
% revno)
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2781
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2800
2782
self.outf.write("%s\n" % revid)
2801
2783
2802
2784
2829
2811
================= =========================
2830
2812
"""
2831
2813
takes_args = ['dest', 'branch_or_subdir?']
2832
takes_options = [
2814
takes_options = ['directory',
2833
2815
Option('format',
2834
2816
help="Type of file to export to.",
2835
2817
type=unicode),
2844
2826
'revision in which it was changed.'),
2845
2827
]
2846
2828
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2829
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2848
2830
from bzrlib.export import export
2849
2831
2850
2832
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
2833
tree = WorkingTree.open_containing(directory)[0]
2852
2834
b = tree.branch
2853
2835
subdir = None
2854
2836
else:
2873
2855
"""
2874
2856
2875
2857
_see_also = ['ls']
2876
takes_options = [
2858
takes_options = ['directory',
2877
2859
Option('name-from-revision', help='The path name in the old tree.'),
2878
2860
Option('filters', help='Apply content filters to display the '
2879
2861
'convenience form.'),
2884
2866
2885
2867
@display_command
2886
2868
def run(self, filename, revision=None, name_from_revision=False,
2887
filters=False):
2869
filters=False, directory=None):
2888
2870
if revision is not None and len(revision) != 1:
2889
2871
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
2872
" one revision specifier")
2891
2873
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2893
branch.lock_read()
2894
self.add_cleanup(branch.unlock)
2874
_open_directory_or_containing_tree_or_branch(filename, directory)
2875
self.add_cleanup(branch.lock_read().unlock)
2895
2876
return self._run(tree, branch, relpath, filename, revision,
2896
2877
name_from_revision, filters)
2897
2878
2900
2881
if tree is None:
2901
2882
tree = b.basis_tree()
2902
2883
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2884
self.add_cleanup(rev_tree.lock_read().unlock)
2905
2885
2906
2886
old_file_id = rev_tree.path2id(relpath)
2907
2887
3169
3149
def get_message(commit_obj):
3170
3150
"""Callback to get commit message"""
3171
3151
if file:
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3152
f = codecs.open(file, 'rt', osutils.get_user_encoding())
3153
try:
3154
my_message = f.read()
3155
finally:
3156
f.close()
3174
3157
elif message is not None:
3175
3158
my_message = message
3176
3159
else:
3380
3363
3381
3364
_see_also = ['info']
3382
3365
takes_args = ['nickname?']
3383
def run(self, nickname=None):
3384
branch = Branch.open_containing(u'.')[0]
3366
takes_options = ['directory']
3367
def run(self, nickname=None, directory=u'.'):
3368
branch = Branch.open_containing(directory)[0]
3385
3369
if nickname is None:
3386
3370
self.printme(branch)
3387
3371
else:
3612
3596
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3597
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3598
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3599
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3600
# following code can be deleted when it's sufficiently deployed
3601
# -- vila/mgz 20100514
3602
if (sys.platform == "win32"
3603
and getattr(sys.stdout, 'fileno', None) is not None):
3616
3604
import msvcrt
3617
3605
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3618
3606
if parallel:
3690
3678
3691
3679
branch1 = Branch.open_containing(branch)[0]
3692
3680
branch2 = Branch.open_containing(other)[0]
3693
branch1.lock_read()
3694
self.add_cleanup(branch1.unlock)
3695
branch2.lock_read()
3696
self.add_cleanup(branch2.unlock)
3681
self.add_cleanup(branch1.lock_read().unlock)
3682
self.add_cleanup(branch2.lock_read().unlock)
3697
3683
last1 = ensure_null(branch1.last_revision())
3698
3684
last2 = ensure_null(branch2.last_revision())
3699
3685
3793
3779
' completely merged into the source, pull from the'
3794
3780
' source rather than merging. When this happens,'
3795
3781
' you do not need to commit the result.'),
3796
Option('directory',
3782
custom_help('directory',
3797
3783
help='Branch to merge into, '
3798
'rather than the one containing the working directory.',
3799
short_name='d',
3800
type=unicode,
3801
),
3784
'rather than the one containing the working directory.'),
3802
3785
Option('preview', help='Instead of merging, show a diff of the'
3803
3786
' merge.'),
3804
3787
Option('interactive', help='Select changes interactively.',
3837
3820
unversioned_filter=tree.is_ignored, view_info=view_info)
3838
3821
pb = ui.ui_factory.nested_progress_bar()
3839
3822
self.add_cleanup(pb.finished)
3840
tree.lock_write()
3841
self.add_cleanup(tree.unlock)
3823
self.add_cleanup(tree.lock_write().unlock)
3842
3824
if location is not None:
3843
3825
try:
3844
3826
mergeable = bundle.read_mergeable_from_url(location,
3905
3887
def _do_preview(self, merger):
3906
3888
from bzrlib.diff import show_diff_trees
3907
3889
result_tree = self._get_preview(merger)
3890
path_encoding = osutils.get_diff_header_encoding()
3908
3891
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
3892
old_label='', new_label='',
3893
path_encoding=path_encoding)
3910
3894
3911
3895
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
3896
merger.change_reporter = change_reporter
4100
4084
if merge_type is None:
4101
4085
merge_type = _mod_merge.Merge3Merger
4102
4086
tree, file_list = tree_files(file_list)
4103
tree.lock_write()
4104
self.add_cleanup(tree.unlock)
4087
self.add_cleanup(tree.lock_write().unlock)
4105
4088
parents = tree.get_parent_ids()
4106
4089
if len(parents) != 2:
4107
4090
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4217
4200
def run(self, revision=None, no_backup=False, file_list=None,
4218
4201
forget_merges=None):
4219
4202
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4203
self.add_cleanup(tree.lock_tree_write().unlock)
4222
4204
if forget_merges:
4223
4205
tree.set_parent_ids(tree.get_parent_ids()[:1])
4224
4206
else:
4360
4342
restrict = 'remote'
4361
4343
4362
4344
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4345
self.add_cleanup(local_branch.lock_read().unlock)
4365
4346
4366
4347
parent = local_branch.get_parent()
4367
4348
if other_branch is None:
4378
4359
if remote_branch.base == local_branch.base:
4379
4360
remote_branch = local_branch
4380
4361
else:
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4362
self.add_cleanup(remote_branch.lock_read().unlock)
4383
4363
4384
4364
local_revid_range = _revision_range_to_revid_range(
4385
4365
_get_revision_range(my_revision, local_branch,
4440
4420
message("Branches are up to date.\n")
4441
4421
self.cleanup_now()
4442
4422
if not status_code and parent is None and other_branch is not None:
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4423
self.add_cleanup(local_branch.lock_write().unlock)
4445
4424
# handle race conditions - a parent might be set while we run.
4446
4425
if local_branch.get_parent() is None:
4447
4426
local_branch.set_parent(remote_branch.base)
4547
4526
b = Branch.open_containing(branch)[0]
4548
4527
else:
4549
4528
b = Branch.open(branch)
4550
b.lock_read()
4551
self.add_cleanup(b.unlock)
4529
self.add_cleanup(b.lock_read().unlock)
4552
4530
if revision is None:
4553
4531
rev_id = b.last_revision()
4554
4532
else:
4578
4556
Option('long', help='Show commit date in annotations.'),
4579
4557
'revision',
4580
4558
'show-ids',
4559
'directory',
4581
4560
]
4582
4561
encoding_type = 'exact'
4583
4562
4584
4563
@display_command
4585
4564
def run(self, filename, all=False, long=False, revision=None,
4586
show_ids=False):
4565
show_ids=False, directory=None):
4587
4566
from bzrlib.annotate import annotate_file, annotate_file_tree
4588
4567
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4568
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4569
if wt is not None:
4591
wt.lock_read()
4592
self.add_cleanup(wt.unlock)
4570
self.add_cleanup(wt.lock_read().unlock)
4593
4571
else:
4594
branch.lock_read()
4595
self.add_cleanup(branch.unlock)
4572
self.add_cleanup(branch.lock_read().unlock)
4596
4573
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4597
tree.lock_read()
4598
self.add_cleanup(tree.unlock)
4574
self.add_cleanup(tree.lock_read().unlock)
4599
4575
if wt is not None:
4600
4576
file_id = wt.path2id(relpath)
4601
4577
else:
4619
4595
4620
4596
hidden = True # is this right ?
4621
4597
takes_args = ['revision_id*']
4622
takes_options = ['revision']
4598
takes_options = ['directory', 'revision']
4623
4599
4624
def run(self, revision_id_list=None, revision=None):
4600
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4601
if revision_id_list is not None and revision is not None:
4626
4602
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4627
4603
if revision_id_list is None and revision is None:
4628
4604
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4630
b.lock_write()
4631
self.add_cleanup(b.unlock)
4605
b = WorkingTree.open_containing(directory)[0].branch
4606
self.add_cleanup(b.lock_write().unlock)
4632
4607
return self._run(b, revision_id_list, revision)
4633
4608
4634
4609
def _run(self, b, revision_id_list, revision):
4693
4668
4694
4669
_see_also = ['checkouts', 'unbind']
4695
4670
takes_args = ['location?']
4696
takes_options = []
4671
takes_options = ['directory']
4697
4672
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4673
def run(self, location=None, directory=u'.'):
4674
b, relpath = Branch.open_containing(directory)
4700
4675
if location is None:
4701
4676
try:
4702
4677
location = b.get_old_bound_location()
4729
4704
4730
4705
_see_also = ['checkouts', 'bind']
4731
4706
takes_args = []
4732
takes_options = []
4707
takes_options = ['directory']
4733
4708
4734
def run(self):
4735
b, relpath = Branch.open_containing(u'.')
4709
def run(self, directory=u'.'):
4710
b, relpath = Branch.open_containing(directory)
4736
4711
if not b.unbind():
4737
4712
raise errors.BzrCommandError('Local branch is not bound')
4738
4713
4784
4759
b = control.open_branch()
4785
4760
4786
4761
if tree is not None:
4787
tree.lock_write()
4788
self.add_cleanup(tree.unlock)
4762
self.add_cleanup(tree.lock_write().unlock)
4789
4763
else:
4790
b.lock_write()
4791
self.add_cleanup(b.unlock)
4764
self.add_cleanup(b.lock_write().unlock)
4792
4765
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4793
4766
4794
4767
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4902
4875
'result in a dynamically allocated port. The default port '
4903
4876
'depends on the protocol.',
4904
4877
type=str),
4905
Option('directory',
4906
help='Serve contents of this directory.',
4907
type=unicode),
4878
custom_help('directory',
4879
help='Serve contents of this directory.'),
4908
4880
Option('allow-writes',
4909
4881
help='By default the server is a readonly server. Supplying '
4910
4882
'--allow-writes enables write access to the contents of '
5339
5311
Option('delete',
5340
5312
help='Delete this tag rather than placing it.',
5341
5313
),
5342
Option('directory',
5343
help='Branch in which to place the tag.',
5344
short_name='d',
5345
type=unicode,
5346
),
5314
custom_help('directory',
5315
help='Branch in which to place the tag.'),
5347
5316
Option('force',
5348
5317
help='Replace existing tags.',
5349
5318
),
5357
5326
revision=None,
5358
5327
):
5359
5328
branch, relpath = Branch.open_containing(directory)
5360
branch.lock_write()
5361
self.add_cleanup(branch.unlock)
5329
self.add_cleanup(branch.lock_write().unlock)
5362
5330
if delete:
5363
5331
if tag_name is None:
5364
5332
raise errors.BzrCommandError("No tag specified to delete.")
5392
5360
5393
5361
_see_also = ['tag']
5394
5362
takes_options = [
5395
Option('directory',
5396
help='Branch whose tags should be displayed.',
5397
short_name='d',
5398
type=unicode,
5399
),
5363
custom_help('directory',
5364
help='Branch whose tags should be displayed.'),
5400
5365
RegistryOption.from_kwargs('sort',
5401
5366
'Sort tags by different criteria.', title='Sorting',
5402
5367
alpha='Sort tags lexicographically (default).',
5419
5384
if not tags:
5420
5385
return
5421
5386
5422
branch.lock_read()
5423
self.add_cleanup(branch.unlock)
5387
self.add_cleanup(branch.lock_read().unlock)
5424
5388
if revision:
5425
5389
graph = branch.repository.get_graph()
5426
5390
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5904
5868
5905
5869
def run_for_list(self):
5906
5870
tree = WorkingTree.open_containing('.')[0]
5907
tree.lock_read()
5908
self.add_cleanup(tree.unlock)
5871
self.add_cleanup(tree.lock_read().unlock)
5909
5872
manager = tree.get_shelf_manager()
5910
5873
shelves = manager.active_shelves()
5911
5874
if len(shelves) == 0:
5966
5929
5967
5930
To check what clean-tree will do, use --dry-run.
5968
5931
"""
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5932
takes_options = ['directory',
5933
Option('ignored', help='Delete all ignored files.'),
5970
5934
Option('detritus', help='Delete conflict files, merge'
5971
5935
' backups, and failed selftest dirs.'),
5972
5936
Option('unknown',
5975
5939
' deleting them.'),
5976
5940
Option('force', help='Do not prompt before deleting.')]
5977
5941
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5978
force=False):
5942
force=False, directory=u'.'):
5979
5943
from bzrlib.clean_tree import clean_tree
5980
5944
if not (unknown or ignored or detritus):
5981
5945
unknown = True
5982
5946
if dry_run:
5983
5947
force = True
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
5948
clean_tree(directory, unknown=unknown, ignored=ignored,
5949
detritus=detritus, dry_run=dry_run, no_prompt=force)
5986
5950
5987
5951
5988
5952
class cmd_reference(Command):
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0