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 5187.2.12
- compare with another revision
- download diff
- download tarball
- view history from revision 5187.2.12
- Committer: Parth Malwankar
- Date: 2010-05-07 06:35:34 UTC
- mto: This revision was merged to the branch mainline in revision 5217.
- Revision ID: parth.malwankar@gmail.com-20100507063534-t0q1azutcw8dk5dq
trivial clarification in docstring.
- files added:
- bzrlib/tests/blackbox/test_deleted.py
- files removed:
- bzrlib/tests/matchers.py
- files modified:
- NEWS
added
removed
bzrlib/builtins.py
232
232
return view_info
233
233
234
234
235
def _open_directory_or_containing_tree_or_branch(filename, directory):
236
"""Open the tree or branch containing the specified file, unless
237
the --directory option is used to specify a different branch."""
238
if directory is not None:
239
return (None, Branch.open(directory), filename)
240
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
241
242
235
243
# TODO: Make sure no commands unconditionally use the working directory as a
236
244
# branch. If a filename argument is used, the first of them should be used to
237
245
# specify the branch. (Perhaps this can be factored out into some kind of
340
348
341
349
hidden = True
342
350
takes_args = ['revision_id?']
343
takes_options = ['revision']
351
takes_options = ['directory', 'revision']
344
352
# cat-revision is more for frontends so should be exact
345
353
encoding = 'strict'
346
354
353
361
self.outf.write(revtext.decode('utf-8'))
354
362
355
363
@display_command
356
def run(self, revision_id=None, revision=None):
364
def run(self, revision_id=None, revision=None, directory=u'.'):
357
365
if revision_id is not None and revision is not None:
358
366
raise errors.BzrCommandError('You can only supply one of'
359
367
' revision_id or --revision')
360
368
if revision_id is None and revision is None:
361
369
raise errors.BzrCommandError('You must supply either'
362
370
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
371
b = WorkingTree.open_containing(directory)[0].branch
364
372
365
373
revisions = b.repository.revisions
366
374
if revisions is None:
554
562
takes_args = ['revision_info*']
555
563
takes_options = [
556
564
'revision',
557
Option('directory',
565
custom_help('directory',
558
566
help='Branch to examine, '
559
'rather than the one containing the working directory.',
560
short_name='d',
561
type=unicode,
562
),
567
'rather than the one containing the working directory.'),
563
568
Option('tree', help='Show revno of working tree'),
564
569
]
565
570
960
965
takes_options = ['remember', 'overwrite', 'revision',
961
966
custom_help('verbose',
962
967
help='Show logs of pulled revisions.'),
963
Option('directory',
968
custom_help('directory',
964
969
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
966
short_name='d',
967
type=unicode,
968
),
970
'rather than the one containing the working directory.'),
969
971
Option('local',
970
972
help="Perform a local pull in a bound "
971
973
"branch. Local pulls are not applied to "
1088
1090
Option('create-prefix',
1089
1091
help='Create the path leading up to the branch '
1090
1092
'if it does not already exist.'),
1091
Option('directory',
1093
custom_help('directory',
1092
1094
help='Branch to push from, '
1093
'rather than the one containing the working directory.',
1094
short_name='d',
1095
type=unicode,
1096
),
1095
'rather than the one containing the working directory.'),
1097
1096
Option('use-existing-dir',
1098
1097
help='By default push will fail if the target'
1099
1098
' directory exists, but does not already'
1350
1349
except errors.NoWorkingTree:
1351
1350
source.bzrdir.create_workingtree(revision_id)
1352
1351
return
1352
1353
if not lightweight:
1354
message = ('Copying history to "%s". '
1355
'To checkout without local history use --lightweight.' % to_location)
1356
ui.ui_factory.show_message(message)
1353
1357
source.create_checkout(to_location, revision_id, lightweight,
1354
1358
accelerator_tree, hardlink)
1355
1359
2003
2007
# level of effort but possibly much less IO. (Or possibly not,
2004
2008
# if the directories are very large...)
2005
2009
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2010
takes_options = ['directory', 'show-ids']
2007
2011
2008
2012
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2013
def run(self, show_ids=False, directory=u'.'):
2014
tree = WorkingTree.open_containing(directory)[0]
2011
2015
tree.lock_read()
2012
2016
self.add_cleanup(tree.unlock)
2013
2017
old = tree.basis_tree()
2028
2032
2029
2033
hidden = True
2030
2034
_see_also = ['status', 'ls']
2031
takes_options = [
2035
takes_options = ['directory',
2032
2036
Option('null',
2033
2037
help='Write an ascii NUL (\\0) separator '
2034
2038
'between files rather than a newline.')
2035
2039
]
2036
2040
2037
2041
@display_command
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2042
def run(self, null=False, directory=u'.'):
2043
tree = WorkingTree.open_containing(directory)[0]
2040
2044
td = tree.changes_from(tree.basis_tree())
2041
2045
for path, id, kind, text_modified, meta_modified in td.modified:
2042
2046
if null:
2051
2055
2052
2056
hidden = True
2053
2057
_see_also = ['status', 'ls']
2054
takes_options = [
2058
takes_options = ['directory',
2055
2059
Option('null',
2056
2060
help='Write an ascii NUL (\\0) separator '
2057
2061
'between files rather than a newline.')
2058
2062
]
2059
2063
2060
2064
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2065
def run(self, null=False, directory=u'.'):
2066
wt = WorkingTree.open_containing(directory)[0]
2063
2067
wt.lock_read()
2064
2068
self.add_cleanup(wt.unlock)
2065
2069
basis = wt.basis_tree()
2073
2077
if inv.is_root(file_id) and len(basis_inv) == 0:
2074
2078
continue
2075
2079
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2080
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2077
2081
continue
2078
2082
if null:
2079
2083
self.outf.write(path + '\0')
2279
2283
help='Show just the specified revision.'
2280
2284
' See also "help revisionspec".'),
2281
2285
'log-format',
2286
RegistryOption('authors',
2287
'What names to list as authors - first, all or committer.',
2288
title='Authors',
2289
lazy_registry=('bzrlib.log', 'author_list_registry'),
2290
),
2282
2291
Option('levels',
2283
2292
short_name='n',
2284
2293
help='Number of levels to display - 0 for all, 1 for flat.',
2319
2328
limit=None,
2320
2329
show_diff=False,
2321
2330
include_merges=False,
2331
authors=None,
2322
2332
exclude_common_ancestry=False,
2323
2333
):
2324
2334
from bzrlib.log import (
2404
2414
show_timezone=timezone,
2405
2415
delta_format=get_verbosity_level(),
2406
2416
levels=levels,
2407
show_advice=levels is None)
2417
show_advice=levels is None,
2418
author_list_handler=authors)
2408
2419
2409
2420
# Choose the algorithm for doing the logging. It's annoying
2410
2421
# having multiple code paths like this but necessary until
2539
2550
help='List entries of a particular kind: file, directory, symlink.',
2540
2551
type=unicode),
2541
2552
'show-ids',
2553
'directory',
2542
2554
]
2543
2555
@display_command
2544
2556
def run(self, revision=None, verbose=False,
2545
2557
recursive=False, from_root=False,
2546
2558
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2559
null=False, kind=None, show_ids=False, path=None, directory=None):
2548
2560
2549
2561
if kind and kind not in ('file', 'directory', 'symlink'):
2550
2562
raise errors.BzrCommandError('invalid kind specified')
2562
2574
raise errors.BzrCommandError('cannot specify both --from-root'
2563
2575
' and PATH')
2564
2576
fs_path = path
2565
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2566
fs_path)
2577
tree, branch, relpath = \
2578
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2567
2579
2568
2580
# Calculate the prefix to use
2569
2581
prefix = None
2638
2650
2639
2651
hidden = True
2640
2652
_see_also = ['ls']
2653
takes_options = ['directory']
2641
2654
2642
2655
@display_command
2643
def run(self):
2644
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2656
def run(self, directory=u'.'):
2657
for f in WorkingTree.open_containing(directory)[0].unknowns():
2645
2658
self.outf.write(osutils.quotefn(f) + '\n')
2646
2659
2647
2660
2712
2725
2713
2726
_see_also = ['status', 'ignored', 'patterns']
2714
2727
takes_args = ['name_pattern*']
2715
takes_options = [
2728
takes_options = ['directory',
2716
2729
Option('default-rules',
2717
2730
help='Display the default ignore rules that bzr uses.')
2718
2731
]
2719
2732
2720
def run(self, name_pattern_list=None, default_rules=None):
2733
def run(self, name_pattern_list=None, default_rules=None,
2734
directory=u'.'):
2721
2735
from bzrlib import ignores
2722
2736
if default_rules is not None:
2723
2737
# dump the default rules and exit
2734
2748
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
2749
raise errors.BzrCommandError(
2736
2750
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
2751
tree, relpath = WorkingTree.open_containing(directory)
2738
2752
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
2753
ignored = globbing.Globster(name_pattern_list)
2740
2754
matches = []
2766
2780
2767
2781
encoding_type = 'replace'
2768
2782
_see_also = ['ignore', 'ls']
2783
takes_options = ['directory']
2769
2784
2770
2785
@display_command
2771
def run(self):
2772
tree = WorkingTree.open_containing(u'.')[0]
2786
def run(self, directory=u'.'):
2787
tree = WorkingTree.open_containing(directory)[0]
2773
2788
tree.lock_read()
2774
2789
self.add_cleanup(tree.unlock)
2775
2790
for path, file_class, kind, file_id, entry in tree.list_files():
2788
2803
"""
2789
2804
hidden = True
2790
2805
takes_args = ['revno']
2806
takes_options = ['directory']
2791
2807
2792
2808
@display_command
2793
def run(self, revno):
2809
def run(self, revno, directory=u'.'):
2794
2810
try:
2795
2811
revno = int(revno)
2796
2812
except ValueError:
2797
2813
raise errors.BzrCommandError("not a valid revision-number: %r"
2798
2814
% revno)
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2815
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2800
2816
self.outf.write("%s\n" % revid)
2801
2817
2802
2818
2829
2845
================= =========================
2830
2846
"""
2831
2847
takes_args = ['dest', 'branch_or_subdir?']
2832
takes_options = [
2848
takes_options = ['directory',
2833
2849
Option('format',
2834
2850
help="Type of file to export to.",
2835
2851
type=unicode),
2844
2860
'revision in which it was changed.'),
2845
2861
]
2846
2862
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2863
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2848
2864
from bzrlib.export import export
2849
2865
2850
2866
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
2867
tree = WorkingTree.open_containing(directory)[0]
2852
2868
b = tree.branch
2853
2869
subdir = None
2854
2870
else:
2873
2889
"""
2874
2890
2875
2891
_see_also = ['ls']
2876
takes_options = [
2892
takes_options = ['directory',
2877
2893
Option('name-from-revision', help='The path name in the old tree.'),
2878
2894
Option('filters', help='Apply content filters to display the '
2879
2895
'convenience form.'),
2884
2900
2885
2901
@display_command
2886
2902
def run(self, filename, revision=None, name_from_revision=False,
2887
filters=False):
2903
filters=False, directory=None):
2888
2904
if revision is not None and len(revision) != 1:
2889
2905
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
2906
" one revision specifier")
2891
2907
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2908
_open_directory_or_containing_tree_or_branch(filename, directory)
2893
2909
branch.lock_read()
2894
2910
self.add_cleanup(branch.unlock)
2895
2911
return self._run(tree, branch, relpath, filename, revision,
3380
3396
3381
3397
_see_also = ['info']
3382
3398
takes_args = ['nickname?']
3383
def run(self, nickname=None):
3384
branch = Branch.open_containing(u'.')[0]
3399
takes_options = ['directory']
3400
def run(self, nickname=None, directory=u'.'):
3401
branch = Branch.open_containing(directory)[0]
3385
3402
if nickname is None:
3386
3403
self.printme(branch)
3387
3404
else:
3793
3810
' completely merged into the source, pull from the'
3794
3811
' source rather than merging. When this happens,'
3795
3812
' you do not need to commit the result.'),
3796
Option('directory',
3813
custom_help('directory',
3797
3814
help='Branch to merge into, '
3798
'rather than the one containing the working directory.',
3799
short_name='d',
3800
type=unicode,
3801
),
3815
'rather than the one containing the working directory.'),
3802
3816
Option('preview', help='Instead of merging, show a diff of the'
3803
3817
' merge.'),
3804
3818
Option('interactive', help='Select changes interactively.',
4578
4592
Option('long', help='Show commit date in annotations.'),
4579
4593
'revision',
4580
4594
'show-ids',
4595
'directory',
4581
4596
]
4582
4597
encoding_type = 'exact'
4583
4598
4584
4599
@display_command
4585
4600
def run(self, filename, all=False, long=False, revision=None,
4586
show_ids=False):
4601
show_ids=False, directory=None):
4587
4602
from bzrlib.annotate import annotate_file, annotate_file_tree
4588
4603
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4604
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4605
if wt is not None:
4591
4606
wt.lock_read()
4592
4607
self.add_cleanup(wt.unlock)
4619
4634
4620
4635
hidden = True # is this right ?
4621
4636
takes_args = ['revision_id*']
4622
takes_options = ['revision']
4637
takes_options = ['directory', 'revision']
4623
4638
4624
def run(self, revision_id_list=None, revision=None):
4639
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4640
if revision_id_list is not None and revision is not None:
4626
4641
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4627
4642
if revision_id_list is None and revision is None:
4628
4643
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4644
b = WorkingTree.open_containing(directory)[0].branch
4630
4645
b.lock_write()
4631
4646
self.add_cleanup(b.unlock)
4632
4647
return self._run(b, revision_id_list, revision)
4693
4708
4694
4709
_see_also = ['checkouts', 'unbind']
4695
4710
takes_args = ['location?']
4696
takes_options = []
4711
takes_options = ['directory']
4697
4712
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4713
def run(self, location=None, directory=u'.'):
4714
b, relpath = Branch.open_containing(directory)
4700
4715
if location is None:
4701
4716
try:
4702
4717
location = b.get_old_bound_location()
4729
4744
4730
4745
_see_also = ['checkouts', 'bind']
4731
4746
takes_args = []
4732
takes_options = []
4747
takes_options = ['directory']
4733
4748
4734
def run(self):
4735
b, relpath = Branch.open_containing(u'.')
4749
def run(self, directory=u'.'):
4750
b, relpath = Branch.open_containing(directory)
4736
4751
if not b.unbind():
4737
4752
raise errors.BzrCommandError('Local branch is not bound')
4738
4753
4902
4917
'result in a dynamically allocated port. The default port '
4903
4918
'depends on the protocol.',
4904
4919
type=str),
4905
Option('directory',
4906
help='Serve contents of this directory.',
4907
type=unicode),
4920
custom_help('directory',
4921
help='Serve contents of this directory.'),
4908
4922
Option('allow-writes',
4909
4923
help='By default the server is a readonly server. Supplying '
4910
4924
'--allow-writes enables write access to the contents of '
5339
5353
Option('delete',
5340
5354
help='Delete this tag rather than placing it.',
5341
5355
),
5342
Option('directory',
5343
help='Branch in which to place the tag.',
5344
short_name='d',
5345
type=unicode,
5346
),
5356
custom_help('directory',
5357
help='Branch in which to place the tag.'),
5347
5358
Option('force',
5348
5359
help='Replace existing tags.',
5349
5360
),
5392
5403
5393
5404
_see_also = ['tag']
5394
5405
takes_options = [
5395
Option('directory',
5396
help='Branch whose tags should be displayed.',
5397
short_name='d',
5398
type=unicode,
5399
),
5406
custom_help('directory',
5407
help='Branch whose tags should be displayed.'),
5400
5408
RegistryOption.from_kwargs('sort',
5401
5409
'Sort tags by different criteria.', title='Sorting',
5402
5410
alpha='Sort tags lexicographically (default).',
5966
5974
5967
5975
To check what clean-tree will do, use --dry-run.
5968
5976
"""
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5977
takes_options = ['directory',
5978
Option('ignored', help='Delete all ignored files.'),
5970
5979
Option('detritus', help='Delete conflict files, merge'
5971
5980
' backups, and failed selftest dirs.'),
5972
5981
Option('unknown',
5975
5984
' deleting them.'),
5976
5985
Option('force', help='Do not prompt before deleting.')]
5977
5986
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5978
force=False):
5987
force=False, directory=u'.'):
5979
5988
from bzrlib.clean_tree import clean_tree
5980
5989
if not (unknown or ignored or detritus):
5981
5990
unknown = True
5982
5991
if dry_run:
5983
5992
force = True
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
5993
clean_tree(directory, unknown=unknown, ignored=ignored,
5994
detritus=detritus, dry_run=dry_run, no_prompt=force)
5986
5995
5987
5996
5988
5997
class cmd_reference(Command):
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0