/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: Martin Pool
  • Date: 2010-07-16 15:20:17 UTC
  • mfrom: (5346.3.1 pathnotchild)
  • mto: This revision was merged to the branch mainline in revision 5351.
  • Revision ID: mbp@canonical.com-20100716152017-t4c73h9y1uoih7fb
PathNotChild should not give a traceback.

Show diffs side-by-side

added added

removed removed

Lines of Context:
77
77
 
78
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
79
79
    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]))
 
80
    return internal_tree_files(file_list, default_branch, canonicalize,
 
81
        apply_view)
86
82
 
87
83
 
88
84
def tree_files_for_add(file_list):
152
148
 
153
149
# XXX: Bad function name; should possibly also be a class method of
154
150
# WorkingTree rather than a function.
 
151
# @symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
155
152
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
153
    apply_view=True):
157
154
    """Convert command-line paths to a WorkingTree and relative paths.
158
155
 
 
156
    Deprecated: use WorkingTree.open_containing_paths instead.
 
157
 
159
158
    This is typically used for command-line processors that take one or
160
159
    more filenames, and infer the workingtree that contains them.
161
160
 
171
170
 
172
171
    :return: workingtree, [relative_paths]
173
172
    """
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
 
173
    return WorkingTree.open_containing_paths(
 
174
        file_list, default_directory='.',
 
175
        canonicalize=True,
 
176
        apply_view=True)
221
177
 
222
178
 
223
179
def _get_view_info_for_change_reporter(tree):
232
188
    return view_info
233
189
 
234
190
 
 
191
def _open_directory_or_containing_tree_or_branch(filename, directory):
 
192
    """Open the tree or branch containing the specified file, unless
 
193
    the --directory option is used to specify a different branch."""
 
194
    if directory is not None:
 
195
        return (None, Branch.open(directory), filename)
 
196
    return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
 
197
 
 
198
 
235
199
# TODO: Make sure no commands unconditionally use the working directory as a
236
200
# branch.  If a filename argument is used, the first of them should be used to
237
201
# specify the branch.  (Perhaps this can be factored out into some kind of
340
304
 
341
305
    hidden = True
342
306
    takes_args = ['revision_id?']
343
 
    takes_options = ['revision']
 
307
    takes_options = ['directory', 'revision']
344
308
    # cat-revision is more for frontends so should be exact
345
309
    encoding = 'strict'
346
310
 
353
317
        self.outf.write(revtext.decode('utf-8'))
354
318
 
355
319
    @display_command
356
 
    def run(self, revision_id=None, revision=None):
 
320
    def run(self, revision_id=None, revision=None, directory=u'.'):
357
321
        if revision_id is not None and revision is not None:
358
322
            raise errors.BzrCommandError('You can only supply one of'
359
323
                                         ' revision_id or --revision')
360
324
        if revision_id is None and revision is None:
361
325
            raise errors.BzrCommandError('You must supply either'
362
326
                                         ' --revision or a revision_id')
363
 
        b = WorkingTree.open_containing(u'.')[0].branch
 
327
        b = WorkingTree.open_containing(directory)[0].branch
364
328
 
365
329
        revisions = b.repository.revisions
366
330
        if revisions is None:
483
447
    takes_options = [
484
448
        Option('force',
485
449
               help='Remove the working tree even if it has '
486
 
                    'uncommitted changes.'),
 
450
                    'uncommitted or shelved changes.'),
487
451
        ]
488
452
 
489
453
    def run(self, location_list, force=False):
503
467
            if not force:
504
468
                if (working.has_changes()):
505
469
                    raise errors.UncommittedChanges(working)
 
470
                if working.get_shelf_manager().last_shelf() is not None:
 
471
                    raise errors.ShelvedChanges(working)
506
472
 
507
473
            if working.user_url != working.branch.user_url:
508
474
                raise errors.BzrCommandError("You cannot remove the working tree"
528
494
        if tree:
529
495
            try:
530
496
                wt = WorkingTree.open_containing(location)[0]
531
 
                wt.lock_read()
 
497
                self.add_cleanup(wt.lock_read().unlock)
532
498
            except (errors.NoWorkingTree, errors.NotLocalUrl):
533
499
                raise errors.NoWorkingTree(location)
534
 
            self.add_cleanup(wt.unlock)
535
500
            revid = wt.last_revision()
536
501
            try:
537
502
                revno_t = wt.branch.revision_id_to_dotted_revno(revid)
540
505
            revno = ".".join(str(n) for n in revno_t)
541
506
        else:
542
507
            b = Branch.open_containing(location)[0]
543
 
            b.lock_read()
544
 
            self.add_cleanup(b.unlock)
 
508
            self.add_cleanup(b.lock_read().unlock)
545
509
            revno = b.revno()
546
510
        self.cleanup_now()
547
511
        self.outf.write(str(revno) + '\n')
554
518
    takes_args = ['revision_info*']
555
519
    takes_options = [
556
520
        'revision',
557
 
        Option('directory',
 
521
        custom_help('directory',
558
522
            help='Branch to examine, '
559
 
                 'rather than the one containing the working directory.',
560
 
            short_name='d',
561
 
            type=unicode,
562
 
            ),
 
523
                 'rather than the one containing the working directory.'),
563
524
        Option('tree', help='Show revno of working tree'),
564
525
        ]
565
526
 
570
531
        try:
571
532
            wt = WorkingTree.open_containing(directory)[0]
572
533
            b = wt.branch
573
 
            wt.lock_read()
574
 
            self.add_cleanup(wt.unlock)
 
534
            self.add_cleanup(wt.lock_read().unlock)
575
535
        except (errors.NoWorkingTree, errors.NotLocalUrl):
576
536
            wt = None
577
537
            b = Branch.open_containing(directory)[0]
578
 
            b.lock_read()
579
 
            self.add_cleanup(b.unlock)
 
538
            self.add_cleanup(b.lock_read().unlock)
580
539
        revision_ids = []
581
540
        if revision is not None:
582
541
            revision_ids.extend(rev.as_revision_id(b) for rev in revision)
681
640
                should_print=(not is_quiet()))
682
641
 
683
642
        if base_tree:
684
 
            base_tree.lock_read()
685
 
            self.add_cleanup(base_tree.unlock)
 
643
            self.add_cleanup(base_tree.lock_read().unlock)
686
644
        tree, file_list = tree_files_for_add(file_list)
687
645
        added, ignored = tree.smart_add(file_list, not
688
646
            no_recurse, action=action, save=not dry_run)
760
718
 
761
719
        revision = _get_one_revision('inventory', revision)
762
720
        work_tree, file_list = tree_files(file_list)
763
 
        work_tree.lock_read()
764
 
        self.add_cleanup(work_tree.unlock)
 
721
        self.add_cleanup(work_tree.lock_read().unlock)
765
722
        if revision is not None:
766
723
            tree = revision.as_tree(work_tree.branch)
767
724
 
768
725
            extra_trees = [work_tree]
769
 
            tree.lock_read()
770
 
            self.add_cleanup(tree.unlock)
 
726
            self.add_cleanup(tree.lock_read().unlock)
771
727
        else:
772
728
            tree = work_tree
773
729
            extra_trees = []
833
789
        if len(names_list) < 2:
834
790
            raise errors.BzrCommandError("missing file argument")
835
791
        tree, rel_names = tree_files(names_list, canonicalize=False)
836
 
        tree.lock_tree_write()
837
 
        self.add_cleanup(tree.unlock)
 
792
        self.add_cleanup(tree.lock_tree_write().unlock)
838
793
        self._run(tree, names_list, rel_names, after)
839
794
 
840
795
    def run_auto(self, names_list, after, dry_run):
845
800
            raise errors.BzrCommandError('--after cannot be specified with'
846
801
                                         ' --auto.')
847
802
        work_tree, file_list = tree_files(names_list, default_branch='.')
848
 
        work_tree.lock_tree_write()
849
 
        self.add_cleanup(work_tree.unlock)
 
803
        self.add_cleanup(work_tree.lock_tree_write().unlock)
850
804
        rename_map.RenameMap.guess_renames(work_tree, dry_run)
851
805
 
852
806
    def _run(self, tree, names_list, rel_names, after):
960
914
    takes_options = ['remember', 'overwrite', 'revision',
961
915
        custom_help('verbose',
962
916
            help='Show logs of pulled revisions.'),
963
 
        Option('directory',
 
917
        custom_help('directory',
964
918
            help='Branch to pull into, '
965
 
                 'rather than the one containing the working directory.',
966
 
            short_name='d',
967
 
            type=unicode,
968
 
            ),
 
919
                 'rather than the one containing the working directory.'),
969
920
        Option('local',
970
921
            help="Perform a local pull in a bound "
971
922
                 "branch.  Local pulls are not applied to "
986
937
        try:
987
938
            tree_to = WorkingTree.open_containing(directory)[0]
988
939
            branch_to = tree_to.branch
989
 
            tree_to.lock_write()
990
 
            self.add_cleanup(tree_to.unlock)
 
940
            self.add_cleanup(tree_to.lock_write().unlock)
991
941
        except errors.NoWorkingTree:
992
942
            tree_to = None
993
943
            branch_to = Branch.open_containing(directory)[0]
994
 
            branch_to.lock_write()
995
 
            self.add_cleanup(branch_to.unlock)
 
944
            self.add_cleanup(branch_to.lock_write().unlock)
996
945
 
997
946
        if local and not branch_to.get_bound_location():
998
947
            raise errors.LocalRequiresBoundBranch()
1029
978
        else:
1030
979
            branch_from = Branch.open(location,
1031
980
                possible_transports=possible_transports)
1032
 
            branch_from.lock_read()
1033
 
            self.add_cleanup(branch_from.unlock)
 
981
            self.add_cleanup(branch_from.lock_read().unlock)
1034
982
 
1035
983
            if branch_to.get_parent() is None or remember:
1036
984
                branch_to.set_parent(branch_from.base)
1088
1036
        Option('create-prefix',
1089
1037
               help='Create the path leading up to the branch '
1090
1038
                    'if it does not already exist.'),
1091
 
        Option('directory',
 
1039
        custom_help('directory',
1092
1040
            help='Branch to push from, '
1093
 
                 'rather than the one containing the working directory.',
1094
 
            short_name='d',
1095
 
            type=unicode,
1096
 
            ),
 
1041
                 'rather than the one containing the working directory.'),
1097
1042
        Option('use-existing-dir',
1098
1043
               help='By default push will fail if the target'
1099
1044
                    ' directory exists, but does not already'
1219
1164
        accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1220
1165
            from_location)
1221
1166
        revision = _get_one_revision('branch', revision)
1222
 
        br_from.lock_read()
1223
 
        self.add_cleanup(br_from.unlock)
 
1167
        self.add_cleanup(br_from.lock_read().unlock)
1224
1168
        if revision is not None:
1225
1169
            revision_id = revision.as_revision_id(br_from)
1226
1170
        else:
1366
1310
    @display_command
1367
1311
    def run(self, dir=u'.'):
1368
1312
        tree = WorkingTree.open_containing(dir)[0]
1369
 
        tree.lock_read()
1370
 
        self.add_cleanup(tree.unlock)
 
1313
        self.add_cleanup(tree.lock_read().unlock)
1371
1314
        new_inv = tree.inventory
1372
1315
        old_tree = tree.basis_tree()
1373
 
        old_tree.lock_read()
1374
 
        self.add_cleanup(old_tree.unlock)
 
1316
        self.add_cleanup(old_tree.lock_read().unlock)
1375
1317
        old_inv = old_tree.inventory
1376
1318
        renames = []
1377
1319
        iterator = tree.iter_changes(old_tree, include_unchanged=True)
1415
1357
        master = branch.get_master_branch(
1416
1358
            possible_transports=possible_transports)
1417
1359
        if master is not None:
1418
 
            tree.lock_write()
1419
1360
            branch_location = master.base
 
1361
            tree.lock_write()
1420
1362
        else:
 
1363
            branch_location = tree.branch.base
1421
1364
            tree.lock_tree_write()
1422
 
            branch_location = tree.branch.base
1423
1365
        self.add_cleanup(tree.unlock)
1424
1366
        # get rid of the final '/' and be ready for display
1425
1367
        branch_location = urlutils.unescape_for_display(
1545
1487
        if file_list is not None:
1546
1488
            file_list = [f for f in file_list]
1547
1489
 
1548
 
        tree.lock_write()
1549
 
        self.add_cleanup(tree.unlock)
 
1490
        self.add_cleanup(tree.lock_write().unlock)
1550
1491
        # Heuristics should probably all move into tree.remove_smart or
1551
1492
        # some such?
1552
1493
        if new:
1985
1926
         old_branch, new_branch,
1986
1927
         specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
1928
            file_list, revision, old, new, self.add_cleanup, apply_view=True)
 
1929
        # GNU diff on Windows uses ANSI encoding for filenames
 
1930
        path_encoding = osutils.get_diff_header_encoding()
1988
1931
        return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1932
                               specific_files=specific_files,
1990
1933
                               external_diff_options=diff_options,
1991
1934
                               old_label=old_label, new_label=new_label,
1992
 
                               extra_trees=extra_trees, using=using,
 
1935
                               extra_trees=extra_trees,
 
1936
                               path_encoding=path_encoding,
 
1937
                               using=using,
1993
1938
                               format_cls=format)
1994
1939
 
1995
1940
 
2003
1948
    # level of effort but possibly much less IO.  (Or possibly not,
2004
1949
    # if the directories are very large...)
2005
1950
    _see_also = ['status', 'ls']
2006
 
    takes_options = ['show-ids']
 
1951
    takes_options = ['directory', 'show-ids']
2007
1952
 
2008
1953
    @display_command
2009
 
    def run(self, show_ids=False):
2010
 
        tree = WorkingTree.open_containing(u'.')[0]
2011
 
        tree.lock_read()
2012
 
        self.add_cleanup(tree.unlock)
 
1954
    def run(self, show_ids=False, directory=u'.'):
 
1955
        tree = WorkingTree.open_containing(directory)[0]
 
1956
        self.add_cleanup(tree.lock_read().unlock)
2013
1957
        old = tree.basis_tree()
2014
 
        old.lock_read()
2015
 
        self.add_cleanup(old.unlock)
 
1958
        self.add_cleanup(old.lock_read().unlock)
2016
1959
        for path, ie in old.inventory.iter_entries():
2017
1960
            if not tree.has_id(ie.file_id):
2018
1961
                self.outf.write(path)
2028
1971
 
2029
1972
    hidden = True
2030
1973
    _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
 
            ]
 
1974
    takes_options = ['directory', 'null']
2036
1975
 
2037
1976
    @display_command
2038
 
    def run(self, null=False):
2039
 
        tree = WorkingTree.open_containing(u'.')[0]
 
1977
    def run(self, null=False, directory=u'.'):
 
1978
        tree = WorkingTree.open_containing(directory)[0]
2040
1979
        td = tree.changes_from(tree.basis_tree())
2041
1980
        for path, id, kind, text_modified, meta_modified in td.modified:
2042
1981
            if null:
2051
1990
 
2052
1991
    hidden = True
2053
1992
    _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
 
            ]
 
1993
    takes_options = ['directory', 'null']
2059
1994
 
2060
1995
    @display_command
2061
 
    def run(self, null=False):
2062
 
        wt = WorkingTree.open_containing(u'.')[0]
2063
 
        wt.lock_read()
2064
 
        self.add_cleanup(wt.unlock)
 
1996
    def run(self, null=False, directory=u'.'):
 
1997
        wt = WorkingTree.open_containing(directory)[0]
 
1998
        self.add_cleanup(wt.lock_read().unlock)
2065
1999
        basis = wt.basis_tree()
2066
 
        basis.lock_read()
2067
 
        self.add_cleanup(basis.unlock)
 
2000
        self.add_cleanup(basis.lock_read().unlock)
2068
2001
        basis_inv = basis.inventory
2069
2002
        inv = wt.inventory
2070
2003
        for file_id in inv:
2073
2006
            if inv.is_root(file_id) and len(basis_inv) == 0:
2074
2007
                continue
2075
2008
            path = inv.id2path(file_id)
2076
 
            if not os.access(osutils.abspath(path), os.F_OK):
 
2009
            if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2077
2010
                continue
2078
2011
            if null:
2079
2012
                self.outf.write(path + '\0')
2279
2212
                   help='Show just the specified revision.'
2280
2213
                   ' See also "help revisionspec".'),
2281
2214
            'log-format',
 
2215
            RegistryOption('authors',
 
2216
                'What names to list as authors - first, all or committer.',
 
2217
                title='Authors',
 
2218
                lazy_registry=('bzrlib.log', 'author_list_registry'),
 
2219
            ),
2282
2220
            Option('levels',
2283
2221
                   short_name='n',
2284
2222
                   help='Number of levels to display - 0 for all, 1 for flat.',
2319
2257
            limit=None,
2320
2258
            show_diff=False,
2321
2259
            include_merges=False,
 
2260
            authors=None,
2322
2261
            exclude_common_ancestry=False,
2323
2262
            ):
2324
2263
        from bzrlib.log import (
2352
2291
        if file_list:
2353
2292
            # find the file ids to log and check for directory filtering
2354
2293
            b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2355
 
                revision, file_list)
2356
 
            self.add_cleanup(b.unlock)
 
2294
                revision, file_list, self.add_cleanup)
2357
2295
            for relpath, file_id, kind in file_info_list:
2358
2296
                if file_id is None:
2359
2297
                    raise errors.BzrCommandError(
2377
2315
                location = '.'
2378
2316
            dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
2317
            b = dir.open_branch()
2380
 
            b.lock_read()
2381
 
            self.add_cleanup(b.unlock)
 
2318
            self.add_cleanup(b.lock_read().unlock)
2382
2319
            rev1, rev2 = _get_revision_range(revision, b, self.name())
2383
2320
 
2384
2321
        # Decide on the type of delta & diff filtering to use
2404
2341
                        show_timezone=timezone,
2405
2342
                        delta_format=get_verbosity_level(),
2406
2343
                        levels=levels,
2407
 
                        show_advice=levels is None)
 
2344
                        show_advice=levels is None,
 
2345
                        author_list_handler=authors)
2408
2346
 
2409
2347
        # Choose the algorithm for doing the logging. It's annoying
2410
2348
        # having multiple code paths like this but necessary until
2508
2446
        tree, relpath = WorkingTree.open_containing(filename)
2509
2447
        file_id = tree.path2id(relpath)
2510
2448
        b = tree.branch
2511
 
        b.lock_read()
2512
 
        self.add_cleanup(b.unlock)
 
2449
        self.add_cleanup(b.lock_read().unlock)
2513
2450
        touching_revs = log.find_touching_revisions(b, file_id)
2514
2451
        for revno, revision_id, what in touching_revs:
2515
2452
            self.outf.write("%6d %s\n" % (revno, what))
2528
2465
                   help='Recurse into subdirectories.'),
2529
2466
            Option('from-root',
2530
2467
                   help='Print paths relative to the root of the branch.'),
2531
 
            Option('unknown', help='Print unknown files.'),
 
2468
            Option('unknown', short_name='u',
 
2469
                help='Print unknown files.'),
2532
2470
            Option('versioned', help='Print versioned files.',
2533
2471
                   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',
 
2472
            Option('ignored', short_name='i',
 
2473
                help='Print ignored files.'),
 
2474
            Option('kind', short_name='k',
2539
2475
                   help='List entries of a particular kind: file, directory, symlink.',
2540
2476
                   type=unicode),
 
2477
            'null',
2541
2478
            'show-ids',
 
2479
            'directory',
2542
2480
            ]
2543
2481
    @display_command
2544
2482
    def run(self, revision=None, verbose=False,
2545
2483
            recursive=False, from_root=False,
2546
2484
            unknown=False, versioned=False, ignored=False,
2547
 
            null=False, kind=None, show_ids=False, path=None):
 
2485
            null=False, kind=None, show_ids=False, path=None, directory=None):
2548
2486
 
2549
2487
        if kind and kind not in ('file', 'directory', 'symlink'):
2550
2488
            raise errors.BzrCommandError('invalid kind specified')
2562
2500
                raise errors.BzrCommandError('cannot specify both --from-root'
2563
2501
                                             ' and PATH')
2564
2502
            fs_path = path
2565
 
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2566
 
            fs_path)
 
2503
        tree, branch, relpath = \
 
2504
            _open_directory_or_containing_tree_or_branch(fs_path, directory)
2567
2505
 
2568
2506
        # Calculate the prefix to use
2569
2507
        prefix = None
2584
2522
                view_str = views.view_display_str(view_files)
2585
2523
                note("Ignoring files outside view. View is %s" % view_str)
2586
2524
 
2587
 
        tree.lock_read()
2588
 
        self.add_cleanup(tree.unlock)
 
2525
        self.add_cleanup(tree.lock_read().unlock)
2589
2526
        for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
2527
            from_dir=relpath, recursive=recursive):
2591
2528
            # Apply additional masking
2638
2575
 
2639
2576
    hidden = True
2640
2577
    _see_also = ['ls']
 
2578
    takes_options = ['directory']
2641
2579
 
2642
2580
    @display_command
2643
 
    def run(self):
2644
 
        for f in WorkingTree.open_containing(u'.')[0].unknowns():
 
2581
    def run(self, directory=u'.'):
 
2582
        for f in WorkingTree.open_containing(directory)[0].unknowns():
2645
2583
            self.outf.write(osutils.quotefn(f) + '\n')
2646
2584
 
2647
2585
 
2712
2650
 
2713
2651
    _see_also = ['status', 'ignored', 'patterns']
2714
2652
    takes_args = ['name_pattern*']
2715
 
    takes_options = [
 
2653
    takes_options = ['directory',
2716
2654
        Option('default-rules',
2717
2655
               help='Display the default ignore rules that bzr uses.')
2718
2656
        ]
2719
2657
 
2720
 
    def run(self, name_pattern_list=None, default_rules=None):
 
2658
    def run(self, name_pattern_list=None, default_rules=None,
 
2659
            directory=u'.'):
2721
2660
        from bzrlib import ignores
2722
2661
        if default_rules is not None:
2723
2662
            # dump the default rules and exit
2734
2673
                (len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
2674
                raise errors.BzrCommandError(
2736
2675
                    "NAME_PATTERN should not be an absolute path")
2737
 
        tree, relpath = WorkingTree.open_containing(u'.')
 
2676
        tree, relpath = WorkingTree.open_containing(directory)
2738
2677
        ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
2678
        ignored = globbing.Globster(name_pattern_list)
2740
2679
        matches = []
2741
 
        tree.lock_read()
 
2680
        self.add_cleanup(tree.lock_read().unlock)
2742
2681
        for entry in tree.list_files():
2743
2682
            id = entry[3]
2744
2683
            if id is not None:
2745
2684
                filename = entry[0]
2746
2685
                if ignored.match(filename):
2747
2686
                    matches.append(filename)
2748
 
        tree.unlock()
2749
2687
        if len(matches) > 0:
2750
2688
            self.outf.write("Warning: the following files are version controlled and"
2751
2689
                  " match your ignore pattern:\n%s"
2766
2704
 
2767
2705
    encoding_type = 'replace'
2768
2706
    _see_also = ['ignore', 'ls']
 
2707
    takes_options = ['directory']
2769
2708
 
2770
2709
    @display_command
2771
 
    def run(self):
2772
 
        tree = WorkingTree.open_containing(u'.')[0]
2773
 
        tree.lock_read()
2774
 
        self.add_cleanup(tree.unlock)
 
2710
    def run(self, directory=u'.'):
 
2711
        tree = WorkingTree.open_containing(directory)[0]
 
2712
        self.add_cleanup(tree.lock_read().unlock)
2775
2713
        for path, file_class, kind, file_id, entry in tree.list_files():
2776
2714
            if file_class != 'I':
2777
2715
                continue
2788
2726
    """
2789
2727
    hidden = True
2790
2728
    takes_args = ['revno']
 
2729
    takes_options = ['directory']
2791
2730
 
2792
2731
    @display_command
2793
 
    def run(self, revno):
 
2732
    def run(self, revno, directory=u'.'):
2794
2733
        try:
2795
2734
            revno = int(revno)
2796
2735
        except ValueError:
2797
2736
            raise errors.BzrCommandError("not a valid revision-number: %r"
2798
2737
                                         % revno)
2799
 
        revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
 
2738
        revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2800
2739
        self.outf.write("%s\n" % revid)
2801
2740
 
2802
2741
 
2829
2768
      =================       =========================
2830
2769
    """
2831
2770
    takes_args = ['dest', 'branch_or_subdir?']
2832
 
    takes_options = [
 
2771
    takes_options = ['directory',
2833
2772
        Option('format',
2834
2773
               help="Type of file to export to.",
2835
2774
               type=unicode),
2844
2783
                    'revision in which it was changed.'),
2845
2784
        ]
2846
2785
    def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
 
        root=None, filters=False, per_file_timestamps=False):
 
2786
        root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2848
2787
        from bzrlib.export import export
2849
2788
 
2850
2789
        if branch_or_subdir is None:
2851
 
            tree = WorkingTree.open_containing(u'.')[0]
 
2790
            tree = WorkingTree.open_containing(directory)[0]
2852
2791
            b = tree.branch
2853
2792
            subdir = None
2854
2793
        else:
2873
2812
    """
2874
2813
 
2875
2814
    _see_also = ['ls']
2876
 
    takes_options = [
 
2815
    takes_options = ['directory',
2877
2816
        Option('name-from-revision', help='The path name in the old tree.'),
2878
2817
        Option('filters', help='Apply content filters to display the '
2879
2818
                'convenience form.'),
2884
2823
 
2885
2824
    @display_command
2886
2825
    def run(self, filename, revision=None, name_from_revision=False,
2887
 
            filters=False):
 
2826
            filters=False, directory=None):
2888
2827
        if revision is not None and len(revision) != 1:
2889
2828
            raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
2829
                                         " one revision specifier")
2891
2830
        tree, branch, relpath = \
2892
 
            bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2893
 
        branch.lock_read()
2894
 
        self.add_cleanup(branch.unlock)
 
2831
            _open_directory_or_containing_tree_or_branch(filename, directory)
 
2832
        self.add_cleanup(branch.lock_read().unlock)
2895
2833
        return self._run(tree, branch, relpath, filename, revision,
2896
2834
                         name_from_revision, filters)
2897
2835
 
2900
2838
        if tree is None:
2901
2839
            tree = b.basis_tree()
2902
2840
        rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
 
        rev_tree.lock_read()
2904
 
        self.add_cleanup(rev_tree.unlock)
 
2841
        self.add_cleanup(rev_tree.lock_read().unlock)
2905
2842
 
2906
2843
        old_file_id = rev_tree.path2id(relpath)
2907
2844
 
3169
3106
        def get_message(commit_obj):
3170
3107
            """Callback to get commit message"""
3171
3108
            if file:
3172
 
                my_message = codecs.open(
3173
 
                    file, 'rt', osutils.get_user_encoding()).read()
 
3109
                f = codecs.open(file, 'rt', osutils.get_user_encoding())
 
3110
                try:
 
3111
                    my_message = f.read()
 
3112
                finally:
 
3113
                    f.close()
3174
3114
            elif message is not None:
3175
3115
                my_message = message
3176
3116
            else:
3205
3145
                        reporter=None, verbose=verbose, revprops=properties,
3206
3146
                        authors=author, timestamp=commit_stamp,
3207
3147
                        timezone=offset,
3208
 
                        exclude=safe_relpath_files(tree, exclude))
 
3148
                        exclude=tree.safe_relpath_files(exclude))
3209
3149
        except PointlessCommit:
3210
3150
            raise errors.BzrCommandError("No changes to commit."
3211
3151
                              " Use --unchanged to commit anyhow.")
3330
3270
 
3331
3271
            bzr whoami "Frank Chu <fchu@example.com>"
3332
3272
    """
3333
 
    takes_options = [ Option('email',
 
3273
    takes_options = [ 'directory',
 
3274
                      Option('email',
3334
3275
                             help='Display email address only.'),
3335
3276
                      Option('branch',
3336
3277
                             help='Set identity for the current branch instead of '
3340
3281
    encoding_type = 'replace'
3341
3282
 
3342
3283
    @display_command
3343
 
    def run(self, email=False, branch=False, name=None):
 
3284
    def run(self, email=False, branch=False, name=None, directory=None):
3344
3285
        if name is None:
3345
 
            # use branch if we're inside one; otherwise global config
3346
 
            try:
3347
 
                c = Branch.open_containing('.')[0].get_config()
3348
 
            except errors.NotBranchError:
3349
 
                c = config.GlobalConfig()
 
3286
            if directory is None:
 
3287
                # use branch if we're inside one; otherwise global config
 
3288
                try:
 
3289
                    c = Branch.open_containing(u'.')[0].get_config()
 
3290
                except errors.NotBranchError:
 
3291
                    c = config.GlobalConfig()
 
3292
            else:
 
3293
                c = Branch.open(directory).get_config()
3350
3294
            if email:
3351
3295
                self.outf.write(c.user_email() + '\n')
3352
3296
            else:
3362
3306
 
3363
3307
        # use global config unless --branch given
3364
3308
        if branch:
3365
 
            c = Branch.open_containing('.')[0].get_config()
 
3309
            if directory is None:
 
3310
                c = Branch.open_containing(u'.')[0].get_config()
 
3311
            else:
 
3312
                c = Branch.open(directory).get_config()
3366
3313
        else:
3367
3314
            c = config.GlobalConfig()
3368
3315
        c.set_user_option('email', name)
3380
3327
 
3381
3328
    _see_also = ['info']
3382
3329
    takes_args = ['nickname?']
3383
 
    def run(self, nickname=None):
3384
 
        branch = Branch.open_containing(u'.')[0]
 
3330
    takes_options = ['directory']
 
3331
    def run(self, nickname=None, directory=u'.'):
 
3332
        branch = Branch.open_containing(directory)[0]
3385
3333
        if nickname is None:
3386
3334
            self.printme(branch)
3387
3335
        else:
3612
3560
            self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3561
            # On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3562
            # stdout, which would corrupt the subunit stream. 
3615
 
            if sys.platform == "win32" and sys.stdout.fileno() >= 0:
 
3563
            # FIXME: This has been fixed in subunit trunk (>0.0.5) so the
 
3564
            # following code can be deleted when it's sufficiently deployed
 
3565
            # -- vila/mgz 20100514
 
3566
            if (sys.platform == "win32"
 
3567
                and getattr(sys.stdout, 'fileno', None) is not None):
3616
3568
                import msvcrt
3617
3569
                msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3618
3570
        if parallel:
3690
3642
 
3691
3643
        branch1 = Branch.open_containing(branch)[0]
3692
3644
        branch2 = Branch.open_containing(other)[0]
3693
 
        branch1.lock_read()
3694
 
        self.add_cleanup(branch1.unlock)
3695
 
        branch2.lock_read()
3696
 
        self.add_cleanup(branch2.unlock)
 
3645
        self.add_cleanup(branch1.lock_read().unlock)
 
3646
        self.add_cleanup(branch2.lock_read().unlock)
3697
3647
        last1 = ensure_null(branch1.last_revision())
3698
3648
        last2 = ensure_null(branch2.last_revision())
3699
3649
 
3793
3743
                ' completely merged into the source, pull from the'
3794
3744
                ' source rather than merging.  When this happens,'
3795
3745
                ' you do not need to commit the result.'),
3796
 
        Option('directory',
 
3746
        custom_help('directory',
3797
3747
               help='Branch to merge into, '
3798
 
                    'rather than the one containing the working directory.',
3799
 
               short_name='d',
3800
 
               type=unicode,
3801
 
               ),
 
3748
                    'rather than the one containing the working directory.'),
3802
3749
        Option('preview', help='Instead of merging, show a diff of the'
3803
3750
               ' merge.'),
3804
3751
        Option('interactive', help='Select changes interactively.',
3837
3784
            unversioned_filter=tree.is_ignored, view_info=view_info)
3838
3785
        pb = ui.ui_factory.nested_progress_bar()
3839
3786
        self.add_cleanup(pb.finished)
3840
 
        tree.lock_write()
3841
 
        self.add_cleanup(tree.unlock)
 
3787
        self.add_cleanup(tree.lock_write().unlock)
3842
3788
        if location is not None:
3843
3789
            try:
3844
3790
                mergeable = bundle.read_mergeable_from_url(location,
3905
3851
    def _do_preview(self, merger):
3906
3852
        from bzrlib.diff import show_diff_trees
3907
3853
        result_tree = self._get_preview(merger)
 
3854
        path_encoding = osutils.get_diff_header_encoding()
3908
3855
        show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
 
                        old_label='', new_label='')
 
3856
                        old_label='', new_label='',
 
3857
                        path_encoding=path_encoding)
3910
3858
 
3911
3859
    def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
3860
        merger.change_reporter = change_reporter
4100
4048
        if merge_type is None:
4101
4049
            merge_type = _mod_merge.Merge3Merger
4102
4050
        tree, file_list = tree_files(file_list)
4103
 
        tree.lock_write()
4104
 
        self.add_cleanup(tree.unlock)
 
4051
        self.add_cleanup(tree.lock_write().unlock)
4105
4052
        parents = tree.get_parent_ids()
4106
4053
        if len(parents) != 2:
4107
4054
            raise errors.BzrCommandError("Sorry, remerge only works after normal"
4217
4164
    def run(self, revision=None, no_backup=False, file_list=None,
4218
4165
            forget_merges=None):
4219
4166
        tree, file_list = tree_files(file_list)
4220
 
        tree.lock_tree_write()
4221
 
        self.add_cleanup(tree.unlock)
 
4167
        self.add_cleanup(tree.lock_tree_write().unlock)
4222
4168
        if forget_merges:
4223
4169
            tree.set_parent_ids(tree.get_parent_ids()[:1])
4224
4170
        else:
4313
4259
    _see_also = ['merge', 'pull']
4314
4260
    takes_args = ['other_branch?']
4315
4261
    takes_options = [
 
4262
        'directory',
4316
4263
        Option('reverse', 'Reverse the order of revisions.'),
4317
4264
        Option('mine-only',
4318
4265
               'Display changes in the local branch only.'),
4340
4287
            theirs_only=False,
4341
4288
            log_format=None, long=False, short=False, line=False,
4342
4289
            show_ids=False, verbose=False, this=False, other=False,
4343
 
            include_merges=False, revision=None, my_revision=None):
 
4290
            include_merges=False, revision=None, my_revision=None,
 
4291
            directory=u'.'):
4344
4292
        from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4293
        def message(s):
4346
4294
            if not is_quiet():
4359
4307
        elif theirs_only:
4360
4308
            restrict = 'remote'
4361
4309
 
4362
 
        local_branch = Branch.open_containing(u".")[0]
4363
 
        local_branch.lock_read()
4364
 
        self.add_cleanup(local_branch.unlock)
 
4310
        local_branch = Branch.open_containing(directory)[0]
 
4311
        self.add_cleanup(local_branch.lock_read().unlock)
4365
4312
 
4366
4313
        parent = local_branch.get_parent()
4367
4314
        if other_branch is None:
4378
4325
        if remote_branch.base == local_branch.base:
4379
4326
            remote_branch = local_branch
4380
4327
        else:
4381
 
            remote_branch.lock_read()
4382
 
            self.add_cleanup(remote_branch.unlock)
 
4328
            self.add_cleanup(remote_branch.lock_read().unlock)
4383
4329
 
4384
4330
        local_revid_range = _revision_range_to_revid_range(
4385
4331
            _get_revision_range(my_revision, local_branch,
4440
4386
            message("Branches are up to date.\n")
4441
4387
        self.cleanup_now()
4442
4388
        if not status_code and parent is None and other_branch is not None:
4443
 
            local_branch.lock_write()
4444
 
            self.add_cleanup(local_branch.unlock)
 
4389
            self.add_cleanup(local_branch.lock_write().unlock)
4445
4390
            # handle race conditions - a parent might be set while we run.
4446
4391
            if local_branch.get_parent() is None:
4447
4392
                local_branch.set_parent(remote_branch.base)
4547
4492
            b = Branch.open_containing(branch)[0]
4548
4493
        else:
4549
4494
            b = Branch.open(branch)
4550
 
        b.lock_read()
4551
 
        self.add_cleanup(b.unlock)
 
4495
        self.add_cleanup(b.lock_read().unlock)
4552
4496
        if revision is None:
4553
4497
            rev_id = b.last_revision()
4554
4498
        else:
4578
4522
                     Option('long', help='Show commit date in annotations.'),
4579
4523
                     'revision',
4580
4524
                     'show-ids',
 
4525
                     'directory',
4581
4526
                     ]
4582
4527
    encoding_type = 'exact'
4583
4528
 
4584
4529
    @display_command
4585
4530
    def run(self, filename, all=False, long=False, revision=None,
4586
 
            show_ids=False):
 
4531
            show_ids=False, directory=None):
4587
4532
        from bzrlib.annotate import annotate_file, annotate_file_tree
4588
4533
        wt, branch, relpath = \
4589
 
            bzrdir.BzrDir.open_containing_tree_or_branch(filename)
 
4534
            _open_directory_or_containing_tree_or_branch(filename, directory)
4590
4535
        if wt is not None:
4591
 
            wt.lock_read()
4592
 
            self.add_cleanup(wt.unlock)
 
4536
            self.add_cleanup(wt.lock_read().unlock)
4593
4537
        else:
4594
 
            branch.lock_read()
4595
 
            self.add_cleanup(branch.unlock)
 
4538
            self.add_cleanup(branch.lock_read().unlock)
4596
4539
        tree = _get_one_revision_tree('annotate', revision, branch=branch)
4597
 
        tree.lock_read()
4598
 
        self.add_cleanup(tree.unlock)
 
4540
        self.add_cleanup(tree.lock_read().unlock)
4599
4541
        if wt is not None:
4600
4542
            file_id = wt.path2id(relpath)
4601
4543
        else:
4619
4561
 
4620
4562
    hidden = True # is this right ?
4621
4563
    takes_args = ['revision_id*']
4622
 
    takes_options = ['revision']
 
4564
    takes_options = ['directory', 'revision']
4623
4565
 
4624
 
    def run(self, revision_id_list=None, revision=None):
 
4566
    def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4567
        if revision_id_list is not None and revision is not None:
4626
4568
            raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4627
4569
        if revision_id_list is None and revision is None:
4628
4570
            raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
 
        b = WorkingTree.open_containing(u'.')[0].branch
4630
 
        b.lock_write()
4631
 
        self.add_cleanup(b.unlock)
 
4571
        b = WorkingTree.open_containing(directory)[0].branch
 
4572
        self.add_cleanup(b.lock_write().unlock)
4632
4573
        return self._run(b, revision_id_list, revision)
4633
4574
 
4634
4575
    def _run(self, b, revision_id_list, revision):
4693
4634
 
4694
4635
    _see_also = ['checkouts', 'unbind']
4695
4636
    takes_args = ['location?']
4696
 
    takes_options = []
 
4637
    takes_options = ['directory']
4697
4638
 
4698
 
    def run(self, location=None):
4699
 
        b, relpath = Branch.open_containing(u'.')
 
4639
    def run(self, location=None, directory=u'.'):
 
4640
        b, relpath = Branch.open_containing(directory)
4700
4641
        if location is None:
4701
4642
            try:
4702
4643
                location = b.get_old_bound_location()
4729
4670
 
4730
4671
    _see_also = ['checkouts', 'bind']
4731
4672
    takes_args = []
4732
 
    takes_options = []
 
4673
    takes_options = ['directory']
4733
4674
 
4734
 
    def run(self):
4735
 
        b, relpath = Branch.open_containing(u'.')
 
4675
    def run(self, directory=u'.'):
 
4676
        b, relpath = Branch.open_containing(directory)
4736
4677
        if not b.unbind():
4737
4678
            raise errors.BzrCommandError('Local branch is not bound')
4738
4679
 
4784
4725
            b = control.open_branch()
4785
4726
 
4786
4727
        if tree is not None:
4787
 
            tree.lock_write()
4788
 
            self.add_cleanup(tree.unlock)
 
4728
            self.add_cleanup(tree.lock_write().unlock)
4789
4729
        else:
4790
 
            b.lock_write()
4791
 
            self.add_cleanup(b.unlock)
 
4730
            self.add_cleanup(b.lock_write().unlock)
4792
4731
        return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4793
4732
 
4794
4733
    def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4902
4841
                    'result in a dynamically allocated port.  The default port '
4903
4842
                    'depends on the protocol.',
4904
4843
               type=str),
4905
 
        Option('directory',
4906
 
               help='Serve contents of this directory.',
4907
 
               type=unicode),
 
4844
        custom_help('directory',
 
4845
               help='Serve contents of this directory.'),
4908
4846
        Option('allow-writes',
4909
4847
               help='By default the server is a readonly server.  Supplying '
4910
4848
                    '--allow-writes enables write access to the contents of '
4937
4875
 
4938
4876
    def run(self, port=None, inet=False, directory=None, allow_writes=False,
4939
4877
            protocol=None):
4940
 
        from bzrlib.transport import get_transport, transport_server_registry
 
4878
        from bzrlib import transport
4941
4879
        if directory is None:
4942
4880
            directory = os.getcwd()
4943
4881
        if protocol is None:
4944
 
            protocol = transport_server_registry.get()
 
4882
            protocol = transport.transport_server_registry.get()
4945
4883
        host, port = self.get_host_and_port(port)
4946
4884
        url = urlutils.local_path_to_url(directory)
4947
4885
        if not allow_writes:
4948
4886
            url = 'readonly+' + url
4949
 
        transport = get_transport(url)
4950
 
        protocol(transport, host, port, inet)
 
4887
        t = transport.get_transport(url)
 
4888
        protocol(t, host, port, inet)
4951
4889
 
4952
4890
 
4953
4891
class cmd_join(Command):
5046
4984
    _see_also = ['send']
5047
4985
 
5048
4986
    takes_options = [
 
4987
        'directory',
5049
4988
        RegistryOption.from_kwargs('patch-type',
5050
4989
            'The type of patch to include in the directive.',
5051
4990
            title='Patch type',
5064
5003
    encoding_type = 'exact'
5065
5004
 
5066
5005
    def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5067
 
            sign=False, revision=None, mail_to=None, message=None):
 
5006
            sign=False, revision=None, mail_to=None, message=None,
 
5007
            directory=u'.'):
5068
5008
        from bzrlib.revision import ensure_null, NULL_REVISION
5069
5009
        include_patch, include_bundle = {
5070
5010
            'plain': (False, False),
5071
5011
            'diff': (True, False),
5072
5012
            'bundle': (True, True),
5073
5013
            }[patch_type]
5074
 
        branch = Branch.open('.')
 
5014
        branch = Branch.open(directory)
5075
5015
        stored_submit_branch = branch.get_submit_branch()
5076
5016
        if submit_branch is None:
5077
5017
            submit_branch = stored_submit_branch
5162
5102
    given, in which case it is sent to a file.
5163
5103
 
5164
5104
    Mail is sent using your preferred mail program.  This should be transparent
5165
 
    on Windows (it uses MAPI).  On Linux, it requires the xdg-email utility.
 
5105
    on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.
5166
5106
    If the preferred client can't be found (or used), your editor will be used.
5167
5107
 
5168
5108
    To use a specific mail program, set the mail_client configuration option.
5339
5279
        Option('delete',
5340
5280
            help='Delete this tag rather than placing it.',
5341
5281
            ),
5342
 
        Option('directory',
5343
 
            help='Branch in which to place the tag.',
5344
 
            short_name='d',
5345
 
            type=unicode,
5346
 
            ),
 
5282
        custom_help('directory',
 
5283
            help='Branch in which to place the tag.'),
5347
5284
        Option('force',
5348
5285
            help='Replace existing tags.',
5349
5286
            ),
5357
5294
            revision=None,
5358
5295
            ):
5359
5296
        branch, relpath = Branch.open_containing(directory)
5360
 
        branch.lock_write()
5361
 
        self.add_cleanup(branch.unlock)
 
5297
        self.add_cleanup(branch.lock_write().unlock)
5362
5298
        if delete:
5363
5299
            if tag_name is None:
5364
5300
                raise errors.BzrCommandError("No tag specified to delete.")
5392
5328
 
5393
5329
    _see_also = ['tag']
5394
5330
    takes_options = [
5395
 
        Option('directory',
5396
 
            help='Branch whose tags should be displayed.',
5397
 
            short_name='d',
5398
 
            type=unicode,
5399
 
            ),
 
5331
        custom_help('directory',
 
5332
            help='Branch whose tags should be displayed.'),
5400
5333
        RegistryOption.from_kwargs('sort',
5401
5334
            'Sort tags by different criteria.', title='Sorting',
5402
5335
            alpha='Sort tags lexicographically (default).',
5419
5352
        if not tags:
5420
5353
            return
5421
5354
 
5422
 
        branch.lock_read()
5423
 
        self.add_cleanup(branch.unlock)
 
5355
        self.add_cleanup(branch.lock_read().unlock)
5424
5356
        if revision:
5425
5357
            graph = branch.repository.get_graph()
5426
5358
            rev1, rev2 = _get_revision_range(revision, branch, self.name())
5573
5505
    """
5574
5506
 
5575
5507
    takes_args = ['to_location?']
5576
 
    takes_options = [Option('force',
 
5508
    takes_options = ['directory',
 
5509
                     Option('force',
5577
5510
                        help='Switch even if local commits will be lost.'),
5578
5511
                     'revision',
5579
5512
                     Option('create-branch', short_name='b',
5582
5515
                    ]
5583
5516
 
5584
5517
    def run(self, to_location=None, force=False, create_branch=False,
5585
 
            revision=None):
 
5518
            revision=None, directory=u'.'):
5586
5519
        from bzrlib import switch
5587
 
        tree_location = '.'
 
5520
        tree_location = directory
5588
5521
        revision = _get_one_revision('switch', revision)
5589
5522
        control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
5523
        if to_location is None:
5591
5524
            if revision is None:
5592
5525
                raise errors.BzrCommandError('You must supply either a'
5593
5526
                                             ' revision or a location')
5594
 
            to_location = '.'
 
5527
            to_location = tree_location
5595
5528
        try:
5596
5529
            branch = control_dir.open_branch()
5597
5530
            had_explicit_nick = branch.get_config().has_explicit_nickname()
5872
5805
    takes_args = ['file*']
5873
5806
 
5874
5807
    takes_options = [
 
5808
        'directory',
5875
5809
        'revision',
5876
5810
        Option('all', help='Shelve all changes.'),
5877
5811
        'message',
5886
5820
    _see_also = ['unshelve']
5887
5821
 
5888
5822
    def run(self, revision=None, all=False, file_list=None, message=None,
5889
 
            writer=None, list=False, destroy=False):
 
5823
            writer=None, list=False, destroy=False, directory=u'.'):
5890
5824
        if list:
5891
5825
            return self.run_for_list()
5892
5826
        from bzrlib.shelf_ui import Shelver
5894
5828
            writer = bzrlib.option.diff_writer_registry.get()
5895
5829
        try:
5896
5830
            shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
 
                file_list, message, destroy=destroy)
 
5831
                file_list, message, destroy=destroy, directory=directory)
5898
5832
            try:
5899
5833
                shelver.run()
5900
5834
            finally:
5904
5838
 
5905
5839
    def run_for_list(self):
5906
5840
        tree = WorkingTree.open_containing('.')[0]
5907
 
        tree.lock_read()
5908
 
        self.add_cleanup(tree.unlock)
 
5841
        self.add_cleanup(tree.lock_read().unlock)
5909
5842
        manager = tree.get_shelf_manager()
5910
5843
        shelves = manager.active_shelves()
5911
5844
        if len(shelves) == 0:
5929
5862
 
5930
5863
    takes_args = ['shelf_id?']
5931
5864
    takes_options = [
 
5865
        'directory',
5932
5866
        RegistryOption.from_kwargs(
5933
5867
            'action', help="The action to perform.",
5934
5868
            enum_switch=False, value_switches=True,
5942
5876
    ]
5943
5877
    _see_also = ['shelve']
5944
5878
 
5945
 
    def run(self, shelf_id=None, action='apply'):
 
5879
    def run(self, shelf_id=None, action='apply', directory=u'.'):
5946
5880
        from bzrlib.shelf_ui import Unshelver
5947
 
        unshelver = Unshelver.from_args(shelf_id, action)
 
5881
        unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5948
5882
        try:
5949
5883
            unshelver.run()
5950
5884
        finally:
5966
5900
 
5967
5901
    To check what clean-tree will do, use --dry-run.
5968
5902
    """
5969
 
    takes_options = [Option('ignored', help='Delete all ignored files.'),
 
5903
    takes_options = ['directory',
 
5904
                     Option('ignored', help='Delete all ignored files.'),
5970
5905
                     Option('detritus', help='Delete conflict files, merge'
5971
5906
                            ' backups, and failed selftest dirs.'),
5972
5907
                     Option('unknown',
5975
5910
                            ' deleting them.'),
5976
5911
                     Option('force', help='Do not prompt before deleting.')]
5977
5912
    def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5978
 
            force=False):
 
5913
            force=False, directory=u'.'):
5979
5914
        from bzrlib.clean_tree import clean_tree
5980
5915
        if not (unknown or ignored or detritus):
5981
5916
            unknown = True
5982
5917
        if dry_run:
5983
5918
            force = True
5984
 
        clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
 
                   dry_run=dry_run, no_prompt=force)
 
5919
        clean_tree(directory, unknown=unknown, ignored=ignored,
 
5920
                   detritus=detritus, dry_run=dry_run, no_prompt=force)
5986
5921
 
5987
5922
 
5988
5923
class cmd_reference(Command):