/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: Vincent Ladeuil
  • Date: 2010-07-20 14:36:42 UTC
  • mto: This revision was merged to the branch mainline in revision 5355.
  • Revision ID: v.ladeuil+lp@free.fr-20100720143642-u3x5uvkgny6iie2p
Set a Content-Length header on errors for HTTP/1.1.

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"
528
495
        if tree:
529
496
            try:
530
497
                wt = WorkingTree.open_containing(location)[0]
531
 
                wt.lock_read()
 
498
                self.add_cleanup(wt.lock_read().unlock)
532
499
            except (errors.NoWorkingTree, errors.NotLocalUrl):
533
500
                raise errors.NoWorkingTree(location)
534
 
            self.add_cleanup(wt.unlock)
535
501
            revid = wt.last_revision()
536
502
            try:
537
503
                revno_t = wt.branch.revision_id_to_dotted_revno(revid)
540
506
            revno = ".".join(str(n) for n in revno_t)
541
507
        else:
542
508
            b = Branch.open_containing(location)[0]
543
 
            b.lock_read()
544
 
            self.add_cleanup(b.unlock)
 
509
            self.add_cleanup(b.lock_read().unlock)
545
510
            revno = b.revno()
546
511
        self.cleanup_now()
547
512
        self.outf.write(str(revno) + '\n')
554
519
    takes_args = ['revision_info*']
555
520
    takes_options = [
556
521
        'revision',
557
 
        Option('directory',
 
522
        custom_help('directory',
558
523
            help='Branch to examine, '
559
 
                 'rather than the one containing the working directory.',
560
 
            short_name='d',
561
 
            type=unicode,
562
 
            ),
 
524
                 'rather than the one containing the working directory.'),
563
525
        Option('tree', help='Show revno of working tree'),
564
526
        ]
565
527
 
570
532
        try:
571
533
            wt = WorkingTree.open_containing(directory)[0]
572
534
            b = wt.branch
573
 
            wt.lock_read()
574
 
            self.add_cleanup(wt.unlock)
 
535
            self.add_cleanup(wt.lock_read().unlock)
575
536
        except (errors.NoWorkingTree, errors.NotLocalUrl):
576
537
            wt = None
577
538
            b = Branch.open_containing(directory)[0]
578
 
            b.lock_read()
579
 
            self.add_cleanup(b.unlock)
 
539
            self.add_cleanup(b.lock_read().unlock)
580
540
        revision_ids = []
581
541
        if revision is not None:
582
542
            revision_ids.extend(rev.as_revision_id(b) for rev in revision)
681
641
                should_print=(not is_quiet()))
682
642
 
683
643
        if base_tree:
684
 
            base_tree.lock_read()
685
 
            self.add_cleanup(base_tree.unlock)
 
644
            self.add_cleanup(base_tree.lock_read().unlock)
686
645
        tree, file_list = tree_files_for_add(file_list)
687
646
        added, ignored = tree.smart_add(file_list, not
688
647
            no_recurse, action=action, save=not dry_run)
759
718
            raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
760
719
 
761
720
        revision = _get_one_revision('inventory', revision)
762
 
        work_tree, file_list = tree_files(file_list)
763
 
        work_tree.lock_read()
764
 
        self.add_cleanup(work_tree.unlock)
 
721
        work_tree, file_list = WorkingTree.open_containing_paths(file_list)
 
722
        self.add_cleanup(work_tree.lock_read().unlock)
765
723
        if revision is not None:
766
724
            tree = revision.as_tree(work_tree.branch)
767
725
 
768
726
            extra_trees = [work_tree]
769
 
            tree.lock_read()
770
 
            self.add_cleanup(tree.unlock)
 
727
            self.add_cleanup(tree.lock_read().unlock)
771
728
        else:
772
729
            tree = work_tree
773
730
            extra_trees = []
832
789
            names_list = []
833
790
        if len(names_list) < 2:
834
791
            raise errors.BzrCommandError("missing file argument")
835
 
        tree, rel_names = tree_files(names_list, canonicalize=False)
836
 
        tree.lock_tree_write()
837
 
        self.add_cleanup(tree.unlock)
 
792
        tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
 
793
        self.add_cleanup(tree.lock_tree_write().unlock)
838
794
        self._run(tree, names_list, rel_names, after)
839
795
 
840
796
    def run_auto(self, names_list, after, dry_run):
844
800
        if after:
845
801
            raise errors.BzrCommandError('--after cannot be specified with'
846
802
                                         ' --auto.')
847
 
        work_tree, file_list = tree_files(names_list, default_branch='.')
848
 
        work_tree.lock_tree_write()
849
 
        self.add_cleanup(work_tree.unlock)
 
803
        work_tree, file_list = WorkingTree.open_containing_paths(
 
804
            names_list, default_directory='.')
 
805
        self.add_cleanup(work_tree.lock_tree_write().unlock)
850
806
        rename_map.RenameMap.guess_renames(work_tree, dry_run)
851
807
 
852
808
    def _run(self, tree, names_list, rel_names, after):
960
916
    takes_options = ['remember', 'overwrite', 'revision',
961
917
        custom_help('verbose',
962
918
            help='Show logs of pulled revisions.'),
963
 
        Option('directory',
 
919
        custom_help('directory',
964
920
            help='Branch to pull into, '
965
 
                 'rather than the one containing the working directory.',
966
 
            short_name='d',
967
 
            type=unicode,
968
 
            ),
 
921
                 'rather than the one containing the working directory.'),
969
922
        Option('local',
970
923
            help="Perform a local pull in a bound "
971
924
                 "branch.  Local pulls are not applied to "
986
939
        try:
987
940
            tree_to = WorkingTree.open_containing(directory)[0]
988
941
            branch_to = tree_to.branch
989
 
            tree_to.lock_write()
990
 
            self.add_cleanup(tree_to.unlock)
 
942
            self.add_cleanup(tree_to.lock_write().unlock)
991
943
        except errors.NoWorkingTree:
992
944
            tree_to = None
993
945
            branch_to = Branch.open_containing(directory)[0]
994
 
            branch_to.lock_write()
995
 
            self.add_cleanup(branch_to.unlock)
 
946
            self.add_cleanup(branch_to.lock_write().unlock)
996
947
 
997
948
        if local and not branch_to.get_bound_location():
998
949
            raise errors.LocalRequiresBoundBranch()
1029
980
        else:
1030
981
            branch_from = Branch.open(location,
1031
982
                possible_transports=possible_transports)
1032
 
            branch_from.lock_read()
1033
 
            self.add_cleanup(branch_from.unlock)
 
983
            self.add_cleanup(branch_from.lock_read().unlock)
1034
984
 
1035
985
            if branch_to.get_parent() is None or remember:
1036
986
                branch_to.set_parent(branch_from.base)
1088
1038
        Option('create-prefix',
1089
1039
               help='Create the path leading up to the branch '
1090
1040
                    'if it does not already exist.'),
1091
 
        Option('directory',
 
1041
        custom_help('directory',
1092
1042
            help='Branch to push from, '
1093
 
                 'rather than the one containing the working directory.',
1094
 
            short_name='d',
1095
 
            type=unicode,
1096
 
            ),
 
1043
                 'rather than the one containing the working directory.'),
1097
1044
        Option('use-existing-dir',
1098
1045
               help='By default push will fail if the target'
1099
1046
                    ' directory exists, but does not already'
1219
1166
        accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1220
1167
            from_location)
1221
1168
        revision = _get_one_revision('branch', revision)
1222
 
        br_from.lock_read()
1223
 
        self.add_cleanup(br_from.unlock)
 
1169
        self.add_cleanup(br_from.lock_read().unlock)
1224
1170
        if revision is not None:
1225
1171
            revision_id = revision.as_revision_id(br_from)
1226
1172
        else:
1366
1312
    @display_command
1367
1313
    def run(self, dir=u'.'):
1368
1314
        tree = WorkingTree.open_containing(dir)[0]
1369
 
        tree.lock_read()
1370
 
        self.add_cleanup(tree.unlock)
 
1315
        self.add_cleanup(tree.lock_read().unlock)
1371
1316
        new_inv = tree.inventory
1372
1317
        old_tree = tree.basis_tree()
1373
 
        old_tree.lock_read()
1374
 
        self.add_cleanup(old_tree.unlock)
 
1318
        self.add_cleanup(old_tree.lock_read().unlock)
1375
1319
        old_inv = old_tree.inventory
1376
1320
        renames = []
1377
1321
        iterator = tree.iter_changes(old_tree, include_unchanged=True)
1415
1359
        master = branch.get_master_branch(
1416
1360
            possible_transports=possible_transports)
1417
1361
        if master is not None:
1418
 
            tree.lock_write()
1419
1362
            branch_location = master.base
 
1363
            tree.lock_write()
1420
1364
        else:
 
1365
            branch_location = tree.branch.base
1421
1366
            tree.lock_tree_write()
1422
 
            branch_location = tree.branch.base
1423
1367
        self.add_cleanup(tree.unlock)
1424
1368
        # get rid of the final '/' and be ready for display
1425
1369
        branch_location = urlutils.unescape_for_display(
1540
1484
 
1541
1485
    def run(self, file_list, verbose=False, new=False,
1542
1486
        file_deletion_strategy='safe'):
1543
 
        tree, file_list = tree_files(file_list)
 
1487
        tree, file_list = WorkingTree.open_containing_paths(file_list)
1544
1488
 
1545
1489
        if file_list is not None:
1546
1490
            file_list = [f for f in file_list]
1547
1491
 
1548
 
        tree.lock_write()
1549
 
        self.add_cleanup(tree.unlock)
 
1492
        self.add_cleanup(tree.lock_write().unlock)
1550
1493
        # Heuristics should probably all move into tree.remove_smart or
1551
1494
        # some such?
1552
1495
        if new:
1926
1869
    takes_args = ['file*']
1927
1870
    takes_options = [
1928
1871
        Option('diff-options', type=str,
1929
 
               help='Pass these options to the external diff program.'),
 
1872
               help='Pass these options to the diff program.'),
1930
1873
        Option('prefix', type=str,
1931
1874
               short_name='p',
1932
1875
               help='Set prefixes added to old and new filenames, as '
1973
1916
                '--prefix expects two values separated by a colon'
1974
1917
                ' (eg "old/:new/")')
1975
1918
 
 
1919
        if using is not None and diff_options is not None:
 
1920
            raise errors.BzrCommandError(
 
1921
            '--diff-options and --using are mutually exclusive.')
 
1922
 
1976
1923
        if revision and len(revision) > 2:
1977
1924
            raise errors.BzrCommandError('bzr diff --revision takes exactly'
1978
1925
                                         ' one or two revision specifiers')
1985
1932
         old_branch, new_branch,
1986
1933
         specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
1934
            file_list, revision, old, new, self.add_cleanup, apply_view=True)
 
1935
        # GNU diff on Windows uses ANSI encoding for filenames
 
1936
        path_encoding = osutils.get_diff_header_encoding()
1988
1937
        return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1938
                               specific_files=specific_files,
1990
1939
                               external_diff_options=diff_options,
1991
1940
                               old_label=old_label, new_label=new_label,
1992
 
                               extra_trees=extra_trees, using=using,
 
1941
                               extra_trees=extra_trees,
 
1942
                               path_encoding=path_encoding,
 
1943
                               using=using,
1993
1944
                               format_cls=format)
1994
1945
 
1995
1946
 
2003
1954
    # level of effort but possibly much less IO.  (Or possibly not,
2004
1955
    # if the directories are very large...)
2005
1956
    _see_also = ['status', 'ls']
2006
 
    takes_options = ['show-ids']
 
1957
    takes_options = ['directory', 'show-ids']
2007
1958
 
2008
1959
    @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)
 
1960
    def run(self, show_ids=False, directory=u'.'):
 
1961
        tree = WorkingTree.open_containing(directory)[0]
 
1962
        self.add_cleanup(tree.lock_read().unlock)
2013
1963
        old = tree.basis_tree()
2014
 
        old.lock_read()
2015
 
        self.add_cleanup(old.unlock)
 
1964
        self.add_cleanup(old.lock_read().unlock)
2016
1965
        for path, ie in old.inventory.iter_entries():
2017
1966
            if not tree.has_id(ie.file_id):
2018
1967
                self.outf.write(path)
2028
1977
 
2029
1978
    hidden = True
2030
1979
    _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
 
            ]
 
1980
    takes_options = ['directory', 'null']
2036
1981
 
2037
1982
    @display_command
2038
 
    def run(self, null=False):
2039
 
        tree = WorkingTree.open_containing(u'.')[0]
 
1983
    def run(self, null=False, directory=u'.'):
 
1984
        tree = WorkingTree.open_containing(directory)[0]
2040
1985
        td = tree.changes_from(tree.basis_tree())
2041
1986
        for path, id, kind, text_modified, meta_modified in td.modified:
2042
1987
            if null:
2051
1996
 
2052
1997
    hidden = True
2053
1998
    _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
 
            ]
 
1999
    takes_options = ['directory', 'null']
2059
2000
 
2060
2001
    @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)
 
2002
    def run(self, null=False, directory=u'.'):
 
2003
        wt = WorkingTree.open_containing(directory)[0]
 
2004
        self.add_cleanup(wt.lock_read().unlock)
2065
2005
        basis = wt.basis_tree()
2066
 
        basis.lock_read()
2067
 
        self.add_cleanup(basis.unlock)
 
2006
        self.add_cleanup(basis.lock_read().unlock)
2068
2007
        basis_inv = basis.inventory
2069
2008
        inv = wt.inventory
2070
2009
        for file_id in inv:
2073
2012
            if inv.is_root(file_id) and len(basis_inv) == 0:
2074
2013
                continue
2075
2014
            path = inv.id2path(file_id)
2076
 
            if not os.access(osutils.abspath(path), os.F_OK):
 
2015
            if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2077
2016
                continue
2078
2017
            if null:
2079
2018
                self.outf.write(path + '\0')
2279
2218
                   help='Show just the specified revision.'
2280
2219
                   ' See also "help revisionspec".'),
2281
2220
            'log-format',
 
2221
            RegistryOption('authors',
 
2222
                'What names to list as authors - first, all or committer.',
 
2223
                title='Authors',
 
2224
                lazy_registry=('bzrlib.log', 'author_list_registry'),
 
2225
            ),
2282
2226
            Option('levels',
2283
2227
                   short_name='n',
2284
2228
                   help='Number of levels to display - 0 for all, 1 for flat.',
2319
2263
            limit=None,
2320
2264
            show_diff=False,
2321
2265
            include_merges=False,
 
2266
            authors=None,
2322
2267
            exclude_common_ancestry=False,
2323
2268
            ):
2324
2269
        from bzrlib.log import (
2352
2297
        if file_list:
2353
2298
            # find the file ids to log and check for directory filtering
2354
2299
            b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2355
 
                revision, file_list)
2356
 
            self.add_cleanup(b.unlock)
 
2300
                revision, file_list, self.add_cleanup)
2357
2301
            for relpath, file_id, kind in file_info_list:
2358
2302
                if file_id is None:
2359
2303
                    raise errors.BzrCommandError(
2377
2321
                location = '.'
2378
2322
            dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
2323
            b = dir.open_branch()
2380
 
            b.lock_read()
2381
 
            self.add_cleanup(b.unlock)
 
2324
            self.add_cleanup(b.lock_read().unlock)
2382
2325
            rev1, rev2 = _get_revision_range(revision, b, self.name())
2383
2326
 
2384
2327
        # Decide on the type of delta & diff filtering to use
2404
2347
                        show_timezone=timezone,
2405
2348
                        delta_format=get_verbosity_level(),
2406
2349
                        levels=levels,
2407
 
                        show_advice=levels is None)
 
2350
                        show_advice=levels is None,
 
2351
                        author_list_handler=authors)
2408
2352
 
2409
2353
        # Choose the algorithm for doing the logging. It's annoying
2410
2354
        # having multiple code paths like this but necessary until
2508
2452
        tree, relpath = WorkingTree.open_containing(filename)
2509
2453
        file_id = tree.path2id(relpath)
2510
2454
        b = tree.branch
2511
 
        b.lock_read()
2512
 
        self.add_cleanup(b.unlock)
 
2455
        self.add_cleanup(b.lock_read().unlock)
2513
2456
        touching_revs = log.find_touching_revisions(b, file_id)
2514
2457
        for revno, revision_id, what in touching_revs:
2515
2458
            self.outf.write("%6d %s\n" % (revno, what))
2528
2471
                   help='Recurse into subdirectories.'),
2529
2472
            Option('from-root',
2530
2473
                   help='Print paths relative to the root of the branch.'),
2531
 
            Option('unknown', help='Print unknown files.'),
 
2474
            Option('unknown', short_name='u',
 
2475
                help='Print unknown files.'),
2532
2476
            Option('versioned', help='Print versioned files.',
2533
2477
                   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',
 
2478
            Option('ignored', short_name='i',
 
2479
                help='Print ignored files.'),
 
2480
            Option('kind', short_name='k',
2539
2481
                   help='List entries of a particular kind: file, directory, symlink.',
2540
2482
                   type=unicode),
 
2483
            'null',
2541
2484
            'show-ids',
 
2485
            'directory',
2542
2486
            ]
2543
2487
    @display_command
2544
2488
    def run(self, revision=None, verbose=False,
2545
2489
            recursive=False, from_root=False,
2546
2490
            unknown=False, versioned=False, ignored=False,
2547
 
            null=False, kind=None, show_ids=False, path=None):
 
2491
            null=False, kind=None, show_ids=False, path=None, directory=None):
2548
2492
 
2549
2493
        if kind and kind not in ('file', 'directory', 'symlink'):
2550
2494
            raise errors.BzrCommandError('invalid kind specified')
2562
2506
                raise errors.BzrCommandError('cannot specify both --from-root'
2563
2507
                                             ' and PATH')
2564
2508
            fs_path = path
2565
 
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2566
 
            fs_path)
 
2509
        tree, branch, relpath = \
 
2510
            _open_directory_or_containing_tree_or_branch(fs_path, directory)
2567
2511
 
2568
2512
        # Calculate the prefix to use
2569
2513
        prefix = None
2584
2528
                view_str = views.view_display_str(view_files)
2585
2529
                note("Ignoring files outside view. View is %s" % view_str)
2586
2530
 
2587
 
        tree.lock_read()
2588
 
        self.add_cleanup(tree.unlock)
 
2531
        self.add_cleanup(tree.lock_read().unlock)
2589
2532
        for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
2533
            from_dir=relpath, recursive=recursive):
2591
2534
            # Apply additional masking
2638
2581
 
2639
2582
    hidden = True
2640
2583
    _see_also = ['ls']
 
2584
    takes_options = ['directory']
2641
2585
 
2642
2586
    @display_command
2643
 
    def run(self):
2644
 
        for f in WorkingTree.open_containing(u'.')[0].unknowns():
 
2587
    def run(self, directory=u'.'):
 
2588
        for f in WorkingTree.open_containing(directory)[0].unknowns():
2645
2589
            self.outf.write(osutils.quotefn(f) + '\n')
2646
2590
 
2647
2591
 
2712
2656
 
2713
2657
    _see_also = ['status', 'ignored', 'patterns']
2714
2658
    takes_args = ['name_pattern*']
2715
 
    takes_options = [
 
2659
    takes_options = ['directory',
2716
2660
        Option('default-rules',
2717
2661
               help='Display the default ignore rules that bzr uses.')
2718
2662
        ]
2719
2663
 
2720
 
    def run(self, name_pattern_list=None, default_rules=None):
 
2664
    def run(self, name_pattern_list=None, default_rules=None,
 
2665
            directory=u'.'):
2721
2666
        from bzrlib import ignores
2722
2667
        if default_rules is not None:
2723
2668
            # dump the default rules and exit
2734
2679
                (len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
2680
                raise errors.BzrCommandError(
2736
2681
                    "NAME_PATTERN should not be an absolute path")
2737
 
        tree, relpath = WorkingTree.open_containing(u'.')
 
2682
        tree, relpath = WorkingTree.open_containing(directory)
2738
2683
        ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
2684
        ignored = globbing.Globster(name_pattern_list)
2740
2685
        matches = []
2741
 
        tree.lock_read()
 
2686
        self.add_cleanup(tree.lock_read().unlock)
2742
2687
        for entry in tree.list_files():
2743
2688
            id = entry[3]
2744
2689
            if id is not None:
2745
2690
                filename = entry[0]
2746
2691
                if ignored.match(filename):
2747
2692
                    matches.append(filename)
2748
 
        tree.unlock()
2749
2693
        if len(matches) > 0:
2750
2694
            self.outf.write("Warning: the following files are version controlled and"
2751
2695
                  " match your ignore pattern:\n%s"
2766
2710
 
2767
2711
    encoding_type = 'replace'
2768
2712
    _see_also = ['ignore', 'ls']
 
2713
    takes_options = ['directory']
2769
2714
 
2770
2715
    @display_command
2771
 
    def run(self):
2772
 
        tree = WorkingTree.open_containing(u'.')[0]
2773
 
        tree.lock_read()
2774
 
        self.add_cleanup(tree.unlock)
 
2716
    def run(self, directory=u'.'):
 
2717
        tree = WorkingTree.open_containing(directory)[0]
 
2718
        self.add_cleanup(tree.lock_read().unlock)
2775
2719
        for path, file_class, kind, file_id, entry in tree.list_files():
2776
2720
            if file_class != 'I':
2777
2721
                continue
2788
2732
    """
2789
2733
    hidden = True
2790
2734
    takes_args = ['revno']
 
2735
    takes_options = ['directory']
2791
2736
 
2792
2737
    @display_command
2793
 
    def run(self, revno):
 
2738
    def run(self, revno, directory=u'.'):
2794
2739
        try:
2795
2740
            revno = int(revno)
2796
2741
        except ValueError:
2797
2742
            raise errors.BzrCommandError("not a valid revision-number: %r"
2798
2743
                                         % revno)
2799
 
        revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
 
2744
        revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2800
2745
        self.outf.write("%s\n" % revid)
2801
2746
 
2802
2747
 
2829
2774
      =================       =========================
2830
2775
    """
2831
2776
    takes_args = ['dest', 'branch_or_subdir?']
2832
 
    takes_options = [
 
2777
    takes_options = ['directory',
2833
2778
        Option('format',
2834
2779
               help="Type of file to export to.",
2835
2780
               type=unicode),
2844
2789
                    'revision in which it was changed.'),
2845
2790
        ]
2846
2791
    def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
 
        root=None, filters=False, per_file_timestamps=False):
 
2792
        root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2848
2793
        from bzrlib.export import export
2849
2794
 
2850
2795
        if branch_or_subdir is None:
2851
 
            tree = WorkingTree.open_containing(u'.')[0]
 
2796
            tree = WorkingTree.open_containing(directory)[0]
2852
2797
            b = tree.branch
2853
2798
            subdir = None
2854
2799
        else:
2873
2818
    """
2874
2819
 
2875
2820
    _see_also = ['ls']
2876
 
    takes_options = [
 
2821
    takes_options = ['directory',
2877
2822
        Option('name-from-revision', help='The path name in the old tree.'),
2878
2823
        Option('filters', help='Apply content filters to display the '
2879
2824
                'convenience form.'),
2884
2829
 
2885
2830
    @display_command
2886
2831
    def run(self, filename, revision=None, name_from_revision=False,
2887
 
            filters=False):
 
2832
            filters=False, directory=None):
2888
2833
        if revision is not None and len(revision) != 1:
2889
2834
            raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
2835
                                         " one revision specifier")
2891
2836
        tree, branch, relpath = \
2892
 
            bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2893
 
        branch.lock_read()
2894
 
        self.add_cleanup(branch.unlock)
 
2837
            _open_directory_or_containing_tree_or_branch(filename, directory)
 
2838
        self.add_cleanup(branch.lock_read().unlock)
2895
2839
        return self._run(tree, branch, relpath, filename, revision,
2896
2840
                         name_from_revision, filters)
2897
2841
 
2900
2844
        if tree is None:
2901
2845
            tree = b.basis_tree()
2902
2846
        rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
 
        rev_tree.lock_read()
2904
 
        self.add_cleanup(rev_tree.unlock)
 
2847
        self.add_cleanup(rev_tree.lock_read().unlock)
2905
2848
 
2906
2849
        old_file_id = rev_tree.path2id(relpath)
2907
2850
 
3128
3071
 
3129
3072
        properties = {}
3130
3073
 
3131
 
        tree, selected_list = tree_files(selected_list)
 
3074
        tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3075
        if selected_list == ['']:
3133
3076
            # workaround - commit of root of tree should be exactly the same
3134
3077
            # as just default commit in that tree, and succeed even though
3169
3112
        def get_message(commit_obj):
3170
3113
            """Callback to get commit message"""
3171
3114
            if file:
3172
 
                my_message = codecs.open(
3173
 
                    file, 'rt', osutils.get_user_encoding()).read()
 
3115
                f = codecs.open(file, 'rt', osutils.get_user_encoding())
 
3116
                try:
 
3117
                    my_message = f.read()
 
3118
                finally:
 
3119
                    f.close()
3174
3120
            elif message is not None:
3175
3121
                my_message = message
3176
3122
            else:
3205
3151
                        reporter=None, verbose=verbose, revprops=properties,
3206
3152
                        authors=author, timestamp=commit_stamp,
3207
3153
                        timezone=offset,
3208
 
                        exclude=safe_relpath_files(tree, exclude))
 
3154
                        exclude=tree.safe_relpath_files(exclude))
3209
3155
        except PointlessCommit:
3210
3156
            raise errors.BzrCommandError("No changes to commit."
3211
3157
                              " Use --unchanged to commit anyhow.")
3330
3276
 
3331
3277
            bzr whoami "Frank Chu <fchu@example.com>"
3332
3278
    """
3333
 
    takes_options = [ Option('email',
 
3279
    takes_options = [ 'directory',
 
3280
                      Option('email',
3334
3281
                             help='Display email address only.'),
3335
3282
                      Option('branch',
3336
3283
                             help='Set identity for the current branch instead of '
3340
3287
    encoding_type = 'replace'
3341
3288
 
3342
3289
    @display_command
3343
 
    def run(self, email=False, branch=False, name=None):
 
3290
    def run(self, email=False, branch=False, name=None, directory=None):
3344
3291
        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()
 
3292
            if directory is None:
 
3293
                # use branch if we're inside one; otherwise global config
 
3294
                try:
 
3295
                    c = Branch.open_containing(u'.')[0].get_config()
 
3296
                except errors.NotBranchError:
 
3297
                    c = config.GlobalConfig()
 
3298
            else:
 
3299
                c = Branch.open(directory).get_config()
3350
3300
            if email:
3351
3301
                self.outf.write(c.user_email() + '\n')
3352
3302
            else:
3362
3312
 
3363
3313
        # use global config unless --branch given
3364
3314
        if branch:
3365
 
            c = Branch.open_containing('.')[0].get_config()
 
3315
            if directory is None:
 
3316
                c = Branch.open_containing(u'.')[0].get_config()
 
3317
            else:
 
3318
                c = Branch.open(directory).get_config()
3366
3319
        else:
3367
3320
            c = config.GlobalConfig()
3368
3321
        c.set_user_option('email', name)
3380
3333
 
3381
3334
    _see_also = ['info']
3382
3335
    takes_args = ['nickname?']
3383
 
    def run(self, nickname=None):
3384
 
        branch = Branch.open_containing(u'.')[0]
 
3336
    takes_options = ['directory']
 
3337
    def run(self, nickname=None, directory=u'.'):
 
3338
        branch = Branch.open_containing(directory)[0]
3385
3339
        if nickname is None:
3386
3340
            self.printme(branch)
3387
3341
        else:
3612
3566
            self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3567
            # On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3568
            # stdout, which would corrupt the subunit stream. 
3615
 
            if sys.platform == "win32" and sys.stdout.fileno() >= 0:
 
3569
            # FIXME: This has been fixed in subunit trunk (>0.0.5) so the
 
3570
            # following code can be deleted when it's sufficiently deployed
 
3571
            # -- vila/mgz 20100514
 
3572
            if (sys.platform == "win32"
 
3573
                and getattr(sys.stdout, 'fileno', None) is not None):
3616
3574
                import msvcrt
3617
3575
                msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3618
3576
        if parallel:
3690
3648
 
3691
3649
        branch1 = Branch.open_containing(branch)[0]
3692
3650
        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)
 
3651
        self.add_cleanup(branch1.lock_read().unlock)
 
3652
        self.add_cleanup(branch2.lock_read().unlock)
3697
3653
        last1 = ensure_null(branch1.last_revision())
3698
3654
        last2 = ensure_null(branch2.last_revision())
3699
3655
 
3793
3749
                ' completely merged into the source, pull from the'
3794
3750
                ' source rather than merging.  When this happens,'
3795
3751
                ' you do not need to commit the result.'),
3796
 
        Option('directory',
 
3752
        custom_help('directory',
3797
3753
               help='Branch to merge into, '
3798
 
                    'rather than the one containing the working directory.',
3799
 
               short_name='d',
3800
 
               type=unicode,
3801
 
               ),
 
3754
                    'rather than the one containing the working directory.'),
3802
3755
        Option('preview', help='Instead of merging, show a diff of the'
3803
3756
               ' merge.'),
3804
3757
        Option('interactive', help='Select changes interactively.',
3837
3790
            unversioned_filter=tree.is_ignored, view_info=view_info)
3838
3791
        pb = ui.ui_factory.nested_progress_bar()
3839
3792
        self.add_cleanup(pb.finished)
3840
 
        tree.lock_write()
3841
 
        self.add_cleanup(tree.unlock)
 
3793
        self.add_cleanup(tree.lock_write().unlock)
3842
3794
        if location is not None:
3843
3795
            try:
3844
3796
                mergeable = bundle.read_mergeable_from_url(location,
3905
3857
    def _do_preview(self, merger):
3906
3858
        from bzrlib.diff import show_diff_trees
3907
3859
        result_tree = self._get_preview(merger)
 
3860
        path_encoding = osutils.get_diff_header_encoding()
3908
3861
        show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
 
                        old_label='', new_label='')
 
3862
                        old_label='', new_label='',
 
3863
                        path_encoding=path_encoding)
3910
3864
 
3911
3865
    def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
3866
        merger.change_reporter = change_reporter
4099
4053
        from bzrlib.conflicts import restore
4100
4054
        if merge_type is None:
4101
4055
            merge_type = _mod_merge.Merge3Merger
4102
 
        tree, file_list = tree_files(file_list)
4103
 
        tree.lock_write()
4104
 
        self.add_cleanup(tree.unlock)
 
4056
        tree, file_list = WorkingTree.open_containing_paths(file_list)
 
4057
        self.add_cleanup(tree.lock_write().unlock)
4105
4058
        parents = tree.get_parent_ids()
4106
4059
        if len(parents) != 2:
4107
4060
            raise errors.BzrCommandError("Sorry, remerge only works after normal"
4216
4169
 
4217
4170
    def run(self, revision=None, no_backup=False, file_list=None,
4218
4171
            forget_merges=None):
4219
 
        tree, file_list = tree_files(file_list)
4220
 
        tree.lock_tree_write()
4221
 
        self.add_cleanup(tree.unlock)
 
4172
        tree, file_list = WorkingTree.open_containing_paths(file_list)
 
4173
        self.add_cleanup(tree.lock_tree_write().unlock)
4222
4174
        if forget_merges:
4223
4175
            tree.set_parent_ids(tree.get_parent_ids()[:1])
4224
4176
        else:
4313
4265
    _see_also = ['merge', 'pull']
4314
4266
    takes_args = ['other_branch?']
4315
4267
    takes_options = [
 
4268
        'directory',
4316
4269
        Option('reverse', 'Reverse the order of revisions.'),
4317
4270
        Option('mine-only',
4318
4271
               'Display changes in the local branch only.'),
4340
4293
            theirs_only=False,
4341
4294
            log_format=None, long=False, short=False, line=False,
4342
4295
            show_ids=False, verbose=False, this=False, other=False,
4343
 
            include_merges=False, revision=None, my_revision=None):
 
4296
            include_merges=False, revision=None, my_revision=None,
 
4297
            directory=u'.'):
4344
4298
        from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4299
        def message(s):
4346
4300
            if not is_quiet():
4359
4313
        elif theirs_only:
4360
4314
            restrict = 'remote'
4361
4315
 
4362
 
        local_branch = Branch.open_containing(u".")[0]
4363
 
        local_branch.lock_read()
4364
 
        self.add_cleanup(local_branch.unlock)
 
4316
        local_branch = Branch.open_containing(directory)[0]
 
4317
        self.add_cleanup(local_branch.lock_read().unlock)
4365
4318
 
4366
4319
        parent = local_branch.get_parent()
4367
4320
        if other_branch is None:
4378
4331
        if remote_branch.base == local_branch.base:
4379
4332
            remote_branch = local_branch
4380
4333
        else:
4381
 
            remote_branch.lock_read()
4382
 
            self.add_cleanup(remote_branch.unlock)
 
4334
            self.add_cleanup(remote_branch.lock_read().unlock)
4383
4335
 
4384
4336
        local_revid_range = _revision_range_to_revid_range(
4385
4337
            _get_revision_range(my_revision, local_branch,
4440
4392
            message("Branches are up to date.\n")
4441
4393
        self.cleanup_now()
4442
4394
        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)
 
4395
            self.add_cleanup(local_branch.lock_write().unlock)
4445
4396
            # handle race conditions - a parent might be set while we run.
4446
4397
            if local_branch.get_parent() is None:
4447
4398
                local_branch.set_parent(remote_branch.base)
4547
4498
            b = Branch.open_containing(branch)[0]
4548
4499
        else:
4549
4500
            b = Branch.open(branch)
4550
 
        b.lock_read()
4551
 
        self.add_cleanup(b.unlock)
 
4501
        self.add_cleanup(b.lock_read().unlock)
4552
4502
        if revision is None:
4553
4503
            rev_id = b.last_revision()
4554
4504
        else:
4578
4528
                     Option('long', help='Show commit date in annotations.'),
4579
4529
                     'revision',
4580
4530
                     'show-ids',
 
4531
                     'directory',
4581
4532
                     ]
4582
4533
    encoding_type = 'exact'
4583
4534
 
4584
4535
    @display_command
4585
4536
    def run(self, filename, all=False, long=False, revision=None,
4586
 
            show_ids=False):
 
4537
            show_ids=False, directory=None):
4587
4538
        from bzrlib.annotate import annotate_file, annotate_file_tree
4588
4539
        wt, branch, relpath = \
4589
 
            bzrdir.BzrDir.open_containing_tree_or_branch(filename)
 
4540
            _open_directory_or_containing_tree_or_branch(filename, directory)
4590
4541
        if wt is not None:
4591
 
            wt.lock_read()
4592
 
            self.add_cleanup(wt.unlock)
 
4542
            self.add_cleanup(wt.lock_read().unlock)
4593
4543
        else:
4594
 
            branch.lock_read()
4595
 
            self.add_cleanup(branch.unlock)
 
4544
            self.add_cleanup(branch.lock_read().unlock)
4596
4545
        tree = _get_one_revision_tree('annotate', revision, branch=branch)
4597
 
        tree.lock_read()
4598
 
        self.add_cleanup(tree.unlock)
 
4546
        self.add_cleanup(tree.lock_read().unlock)
4599
4547
        if wt is not None:
4600
4548
            file_id = wt.path2id(relpath)
4601
4549
        else:
4619
4567
 
4620
4568
    hidden = True # is this right ?
4621
4569
    takes_args = ['revision_id*']
4622
 
    takes_options = ['revision']
 
4570
    takes_options = ['directory', 'revision']
4623
4571
 
4624
 
    def run(self, revision_id_list=None, revision=None):
 
4572
    def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4573
        if revision_id_list is not None and revision is not None:
4626
4574
            raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4627
4575
        if revision_id_list is None and revision is None:
4628
4576
            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)
 
4577
        b = WorkingTree.open_containing(directory)[0].branch
 
4578
        self.add_cleanup(b.lock_write().unlock)
4632
4579
        return self._run(b, revision_id_list, revision)
4633
4580
 
4634
4581
    def _run(self, b, revision_id_list, revision):
4693
4640
 
4694
4641
    _see_also = ['checkouts', 'unbind']
4695
4642
    takes_args = ['location?']
4696
 
    takes_options = []
 
4643
    takes_options = ['directory']
4697
4644
 
4698
 
    def run(self, location=None):
4699
 
        b, relpath = Branch.open_containing(u'.')
 
4645
    def run(self, location=None, directory=u'.'):
 
4646
        b, relpath = Branch.open_containing(directory)
4700
4647
        if location is None:
4701
4648
            try:
4702
4649
                location = b.get_old_bound_location()
4729
4676
 
4730
4677
    _see_also = ['checkouts', 'bind']
4731
4678
    takes_args = []
4732
 
    takes_options = []
 
4679
    takes_options = ['directory']
4733
4680
 
4734
 
    def run(self):
4735
 
        b, relpath = Branch.open_containing(u'.')
 
4681
    def run(self, directory=u'.'):
 
4682
        b, relpath = Branch.open_containing(directory)
4736
4683
        if not b.unbind():
4737
4684
            raise errors.BzrCommandError('Local branch is not bound')
4738
4685
 
4784
4731
            b = control.open_branch()
4785
4732
 
4786
4733
        if tree is not None:
4787
 
            tree.lock_write()
4788
 
            self.add_cleanup(tree.unlock)
 
4734
            self.add_cleanup(tree.lock_write().unlock)
4789
4735
        else:
4790
 
            b.lock_write()
4791
 
            self.add_cleanup(b.unlock)
 
4736
            self.add_cleanup(b.lock_write().unlock)
4792
4737
        return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4793
4738
 
4794
4739
    def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4902
4847
                    'result in a dynamically allocated port.  The default port '
4903
4848
                    'depends on the protocol.',
4904
4849
               type=str),
4905
 
        Option('directory',
4906
 
               help='Serve contents of this directory.',
4907
 
               type=unicode),
 
4850
        custom_help('directory',
 
4851
               help='Serve contents of this directory.'),
4908
4852
        Option('allow-writes',
4909
4853
               help='By default the server is a readonly server.  Supplying '
4910
4854
                    '--allow-writes enables write access to the contents of '
4937
4881
 
4938
4882
    def run(self, port=None, inet=False, directory=None, allow_writes=False,
4939
4883
            protocol=None):
4940
 
        from bzrlib.transport import get_transport, transport_server_registry
 
4884
        from bzrlib import transport
4941
4885
        if directory is None:
4942
4886
            directory = os.getcwd()
4943
4887
        if protocol is None:
4944
 
            protocol = transport_server_registry.get()
 
4888
            protocol = transport.transport_server_registry.get()
4945
4889
        host, port = self.get_host_and_port(port)
4946
4890
        url = urlutils.local_path_to_url(directory)
4947
4891
        if not allow_writes:
4948
4892
            url = 'readonly+' + url
4949
 
        transport = get_transport(url)
4950
 
        protocol(transport, host, port, inet)
 
4893
        t = transport.get_transport(url)
 
4894
        protocol(t, host, port, inet)
4951
4895
 
4952
4896
 
4953
4897
class cmd_join(Command):
5046
4990
    _see_also = ['send']
5047
4991
 
5048
4992
    takes_options = [
 
4993
        'directory',
5049
4994
        RegistryOption.from_kwargs('patch-type',
5050
4995
            'The type of patch to include in the directive.',
5051
4996
            title='Patch type',
5064
5009
    encoding_type = 'exact'
5065
5010
 
5066
5011
    def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5067
 
            sign=False, revision=None, mail_to=None, message=None):
 
5012
            sign=False, revision=None, mail_to=None, message=None,
 
5013
            directory=u'.'):
5068
5014
        from bzrlib.revision import ensure_null, NULL_REVISION
5069
5015
        include_patch, include_bundle = {
5070
5016
            'plain': (False, False),
5071
5017
            'diff': (True, False),
5072
5018
            'bundle': (True, True),
5073
5019
            }[patch_type]
5074
 
        branch = Branch.open('.')
 
5020
        branch = Branch.open(directory)
5075
5021
        stored_submit_branch = branch.get_submit_branch()
5076
5022
        if submit_branch is None:
5077
5023
            submit_branch = stored_submit_branch
5162
5108
    given, in which case it is sent to a file.
5163
5109
 
5164
5110
    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.
 
5111
    on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.
5166
5112
    If the preferred client can't be found (or used), your editor will be used.
5167
5113
 
5168
5114
    To use a specific mail program, set the mail_client configuration option.
5339
5285
        Option('delete',
5340
5286
            help='Delete this tag rather than placing it.',
5341
5287
            ),
5342
 
        Option('directory',
5343
 
            help='Branch in which to place the tag.',
5344
 
            short_name='d',
5345
 
            type=unicode,
5346
 
            ),
 
5288
        custom_help('directory',
 
5289
            help='Branch in which to place the tag.'),
5347
5290
        Option('force',
5348
5291
            help='Replace existing tags.',
5349
5292
            ),
5357
5300
            revision=None,
5358
5301
            ):
5359
5302
        branch, relpath = Branch.open_containing(directory)
5360
 
        branch.lock_write()
5361
 
        self.add_cleanup(branch.unlock)
 
5303
        self.add_cleanup(branch.lock_write().unlock)
5362
5304
        if delete:
5363
5305
            if tag_name is None:
5364
5306
                raise errors.BzrCommandError("No tag specified to delete.")
5392
5334
 
5393
5335
    _see_also = ['tag']
5394
5336
    takes_options = [
5395
 
        Option('directory',
5396
 
            help='Branch whose tags should be displayed.',
5397
 
            short_name='d',
5398
 
            type=unicode,
5399
 
            ),
 
5337
        custom_help('directory',
 
5338
            help='Branch whose tags should be displayed.'),
5400
5339
        RegistryOption.from_kwargs('sort',
5401
5340
            'Sort tags by different criteria.', title='Sorting',
5402
5341
            alpha='Sort tags lexicographically (default).',
5419
5358
        if not tags:
5420
5359
            return
5421
5360
 
5422
 
        branch.lock_read()
5423
 
        self.add_cleanup(branch.unlock)
 
5361
        self.add_cleanup(branch.lock_read().unlock)
5424
5362
        if revision:
5425
5363
            graph = branch.repository.get_graph()
5426
5364
            rev1, rev2 = _get_revision_range(revision, branch, self.name())
5573
5511
    """
5574
5512
 
5575
5513
    takes_args = ['to_location?']
5576
 
    takes_options = [Option('force',
 
5514
    takes_options = ['directory',
 
5515
                     Option('force',
5577
5516
                        help='Switch even if local commits will be lost.'),
5578
5517
                     'revision',
5579
5518
                     Option('create-branch', short_name='b',
5582
5521
                    ]
5583
5522
 
5584
5523
    def run(self, to_location=None, force=False, create_branch=False,
5585
 
            revision=None):
 
5524
            revision=None, directory=u'.'):
5586
5525
        from bzrlib import switch
5587
 
        tree_location = '.'
 
5526
        tree_location = directory
5588
5527
        revision = _get_one_revision('switch', revision)
5589
5528
        control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
5529
        if to_location is None:
5591
5530
            if revision is None:
5592
5531
                raise errors.BzrCommandError('You must supply either a'
5593
5532
                                             ' revision or a location')
5594
 
            to_location = '.'
 
5533
            to_location = tree_location
5595
5534
        try:
5596
5535
            branch = control_dir.open_branch()
5597
5536
            had_explicit_nick = branch.get_config().has_explicit_nickname()
5732
5671
            name=None,
5733
5672
            switch=None,
5734
5673
            ):
5735
 
        tree, file_list = tree_files(file_list, apply_view=False)
 
5674
        tree, file_list = WorkingTree.open_containing_paths(file_list,
 
5675
            apply_view=False)
5736
5676
        current_view, view_dict = tree.views.get_view_info()
5737
5677
        if name is None:
5738
5678
            name = current_view
5872
5812
    takes_args = ['file*']
5873
5813
 
5874
5814
    takes_options = [
 
5815
        'directory',
5875
5816
        'revision',
5876
5817
        Option('all', help='Shelve all changes.'),
5877
5818
        'message',
5886
5827
    _see_also = ['unshelve']
5887
5828
 
5888
5829
    def run(self, revision=None, all=False, file_list=None, message=None,
5889
 
            writer=None, list=False, destroy=False):
 
5830
            writer=None, list=False, destroy=False, directory=u'.'):
5890
5831
        if list:
5891
5832
            return self.run_for_list()
5892
5833
        from bzrlib.shelf_ui import Shelver
5894
5835
            writer = bzrlib.option.diff_writer_registry.get()
5895
5836
        try:
5896
5837
            shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
 
                file_list, message, destroy=destroy)
 
5838
                file_list, message, destroy=destroy, directory=directory)
5898
5839
            try:
5899
5840
                shelver.run()
5900
5841
            finally:
5904
5845
 
5905
5846
    def run_for_list(self):
5906
5847
        tree = WorkingTree.open_containing('.')[0]
5907
 
        tree.lock_read()
5908
 
        self.add_cleanup(tree.unlock)
 
5848
        self.add_cleanup(tree.lock_read().unlock)
5909
5849
        manager = tree.get_shelf_manager()
5910
5850
        shelves = manager.active_shelves()
5911
5851
        if len(shelves) == 0:
5929
5869
 
5930
5870
    takes_args = ['shelf_id?']
5931
5871
    takes_options = [
 
5872
        'directory',
5932
5873
        RegistryOption.from_kwargs(
5933
5874
            'action', help="The action to perform.",
5934
5875
            enum_switch=False, value_switches=True,
5942
5883
    ]
5943
5884
    _see_also = ['shelve']
5944
5885
 
5945
 
    def run(self, shelf_id=None, action='apply'):
 
5886
    def run(self, shelf_id=None, action='apply', directory=u'.'):
5946
5887
        from bzrlib.shelf_ui import Unshelver
5947
 
        unshelver = Unshelver.from_args(shelf_id, action)
 
5888
        unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5948
5889
        try:
5949
5890
            unshelver.run()
5950
5891
        finally:
5966
5907
 
5967
5908
    To check what clean-tree will do, use --dry-run.
5968
5909
    """
5969
 
    takes_options = [Option('ignored', help='Delete all ignored files.'),
 
5910
    takes_options = ['directory',
 
5911
                     Option('ignored', help='Delete all ignored files.'),
5970
5912
                     Option('detritus', help='Delete conflict files, merge'
5971
5913
                            ' backups, and failed selftest dirs.'),
5972
5914
                     Option('unknown',
5975
5917
                            ' deleting them.'),
5976
5918
                     Option('force', help='Do not prompt before deleting.')]
5977
5919
    def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5978
 
            force=False):
 
5920
            force=False, directory=u'.'):
5979
5921
        from bzrlib.clean_tree import clean_tree
5980
5922
        if not (unknown or ignored or detritus):
5981
5923
            unknown = True
5982
5924
        if dry_run:
5983
5925
            force = True
5984
 
        clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
 
                   dry_run=dry_run, no_prompt=force)
 
5926
        clean_tree(directory, unknown=unknown, ignored=ignored,
 
5927
                   detritus=detritus, dry_run=dry_run, no_prompt=force)
5986
5928
 
5987
5929
 
5988
5930
class cmd_reference(Command):