~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

(jameinel) Handle [:digit:] globbing tests better for python2.7 (Martin [gz])

Show diffs side-by-side

added added

removed removed

Lines of Context:
75
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
76
76
 
77
77
 
 
78
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
79
def tree_files(file_list, default_branch=u'.', canonicalize=True,
79
80
    apply_view=True):
80
 
    try:
81
 
        return internal_tree_files(file_list, default_branch, canonicalize,
82
 
            apply_view)
83
 
    except errors.FileInWrongBranch, e:
84
 
        raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
 
                                     (e.path, file_list[0]))
 
81
    return internal_tree_files(file_list, default_branch, canonicalize,
 
82
        apply_view)
86
83
 
87
84
 
88
85
def tree_files_for_add(file_list):
152
149
 
153
150
# XXX: Bad function name; should possibly also be a class method of
154
151
# WorkingTree rather than a function.
 
152
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
155
153
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
154
    apply_view=True):
157
155
    """Convert command-line paths to a WorkingTree and relative paths.
158
156
 
 
157
    Deprecated: use WorkingTree.open_containing_paths instead.
 
158
 
159
159
    This is typically used for command-line processors that take one or
160
160
    more filenames, and infer the workingtree that contains them.
161
161
 
171
171
 
172
172
    :return: workingtree, [relative_paths]
173
173
    """
174
 
    if file_list is None or len(file_list) == 0:
175
 
        tree = WorkingTree.open_containing(default_branch)[0]
176
 
        if tree.supports_views() and apply_view:
177
 
            view_files = tree.views.lookup_view()
178
 
            if view_files:
179
 
                file_list = view_files
180
 
                view_str = views.view_display_str(view_files)
181
 
                note("Ignoring files outside view. View is %s" % view_str)
182
 
        return tree, file_list
183
 
    tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
 
    return tree, safe_relpath_files(tree, file_list, canonicalize,
185
 
        apply_view=apply_view)
186
 
 
187
 
 
188
 
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
 
    """Convert file_list into a list of relpaths in tree.
190
 
 
191
 
    :param tree: A tree to operate on.
192
 
    :param file_list: A list of user provided paths or None.
193
 
    :param apply_view: if True and a view is set, apply it or check that
194
 
        specified files are within it
195
 
    :return: A list of relative paths.
196
 
    :raises errors.PathNotChild: When a provided path is in a different tree
197
 
        than tree.
198
 
    """
199
 
    if file_list is None:
200
 
        return None
201
 
    if tree.supports_views() and apply_view:
202
 
        view_files = tree.views.lookup_view()
203
 
    else:
204
 
        view_files = []
205
 
    new_list = []
206
 
    # tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
 
    # doesn't - fix that up here before we enter the loop.
208
 
    if canonicalize:
209
 
        fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
210
 
    else:
211
 
        fixer = tree.relpath
212
 
    for filename in file_list:
213
 
        try:
214
 
            relpath = fixer(osutils.dereference_path(filename))
215
 
            if  view_files and not osutils.is_inside_any(view_files, relpath):
216
 
                raise errors.FileOutsideView(filename, view_files)
217
 
            new_list.append(relpath)
218
 
        except errors.PathNotChild:
219
 
            raise errors.FileInWrongBranch(tree.branch, filename)
220
 
    return new_list
 
174
    return WorkingTree.open_containing_paths(
 
175
        file_list, default_directory='.',
 
176
        canonicalize=True,
 
177
        apply_view=True)
221
178
 
222
179
 
223
180
def _get_view_info_for_change_reporter(tree):
232
189
    return view_info
233
190
 
234
191
 
 
192
def _open_directory_or_containing_tree_or_branch(filename, directory):
 
193
    """Open the tree or branch containing the specified file, unless
 
194
    the --directory option is used to specify a different branch."""
 
195
    if directory is not None:
 
196
        return (None, Branch.open(directory), filename)
 
197
    return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
 
198
 
 
199
 
235
200
# TODO: Make sure no commands unconditionally use the working directory as a
236
201
# branch.  If a filename argument is used, the first of them should be used to
237
202
# specify the branch.  (Perhaps this can be factored out into some kind of
315
280
            raise errors.BzrCommandError('bzr status --revision takes exactly'
316
281
                                         ' one or two revision specifiers')
317
282
 
318
 
        tree, relfile_list = tree_files(file_list)
 
283
        tree, relfile_list = WorkingTree.open_containing_paths(file_list)
319
284
        # Avoid asking for specific files when that is not needed.
320
285
        if relfile_list == ['']:
321
286
            relfile_list = None
340
305
 
341
306
    hidden = True
342
307
    takes_args = ['revision_id?']
343
 
    takes_options = ['revision']
 
308
    takes_options = ['directory', 'revision']
344
309
    # cat-revision is more for frontends so should be exact
345
310
    encoding = 'strict'
346
311
 
353
318
        self.outf.write(revtext.decode('utf-8'))
354
319
 
355
320
    @display_command
356
 
    def run(self, revision_id=None, revision=None):
 
321
    def run(self, revision_id=None, revision=None, directory=u'.'):
357
322
        if revision_id is not None and revision is not None:
358
323
            raise errors.BzrCommandError('You can only supply one of'
359
324
                                         ' revision_id or --revision')
360
325
        if revision_id is None and revision is None:
361
326
            raise errors.BzrCommandError('You must supply either'
362
327
                                         ' --revision or a revision_id')
363
 
        b = WorkingTree.open_containing(u'.')[0].branch
 
328
        b = WorkingTree.open_containing(directory)[0].branch
364
329
 
365
330
        revisions = b.repository.revisions
366
331
        if revisions is None:
483
448
    takes_options = [
484
449
        Option('force',
485
450
               help='Remove the working tree even if it has '
486
 
                    'uncommitted changes.'),
 
451
                    'uncommitted or shelved changes.'),
487
452
        ]
488
453
 
489
454
    def run(self, location_list, force=False):
503
468
            if not force:
504
469
                if (working.has_changes()):
505
470
                    raise errors.UncommittedChanges(working)
 
471
                if working.get_shelf_manager().last_shelf() is not None:
 
472
                    raise errors.ShelvedChanges(working)
506
473
 
507
474
            if working.user_url != working.branch.user_url:
508
475
                raise errors.BzrCommandError("You cannot remove the working tree"
552
519
    takes_args = ['revision_info*']
553
520
    takes_options = [
554
521
        'revision',
555
 
        Option('directory',
 
522
        custom_help('directory',
556
523
            help='Branch to examine, '
557
 
                 'rather than the one containing the working directory.',
558
 
            short_name='d',
559
 
            type=unicode,
560
 
            ),
 
524
                 'rather than the one containing the working directory.'),
561
525
        Option('tree', help='Show revno of working tree'),
562
526
        ]
563
527
 
754
718
            raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
755
719
 
756
720
        revision = _get_one_revision('inventory', revision)
757
 
        work_tree, file_list = tree_files(file_list)
 
721
        work_tree, file_list = WorkingTree.open_containing_paths(file_list)
758
722
        self.add_cleanup(work_tree.lock_read().unlock)
759
723
        if revision is not None:
760
724
            tree = revision.as_tree(work_tree.branch)
825
789
            names_list = []
826
790
        if len(names_list) < 2:
827
791
            raise errors.BzrCommandError("missing file argument")
828
 
        tree, rel_names = tree_files(names_list, canonicalize=False)
 
792
        tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
829
793
        self.add_cleanup(tree.lock_tree_write().unlock)
830
794
        self._run(tree, names_list, rel_names, after)
831
795
 
836
800
        if after:
837
801
            raise errors.BzrCommandError('--after cannot be specified with'
838
802
                                         ' --auto.')
839
 
        work_tree, file_list = tree_files(names_list, default_branch='.')
 
803
        work_tree, file_list = WorkingTree.open_containing_paths(
 
804
            names_list, default_directory='.')
840
805
        self.add_cleanup(work_tree.lock_tree_write().unlock)
841
806
        rename_map.RenameMap.guess_renames(work_tree, dry_run)
842
807
 
951
916
    takes_options = ['remember', 'overwrite', 'revision',
952
917
        custom_help('verbose',
953
918
            help='Show logs of pulled revisions.'),
954
 
        Option('directory',
 
919
        custom_help('directory',
955
920
            help='Branch to pull into, '
956
 
                 'rather than the one containing the working directory.',
957
 
            short_name='d',
958
 
            type=unicode,
959
 
            ),
 
921
                 'rather than the one containing the working directory.'),
960
922
        Option('local',
961
923
            help="Perform a local pull in a bound "
962
924
                 "branch.  Local pulls are not applied to "
1076
1038
        Option('create-prefix',
1077
1039
               help='Create the path leading up to the branch '
1078
1040
                    'if it does not already exist.'),
1079
 
        Option('directory',
 
1041
        custom_help('directory',
1080
1042
            help='Branch to push from, '
1081
 
                 'rather than the one containing the working directory.',
1082
 
            short_name='d',
1083
 
            type=unicode,
1084
 
            ),
 
1043
                 'rather than the one containing the working directory.'),
1085
1044
        Option('use-existing-dir',
1086
1045
               help='By default push will fail if the target'
1087
1046
                    ' directory exists, but does not already'
1176
1135
 
1177
1136
    _see_also = ['checkout']
1178
1137
    takes_args = ['from_location', 'to_location?']
1179
 
    takes_options = ['revision', Option('hardlink',
1180
 
        help='Hard-link working tree files where possible.'),
 
1138
    takes_options = ['revision',
 
1139
        Option('hardlink', help='Hard-link working tree files where possible.'),
 
1140
        Option('files-from', type=str,
 
1141
               help="Get file contents from this tree."),
1181
1142
        Option('no-tree',
1182
1143
            help="Create a branch without a working-tree."),
1183
1144
        Option('switch',
1201
1162
 
1202
1163
    def run(self, from_location, to_location=None, revision=None,
1203
1164
            hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
 
            use_existing_dir=False, switch=False, bind=False):
 
1165
            use_existing_dir=False, switch=False, bind=False,
 
1166
            files_from=None):
1205
1167
        from bzrlib import switch as _mod_switch
1206
1168
        from bzrlib.tag import _merge_tags_if_possible
1207
1169
        accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1208
1170
            from_location)
 
1171
        if not (hardlink or files_from):
 
1172
            # accelerator_tree is usually slower because you have to read N
 
1173
            # files (no readahead, lots of seeks, etc), but allow the user to
 
1174
            # explicitly request it
 
1175
            accelerator_tree = None
 
1176
        if files_from is not None and files_from != from_location:
 
1177
            accelerator_tree = WorkingTree.open(files_from)
1209
1178
        revision = _get_one_revision('branch', revision)
1210
1179
        self.add_cleanup(br_from.lock_read().unlock)
1211
1180
        if revision is not None:
1318
1287
            to_location = branch_location
1319
1288
        accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1320
1289
            branch_location)
 
1290
        if not (hardlink or files_from):
 
1291
            # accelerator_tree is usually slower because you have to read N
 
1292
            # files (no readahead, lots of seeks, etc), but allow the user to
 
1293
            # explicitly request it
 
1294
            accelerator_tree = None
1321
1295
        revision = _get_one_revision('checkout', revision)
1322
 
        if files_from is not None:
 
1296
        if files_from is not None and files_from != branch_location:
1323
1297
            accelerator_tree = WorkingTree.open(files_from)
1324
1298
        if revision is not None:
1325
1299
            revision_id = revision.as_revision_id(source)
1525
1499
 
1526
1500
    def run(self, file_list, verbose=False, new=False,
1527
1501
        file_deletion_strategy='safe'):
1528
 
        tree, file_list = tree_files(file_list)
 
1502
        tree, file_list = WorkingTree.open_containing_paths(file_list)
1529
1503
 
1530
1504
        if file_list is not None:
1531
1505
            file_list = [f for f in file_list]
1910
1884
    takes_args = ['file*']
1911
1885
    takes_options = [
1912
1886
        Option('diff-options', type=str,
1913
 
               help='Pass these options to the external diff program.'),
 
1887
               help='Pass these options to the diff program.'),
1914
1888
        Option('prefix', type=str,
1915
1889
               short_name='p',
1916
1890
               help='Set prefixes added to old and new filenames, as '
1957
1931
                '--prefix expects two values separated by a colon'
1958
1932
                ' (eg "old/:new/")')
1959
1933
 
 
1934
        if using is not None and diff_options is not None:
 
1935
            raise errors.BzrCommandError(
 
1936
            '--diff-options and --using are mutually exclusive.')
 
1937
 
1960
1938
        if revision and len(revision) > 2:
1961
1939
            raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1940
                                         ' one or two revision specifiers')
1969
1947
         old_branch, new_branch,
1970
1948
         specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
1949
            file_list, revision, old, new, self.add_cleanup, apply_view=True)
 
1950
        # GNU diff on Windows uses ANSI encoding for filenames
 
1951
        path_encoding = osutils.get_diff_header_encoding()
1972
1952
        return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1953
                               specific_files=specific_files,
1974
1954
                               external_diff_options=diff_options,
1975
1955
                               old_label=old_label, new_label=new_label,
1976
 
                               extra_trees=extra_trees, using=using,
 
1956
                               extra_trees=extra_trees,
 
1957
                               path_encoding=path_encoding,
 
1958
                               using=using,
1977
1959
                               format_cls=format)
1978
1960
 
1979
1961
 
1987
1969
    # level of effort but possibly much less IO.  (Or possibly not,
1988
1970
    # if the directories are very large...)
1989
1971
    _see_also = ['status', 'ls']
1990
 
    takes_options = ['show-ids']
 
1972
    takes_options = ['directory', 'show-ids']
1991
1973
 
1992
1974
    @display_command
1993
 
    def run(self, show_ids=False):
1994
 
        tree = WorkingTree.open_containing(u'.')[0]
 
1975
    def run(self, show_ids=False, directory=u'.'):
 
1976
        tree = WorkingTree.open_containing(directory)[0]
1995
1977
        self.add_cleanup(tree.lock_read().unlock)
1996
1978
        old = tree.basis_tree()
1997
1979
        self.add_cleanup(old.lock_read().unlock)
2010
1992
 
2011
1993
    hidden = True
2012
1994
    _see_also = ['status', 'ls']
2013
 
    takes_options = [
2014
 
            Option('null',
2015
 
                   help='Write an ascii NUL (\\0) separator '
2016
 
                   'between files rather than a newline.')
2017
 
            ]
 
1995
    takes_options = ['directory', 'null']
2018
1996
 
2019
1997
    @display_command
2020
 
    def run(self, null=False):
2021
 
        tree = WorkingTree.open_containing(u'.')[0]
 
1998
    def run(self, null=False, directory=u'.'):
 
1999
        tree = WorkingTree.open_containing(directory)[0]
2022
2000
        td = tree.changes_from(tree.basis_tree())
2023
2001
        for path, id, kind, text_modified, meta_modified in td.modified:
2024
2002
            if null:
2033
2011
 
2034
2012
    hidden = True
2035
2013
    _see_also = ['status', 'ls']
2036
 
    takes_options = [
2037
 
            Option('null',
2038
 
                   help='Write an ascii NUL (\\0) separator '
2039
 
                   'between files rather than a newline.')
2040
 
            ]
 
2014
    takes_options = ['directory', 'null']
2041
2015
 
2042
2016
    @display_command
2043
 
    def run(self, null=False):
2044
 
        wt = WorkingTree.open_containing(u'.')[0]
 
2017
    def run(self, null=False, directory=u'.'):
 
2018
        wt = WorkingTree.open_containing(directory)[0]
2045
2019
        self.add_cleanup(wt.lock_read().unlock)
2046
2020
        basis = wt.basis_tree()
2047
2021
        self.add_cleanup(basis.lock_read().unlock)
2053
2027
            if inv.is_root(file_id) and len(basis_inv) == 0:
2054
2028
                continue
2055
2029
            path = inv.id2path(file_id)
2056
 
            if not os.access(osutils.abspath(path), os.F_OK):
 
2030
            if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2057
2031
                continue
2058
2032
            if null:
2059
2033
                self.outf.write(path + '\0')
2259
2233
                   help='Show just the specified revision.'
2260
2234
                   ' See also "help revisionspec".'),
2261
2235
            'log-format',
 
2236
            RegistryOption('authors',
 
2237
                'What names to list as authors - first, all or committer.',
 
2238
                title='Authors',
 
2239
                lazy_registry=('bzrlib.log', 'author_list_registry'),
 
2240
            ),
2262
2241
            Option('levels',
2263
2242
                   short_name='n',
2264
2243
                   help='Number of levels to display - 0 for all, 1 for flat.',
2299
2278
            limit=None,
2300
2279
            show_diff=False,
2301
2280
            include_merges=False,
 
2281
            authors=None,
2302
2282
            exclude_common_ancestry=False,
2303
2283
            ):
2304
2284
        from bzrlib.log import (
2382
2362
                        show_timezone=timezone,
2383
2363
                        delta_format=get_verbosity_level(),
2384
2364
                        levels=levels,
2385
 
                        show_advice=levels is None)
 
2365
                        show_advice=levels is None,
 
2366
                        author_list_handler=authors)
2386
2367
 
2387
2368
        # Choose the algorithm for doing the logging. It's annoying
2388
2369
        # having multiple code paths like this but necessary until
2505
2486
                   help='Recurse into subdirectories.'),
2506
2487
            Option('from-root',
2507
2488
                   help='Print paths relative to the root of the branch.'),
2508
 
            Option('unknown', help='Print unknown files.'),
 
2489
            Option('unknown', short_name='u',
 
2490
                help='Print unknown files.'),
2509
2491
            Option('versioned', help='Print versioned files.',
2510
2492
                   short_name='V'),
2511
 
            Option('ignored', help='Print ignored files.'),
2512
 
            Option('null',
2513
 
                   help='Write an ascii NUL (\\0) separator '
2514
 
                   'between files rather than a newline.'),
2515
 
            Option('kind',
 
2493
            Option('ignored', short_name='i',
 
2494
                help='Print ignored files.'),
 
2495
            Option('kind', short_name='k',
2516
2496
                   help='List entries of a particular kind: file, directory, symlink.',
2517
2497
                   type=unicode),
 
2498
            'null',
2518
2499
            'show-ids',
 
2500
            'directory',
2519
2501
            ]
2520
2502
    @display_command
2521
2503
    def run(self, revision=None, verbose=False,
2522
2504
            recursive=False, from_root=False,
2523
2505
            unknown=False, versioned=False, ignored=False,
2524
 
            null=False, kind=None, show_ids=False, path=None):
 
2506
            null=False, kind=None, show_ids=False, path=None, directory=None):
2525
2507
 
2526
2508
        if kind and kind not in ('file', 'directory', 'symlink'):
2527
2509
            raise errors.BzrCommandError('invalid kind specified')
2539
2521
                raise errors.BzrCommandError('cannot specify both --from-root'
2540
2522
                                             ' and PATH')
2541
2523
            fs_path = path
2542
 
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2543
 
            fs_path)
 
2524
        tree, branch, relpath = \
 
2525
            _open_directory_or_containing_tree_or_branch(fs_path, directory)
2544
2526
 
2545
2527
        # Calculate the prefix to use
2546
2528
        prefix = None
2614
2596
 
2615
2597
    hidden = True
2616
2598
    _see_also = ['ls']
 
2599
    takes_options = ['directory']
2617
2600
 
2618
2601
    @display_command
2619
 
    def run(self):
2620
 
        for f in WorkingTree.open_containing(u'.')[0].unknowns():
 
2602
    def run(self, directory=u'.'):
 
2603
        for f in WorkingTree.open_containing(directory)[0].unknowns():
2621
2604
            self.outf.write(osutils.quotefn(f) + '\n')
2622
2605
 
2623
2606
 
2688
2671
 
2689
2672
    _see_also = ['status', 'ignored', 'patterns']
2690
2673
    takes_args = ['name_pattern*']
2691
 
    takes_options = [
 
2674
    takes_options = ['directory',
2692
2675
        Option('default-rules',
2693
2676
               help='Display the default ignore rules that bzr uses.')
2694
2677
        ]
2695
2678
 
2696
 
    def run(self, name_pattern_list=None, default_rules=None):
 
2679
    def run(self, name_pattern_list=None, default_rules=None,
 
2680
            directory=u'.'):
2697
2681
        from bzrlib import ignores
2698
2682
        if default_rules is not None:
2699
2683
            # dump the default rules and exit
2705
2689
                "NAME_PATTERN or --default-rules.")
2706
2690
        name_pattern_list = [globbing.normalize_pattern(p)
2707
2691
                             for p in name_pattern_list]
 
2692
        bad_patterns = ''
 
2693
        for p in name_pattern_list:
 
2694
            if not globbing.Globster.is_pattern_valid(p):
 
2695
                bad_patterns += ('\n  %s' % p)
 
2696
        if bad_patterns:
 
2697
            msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
 
2698
            ui.ui_factory.show_error(msg)
 
2699
            raise errors.InvalidPattern('')
2708
2700
        for name_pattern in name_pattern_list:
2709
2701
            if (name_pattern[0] == '/' or
2710
2702
                (len(name_pattern) > 1 and name_pattern[1] == ':')):
2711
2703
                raise errors.BzrCommandError(
2712
2704
                    "NAME_PATTERN should not be an absolute path")
2713
 
        tree, relpath = WorkingTree.open_containing(u'.')
 
2705
        tree, relpath = WorkingTree.open_containing(directory)
2714
2706
        ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2715
2707
        ignored = globbing.Globster(name_pattern_list)
2716
2708
        matches = []
2717
 
        tree.lock_read()
 
2709
        self.add_cleanup(tree.lock_read().unlock)
2718
2710
        for entry in tree.list_files():
2719
2711
            id = entry[3]
2720
2712
            if id is not None:
2721
2713
                filename = entry[0]
2722
2714
                if ignored.match(filename):
2723
2715
                    matches.append(filename)
2724
 
        tree.unlock()
2725
2716
        if len(matches) > 0:
2726
2717
            self.outf.write("Warning: the following files are version controlled and"
2727
2718
                  " match your ignore pattern:\n%s"
2742
2733
 
2743
2734
    encoding_type = 'replace'
2744
2735
    _see_also = ['ignore', 'ls']
 
2736
    takes_options = ['directory']
2745
2737
 
2746
2738
    @display_command
2747
 
    def run(self):
2748
 
        tree = WorkingTree.open_containing(u'.')[0]
 
2739
    def run(self, directory=u'.'):
 
2740
        tree = WorkingTree.open_containing(directory)[0]
2749
2741
        self.add_cleanup(tree.lock_read().unlock)
2750
2742
        for path, file_class, kind, file_id, entry in tree.list_files():
2751
2743
            if file_class != 'I':
2763
2755
    """
2764
2756
    hidden = True
2765
2757
    takes_args = ['revno']
 
2758
    takes_options = ['directory']
2766
2759
 
2767
2760
    @display_command
2768
 
    def run(self, revno):
 
2761
    def run(self, revno, directory=u'.'):
2769
2762
        try:
2770
2763
            revno = int(revno)
2771
2764
        except ValueError:
2772
2765
            raise errors.BzrCommandError("not a valid revision-number: %r"
2773
2766
                                         % revno)
2774
 
        revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
 
2767
        revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2775
2768
        self.outf.write("%s\n" % revid)
2776
2769
 
2777
2770
 
2804
2797
      =================       =========================
2805
2798
    """
2806
2799
    takes_args = ['dest', 'branch_or_subdir?']
2807
 
    takes_options = [
 
2800
    takes_options = ['directory',
2808
2801
        Option('format',
2809
2802
               help="Type of file to export to.",
2810
2803
               type=unicode),
2819
2812
                    'revision in which it was changed.'),
2820
2813
        ]
2821
2814
    def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
 
        root=None, filters=False, per_file_timestamps=False):
 
2815
        root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2823
2816
        from bzrlib.export import export
2824
2817
 
2825
2818
        if branch_or_subdir is None:
2826
 
            tree = WorkingTree.open_containing(u'.')[0]
 
2819
            tree = WorkingTree.open_containing(directory)[0]
2827
2820
            b = tree.branch
2828
2821
            subdir = None
2829
2822
        else:
2848
2841
    """
2849
2842
 
2850
2843
    _see_also = ['ls']
2851
 
    takes_options = [
 
2844
    takes_options = ['directory',
2852
2845
        Option('name-from-revision', help='The path name in the old tree.'),
2853
2846
        Option('filters', help='Apply content filters to display the '
2854
2847
                'convenience form.'),
2859
2852
 
2860
2853
    @display_command
2861
2854
    def run(self, filename, revision=None, name_from_revision=False,
2862
 
            filters=False):
 
2855
            filters=False, directory=None):
2863
2856
        if revision is not None and len(revision) != 1:
2864
2857
            raise errors.BzrCommandError("bzr cat --revision takes exactly"
2865
2858
                                         " one revision specifier")
2866
2859
        tree, branch, relpath = \
2867
 
            bzrdir.BzrDir.open_containing_tree_or_branch(filename)
 
2860
            _open_directory_or_containing_tree_or_branch(filename, directory)
2868
2861
        self.add_cleanup(branch.lock_read().unlock)
2869
2862
        return self._run(tree, branch, relpath, filename, revision,
2870
2863
                         name_from_revision, filters)
3101
3094
 
3102
3095
        properties = {}
3103
3096
 
3104
 
        tree, selected_list = tree_files(selected_list)
 
3097
        tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3105
3098
        if selected_list == ['']:
3106
3099
            # workaround - commit of root of tree should be exactly the same
3107
3100
            # as just default commit in that tree, and succeed even though
3142
3135
        def get_message(commit_obj):
3143
3136
            """Callback to get commit message"""
3144
3137
            if file:
3145
 
                my_message = codecs.open(
3146
 
                    file, 'rt', osutils.get_user_encoding()).read()
 
3138
                f = codecs.open(file, 'rt', osutils.get_user_encoding())
 
3139
                try:
 
3140
                    my_message = f.read()
 
3141
                finally:
 
3142
                    f.close()
3147
3143
            elif message is not None:
3148
3144
                my_message = message
3149
3145
            else:
3178
3174
                        reporter=None, verbose=verbose, revprops=properties,
3179
3175
                        authors=author, timestamp=commit_stamp,
3180
3176
                        timezone=offset,
3181
 
                        exclude=safe_relpath_files(tree, exclude))
 
3177
                        exclude=tree.safe_relpath_files(exclude))
3182
3178
        except PointlessCommit:
3183
3179
            raise errors.BzrCommandError("No changes to commit."
3184
3180
                              " Use --unchanged to commit anyhow.")
3303
3299
 
3304
3300
            bzr whoami "Frank Chu <fchu@example.com>"
3305
3301
    """
3306
 
    takes_options = [ Option('email',
 
3302
    takes_options = [ 'directory',
 
3303
                      Option('email',
3307
3304
                             help='Display email address only.'),
3308
3305
                      Option('branch',
3309
3306
                             help='Set identity for the current branch instead of '
3313
3310
    encoding_type = 'replace'
3314
3311
 
3315
3312
    @display_command
3316
 
    def run(self, email=False, branch=False, name=None):
 
3313
    def run(self, email=False, branch=False, name=None, directory=None):
3317
3314
        if name is None:
3318
 
            # use branch if we're inside one; otherwise global config
3319
 
            try:
3320
 
                c = Branch.open_containing('.')[0].get_config()
3321
 
            except errors.NotBranchError:
3322
 
                c = config.GlobalConfig()
 
3315
            if directory is None:
 
3316
                # use branch if we're inside one; otherwise global config
 
3317
                try:
 
3318
                    c = Branch.open_containing(u'.')[0].get_config()
 
3319
                except errors.NotBranchError:
 
3320
                    c = config.GlobalConfig()
 
3321
            else:
 
3322
                c = Branch.open(directory).get_config()
3323
3323
            if email:
3324
3324
                self.outf.write(c.user_email() + '\n')
3325
3325
            else:
3335
3335
 
3336
3336
        # use global config unless --branch given
3337
3337
        if branch:
3338
 
            c = Branch.open_containing('.')[0].get_config()
 
3338
            if directory is None:
 
3339
                c = Branch.open_containing(u'.')[0].get_config()
 
3340
            else:
 
3341
                c = Branch.open(directory).get_config()
3339
3342
        else:
3340
3343
            c = config.GlobalConfig()
3341
3344
        c.set_user_option('email', name)
3353
3356
 
3354
3357
    _see_also = ['info']
3355
3358
    takes_args = ['nickname?']
3356
 
    def run(self, nickname=None):
3357
 
        branch = Branch.open_containing(u'.')[0]
 
3359
    takes_options = ['directory']
 
3360
    def run(self, nickname=None, directory=u'.'):
 
3361
        branch = Branch.open_containing(directory)[0]
3358
3362
        if nickname is None:
3359
3363
            self.printme(branch)
3360
3364
        else:
3510
3514
                                 'throughout the test suite.',
3511
3515
                            type=get_transport_type),
3512
3516
                     Option('benchmark',
3513
 
                            help='Run the benchmarks rather than selftests.'),
 
3517
                            help='Run the benchmarks rather than selftests.',
 
3518
                            hidden=True),
3514
3519
                     Option('lsprof-timed',
3515
3520
                            help='Generate lsprof output for benchmarked'
3516
3521
                                 ' sections of code.'),
3517
3522
                     Option('lsprof-tests',
3518
3523
                            help='Generate lsprof output for each test.'),
3519
 
                     Option('cache-dir', type=str,
3520
 
                            help='Cache intermediate benchmark output in this '
3521
 
                                 'directory.'),
3522
3524
                     Option('first',
3523
3525
                            help='Run all tests, but run specified tests first.',
3524
3526
                            short_name='f',
3558
3560
 
3559
3561
    def run(self, testspecs_list=None, verbose=False, one=False,
3560
3562
            transport=None, benchmark=None,
3561
 
            lsprof_timed=None, cache_dir=None,
 
3563
            lsprof_timed=None,
3562
3564
            first=False, list_only=False,
3563
3565
            randomize=None, exclude=None, strict=False,
3564
3566
            load_list=None, debugflag=None, starting_with=None, subunit=False,
3565
3567
            parallel=None, lsprof_tests=False):
3566
3568
        from bzrlib.tests import selftest
3567
 
        import bzrlib.benchmarks as benchmarks
3568
 
        from bzrlib.benchmarks import tree_creator
3569
3569
 
3570
3570
        # Make deprecation warnings visible, unless -Werror is set
3571
3571
        symbol_versioning.activate_deprecation_warnings(override=False)
3572
3572
 
3573
 
        if cache_dir is not None:
3574
 
            tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3575
3573
        if testspecs_list is not None:
3576
3574
            pattern = '|'.join(testspecs_list)
3577
3575
        else:
3585
3583
            self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3586
3584
            # On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
3585
            # stdout, which would corrupt the subunit stream. 
3588
 
            if sys.platform == "win32" and sys.stdout.fileno() >= 0:
 
3586
            # FIXME: This has been fixed in subunit trunk (>0.0.5) so the
 
3587
            # following code can be deleted when it's sufficiently deployed
 
3588
            # -- vila/mgz 20100514
 
3589
            if (sys.platform == "win32"
 
3590
                and getattr(sys.stdout, 'fileno', None) is not None):
3589
3591
                import msvcrt
3590
3592
                msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3591
3593
        if parallel:
3592
3594
            self.additional_selftest_args.setdefault(
3593
3595
                'suite_decorators', []).append(parallel)
3594
3596
        if benchmark:
3595
 
            test_suite_factory = benchmarks.test_suite
3596
 
            # Unless user explicitly asks for quiet, be verbose in benchmarks
3597
 
            verbose = not is_quiet()
3598
 
            # TODO: should possibly lock the history file...
3599
 
            benchfile = open(".perf_history", "at", buffering=1)
3600
 
            self.add_cleanup(benchfile.close)
3601
 
        else:
3602
 
            test_suite_factory = None
3603
 
            benchfile = None
 
3597
            raise errors.BzrCommandError(
 
3598
                "--benchmark is no longer supported from bzr 2.2; "
 
3599
                "use bzr-usertest instead")
 
3600
        test_suite_factory = None
3604
3601
        selftest_kwargs = {"verbose": verbose,
3605
3602
                          "pattern": pattern,
3606
3603
                          "stop_on_failure": one,
3608
3605
                          "test_suite_factory": test_suite_factory,
3609
3606
                          "lsprof_timed": lsprof_timed,
3610
3607
                          "lsprof_tests": lsprof_tests,
3611
 
                          "bench_history": benchfile,
3612
3608
                          "matching_tests_first": first,
3613
3609
                          "list_only": list_only,
3614
3610
                          "random_seed": randomize,
3764
3760
                ' completely merged into the source, pull from the'
3765
3761
                ' source rather than merging.  When this happens,'
3766
3762
                ' you do not need to commit the result.'),
3767
 
        Option('directory',
 
3763
        custom_help('directory',
3768
3764
               help='Branch to merge into, '
3769
 
                    'rather than the one containing the working directory.',
3770
 
               short_name='d',
3771
 
               type=unicode,
3772
 
               ),
 
3765
                    'rather than the one containing the working directory.'),
3773
3766
        Option('preview', help='Instead of merging, show a diff of the'
3774
3767
               ' merge.'),
3775
3768
        Option('interactive', help='Select changes interactively.',
3875
3868
    def _do_preview(self, merger):
3876
3869
        from bzrlib.diff import show_diff_trees
3877
3870
        result_tree = self._get_preview(merger)
 
3871
        path_encoding = osutils.get_diff_header_encoding()
3878
3872
        show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
 
                        old_label='', new_label='')
 
3873
                        old_label='', new_label='',
 
3874
                        path_encoding=path_encoding)
3880
3875
 
3881
3876
    def _do_merge(self, merger, change_reporter, allow_pending, verified):
3882
3877
        merger.change_reporter = change_reporter
4069
4064
        from bzrlib.conflicts import restore
4070
4065
        if merge_type is None:
4071
4066
            merge_type = _mod_merge.Merge3Merger
4072
 
        tree, file_list = tree_files(file_list)
 
4067
        tree, file_list = WorkingTree.open_containing_paths(file_list)
4073
4068
        self.add_cleanup(tree.lock_write().unlock)
4074
4069
        parents = tree.get_parent_ids()
4075
4070
        if len(parents) != 2:
4185
4180
 
4186
4181
    def run(self, revision=None, no_backup=False, file_list=None,
4187
4182
            forget_merges=None):
4188
 
        tree, file_list = tree_files(file_list)
 
4183
        tree, file_list = WorkingTree.open_containing_paths(file_list)
4189
4184
        self.add_cleanup(tree.lock_tree_write().unlock)
4190
4185
        if forget_merges:
4191
4186
            tree.set_parent_ids(tree.get_parent_ids()[:1])
4281
4276
    _see_also = ['merge', 'pull']
4282
4277
    takes_args = ['other_branch?']
4283
4278
    takes_options = [
 
4279
        'directory',
4284
4280
        Option('reverse', 'Reverse the order of revisions.'),
4285
4281
        Option('mine-only',
4286
4282
               'Display changes in the local branch only.'),
4308
4304
            theirs_only=False,
4309
4305
            log_format=None, long=False, short=False, line=False,
4310
4306
            show_ids=False, verbose=False, this=False, other=False,
4311
 
            include_merges=False, revision=None, my_revision=None):
 
4307
            include_merges=False, revision=None, my_revision=None,
 
4308
            directory=u'.'):
4312
4309
        from bzrlib.missing import find_unmerged, iter_log_revisions
4313
4310
        def message(s):
4314
4311
            if not is_quiet():
4327
4324
        elif theirs_only:
4328
4325
            restrict = 'remote'
4329
4326
 
4330
 
        local_branch = Branch.open_containing(u".")[0]
 
4327
        local_branch = Branch.open_containing(directory)[0]
4331
4328
        self.add_cleanup(local_branch.lock_read().unlock)
4332
4329
 
4333
4330
        parent = local_branch.get_parent()
4542
4539
                     Option('long', help='Show commit date in annotations.'),
4543
4540
                     'revision',
4544
4541
                     'show-ids',
 
4542
                     'directory',
4545
4543
                     ]
4546
4544
    encoding_type = 'exact'
4547
4545
 
4548
4546
    @display_command
4549
4547
    def run(self, filename, all=False, long=False, revision=None,
4550
 
            show_ids=False):
 
4548
            show_ids=False, directory=None):
4551
4549
        from bzrlib.annotate import annotate_file, annotate_file_tree
4552
4550
        wt, branch, relpath = \
4553
 
            bzrdir.BzrDir.open_containing_tree_or_branch(filename)
 
4551
            _open_directory_or_containing_tree_or_branch(filename, directory)
4554
4552
        if wt is not None:
4555
4553
            self.add_cleanup(wt.lock_read().unlock)
4556
4554
        else:
4580
4578
 
4581
4579
    hidden = True # is this right ?
4582
4580
    takes_args = ['revision_id*']
4583
 
    takes_options = ['revision']
 
4581
    takes_options = ['directory', 'revision']
4584
4582
 
4585
 
    def run(self, revision_id_list=None, revision=None):
 
4583
    def run(self, revision_id_list=None, revision=None, directory=u'.'):
4586
4584
        if revision_id_list is not None and revision is not None:
4587
4585
            raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4588
4586
        if revision_id_list is None and revision is None:
4589
4587
            raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
 
        b = WorkingTree.open_containing(u'.')[0].branch
 
4588
        b = WorkingTree.open_containing(directory)[0].branch
4591
4589
        self.add_cleanup(b.lock_write().unlock)
4592
4590
        return self._run(b, revision_id_list, revision)
4593
4591
 
4653
4651
 
4654
4652
    _see_also = ['checkouts', 'unbind']
4655
4653
    takes_args = ['location?']
4656
 
    takes_options = []
 
4654
    takes_options = ['directory']
4657
4655
 
4658
 
    def run(self, location=None):
4659
 
        b, relpath = Branch.open_containing(u'.')
 
4656
    def run(self, location=None, directory=u'.'):
 
4657
        b, relpath = Branch.open_containing(directory)
4660
4658
        if location is None:
4661
4659
            try:
4662
4660
                location = b.get_old_bound_location()
4689
4687
 
4690
4688
    _see_also = ['checkouts', 'bind']
4691
4689
    takes_args = []
4692
 
    takes_options = []
 
4690
    takes_options = ['directory']
4693
4691
 
4694
 
    def run(self):
4695
 
        b, relpath = Branch.open_containing(u'.')
 
4692
    def run(self, directory=u'.'):
 
4693
        b, relpath = Branch.open_containing(directory)
4696
4694
        if not b.unbind():
4697
4695
            raise errors.BzrCommandError('Local branch is not bound')
4698
4696
 
4860
4858
                    'result in a dynamically allocated port.  The default port '
4861
4859
                    'depends on the protocol.',
4862
4860
               type=str),
4863
 
        Option('directory',
4864
 
               help='Serve contents of this directory.',
4865
 
               type=unicode),
 
4861
        custom_help('directory',
 
4862
               help='Serve contents of this directory.'),
4866
4863
        Option('allow-writes',
4867
4864
               help='By default the server is a readonly server.  Supplying '
4868
4865
                    '--allow-writes enables write access to the contents of '
4895
4892
 
4896
4893
    def run(self, port=None, inet=False, directory=None, allow_writes=False,
4897
4894
            protocol=None):
4898
 
        from bzrlib.transport import get_transport, transport_server_registry
 
4895
        from bzrlib import transport
4899
4896
        if directory is None:
4900
4897
            directory = os.getcwd()
4901
4898
        if protocol is None:
4902
 
            protocol = transport_server_registry.get()
 
4899
            protocol = transport.transport_server_registry.get()
4903
4900
        host, port = self.get_host_and_port(port)
4904
4901
        url = urlutils.local_path_to_url(directory)
4905
4902
        if not allow_writes:
4906
4903
            url = 'readonly+' + url
4907
 
        transport = get_transport(url)
4908
 
        protocol(transport, host, port, inet)
 
4904
        t = transport.get_transport(url)
 
4905
        protocol(t, host, port, inet)
4909
4906
 
4910
4907
 
4911
4908
class cmd_join(Command):
5004
5001
    _see_also = ['send']
5005
5002
 
5006
5003
    takes_options = [
 
5004
        'directory',
5007
5005
        RegistryOption.from_kwargs('patch-type',
5008
5006
            'The type of patch to include in the directive.',
5009
5007
            title='Patch type',
5022
5020
    encoding_type = 'exact'
5023
5021
 
5024
5022
    def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5025
 
            sign=False, revision=None, mail_to=None, message=None):
 
5023
            sign=False, revision=None, mail_to=None, message=None,
 
5024
            directory=u'.'):
5026
5025
        from bzrlib.revision import ensure_null, NULL_REVISION
5027
5026
        include_patch, include_bundle = {
5028
5027
            'plain': (False, False),
5029
5028
            'diff': (True, False),
5030
5029
            'bundle': (True, True),
5031
5030
            }[patch_type]
5032
 
        branch = Branch.open('.')
 
5031
        branch = Branch.open(directory)
5033
5032
        stored_submit_branch = branch.get_submit_branch()
5034
5033
        if submit_branch is None:
5035
5034
            submit_branch = stored_submit_branch
5120
5119
    given, in which case it is sent to a file.
5121
5120
 
5122
5121
    Mail is sent using your preferred mail program.  This should be transparent
5123
 
    on Windows (it uses MAPI).  On Linux, it requires the xdg-email utility.
 
5122
    on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.
5124
5123
    If the preferred client can't be found (or used), your editor will be used.
5125
5124
 
5126
5125
    To use a specific mail program, set the mail_client configuration option.
5297
5296
        Option('delete',
5298
5297
            help='Delete this tag rather than placing it.',
5299
5298
            ),
5300
 
        Option('directory',
5301
 
            help='Branch in which to place the tag.',
5302
 
            short_name='d',
5303
 
            type=unicode,
5304
 
            ),
 
5299
        custom_help('directory',
 
5300
            help='Branch in which to place the tag.'),
5305
5301
        Option('force',
5306
5302
            help='Replace existing tags.',
5307
5303
            ),
5349
5345
 
5350
5346
    _see_also = ['tag']
5351
5347
    takes_options = [
5352
 
        Option('directory',
5353
 
            help='Branch whose tags should be displayed.',
5354
 
            short_name='d',
5355
 
            type=unicode,
5356
 
            ),
 
5348
        custom_help('directory',
 
5349
            help='Branch whose tags should be displayed.'),
5357
5350
        RegistryOption.from_kwargs('sort',
5358
5351
            'Sort tags by different criteria.', title='Sorting',
5359
5352
            alpha='Sort tags lexicographically (default).',
5529
5522
    """
5530
5523
 
5531
5524
    takes_args = ['to_location?']
5532
 
    takes_options = [Option('force',
 
5525
    takes_options = ['directory',
 
5526
                     Option('force',
5533
5527
                        help='Switch even if local commits will be lost.'),
5534
5528
                     'revision',
5535
5529
                     Option('create-branch', short_name='b',
5538
5532
                    ]
5539
5533
 
5540
5534
    def run(self, to_location=None, force=False, create_branch=False,
5541
 
            revision=None):
 
5535
            revision=None, directory=u'.'):
5542
5536
        from bzrlib import switch
5543
 
        tree_location = '.'
 
5537
        tree_location = directory
5544
5538
        revision = _get_one_revision('switch', revision)
5545
5539
        control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
5540
        if to_location is None:
5547
5541
            if revision is None:
5548
5542
                raise errors.BzrCommandError('You must supply either a'
5549
5543
                                             ' revision or a location')
5550
 
            to_location = '.'
 
5544
            to_location = tree_location
5551
5545
        try:
5552
5546
            branch = control_dir.open_branch()
5553
5547
            had_explicit_nick = branch.get_config().has_explicit_nickname()
5688
5682
            name=None,
5689
5683
            switch=None,
5690
5684
            ):
5691
 
        tree, file_list = tree_files(file_list, apply_view=False)
 
5685
        tree, file_list = WorkingTree.open_containing_paths(file_list,
 
5686
            apply_view=False)
5692
5687
        current_view, view_dict = tree.views.get_view_info()
5693
5688
        if name is None:
5694
5689
            name = current_view
5828
5823
    takes_args = ['file*']
5829
5824
 
5830
5825
    takes_options = [
 
5826
        'directory',
5831
5827
        'revision',
5832
5828
        Option('all', help='Shelve all changes.'),
5833
5829
        'message',
5842
5838
    _see_also = ['unshelve']
5843
5839
 
5844
5840
    def run(self, revision=None, all=False, file_list=None, message=None,
5845
 
            writer=None, list=False, destroy=False):
 
5841
            writer=None, list=False, destroy=False, directory=u'.'):
5846
5842
        if list:
5847
5843
            return self.run_for_list()
5848
5844
        from bzrlib.shelf_ui import Shelver
5850
5846
            writer = bzrlib.option.diff_writer_registry.get()
5851
5847
        try:
5852
5848
            shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
 
                file_list, message, destroy=destroy)
 
5849
                file_list, message, destroy=destroy, directory=directory)
5854
5850
            try:
5855
5851
                shelver.run()
5856
5852
            finally:
5884
5880
 
5885
5881
    takes_args = ['shelf_id?']
5886
5882
    takes_options = [
 
5883
        'directory',
5887
5884
        RegistryOption.from_kwargs(
5888
5885
            'action', help="The action to perform.",
5889
5886
            enum_switch=False, value_switches=True,
5897
5894
    ]
5898
5895
    _see_also = ['shelve']
5899
5896
 
5900
 
    def run(self, shelf_id=None, action='apply'):
 
5897
    def run(self, shelf_id=None, action='apply', directory=u'.'):
5901
5898
        from bzrlib.shelf_ui import Unshelver
5902
 
        unshelver = Unshelver.from_args(shelf_id, action)
 
5899
        unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5903
5900
        try:
5904
5901
            unshelver.run()
5905
5902
        finally:
5921
5918
 
5922
5919
    To check what clean-tree will do, use --dry-run.
5923
5920
    """
5924
 
    takes_options = [Option('ignored', help='Delete all ignored files.'),
 
5921
    takes_options = ['directory',
 
5922
                     Option('ignored', help='Delete all ignored files.'),
5925
5923
                     Option('detritus', help='Delete conflict files, merge'
5926
5924
                            ' backups, and failed selftest dirs.'),
5927
5925
                     Option('unknown',
5930
5928
                            ' deleting them.'),
5931
5929
                     Option('force', help='Do not prompt before deleting.')]
5932
5930
    def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5933
 
            force=False):
 
5931
            force=False, directory=u'.'):
5934
5932
        from bzrlib.clean_tree import clean_tree
5935
5933
        if not (unknown or ignored or detritus):
5936
5934
            unknown = True
5937
5935
        if dry_run:
5938
5936
            force = True
5939
 
        clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5940
 
                   dry_run=dry_run, no_prompt=force)
 
5937
        clean_tree(directory, unknown=unknown, ignored=ignored,
 
5938
                   detritus=detritus, dry_run=dry_run, no_prompt=force)
5941
5939
 
5942
5940
 
5943
5941
class cmd_reference(Command):