/brz/remove-bazaar

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

  • Committer: Parth Malwankar
  • Date: 2010-05-05 04:08:11 UTC
  • mfrom: (5205 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5216.
  • Revision ID: parth.malwankar@gmail.com-20100505040811-2th2a48s7wak2p9d
merged in changes from trunk and resolved conflict in builtins.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
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'
2003
2002
    # level of effort but possibly much less IO.  (Or possibly not,
2004
2003
    # if the directories are very large...)
2005
2004
    _see_also = ['status', 'ls']
2006
 
    takes_options = ['show-ids']
 
2005
    takes_options = ['directory', 'show-ids']
2007
2006
 
2008
2007
    @display_command
2009
 
    def run(self, show_ids=False):
2010
 
        tree = WorkingTree.open_containing(u'.')[0]
 
2008
    def run(self, show_ids=False, directory=u'.'):
 
2009
        tree = WorkingTree.open_containing(directory)[0]
2011
2010
        tree.lock_read()
2012
2011
        self.add_cleanup(tree.unlock)
2013
2012
        old = tree.basis_tree()
2028
2027
 
2029
2028
    hidden = True
2030
2029
    _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
 
            ]
 
2030
    takes_options = ['directory', 'null']
2036
2031
 
2037
2032
    @display_command
2038
 
    def run(self, null=False):
2039
 
        tree = WorkingTree.open_containing(u'.')[0]
 
2033
    def run(self, null=False, directory=u'.'):
 
2034
        tree = WorkingTree.open_containing(directory)[0]
2040
2035
        td = tree.changes_from(tree.basis_tree())
2041
2036
        for path, id, kind, text_modified, meta_modified in td.modified:
2042
2037
            if null:
2051
2046
 
2052
2047
    hidden = True
2053
2048
    _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
 
            ]
 
2049
    takes_options = ['directory', 'null']
2059
2050
 
2060
2051
    @display_command
2061
 
    def run(self, null=False):
2062
 
        wt = WorkingTree.open_containing(u'.')[0]
 
2052
    def run(self, null=False, directory=u'.'):
 
2053
        wt = WorkingTree.open_containing(directory)[0]
2063
2054
        wt.lock_read()
2064
2055
        self.add_cleanup(wt.unlock)
2065
2056
        basis = wt.basis_tree()
2073
2064
            if inv.is_root(file_id) and len(basis_inv) == 0:
2074
2065
                continue
2075
2066
            path = inv.id2path(file_id)
2076
 
            if not os.access(osutils.abspath(path), os.F_OK):
 
2067
            if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2077
2068
                continue
2078
2069
            if null:
2079
2070
                self.outf.write(path + '\0')
2528
2519
                   help='Recurse into subdirectories.'),
2529
2520
            Option('from-root',
2530
2521
                   help='Print paths relative to the root of the branch.'),
2531
 
            Option('unknown', help='Print unknown files.'),
 
2522
            Option('unknown', short_name='u',
 
2523
                help='Print unknown files.'),
2532
2524
            Option('versioned', help='Print versioned files.',
2533
2525
                   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',
 
2526
            Option('ignored', short_name='i',
 
2527
                help='Print ignored files.'),
 
2528
            Option('kind', short_name='k',
2539
2529
                   help='List entries of a particular kind: file, directory, symlink.',
2540
2530
                   type=unicode),
 
2531
            'null',
2541
2532
            'show-ids',
 
2533
            'directory',
2542
2534
            ]
2543
2535
    @display_command
2544
2536
    def run(self, revision=None, verbose=False,
2545
2537
            recursive=False, from_root=False,
2546
2538
            unknown=False, versioned=False, ignored=False,
2547
 
            null=False, kind=None, show_ids=False, path=None):
 
2539
            null=False, kind=None, show_ids=False, path=None, directory=None):
2548
2540
 
2549
2541
        if kind and kind not in ('file', 'directory', 'symlink'):
2550
2542
            raise errors.BzrCommandError('invalid kind specified')
2562
2554
                raise errors.BzrCommandError('cannot specify both --from-root'
2563
2555
                                             ' and PATH')
2564
2556
            fs_path = path
2565
 
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2566
 
            fs_path)
 
2557
        tree, branch, relpath = \
 
2558
            _open_directory_or_containing_tree_or_branch(fs_path, directory)
2567
2559
 
2568
2560
        # Calculate the prefix to use
2569
2561
        prefix = None
2638
2630
 
2639
2631
    hidden = True
2640
2632
    _see_also = ['ls']
 
2633
    takes_options = ['directory']
2641
2634
 
2642
2635
    @display_command
2643
 
    def run(self):
2644
 
        for f in WorkingTree.open_containing(u'.')[0].unknowns():
 
2636
    def run(self, directory=u'.'):
 
2637
        for f in WorkingTree.open_containing(directory)[0].unknowns():
2645
2638
            self.outf.write(osutils.quotefn(f) + '\n')
2646
2639
 
2647
2640
 
2712
2705
 
2713
2706
    _see_also = ['status', 'ignored', 'patterns']
2714
2707
    takes_args = ['name_pattern*']
2715
 
    takes_options = [
 
2708
    takes_options = ['directory',
2716
2709
        Option('default-rules',
2717
2710
               help='Display the default ignore rules that bzr uses.')
2718
2711
        ]
2719
2712
 
2720
 
    def run(self, name_pattern_list=None, default_rules=None):
 
2713
    def run(self, name_pattern_list=None, default_rules=None,
 
2714
            directory=u'.'):
2721
2715
        from bzrlib import ignores
2722
2716
        if default_rules is not None:
2723
2717
            # dump the default rules and exit
2734
2728
                (len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
2729
                raise errors.BzrCommandError(
2736
2730
                    "NAME_PATTERN should not be an absolute path")
2737
 
        tree, relpath = WorkingTree.open_containing(u'.')
 
2731
        tree, relpath = WorkingTree.open_containing(directory)
2738
2732
        ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
2733
        ignored = globbing.Globster(name_pattern_list)
2740
2734
        matches = []
2766
2760
 
2767
2761
    encoding_type = 'replace'
2768
2762
    _see_also = ['ignore', 'ls']
 
2763
    takes_options = ['directory']
2769
2764
 
2770
2765
    @display_command
2771
 
    def run(self):
2772
 
        tree = WorkingTree.open_containing(u'.')[0]
 
2766
    def run(self, directory=u'.'):
 
2767
        tree = WorkingTree.open_containing(directory)[0]
2773
2768
        tree.lock_read()
2774
2769
        self.add_cleanup(tree.unlock)
2775
2770
        for path, file_class, kind, file_id, entry in tree.list_files():
2788
2783
    """
2789
2784
    hidden = True
2790
2785
    takes_args = ['revno']
 
2786
    takes_options = ['directory']
2791
2787
 
2792
2788
    @display_command
2793
 
    def run(self, revno):
 
2789
    def run(self, revno, directory=u'.'):
2794
2790
        try:
2795
2791
            revno = int(revno)
2796
2792
        except ValueError:
2797
2793
            raise errors.BzrCommandError("not a valid revision-number: %r"
2798
2794
                                         % revno)
2799
 
        revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
 
2795
        revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2800
2796
        self.outf.write("%s\n" % revid)
2801
2797
 
2802
2798
 
2829
2825
      =================       =========================
2830
2826
    """
2831
2827
    takes_args = ['dest', 'branch_or_subdir?']
2832
 
    takes_options = [
 
2828
    takes_options = ['directory',
2833
2829
        Option('format',
2834
2830
               help="Type of file to export to.",
2835
2831
               type=unicode),
2844
2840
                    'revision in which it was changed.'),
2845
2841
        ]
2846
2842
    def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
 
        root=None, filters=False, per_file_timestamps=False):
 
2843
        root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2848
2844
        from bzrlib.export import export
2849
2845
 
2850
2846
        if branch_or_subdir is None:
2851
 
            tree = WorkingTree.open_containing(u'.')[0]
 
2847
            tree = WorkingTree.open_containing(directory)[0]
2852
2848
            b = tree.branch
2853
2849
            subdir = None
2854
2850
        else:
2873
2869
    """
2874
2870
 
2875
2871
    _see_also = ['ls']
2876
 
    takes_options = [
 
2872
    takes_options = ['directory',
2877
2873
        Option('name-from-revision', help='The path name in the old tree.'),
2878
2874
        Option('filters', help='Apply content filters to display the '
2879
2875
                'convenience form.'),
2884
2880
 
2885
2881
    @display_command
2886
2882
    def run(self, filename, revision=None, name_from_revision=False,
2887
 
            filters=False):
 
2883
            filters=False, directory=None):
2888
2884
        if revision is not None and len(revision) != 1:
2889
2885
            raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
2886
                                         " one revision specifier")
2891
2887
        tree, branch, relpath = \
2892
 
            bzrdir.BzrDir.open_containing_tree_or_branch(filename)
 
2888
            _open_directory_or_containing_tree_or_branch(filename, directory)
2893
2889
        branch.lock_read()
2894
2890
        self.add_cleanup(branch.unlock)
2895
2891
        return self._run(tree, branch, relpath, filename, revision,
3380
3376
 
3381
3377
    _see_also = ['info']
3382
3378
    takes_args = ['nickname?']
3383
 
    def run(self, nickname=None):
3384
 
        branch = Branch.open_containing(u'.')[0]
 
3379
    takes_options = ['directory']
 
3380
    def run(self, nickname=None, directory=u'.'):
 
3381
        branch = Branch.open_containing(directory)[0]
3385
3382
        if nickname is None:
3386
3383
            self.printme(branch)
3387
3384
        else:
3793
3790
                ' completely merged into the source, pull from the'
3794
3791
                ' source rather than merging.  When this happens,'
3795
3792
                ' you do not need to commit the result.'),
3796
 
        Option('directory',
 
3793
        custom_help('directory',
3797
3794
               help='Branch to merge into, '
3798
 
                    'rather than the one containing the working directory.',
3799
 
               short_name='d',
3800
 
               type=unicode,
3801
 
               ),
 
3795
                    'rather than the one containing the working directory.'),
3802
3796
        Option('preview', help='Instead of merging, show a diff of the'
3803
3797
               ' merge.'),
3804
3798
        Option('interactive', help='Select changes interactively.',
4578
4572
                     Option('long', help='Show commit date in annotations.'),
4579
4573
                     'revision',
4580
4574
                     'show-ids',
 
4575
                     'directory',
4581
4576
                     ]
4582
4577
    encoding_type = 'exact'
4583
4578
 
4584
4579
    @display_command
4585
4580
    def run(self, filename, all=False, long=False, revision=None,
4586
 
            show_ids=False):
 
4581
            show_ids=False, directory=None):
4587
4582
        from bzrlib.annotate import annotate_file, annotate_file_tree
4588
4583
        wt, branch, relpath = \
4589
 
            bzrdir.BzrDir.open_containing_tree_or_branch(filename)
 
4584
            _open_directory_or_containing_tree_or_branch(filename, directory)
4590
4585
        if wt is not None:
4591
4586
            wt.lock_read()
4592
4587
            self.add_cleanup(wt.unlock)
4619
4614
 
4620
4615
    hidden = True # is this right ?
4621
4616
    takes_args = ['revision_id*']
4622
 
    takes_options = ['revision']
 
4617
    takes_options = ['directory', 'revision']
4623
4618
 
4624
 
    def run(self, revision_id_list=None, revision=None):
 
4619
    def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4620
        if revision_id_list is not None and revision is not None:
4626
4621
            raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4627
4622
        if revision_id_list is None and revision is None:
4628
4623
            raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
 
        b = WorkingTree.open_containing(u'.')[0].branch
 
4624
        b = WorkingTree.open_containing(directory)[0].branch
4630
4625
        b.lock_write()
4631
4626
        self.add_cleanup(b.unlock)
4632
4627
        return self._run(b, revision_id_list, revision)
4693
4688
 
4694
4689
    _see_also = ['checkouts', 'unbind']
4695
4690
    takes_args = ['location?']
4696
 
    takes_options = []
 
4691
    takes_options = ['directory']
4697
4692
 
4698
 
    def run(self, location=None):
4699
 
        b, relpath = Branch.open_containing(u'.')
 
4693
    def run(self, location=None, directory=u'.'):
 
4694
        b, relpath = Branch.open_containing(directory)
4700
4695
        if location is None:
4701
4696
            try:
4702
4697
                location = b.get_old_bound_location()
4729
4724
 
4730
4725
    _see_also = ['checkouts', 'bind']
4731
4726
    takes_args = []
4732
 
    takes_options = []
 
4727
    takes_options = ['directory']
4733
4728
 
4734
 
    def run(self):
4735
 
        b, relpath = Branch.open_containing(u'.')
 
4729
    def run(self, directory=u'.'):
 
4730
        b, relpath = Branch.open_containing(directory)
4736
4731
        if not b.unbind():
4737
4732
            raise errors.BzrCommandError('Local branch is not bound')
4738
4733
 
4902
4897
                    'result in a dynamically allocated port.  The default port '
4903
4898
                    'depends on the protocol.',
4904
4899
               type=str),
4905
 
        Option('directory',
4906
 
               help='Serve contents of this directory.',
4907
 
               type=unicode),
 
4900
        custom_help('directory',
 
4901
               help='Serve contents of this directory.'),
4908
4902
        Option('allow-writes',
4909
4903
               help='By default the server is a readonly server.  Supplying '
4910
4904
                    '--allow-writes enables write access to the contents of '
5339
5333
        Option('delete',
5340
5334
            help='Delete this tag rather than placing it.',
5341
5335
            ),
5342
 
        Option('directory',
5343
 
            help='Branch in which to place the tag.',
5344
 
            short_name='d',
5345
 
            type=unicode,
5346
 
            ),
 
5336
        custom_help('directory',
 
5337
            help='Branch in which to place the tag.'),
5347
5338
        Option('force',
5348
5339
            help='Replace existing tags.',
5349
5340
            ),
5392
5383
 
5393
5384
    _see_also = ['tag']
5394
5385
    takes_options = [
5395
 
        Option('directory',
5396
 
            help='Branch whose tags should be displayed.',
5397
 
            short_name='d',
5398
 
            type=unicode,
5399
 
            ),
 
5386
        custom_help('directory',
 
5387
            help='Branch whose tags should be displayed.'),
5400
5388
        RegistryOption.from_kwargs('sort',
5401
5389
            'Sort tags by different criteria.', title='Sorting',
5402
5390
            alpha='Sort tags lexicographically (default).',
5966
5954
 
5967
5955
    To check what clean-tree will do, use --dry-run.
5968
5956
    """
5969
 
    takes_options = [Option('ignored', help='Delete all ignored files.'),
 
5957
    takes_options = ['directory',
 
5958
                     Option('ignored', help='Delete all ignored files.'),
5970
5959
                     Option('detritus', help='Delete conflict files, merge'
5971
5960
                            ' backups, and failed selftest dirs.'),
5972
5961
                     Option('unknown',
5975
5964
                            ' deleting them.'),
5976
5965
                     Option('force', help='Do not prompt before deleting.')]
5977
5966
    def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5978
 
            force=False):
 
5967
            force=False, directory=u'.'):
5979
5968
        from bzrlib.clean_tree import clean_tree
5980
5969
        if not (unknown or ignored or detritus):
5981
5970
            unknown = True
5982
5971
        if dry_run:
5983
5972
            force = True
5984
 
        clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
 
                   dry_run=dry_run, no_prompt=force)
 
5973
        clean_tree(directory, unknown=unknown, ignored=ignored,
 
5974
                   detritus=detritus, dry_run=dry_run, no_prompt=force)
5986
5975
 
5987
5976
 
5988
5977
class cmd_reference(Command):