/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1553.5.34 by Martin Pool
Stub lock-breaking command
1
# Copyright (C) 2004, 2005, 2006 by Canonical Ltd
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
17
"""builtin bzr commands"""
18
19
1685.1.52 by John Arbash Meinel
[merge] bzr.dev 1704
20
import codecs
1508.1.20 by Robert Collins
Create a checkout command.
21
import errno
1185.65.29 by Robert Collins
Implement final review suggestions.
22
import os
1508.1.20 by Robert Collins
Create a checkout command.
23
from shutil import rmtree
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
24
import sys
25
26
import bzrlib
1508.1.25 by Robert Collins
Update per review comments.
27
import bzrlib.branch
28
from bzrlib.branch import Branch
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
29
import bzrlib.bzrdir as bzrdir
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
30
from bzrlib.commands import Command, display_command
1185.35.4 by Aaron Bentley
Implemented remerge
31
from bzrlib.revision import common_ancestor
1505.1.10 by John Arbash Meinel
Brought back 'optimized' version, for better errors, cleaned up exception handling.
32
import bzrlib.errors as errors
1185.35.4 by Aaron Bentley
Implemented remerge
33
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError, 
1185.35.13 by Aaron Bentley
Merged Martin
34
                           NotBranchError, DivergedBranches, NotConflicted,
1558.2.1 by Aaron Bentley
Ensure remerge errors when file-id is None
35
                           NoSuchFile, NoWorkingTree, FileInWrongBranch,
36
                           NotVersionedError)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
37
from bzrlib.log import show_one_log
1534.7.140 by Aaron Bentley
Moved the merge stuff into merge.py
38
from bzrlib.merge import Merge3Merger
1185.16.43 by Martin Pool
- clean up handling of option objects
39
from bzrlib.option import Option
1685.1.37 by John Arbash Meinel
builtins now use urlfordisplay to display nicer paths to the user.
40
import bzrlib.osutils
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
41
from bzrlib.progress import DummyProgress, ProgressPhase
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
42
from bzrlib.revisionspec import RevisionSpec
1460 by Robert Collins
merge from martin.
43
import bzrlib.trace
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
44
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
45
from bzrlib.transport.local import LocalTransport
1534.9.10 by Aaron Bentley
Fixed use of ui_factory (which can't be imported directly)
46
import bzrlib.ui
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
47
import bzrlib.urlutils as urlutils
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
48
from bzrlib.workingtree import WorkingTree
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
49
50
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
51
def tree_files(file_list, default_branch=u'.'):
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
52
    try:
1508.1.15 by Robert Collins
Merge from mpool.
53
        return internal_tree_files(file_list, default_branch)
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
54
    except FileInWrongBranch, e:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
55
        raise BzrCommandError("%s is not in the same branch as %s" %
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
56
                             (e.path, file_list[0]))
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
57
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
58
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
59
# XXX: Bad function name; should possibly also be a class method of
60
# WorkingTree rather than a function.
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
61
def internal_tree_files(file_list, default_branch=u'.'):
1658.1.8 by Martin Pool
(internal_tree_files) Better docstring
62
    """Convert command-line paths to a WorkingTree and relative paths.
63
64
    This is typically used for command-line processors that take one or
65
    more filenames, and infer the workingtree that contains them.
66
67
    The filenames given are not required to exist.
68
69
    :param file_list: Filenames to convert.  
70
71
    :param default_branch: Fallback tree path to use if file_list is empty or None.
72
73
    :return: workingtree, [relative_paths]
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
74
    """
75
    if file_list is None or len(file_list) == 0:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
76
        return WorkingTree.open_containing(default_branch)[0], file_list
77
    tree = WorkingTree.open_containing(file_list[0])[0]
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
78
    new_list = []
79
    for filename in file_list:
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
80
        try:
81
            new_list.append(tree.relpath(filename))
1185.31.45 by John Arbash Meinel
Refactoring Exceptions found some places where the wrong exception was caught.
82
        except errors.PathNotChild:
1508.1.15 by Robert Collins
Merge from mpool.
83
            raise FileInWrongBranch(tree.branch, filename)
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
84
    return tree, new_list
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
85
86
1553.5.78 by Martin Pool
New bzr init --format option and test
87
def get_format_type(typestring):
88
    """Parse and return a format specifier."""
1666.1.3 by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP.
89
    if typestring == "weave":
90
        return bzrdir.BzrDirFormat6()
1694.2.6 by Martin Pool
[merge] bzr.dev
91
    if typestring == "default":
1553.5.78 by Martin Pool
New bzr init --format option and test
92
        return bzrdir.BzrDirMetaFormat1()
1694.2.6 by Martin Pool
[merge] bzr.dev
93
    if typestring == "metaweave":
94
        format = bzrdir.BzrDirMetaFormat1()
95
        format.repository_format = bzrlib.repository.RepositoryFormat7()
96
        return format
1553.5.78 by Martin Pool
New bzr init --format option and test
97
    if typestring == "knit":
98
        format = bzrdir.BzrDirMetaFormat1()
99
        format.repository_format = bzrlib.repository.RepositoryFormatKnit1()
100
        return format
1694.2.6 by Martin Pool
[merge] bzr.dev
101
    msg = "Unknown bzr format %s. Current formats are: default, knit,\n" \
102
          "metaweave and weave" % typestring
1553.5.78 by Martin Pool
New bzr init --format option and test
103
    raise BzrCommandError(msg)
104
105
1185.16.112 by mbp at sourcefrog
todo
106
# TODO: Make sure no commands unconditionally use the working directory as a
107
# branch.  If a filename argument is used, the first of them should be used to
108
# specify the branch.  (Perhaps this can be factored out into some kind of
109
# Argument class, representing a file in a branch, where the first occurrence
110
# opens the branch?)
111
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
112
class cmd_status(Command):
113
    """Display status summary.
114
115
    This reports on versioned and unknown files, reporting them
116
    grouped by state.  Possible states are:
117
118
    added
119
        Versioned in the working copy but not in the previous revision.
120
121
    removed
122
        Versioned in the previous revision but removed or deleted
123
        in the working copy.
124
125
    renamed
126
        Path of this file changed from the previous revision;
127
        the text may also have changed.  This includes files whose
128
        parent directory was renamed.
129
130
    modified
131
        Text has changed since the previous revision.
132
133
    unchanged
134
        Nothing about this file has changed since the previous revision.
135
        Only shown with --all.
136
137
    unknown
138
        Not versioned and not matching an ignore pattern.
139
140
    To see ignored files use 'bzr ignored'.  For details in the
141
    changes to file texts, use 'bzr diff'.
142
143
    If no arguments are specified, the status of the entire working
144
    directory is shown.  Otherwise, only the status of the specified
145
    files or directories is reported.  If a directory is given, status
146
    is reported for everything inside that directory.
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
147
148
    If a revision argument is given, the status is calculated against
149
    that revision, or between two revisions if two are provided.
1185.3.2 by Martin Pool
- remove -r option from status command because it's not used
150
    """
1185.16.76 by Martin Pool
doc
151
    
152
    # TODO: --no-recurse, --recurse options
153
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
154
    takes_args = ['file*']
1185.34.4 by Jelmer Vernooij
Support -r option to bzr status. The backend code already handled
155
    takes_options = ['all', 'show-ids', 'revision']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
156
    aliases = ['st', 'stat']
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
157
158
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
159
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
160
    @display_command
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
161
    def run(self, all=False, show_ids=False, file_list=None, revision=None):
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
162
        from bzrlib.status import show_tree_status
1185.85.15 by John Arbash Meinel
Updated bzr status, adding test_cat
163
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
164
        tree, file_list = tree_files(file_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
165
            
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
166
        show_tree_status(tree, show_unchanged=all, show_ids=show_ids,
1185.85.84 by John Arbash Meinel
[merge] bzr.dev 1573, lots of updates
167
                         specific_files=file_list, revision=revision,
168
                         to_file=self.outf)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
169
170
171
class cmd_cat_revision(Command):
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
172
    """Write out metadata for a revision.
173
    
174
    The revision to print can either be specified by a specific
175
    revision identifier, or you can use --revision.
176
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
177
178
    hidden = True
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
179
    takes_args = ['revision_id?']
180
    takes_options = ['revision']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
181
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
182
    @display_command
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
183
    def run(self, revision_id=None, revision=None):
184
185
        if revision_id is not None and revision is not None:
186
            raise BzrCommandError('You can only supply one of revision_id or --revision')
187
        if revision_id is None and revision is None:
188
            raise BzrCommandError('You must supply either --revision or a revision_id')
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
189
        b = WorkingTree.open_containing(u'.')[0].branch
1185.85.72 by John Arbash Meinel
Fix some of the tests.
190
191
        # TODO: jam 20060112 should cat-revision always output utf-8?
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
192
        if revision_id is not None:
1185.85.78 by John Arbash Meinel
[merge] jam-integration 1512, includes Storage changes.
193
            self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
194
        elif revision is not None:
195
            for rev in revision:
196
                if rev is None:
197
                    raise BzrCommandError('You cannot specify a NULL revision.')
198
                revno, rev_id = rev.in_history(b)
1185.85.78 by John Arbash Meinel
[merge] jam-integration 1512, includes Storage changes.
199
                self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
1185.1.29 by Robert Collins
merge merge tweaks from aaron, which includes latest .dev
200
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
201
202
class cmd_revno(Command):
203
    """Show current revision number.
204
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
205
    This is equal to the number of revisions on this branch.
206
    """
207
1185.50.16 by John Arbash Meinel
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location'
208
    takes_args = ['location?']
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
209
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
210
    @display_command
1185.50.16 by John Arbash Meinel
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location'
211
    def run(self, location=u'.'):
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
212
        self.outf.write(str(Branch.open_containing(location)[0].revno()))
213
        self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
214
1182 by Martin Pool
- more disentangling of xml storage format from objects
215
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
216
class cmd_revision_info(Command):
217
    """Show revision number and revision id for a given revision identifier.
218
    """
219
    hidden = True
220
    takes_args = ['revision_info*']
221
    takes_options = ['revision']
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
222
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
223
    @display_command
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
224
    def run(self, revision=None, revision_info_list=[]):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
225
226
        revs = []
227
        if revision is not None:
228
            revs.extend(revision)
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
229
        if revision_info_list is not None:
230
            for rev in revision_info_list:
231
                revs.append(RevisionSpec(rev))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
232
        if len(revs) == 0:
233
            raise BzrCommandError('You must supply a revision identifier')
234
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
235
        b = WorkingTree.open_containing(u'.')[0].branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
236
237
        for rev in revs:
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
238
            revinfo = rev.in_history(b)
239
            if revinfo.revno is None:
240
                print '     %s' % revinfo.rev_id
241
            else:
242
                print '%4d %s' % (revinfo.revno, revinfo.rev_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
243
244
    
245
class cmd_add(Command):
246
    """Add specified files or directories.
247
248
    In non-recursive mode, all the named items are added, regardless
249
    of whether they were previously ignored.  A warning is given if
250
    any of the named files are already versioned.
251
252
    In recursive mode (the default), files are treated the same way
253
    but the behaviour for directories is different.  Directories that
254
    are already versioned do not give a warning.  All directories,
255
    whether already versioned or not, are searched for files or
256
    subdirectories that are neither versioned or ignored, and these
257
    are added.  This search proceeds recursively into versioned
258
    directories.  If no names are given '.' is assumed.
259
260
    Therefore simply saying 'bzr add' will version all files that
261
    are currently unknown.
262
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
263
    Adding a file whose parent directory is not versioned will
264
    implicitly add the parent, and so on up to the root. This means
265
    you should never need to explictly add a directory, they'll just
266
    get added when you add a file in the directory.
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
267
268
    --dry-run will show which files would be added, but not actually 
269
    add them.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
270
    """
271
    takes_args = ['file*']
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
272
    takes_options = ['no-recurse', 'dry-run', 'verbose']
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
273
    encoding_type = 'replace'
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
274
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
275
    def run(self, file_list, no_recurse=False, dry_run=False, verbose=False):
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
276
        import bzrlib.add
277
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
278
        action = bzrlib.add.AddAction(to_file=self.outf,
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
279
            should_add=(not dry_run), should_print=(not is_quiet()))
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
280
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
281
        added, ignored = bzrlib.add.smart_add(file_list, not no_recurse, 
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
282
                                              action=action)
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
283
        if len(ignored) > 0:
284
            for glob in sorted(ignored.keys()):
285
                match_len = len(ignored[glob])
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
286
                if verbose:
287
                    for path in ignored[glob]:
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
288
                        self.outf.write("ignored %s matching \"%s\"\n" 
289
                                        % (path, glob))
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
290
                else:
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
291
                    self.outf.write("ignored %d file(s) matching \"%s\"\n"
292
                                    % (match_len, glob))
293
            self.outf.write("If you wish to add some of these files,"
294
                            " please add them by name.\n")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
295
296
297
class cmd_mkdir(Command):
298
    """Create a new versioned directory.
299
300
    This is equivalent to creating the directory and then adding it.
301
    """
302
    takes_args = ['dir+']
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
303
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
304
305
    def run(self, dir_list):
306
        for d in dir_list:
307
            os.mkdir(d)
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
308
            wt, dd = WorkingTree.open_containing(d)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
309
            wt.add([dd])
1685.1.23 by John Arbash Meinel
mkdir was adding an extra space before the path.
310
            print >>self.outf, 'added', d
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
311
312
313
class cmd_relpath(Command):
314
    """Show path of a file relative to root"""
315
    takes_args = ['filename']
316
    hidden = True
317
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
318
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
319
    def run(self, filename):
1185.85.19 by John Arbash Meinel
Updated bzr relpath
320
        # TODO: jam 20050106 Can relpath return a munged path if
321
        #       sys.stdout encoding cannot represent it?
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
322
        tree, relpath = WorkingTree.open_containing(filename)
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
323
        self.outf.write(relpath)
324
        self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
325
326
327
class cmd_inventory(Command):
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
328
    """Show inventory of the current working copy or a revision.
329
330
    It is possible to limit the output to a particular entry
331
    type using the --kind option.  For example; --kind file.
332
    """
333
    takes_options = ['revision', 'show-ids', 'kind']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
334
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
335
    @display_command
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
336
    def run(self, revision=None, show_ids=False, kind=None):
337
        if kind and kind not in ['file', 'directory', 'symlink']:
338
            raise BzrCommandError('invalid kind specified')
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
339
        tree = WorkingTree.open_containing(u'.')[0]
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
340
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
341
            inv = tree.read_working_inventory()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
342
        else:
343
            if len(revision) > 1:
344
                raise BzrCommandError('bzr inventory --revision takes'
345
                    ' exactly one revision identifier')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
346
            inv = tree.branch.repository.get_revision_inventory(
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
347
                revision[0].in_history(tree.branch).rev_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
348
349
        for path, entry in inv.entries():
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
350
            if kind and kind != entry.kind:
351
                continue
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
352
            if show_ids:
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
353
                self.outf.write('%-50s %s\n' % (path, entry.file_id))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
354
            else:
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
355
                self.outf.write(path)
356
                self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
357
358
359
class cmd_mv(Command):
360
    """Move or rename a file.
361
362
    usage:
363
        bzr mv OLDNAME NEWNAME
364
        bzr mv SOURCE... DESTINATION
365
366
    If the last argument is a versioned directory, all the other names
367
    are moved into it.  Otherwise, there must be exactly two arguments
368
    and the file is changed to a new name, which must not already exist.
369
370
    Files cannot be moved between branches.
371
    """
372
    takes_args = ['names*']
1616.1.8 by Martin Pool
Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
373
    aliases = ['move', 'rename']
374
1185.85.26 by John Arbash Meinel
bzr mv should succeed even if it can't display the paths.
375
    encoding_type = 'replace'
376
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
377
    def run(self, names_list):
378
        if len(names_list) < 2:
379
            raise BzrCommandError("missing file argument")
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
380
        tree, rel_names = tree_files(names_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
381
        
382
        if os.path.isdir(names_list[-1]):
383
            # move into existing directory
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
384
            for pair in tree.move(rel_names[:-1], rel_names[-1]):
1185.85.25 by John Arbash Meinel
updated 'bzr mv'
385
                self.outf.write("%s => %s\n" % pair)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
386
        else:
387
            if len(names_list) != 2:
388
                raise BzrCommandError('to mv multiple files the destination '
389
                                      'must be a versioned directory')
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
390
            tree.rename_one(rel_names[0], rel_names[1])
1185.85.25 by John Arbash Meinel
updated 'bzr mv'
391
            self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
392
            
393
    
394
class cmd_pull(Command):
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
395
    """Turn this branch into a mirror of another branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
396
397
    This command only works on branches that have not diverged.  Branches are
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
398
    considered diverged if the destination branch's most recent commit is one
399
    that has not been merged (directly or indirectly) into the parent.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
400
1661.1.1 by Martin Pool
[merge] olaf's --remember changes
401
    If branches have diverged, you can use 'bzr merge' to integrate the changes
402
    from one into the other.  Once one branch has merged, the other should
403
    be able to pull it again.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
404
405
    If branches have diverged, you can use 'bzr merge' to pull the text changes
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
406
    from one into the other.  Once one branch has merged, the other should
407
    be able to pull it again.
408
409
    If you want to forget your local changes and just update your branch to
1661.1.1 by Martin Pool
[merge] olaf's --remember changes
410
    match the remote one, use pull --overwrite.
1614.2.3 by Olaf Conradi
In commands push and pull, moved help text for --remember down. It's not
411
412
    If there is no default location set, the first pull will set it.  After
413
    that, you can omit the location to use the default.  To change the
414
    default, use --remember.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
415
    """
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
416
    takes_options = ['remember', 'overwrite', 'revision', 'verbose']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
417
    takes_args = ['location?']
1185.85.27 by John Arbash Meinel
Updated bzr branch and bzr pull
418
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
419
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
420
    def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
421
        # FIXME: too much stuff is in the command class
422
        try:
423
            tree_to = WorkingTree.open_containing(u'.')[0]
424
            branch_to = tree_to.branch
425
        except NoWorkingTree:
426
            tree_to = None
427
            branch_to = Branch.open_containing(u'.')[0] 
428
        stored_loc = branch_to.get_parent()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
429
        if location is None:
430
            if stored_loc is None:
431
                raise BzrCommandError("No pull location known or specified.")
432
            else:
1685.1.37 by John Arbash Meinel
builtins now use urlfordisplay to display nicer paths to the user.
433
                self.outf.write("Using saved location: %s\n" 
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
434
                    % urlutils.unescape_for_display(stored_loc))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
435
                location = stored_loc
1185.56.1 by Michael Ellerman
Simplify handling of DivergedBranches in cmd_pull()
436
1685.1.19 by John Arbash Meinel
pull/merge/branch/missing should all save the absolute path to the other branch, not the relative one
437
        branch_from = Branch.open(location)
438
1614.2.12 by Olaf Conradi
Merge bzr.dev
439
        if branch_to.get_parent() is None or remember:
1685.1.19 by John Arbash Meinel
pull/merge/branch/missing should all save the absolute path to the other branch, not the relative one
440
            branch_to.set_parent(branch_from.base)
1614.2.8 by Olaf Conradi
Added testcases for using pull with --remember. Moved remember code to
441
1185.56.1 by Michael Ellerman
Simplify handling of DivergedBranches in cmd_pull()
442
1185.76.4 by Erik BÃ¥gfors
expanded tabs
443
        if revision is None:
444
            rev_id = None
1185.76.3 by Erik BÃ¥gfors
changes for pull --revision based on input from John
445
        elif len(revision) == 1:
1614.2.12 by Olaf Conradi
Merge bzr.dev
446
            rev_id = revision[0].in_history(branch_from).rev_id
1185.76.4 by Erik BÃ¥gfors
expanded tabs
447
        else:
448
            raise BzrCommandError('bzr pull --revision takes one value.')
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
449
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
450
        old_rh = branch_to.revision_history()
451
        if tree_to is not None:
1614.2.12 by Olaf Conradi
Merge bzr.dev
452
            count = tree_to.pull(branch_from, overwrite, rev_id)
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
453
        else:
1614.2.12 by Olaf Conradi
Merge bzr.dev
454
            count = branch_to.pull(branch_from, overwrite, rev_id)
1185.40.2 by Robey Pointer
when doing a 'pull', display the number of revisions pulled; on 'commit', display the current (new) revision number
455
        note('%d revision(s) pulled.' % (count,))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
456
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
457
        if verbose:
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
458
            new_rh = branch_to.revision_history()
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
459
            if old_rh != new_rh:
460
                # Something changed
461
                from bzrlib.log import show_changed_revisions
1685.1.1 by John Arbash Meinel
[merge] the old bzr-encoding changes, reparenting them on bzr.dev
462
                show_changed_revisions(branch_to, old_rh, new_rh,
1185.85.27 by John Arbash Meinel
Updated bzr branch and bzr pull
463
                                       to_file=self.outf)
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
464
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
465
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
466
class cmd_push(Command):
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
467
    """Update a mirror of this branch.
468
    
469
    The target branch will not have its working tree populated because this
470
    is both expensive, and is not supported on remote file systems.
471
    
472
    Some smart servers or protocols *may* put the working tree in place in
473
    the future.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
474
475
    This command only works on branches that have not diverged.  Branches are
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
476
    considered diverged if the destination branch's most recent commit is one
477
    that has not been merged (directly or indirectly) by the source branch.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
478
479
    If branches have diverged, you can use 'bzr push --overwrite' to replace
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
480
    the other branch completely, discarding its unmerged changes.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
481
    
482
    If you want to ensure you have the different changes in the other branch,
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
483
    do a merge (see bzr help merge) from the other branch, and commit that.
484
    After that you will be able to do a push without '--overwrite'.
1614.2.3 by Olaf Conradi
In commands push and pull, moved help text for --remember down. It's not
485
486
    If there is no default push location set, the first push will set it.
487
    After that, you can omit the location to use the default.  To change the
488
    default, use --remember.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
489
    """
1185.85.31 by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag.
490
    takes_options = ['remember', 'overwrite', 'verbose',
1495 by Robert Collins
Add a --create-prefix to the new push command.
491
                     Option('create-prefix', 
492
                            help='Create the path leading up to the branch '
493
                                 'if it does not already exist')]
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
494
    takes_args = ['location?']
1185.85.31 by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag.
495
    encoding_type = 'replace'
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
496
1495 by Robert Collins
Add a --create-prefix to the new push command.
497
    def run(self, location=None, remember=False, overwrite=False,
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
498
            create_prefix=False, verbose=False):
1185.33.45 by Martin Pool
[merge] refactoring of branch vs working tree, etc (robertc)
499
        # FIXME: Way too big!  Put this into a function called from the
500
        # command.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
501
        from bzrlib.transport import get_transport
502
        
1692.3.1 by Robert Collins
Fix push to work with just a branch, no need for a working tree.
503
        br_from = Branch.open_containing('.')[0]
504
        stored_loc = br_from.get_push_location()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
505
        if location is None:
506
            if stored_loc is None:
507
                raise BzrCommandError("No push location known or specified.")
508
            else:
1685.1.37 by John Arbash Meinel
builtins now use urlfordisplay to display nicer paths to the user.
509
                self.outf.write("Using saved location: %s" 
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
510
                    % urlutils.unescape_for_display(stored_loc))
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
511
                location = stored_loc
1685.1.22 by John Arbash Meinel
cmd_push was passing the location directly to relpath, rather than a URL
512
513
        transport = get_transport(location)
514
        location_url = transport.base
1614.2.9 by Olaf Conradi
Added testcases for using push with --remember. Moved remember code to
515
        if br_from.get_push_location() is None or remember:
1685.1.24 by John Arbash Meinel
cmd_push should use URLs throughout.
516
            br_from.set_push_location(location_url)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
517
        try:
1685.1.24 by John Arbash Meinel
cmd_push should use URLs throughout.
518
            dir_to = bzrlib.bzrdir.BzrDir.open(location_url)
1563.2.38 by Robert Collins
make push preserve tree formats.
519
            br_to = dir_to.open_branch()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
520
        except NotBranchError:
521
            # create a branch.
1685.1.22 by John Arbash Meinel
cmd_push was passing the location directly to relpath, rather than a URL
522
            transport = transport.clone('..')
1495 by Robert Collins
Add a --create-prefix to the new push command.
523
            if not create_prefix:
524
                try:
1685.1.24 by John Arbash Meinel
cmd_push should use URLs throughout.
525
                    relurl = transport.relpath(location_url)
526
                    mutter('creating directory %s => %s', location_url, relurl)
527
                    transport.mkdir(relurl)
1495 by Robert Collins
Add a --create-prefix to the new push command.
528
                except NoSuchFile:
529
                    raise BzrCommandError("Parent directory of %s "
530
                                          "does not exist." % location)
531
            else:
532
                current = transport.base
1685.1.22 by John Arbash Meinel
cmd_push was passing the location directly to relpath, rather than a URL
533
                needed = [(transport, transport.relpath(location_url))]
1495 by Robert Collins
Add a --create-prefix to the new push command.
534
                while needed:
535
                    try:
536
                        transport, relpath = needed[-1]
537
                        transport.mkdir(relpath)
538
                        needed.pop()
539
                    except NoSuchFile:
540
                        new_transport = transport.clone('..')
541
                        needed.append((new_transport,
542
                                       new_transport.relpath(transport.base)))
543
                        if new_transport.base == transport.base:
1616.1.16 by Martin Pool
typo
544
                            raise BzrCommandError("Could not create "
1495 by Robert Collins
Add a --create-prefix to the new push command.
545
                                                  "path prefix.")
1685.1.24 by John Arbash Meinel
cmd_push should use URLs throughout.
546
            dir_to = br_from.bzrdir.clone(location_url)
1563.2.38 by Robert Collins
make push preserve tree formats.
547
            br_to = dir_to.open_branch()
1185.49.26 by John Arbash Meinel
Adding tests for remote sftp branches without working trees, plus a bugfix to allow push to still work with a warning.
548
        old_rh = br_to.revision_history()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
549
        try:
1185.49.26 by John Arbash Meinel
Adding tests for remote sftp branches without working trees, plus a bugfix to allow push to still work with a warning.
550
            try:
1563.2.38 by Robert Collins
make push preserve tree formats.
551
                tree_to = dir_to.open_workingtree()
552
            except errors.NotLocalUrl:
1185.49.26 by John Arbash Meinel
Adding tests for remote sftp branches without working trees, plus a bugfix to allow push to still work with a warning.
553
                # TODO: This should be updated for branches which don't have a
554
                # working tree, as opposed to ones where we just couldn't 
555
                # update the tree.
1558.7.4 by Aaron Bentley
Adjust push warning [Matthew Fuller]
556
                warning('This transport does not update the working '
557
                        'tree of: %s' % (br_to.base,))
1185.49.26 by John Arbash Meinel
Adding tests for remote sftp branches without working trees, plus a bugfix to allow push to still work with a warning.
558
                count = br_to.pull(br_from, overwrite)
1563.2.38 by Robert Collins
make push preserve tree formats.
559
            except NoWorkingTree:
560
                count = br_to.pull(br_from, overwrite)
1185.49.26 by John Arbash Meinel
Adding tests for remote sftp branches without working trees, plus a bugfix to allow push to still work with a warning.
561
            else:
562
                count = tree_to.pull(br_from, overwrite)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
563
        except DivergedBranches:
564
            raise BzrCommandError("These branches have diverged."
565
                                  "  Try a merge then push with overwrite.")
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
566
        note('%d revision(s) pushed.' % (count,))
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
567
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
568
        if verbose:
569
            new_rh = br_to.revision_history()
570
            if old_rh != new_rh:
571
                # Something changed
572
                from bzrlib.log import show_changed_revisions
1185.85.31 by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag.
573
                show_changed_revisions(br_to, old_rh, new_rh,
574
                                       to_file=self.outf)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
575
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
576
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
577
class cmd_branch(Command):
578
    """Create a new copy of a branch.
579
580
    If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
581
    be used.  In other words, "branch ../foo/bar" will attempt to create ./bar.
582
583
    To retrieve the branch as of a particular revision, supply the --revision
584
    parameter, as in "branch foo/bar -r 5".
1185.10.2 by Aaron Bentley
Updated help message
585
586
    --basis is to speed up branching from remote branches.  When specified, it
587
    copies all the file-contents, inventory and revision data from the basis
588
    branch before copying anything from the remote branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
589
    """
590
    takes_args = ['from_location', 'to_location?']
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
591
    takes_options = ['revision', 'basis']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
592
    aliases = ['get', 'clone']
593
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
594
    def run(self, from_location, to_location=None, revision=None, basis=None):
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
595
        from bzrlib.transport import get_transport
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
596
        from bzrlib.osutils import rmtree
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
597
        if revision is None:
598
            revision = [None]
599
        elif len(revision) > 1:
600
            raise BzrCommandError(
601
                'bzr branch --revision takes exactly 1 revision value')
602
        try:
603
            br_from = Branch.open(from_location)
604
        except OSError, e:
605
            if e.errno == errno.ENOENT:
606
                raise BzrCommandError('Source location "%s" does not'
607
                                      ' exist.' % to_location)
608
            else:
609
                raise
610
        br_from.lock_read()
611
        try:
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
612
            if basis is not None:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
613
                basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
614
            else:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
615
                basis_dir = None
1185.8.4 by Aaron Bentley
Fixed branch -r
616
            if len(revision) == 1 and revision[0] is not None:
1390 by Robert Collins
pair programming worx... merge integration and weave
617
                revision_id = revision[0].in_history(br_from)[1]
1185.8.4 by Aaron Bentley
Fixed branch -r
618
            else:
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
619
                # FIXME - wt.last_revision, fallback to branch, fall back to
620
                # None or perhaps NULL_REVISION to mean copy nothing
621
                # RBC 20060209
622
                revision_id = br_from.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
623
            if to_location is None:
624
                to_location = os.path.basename(from_location.rstrip("/\\"))
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
625
                name = None
626
            else:
627
                name = os.path.basename(to_location) + '\n'
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
628
629
            to_transport = get_transport(to_location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
630
            try:
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
631
                to_transport.mkdir('.')
632
            except bzrlib.errors.FileExists:
633
                raise BzrCommandError('Target directory "%s" already'
634
                                      ' exists.' % to_location)
635
            except bzrlib.errors.NoSuchFile:
636
                raise BzrCommandError('Parent of "%s" does not exist.' %
637
                                      to_location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
638
            try:
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
639
                # preserve whatever source format we have.
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
640
                dir = br_from.bzrdir.sprout(to_transport.base,
641
                        revision_id, basis_dir)
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
642
                branch = dir.open_branch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
643
            except bzrlib.errors.NoSuchRevision:
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
644
                # TODO: jam 20060426 This only works on local paths
645
                #       and it would be nice if 'bzr branch' could
646
                #       work on a remote path
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
647
                rmtree(to_location)
1466 by Robert Collins
revision may be None in cmd_branch, do not treat as an int.
648
                msg = "The branch %s has no revision %s." % (from_location, revision[0])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
649
                raise BzrCommandError(msg)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
650
            except bzrlib.errors.UnlistableBranch:
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
651
                rmtree(to_location)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
652
                msg = "The branch %s cannot be used as a --basis" % (basis,)
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
653
                raise BzrCommandError(msg)
654
            if name:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
655
                branch.control_files.put_utf8('branch-name', name)
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
656
            note('Branched %d revision(s).' % branch.revno())
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
657
        finally:
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
658
            br_from.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
659
660
1508.1.20 by Robert Collins
Create a checkout command.
661
class cmd_checkout(Command):
662
    """Create a new checkout of an existing branch.
663
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
664
    If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
665
    the branch found in '.'. This is useful if you have removed the working tree
666
    or if it was never created - i.e. if you pushed the branch to its current
667
    location using SFTP.
668
    
1508.1.20 by Robert Collins
Create a checkout command.
669
    If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
670
    be used.  In other words, "checkout ../foo/bar" will attempt to create ./bar.
671
672
    To retrieve the branch as of a particular revision, supply the --revision
673
    parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
674
    out of date [so you cannot commit] but it may be useful (i.e. to examine old
675
    code.)
676
677
    --basis is to speed up checking out from remote branches.  When specified, it
678
    uses the inventory and file contents from the basis branch in preference to the
1185.50.88 by John Arbash Meinel
--basis has been implemented for checkouts.
679
    branch being checked out.
1508.1.20 by Robert Collins
Create a checkout command.
680
    """
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
681
    takes_args = ['branch_location?', 'to_location?']
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
682
    takes_options = ['revision', # , 'basis']
683
                     Option('lightweight',
684
                            help="perform a lightweight checkout. Lightweight "
685
                                 "checkouts depend on access to the branch for "
686
                                 "every operation. Normal checkouts can perform "
687
                                 "common operations like diff and status without "
688
                                 "such access, and also support local commits."
689
                            ),
690
                     ]
1508.1.20 by Robert Collins
Create a checkout command.
691
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
692
    def run(self, branch_location=None, to_location=None, revision=None, basis=None,
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
693
            lightweight=False):
1508.1.20 by Robert Collins
Create a checkout command.
694
        if revision is None:
695
            revision = [None]
696
        elif len(revision) > 1:
697
            raise BzrCommandError(
698
                'bzr checkout --revision takes exactly 1 revision value')
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
699
        if branch_location is None:
700
            branch_location = bzrlib.osutils.getcwd()
701
            to_location = branch_location
1508.1.20 by Robert Collins
Create a checkout command.
702
        source = Branch.open(branch_location)
703
        if len(revision) == 1 and revision[0] is not None:
704
            revision_id = revision[0].in_history(source)[1]
705
        else:
706
            revision_id = None
707
        if to_location is None:
708
            to_location = os.path.basename(branch_location.rstrip("/\\"))
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
709
        # if the source and to_location are the same, 
710
        # and there is no working tree,
711
        # then reconstitute a branch
712
        if (bzrlib.osutils.abspath(to_location) == 
713
            bzrlib.osutils.abspath(branch_location)):
714
            try:
715
                source.bzrdir.open_workingtree()
716
            except errors.NoWorkingTree:
717
                source.bzrdir.create_workingtree()
718
                return
1508.1.20 by Robert Collins
Create a checkout command.
719
        try:
720
            os.mkdir(to_location)
721
        except OSError, e:
722
            if e.errno == errno.EEXIST:
723
                raise BzrCommandError('Target directory "%s" already'
724
                                      ' exists.' % to_location)
725
            if e.errno == errno.ENOENT:
726
                raise BzrCommandError('Parent of "%s" does not exist.' %
727
                                      to_location)
728
            else:
729
                raise
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
730
        old_format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
731
        bzrlib.bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
732
        try:
733
            if lightweight:
734
                checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
735
                bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
736
            else:
737
                checkout_branch =  bzrlib.bzrdir.BzrDir.create_branch_convenience(
738
                    to_location, force_new_tree=False)
739
                checkout = checkout_branch.bzrdir
740
                checkout_branch.bind(source)
741
                if revision_id is not None:
742
                    rh = checkout_branch.revision_history()
743
                    checkout_branch.set_revision_history(rh[:rh.index(revision_id) + 1])
744
            checkout.create_workingtree(revision_id)
745
        finally:
746
            bzrlib.bzrdir.BzrDirFormat.set_default_format(old_format)
1508.1.20 by Robert Collins
Create a checkout command.
747
748
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
749
class cmd_renames(Command):
750
    """Show list of renamed files.
751
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
752
    # TODO: Option to show renames between two historical versions.
753
754
    # TODO: Only show renames under dir, rather than in the whole branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
755
    takes_args = ['dir?']
756
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
757
    @display_command
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
758
    def run(self, dir=u'.'):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
759
        tree = WorkingTree.open_containing(dir)[0]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
760
        old_inv = tree.basis_tree().inventory
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
761
        new_inv = tree.read_working_inventory()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
762
763
        renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
764
        renames.sort()
765
        for old_name, new_name in renames:
1185.85.32 by John Arbash Meinel
Updated bzr renames
766
            self.outf.write("%s => %s\n" % (old_name, new_name))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
767
768
1508.1.24 by Robert Collins
Add update command for use with checkouts.
769
class cmd_update(Command):
770
    """Update a tree to have the latest code committed to its branch.
771
    
772
    This will perform a merge into the working tree, and may generate
1587.1.10 by Robert Collins
update updates working tree and branch together.
773
    conflicts. If you have any local changes, you will still 
774
    need to commit them after the update for the update to be complete.
775
    
776
    If you want to discard your local changes, you can just do a 
777
    'bzr revert' instead of 'bzr commit' after the update.
1508.1.24 by Robert Collins
Add update command for use with checkouts.
778
    """
779
    takes_args = ['dir?']
780
781
    def run(self, dir='.'):
782
        tree = WorkingTree.open_containing(dir)[0]
783
        tree.lock_write()
784
        try:
785
            if tree.last_revision() == tree.branch.last_revision():
1587.1.11 by Robert Collins
Local commits appear to be working properly.
786
                # may be up to date, check master too.
787
                master = tree.branch.get_master_branch()
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
788
                if master is None or master.last_revision == tree.last_revision():
1587.1.11 by Robert Collins
Local commits appear to be working properly.
789
                    note("Tree is up to date.")
790
                    return
1508.1.24 by Robert Collins
Add update command for use with checkouts.
791
            conflicts = tree.update()
792
            note('Updated to revision %d.' %
793
                 (tree.branch.revision_id_to_revno(tree.last_revision()),))
794
            if conflicts != 0:
795
                return 1
796
            else:
797
                return 0
798
        finally:
799
            tree.unlock()
800
801
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
802
class cmd_info(Command):
1694.2.6 by Martin Pool
[merge] bzr.dev
803
    """Show information about a working tree, branch or repository.
804
805
    This command will show all known locations and formats associated to the
806
    tree, branch or repository.  Statistical information is included with
807
    each report.
808
809
    Branches and working trees will also report any missing revisions.
810
    """
811
    takes_args = ['location?']
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
812
    takes_options = ['verbose']
1694.2.6 by Martin Pool
[merge] bzr.dev
813
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
814
    @display_command
1694.2.6 by Martin Pool
[merge] bzr.dev
815
    def run(self, location=None, verbose=False):
816
        from bzrlib.info import show_bzrdir_info
817
        show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
818
                         verbose=verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
819
820
821
class cmd_remove(Command):
822
    """Make a file unversioned.
823
824
    This makes bzr stop tracking changes to a versioned file.  It does
825
    not delete the working copy.
826
    """
827
    takes_args = ['file+']
828
    takes_options = ['verbose']
1424 by Robert Collins
add rm alias to remove
829
    aliases = ['rm']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
830
    
831
    def run(self, file_list, verbose=False):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
832
        tree, file_list = tree_files(file_list)
1185.12.105 by Aaron Bentley
Substituted branch_files for equivalent code
833
        tree.remove(file_list, verbose=verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
834
835
836
class cmd_file_id(Command):
837
    """Print file_id of a particular file or directory.
838
839
    The file_id is assigned when the file is first added and remains the
840
    same through all revisions where the file exists, even when it is
841
    moved or renamed.
842
    """
843
    hidden = True
844
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
845
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
846
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
847
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
848
        tree, relpath = WorkingTree.open_containing(filename)
849
        i = tree.inventory.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
850
        if i == None:
851
            raise BzrError("%r is not a versioned file" % filename)
852
        else:
1185.85.34 by John Arbash Meinel
Updating 'bzr file-id' exposed that we weren't allowing unicode file ids. Enabling them reveals a lot more bugs.
853
            self.outf.write(i)
854
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
855
856
857
class cmd_file_path(Command):
858
    """Print path of file_ids to a file or directory.
859
860
    This prints one line for each directory down to the target,
1185.85.35 by John Arbash Meinel
Updated file-path
861
    starting at the branch root.
862
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
863
    hidden = True
864
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
865
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
866
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
867
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
868
        tree, relpath = WorkingTree.open_containing(filename)
869
        inv = tree.inventory
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
870
        fid = inv.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
871
        if fid == None:
872
            raise BzrError("%r is not a versioned file" % filename)
873
        for fip in inv.get_idpath(fid):
1185.85.43 by John Arbash Meinel
Found a bug in 'bzr file-path'
874
            self.outf.write(fip)
1185.85.35 by John Arbash Meinel
Updated file-path
875
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
876
877
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
878
class cmd_reconcile(Command):
879
    """Reconcile bzr metadata in a branch.
880
881
    This can correct data mismatches that may have been caused by
882
    previous ghost operations or bzr upgrades. You should only
883
    need to run this command if 'bzr check' or a bzr developer 
884
    advises you to run it.
885
886
    If a second branch is provided, cross-branch reconciliation is
887
    also attempted, which will check that data like the tree root
888
    id which was not present in very early bzr versions is represented
889
    correctly in both branches.
890
891
    At the same time it is run it may recompress data resulting in 
892
    a potential saving in disk space or performance gain.
893
894
    The branch *MUST* be on a listable system such as local disk or sftp.
895
    """
896
    takes_args = ['branch?']
897
898
    def run(self, branch="."):
899
        from bzrlib.reconcile import reconcile
900
        dir = bzrlib.bzrdir.BzrDir.open(branch)
901
        reconcile(dir)
902
903
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
904
class cmd_revision_history(Command):
905
    """Display list of revision ids on this branch."""
906
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
907
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
908
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
909
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
910
        branch = WorkingTree.open_containing(u'.')[0].branch
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
911
        for patchid in branch.revision_history():
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
912
            self.outf.write(patchid)
913
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
914
915
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
916
class cmd_ancestry(Command):
917
    """List all revisions merged into this branch."""
918
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
919
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
920
    @display_command
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
921
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
922
        tree = WorkingTree.open_containing(u'.')[0]
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
923
        b = tree.branch
924
        # FIXME. should be tree.last_revision
1551.3.11 by Aaron Bentley
Merge from Robert
925
        for revision_id in b.repository.get_ancestry(b.last_revision()):
1185.85.42 by John Arbash Meinel
I haven't been running the full test enough. Found some bugs in bzr ancestry.
926
            if revision_id is None:
927
                continue
928
            self.outf.write(revision_id)
929
            self.outf.write('\n')
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
930
931
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
932
class cmd_init(Command):
933
    """Make a directory into a versioned branch.
934
935
    Use this to create an empty branch, or before importing an
936
    existing project.
937
1662.1.19 by Martin Pool
Better error message when initting existing tree
938
    If there is a repository in a parent directory of the location, then 
939
    the history of the branch will be stored in the repository.  Otherwise
940
    init creates a standalone branch which carries its own history in 
941
    .bzr.
942
943
    If there is already a branch at the location but it has no working tree,
944
    the tree can be populated with 'bzr checkout'.
945
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
946
    Recipe for importing a tree of files:
947
        cd ~/project
948
        bzr init
1185.12.93 by Aaron Bentley
Fixed obsolete help
949
        bzr add .
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
950
        bzr status
951
        bzr commit -m 'imported project'
952
    """
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
953
    takes_args = ['location?']
1553.5.78 by Martin Pool
New bzr init --format option and test
954
    takes_options = [
955
                     Option('format', 
1694.2.6 by Martin Pool
[merge] bzr.dev
956
                            help='Specify a format for this branch. Current'
957
                                 ' formats are: default, knit, metaweave and'
958
                                 ' weave. Default is knit; metaweave and'
959
                                 ' weave are deprecated',
1553.5.78 by Martin Pool
New bzr init --format option and test
960
                            type=get_format_type),
961
                     ]
962
    def run(self, location=None, format=None):
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
963
        from bzrlib.branch import Branch
1694.2.6 by Martin Pool
[merge] bzr.dev
964
        if format is None:
965
            format = get_format_type('default')
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
966
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
967
            location = u'.'
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
968
        else:
969
            # The path has to exist to initialize a
970
            # branch inside of it.
971
            # Just using os.mkdir, since I don't
972
            # believe that we want to create a bunch of
973
            # locations if the user supplies an extended path
974
            if not os.path.exists(location):
975
                os.mkdir(location)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
976
        try:
1662.1.19 by Martin Pool
Better error message when initting existing tree
977
            existing_bzrdir = bzrdir.BzrDir.open(location)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
978
        except NotBranchError:
1662.1.19 by Martin Pool
Better error message when initting existing tree
979
            # really a NotBzrDir error...
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
980
            bzrdir.BzrDir.create_branch_convenience(location, format=format)
981
        else:
1662.1.19 by Martin Pool
Better error message when initting existing tree
982
            if existing_bzrdir.has_branch():
983
                if existing_bzrdir.has_workingtree():
984
                    raise errors.AlreadyBranchError(location)
985
                else:
986
                    raise errors.BranchExistsWithoutWorkingTree(location)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
987
            else:
1662.1.19 by Martin Pool
Better error message when initting existing tree
988
                existing_bzrdir.create_branch()
989
                existing_bzrdir.create_workingtree()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
990
991
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
992
class cmd_init_repository(Command):
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
993
    """Create a shared repository to hold branches.
994
995
    New branches created under the repository directory will store their revisions
996
    in the repository, not in the branch directory, if the branch format supports
997
    shared storage.
998
1662.1.11 by Martin Pool
Better help for init-repo (Erik)
999
    example:
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1000
        bzr init-repo repo
1662.1.11 by Martin Pool
Better help for init-repo (Erik)
1001
        bzr init repo/trunk
1002
        bzr checkout --lightweight repo/trunk trunk-checkout
1003
        cd trunk-checkout
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1004
        (add files here)
1005
    """
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1006
    takes_args = ["location"] 
1007
    takes_options = [Option('format', 
1694.2.6 by Martin Pool
[merge] bzr.dev
1008
                            help='Specify a format for this repository.'
1009
                                 ' Current formats are: default, knit,'
1010
                                 ' metaweave and weave. Default is knit;'
1011
                                 ' metaweave and weave are deprecated',
1624.2.1 by Erik BÃ¥gfors
support for --tree in bzr init-repo
1012
                            type=get_format_type),
1624.2.4 by Erik BÃ¥gfors
rename --tree to --trees
1013
                     Option('trees',
1624.2.1 by Erik BÃ¥gfors
support for --tree in bzr init-repo
1014
                             help='Allows branches in repository to have'
1015
                             ' a working tree')]
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1016
    aliases = ["init-repo"]
1624.2.4 by Erik BÃ¥gfors
rename --tree to --trees
1017
    def run(self, location, format=None, trees=False):
1558.5.1 by Aaron Bentley
Added make-repository command
1018
        from bzrlib.transport import get_transport
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1019
        if format is None:
1694.2.6 by Martin Pool
[merge] bzr.dev
1020
            format = get_format_type('default')
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1021
        transport = get_transport(location)
1022
        if not transport.has('.'):
1023
            transport.mkdir('')
1024
        newdir = format.initialize_on_transport(transport)
1558.5.2 by Aaron Bentley
Created *shared* repositories...
1025
        repo = newdir.create_repository(shared=True)
1624.2.4 by Erik BÃ¥gfors
rename --tree to --trees
1026
        repo.set_make_working_trees(trees)
1558.5.1 by Aaron Bentley
Added make-repository command
1027
1028
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1029
class cmd_diff(Command):
1030
    """Show differences in working tree.
1031
    
1032
    If files are listed, only the changes in those files are listed.
1033
    Otherwise, all changes for the tree are listed.
1034
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1035
    "bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1036
    produces patches suitable for "patch -p1".
1037
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1038
    examples:
1039
        bzr diff
1040
        bzr diff -r1
1185.1.2 by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd
1041
        bzr diff -r1..2
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1042
        bzr diff --diff-prefix old/:new/
1694.2.4 by Martin Pool
When a diff prefix is given, don't show it in === summary lines, only on the diffs themselves.
1043
        bzr diff bzr.mine bzr.dev
1044
        bzr diff foo.c
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1045
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1046
    # TODO: Option to use external diff command; could be GNU diff, wdiff,
1047
    #       or a graphical diff.
1048
1049
    # TODO: Python difflib is not exactly the same as unidiff; should
1050
    #       either fix it up or prefer to use an external diff.
1051
1052
    # TODO: Selected-file diff is inefficient and doesn't show you
1053
    #       deleted files.
1054
1055
    # TODO: This probably handles non-Unix newlines poorly.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1056
    
1057
    takes_args = ['file*']
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1058
    takes_options = ['revision', 'diff-options', 'prefix']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1059
    aliases = ['di', 'dif']
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1060
    encoding_type = 'exact'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1061
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1062
    @display_command
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1063
    def run(self, revision=None, file_list=None, diff_options=None,
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1064
            prefix=None):
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1065
        from bzrlib.diff import diff_cmd_helper, show_diff_trees
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1066
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1067
        if (prefix is None) or (prefix == '0'):
1068
            # diff -p0 format
1694.2.1 by Martin Pool
Remove 'a/', 'b/' default prefixes on diff output.
1069
            old_label = ''
1070
            new_label = ''
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1071
        elif prefix == '1':
1072
            old_label = 'old/'
1073
            new_label = 'new/'
1074
        else:
1075
            if not ':' in prefix:
1076
                 raise BzrError("--diff-prefix expects two values separated by a colon")
1077
            old_label, new_label = prefix.split(":")
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1078
        
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1079
        try:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1080
            tree1, file_list = internal_tree_files(file_list)
1081
            tree2 = None
1508.1.15 by Robert Collins
Merge from mpool.
1082
            b = None
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1083
            b2 = None
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
1084
        except FileInWrongBranch:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1085
            if len(file_list) != 2:
1086
                raise BzrCommandError("Files are in different branches")
1087
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1088
            tree1, file1 = WorkingTree.open_containing(file_list[0])
1089
            tree2, file2 = WorkingTree.open_containing(file_list[1])
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1090
            if file1 != "" or file2 != "":
1508.1.15 by Robert Collins
Merge from mpool.
1091
                # FIXME diff those two files. rbc 20051123
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1092
                raise BzrCommandError("Files are in different branches")
1093
            file_list = None
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1094
        if revision is not None:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1095
            if tree2 is not None:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1096
                raise BzrCommandError("Can't specify -r with two branches")
1185.50.44 by John Arbash Meinel
[patch] Robey Pointer: diff -r 1.. should diff against working tree.
1097
            if (len(revision) == 1) or (revision[1].spec is None):
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1098
                return diff_cmd_helper(tree1, file_list, diff_options,
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1099
                                       revision[0], 
1100
                                       old_label=old_label, new_label=new_label)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1101
            elif len(revision) == 2:
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1102
                return diff_cmd_helper(tree1, file_list, diff_options,
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1103
                                       revision[0], revision[1],
1104
                                       old_label=old_label, new_label=new_label)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1105
            else:
1106
                raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
1107
        else:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1108
            if tree2 is not None:
1109
                return show_diff_trees(tree1, tree2, sys.stdout, 
1110
                                       specific_files=file_list,
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1111
                                       external_diff_options=diff_options,
1112
                                       old_label=old_label, new_label=new_label)
1508.1.15 by Robert Collins
Merge from mpool.
1113
            else:
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1114
                return diff_cmd_helper(tree1, file_list, diff_options,
1115
                                       old_label=old_label, new_label=new_label)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1116
1117
1118
class cmd_deleted(Command):
1119
    """List files deleted in the working tree.
1120
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1121
    # TODO: Show files deleted since a previous revision, or
1122
    # between two revisions.
1123
    # TODO: Much more efficient way to do this: read in new
1124
    # directories with readdir, rather than stating each one.  Same
1125
    # level of effort but possibly much less IO.  (Or possibly not,
1126
    # if the directories are very large...)
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1127
    takes_options = ['show-ids']
1128
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1129
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1130
    def run(self, show_ids=False):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1131
        tree = WorkingTree.open_containing(u'.')[0]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1132
        old = tree.basis_tree()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1133
        for path, ie in old.inventory.iter_entries():
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1134
            if not tree.has_id(ie.file_id):
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1135
                self.outf.write(path)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1136
                if show_ids:
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1137
                    self.outf.write(' ')
1138
                    self.outf.write(ie.file_id)
1139
                self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1140
1141
1142
class cmd_modified(Command):
1143
    """List files modified in working tree."""
1144
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1145
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1146
    def run(self):
1147
        from bzrlib.delta import compare_trees
1148
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1149
        tree = WorkingTree.open_containing(u'.')[0]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1150
        td = compare_trees(tree.basis_tree(), tree)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1151
1398 by Robert Collins
integrate in Gustavos x-bit patch
1152
        for path, id, kind, text_modified, meta_modified in td.modified:
1185.85.50 by John Arbash Meinel
Updated cmd_modified
1153
            self.outf.write(path)
1154
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1155
1156
1157
class cmd_added(Command):
1158
    """List files added in working tree."""
1159
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1160
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1161
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1162
        wt = WorkingTree.open_containing(u'.')[0]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
1163
        basis_inv = wt.basis_tree().inventory
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1164
        inv = wt.inventory
1165
        for file_id in inv:
1166
            if file_id in basis_inv:
1167
                continue
1168
            path = inv.id2path(file_id)
1548 by Martin Pool
Fix 'bzr added' typo, and tests for that command.
1169
            if not os.access(bzrlib.osutils.abspath(path), os.F_OK):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1170
                continue
1185.85.52 by John Arbash Meinel
Updated cmd_added, which obviously had no tests, because it had a bug in it.
1171
            self.outf.write(path)
1172
            self.outf.write('\n')
1185.85.53 by John Arbash Meinel
Updated cmd_root
1173
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1174
1175
class cmd_root(Command):
1176
    """Show the tree root directory.
1177
1178
    The root is the nearest enclosing directory with a .bzr control
1179
    directory."""
1180
    takes_args = ['filename?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1181
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1182
    def run(self, filename=None):
1183
        """Print the branch root."""
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1184
        tree = WorkingTree.open_containing(filename)[0]
1185.85.53 by John Arbash Meinel
Updated cmd_root
1185
        self.outf.write(tree.basedir)
1186
        self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1187
1188
1189
class cmd_log(Command):
1626.1.2 by Martin Pool
Better help message for log command.
1190
    """Show log of a branch, file, or directory.
1191
1192
    By default show the log of the branch containing the working directory.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1193
1185.16.153 by Martin Pool
[patch] fix help for bzr log (Matthieu)
1194
    To request a range of logs, you can use the command -r begin..end
1195
    -r revision requests a specific revision, -r ..end or -r begin.. are
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1196
    also valid.
1626.1.2 by Martin Pool
Better help message for log command.
1197
1198
    examples:
1199
        bzr log
1200
        bzr log foo.c
1201
        bzr log -r -10.. http://server/branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1202
    """
1203
1393.1.55 by Martin Pool
doc
1204
    # TODO: Make --revision support uuid: and hash: [future tag:] notation.
1205
1626.1.2 by Martin Pool
Better help message for log command.
1206
    takes_args = ['location?']
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1207
    takes_options = [Option('forward', 
1208
                            help='show from oldest to newest'),
1626.1.2 by Martin Pool
Better help message for log command.
1209
                     'timezone', 
1210
                     Option('verbose', 
1211
                             help='show files changed in each revision'),
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1212
                     'show-ids', 'revision',
1553.2.1 by Erik BÃ¥gfors
Support for plugins to register log formatters and set default formatter
1213
                     'log-format',
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
1214
                     'line', 'long', 
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1215
                     Option('message',
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1216
                            help='show revisions whose message matches this regexp',
1217
                            type=str),
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
1218
                     'short',
1185.16.57 by Martin Pool
[merge] from aaron
1219
                     ]
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
1220
    encoding_type = 'replace'
1221
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1222
    @display_command
1626.1.2 by Martin Pool
Better help message for log command.
1223
    def run(self, location=None, timezone='original',
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1224
            verbose=False,
1225
            show_ids=False,
1226
            forward=False,
1227
            revision=None,
1553.2.1 by Erik BÃ¥gfors
Support for plugins to register log formatters and set default formatter
1228
            log_format=None,
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1229
            message=None,
1230
            long=False,
1185.12.25 by Aaron Bentley
Added one-line log format
1231
            short=False,
1232
            line=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1233
        from bzrlib.log import log_formatter, show_log
1185.16.49 by mbp at sourcefrog
- more refactoring and tests of commandline
1234
        assert message is None or isinstance(message, basestring), \
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1235
            "invalid message argument %r" % message
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1236
        direction = (forward and 'forward') or 'reverse'
1237
        
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1238
        # log everything
1239
        file_id = None
1626.1.2 by Martin Pool
Better help message for log command.
1240
        if location:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1241
            # find the file id to log:
1242
1626.1.2 by Martin Pool
Better help message for log command.
1243
            dir, fp = bzrdir.BzrDir.open_containing(location)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1244
            b = dir.open_branch()
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1245
            if fp != '':
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1246
                try:
1247
                    # might be a tree:
1248
                    inv = dir.open_workingtree().inventory
1249
                except (errors.NotBranchError, errors.NotLocalUrl):
1250
                    # either no tree, or is remote.
1251
                    inv = b.basis_tree().inventory
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1252
                file_id = inv.path2id(fp)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1253
        else:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1254
            # local dir only
1255
            # FIXME ? log the current subdir only RBC 20060203 
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
1256
            dir, relpath = bzrdir.BzrDir.open_containing('.')
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1257
            b = dir.open_branch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1258
1259
        if revision is None:
1260
            rev1 = None
1261
            rev2 = None
1262
        elif len(revision) == 1:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1263
            rev1 = rev2 = revision[0].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1264
        elif len(revision) == 2:
1553.4.2 by Michael Ellerman
Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure
1265
            if revision[0].spec is None:
1266
                # missing begin-range means first revision
1267
                rev1 = 1
1268
            else:
1269
                rev1 = revision[0].in_history(b).revno
1270
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
1271
            if revision[1].spec is None:
1272
                # missing end-range means last known revision
1273
                rev2 = b.revno()
1274
            else:
1275
                rev2 = revision[1].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1276
        else:
1277
            raise BzrCommandError('bzr log --revision takes one or two values.')
1278
1185.36.1 by Daniel Silverstone
A revision of zero is meant to be zero, not None. Also order the revisions supplied to cope with the user being confused
1279
        # By this point, the revision numbers are converted to the +ve
1280
        # form if they were supplied in the -ve form, so we can do
1281
        # this comparison in relative safety
1282
        if rev1 > rev2:
1283
            (rev2, rev1) = (rev1, rev2)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1284
1553.2.1 by Erik BÃ¥gfors
Support for plugins to register log formatters and set default formatter
1285
        if (log_format == None):
1553.2.9 by Erik BÃ¥gfors
log_formatter => log_format for "named" formatters
1286
            default = bzrlib.config.BranchConfig(b).log_format()
1553.2.4 by Erik BÃ¥gfors
Support for setting the default log format at a configuration option
1287
            log_format = get_log_format(long=long, short=short, line=line, default=default)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1288
        lf = log_formatter(log_format,
1289
                           show_ids=show_ids,
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
1290
                           to_file=self.outf,
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1291
                           show_timezone=timezone)
1292
1293
        show_log(b,
1294
                 lf,
1295
                 file_id,
1296
                 verbose=verbose,
1297
                 direction=direction,
1298
                 start_revision=rev1,
1299
                 end_revision=rev2,
1300
                 search=message)
1301
1185.85.4 by John Arbash Meinel
currently broken, trying to fix things up.
1302
1553.2.4 by Erik BÃ¥gfors
Support for setting the default log format at a configuration option
1303
def get_log_format(long=False, short=False, line=False, default='long'):
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
1304
    log_format = default
1305
    if long:
1306
        log_format = 'long'
1307
    if short:
1308
        log_format = 'short'
1309
    if line:
1310
        log_format = 'line'
1311
    return log_format
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1312
1313
1314
class cmd_touching_revisions(Command):
1315
    """Return revision-ids which affected a particular file.
1316
1317
    A more user-friendly interface is "bzr log FILE"."""
1318
    hidden = True
1319
    takes_args = ["filename"]
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1320
    encoding_type = 'replace'
1321
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1322
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1323
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1324
        tree, relpath = WorkingTree.open_containing(filename)
1325
        b = tree.branch
1326
        inv = tree.read_working_inventory()
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1327
        file_id = inv.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1328
        for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1329
            self.outf.write("%6d %s\n" % (revno, what))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1330
1331
1332
class cmd_ls(Command):
1333
    """List files in a tree.
1334
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1335
    # TODO: Take a revision or remote path and list that tree instead.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1336
    hidden = True
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1337
    takes_options = ['verbose', 'revision',
1338
                     Option('non-recursive',
1339
                            help='don\'t recurse into sub-directories'),
1340
                     Option('from-root',
1341
                            help='Print all paths from the root of the branch.'),
1342
                     Option('unknown', help='Print unknown files'),
1343
                     Option('versioned', help='Print versioned files'),
1344
                     Option('ignored', help='Print ignored files'),
1345
1346
                     Option('null', help='Null separate the files'),
1347
                    ]
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1348
    @display_command
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1349
    def run(self, revision=None, verbose=False, 
1350
            non_recursive=False, from_root=False,
1351
            unknown=False, versioned=False, ignored=False,
1352
            null=False):
1353
1354
        if verbose and null:
1355
            raise BzrCommandError('Cannot set both --verbose and --null')
1356
        all = not (unknown or versioned or ignored)
1357
1358
        selection = {'I':ignored, '?':unknown, 'V':versioned}
1359
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1360
        tree, relpath = WorkingTree.open_containing(u'.')
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1361
        if from_root:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1362
            relpath = u''
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1363
        elif relpath:
1364
            relpath += '/'
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1365
        if revision is not None:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1366
            tree = tree.branch.repository.revision_tree(
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1367
                revision[0].in_history(tree.branch).rev_id)
1185.85.13 by John Arbash Meinel
Moving bzr ls to encoded output.
1368
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
1369
        for fp, fc, kind, fid, entry in tree.list_files():
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1370
            if fp.startswith(relpath):
1371
                fp = fp[len(relpath):]
1372
                if non_recursive and '/' in fp:
1373
                    continue
1374
                if not all and not selection[fc]:
1375
                    continue
1376
                if verbose:
1377
                    kindch = entry.kind_character()
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
1378
                    self.outf.write('%-8s %s%s\n' % (fc, fp, kindch))
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1379
                elif null:
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
1380
                    self.outf.write(fp)
1381
                    self.outf.write('\0')
1382
                    self.outf.flush()
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1383
                else:
1185.85.22 by John Arbash Meinel
Updated cmd_inventory. Changing from having each Command request an encoded stdout to providing one before calling run()
1384
                    self.outf.write(fp)
1385
                    self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1386
1387
1388
class cmd_unknowns(Command):
1389
    """List unknown files."""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1390
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1391
    def run(self):
1392
        from bzrlib.osutils import quotefn
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1393
        for f in WorkingTree.open_containing(u'.')[0].unknowns():
1185.85.57 by John Arbash Meinel
Updated cmd_unknowns
1394
            self.outf.write(quotefn(f))
1395
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1396
1397
1398
class cmd_ignore(Command):
1399
    """Ignore a command or pattern.
1400
1401
    To remove patterns from the ignore list, edit the .bzrignore file.
1402
1403
    If the pattern contains a slash, it is compared to the whole path
1185.16.4 by Martin Pool
- doc and todo for ignore command
1404
    from the branch root.  Otherwise, it is compared to only the last
1405
    component of the path.  To match a file only in the root directory,
1406
    prepend './'.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1407
1408
    Ignore patterns are case-insensitive on case-insensitive systems.
1409
1410
    Note: wildcards must be quoted from the shell on Unix.
1411
1412
    examples:
1413
        bzr ignore ./Makefile
1414
        bzr ignore '*.class'
1415
    """
1185.16.4 by Martin Pool
- doc and todo for ignore command
1416
    # TODO: Complain if the filename is absolute
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1417
    takes_args = ['name_pattern']
1418
    
1419
    def run(self, name_pattern):
1420
        from bzrlib.atomicfile import AtomicFile
1421
        import os.path
1422
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1423
        tree, relpath = WorkingTree.open_containing(u'.')
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1424
        ifn = tree.abspath('.bzrignore')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1425
1426
        if os.path.exists(ifn):
1427
            f = open(ifn, 'rt')
1428
            try:
1429
                igns = f.read().decode('utf-8')
1430
            finally:
1431
                f.close()
1432
        else:
1433
            igns = ''
1434
1435
        # TODO: If the file already uses crlf-style termination, maybe
1436
        # we should use that for the newly added lines?
1437
1438
        if igns and igns[-1] != '\n':
1439
            igns += '\n'
1440
        igns += name_pattern + '\n'
1441
1442
        try:
1443
            f = AtomicFile(ifn, 'wt')
1444
            f.write(igns.encode('utf-8'))
1445
            f.commit()
1446
        finally:
1447
            f.close()
1448
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1449
        inv = tree.inventory
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1450
        if inv.path2id('.bzrignore'):
1451
            mutter('.bzrignore is already versioned')
1452
        else:
1453
            mutter('need to make new .bzrignore file versioned')
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
1454
            tree.add(['.bzrignore'])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1455
1456
1457
class cmd_ignored(Command):
1458
    """List ignored files and the patterns that matched them.
1459
1460
    See also: bzr ignore"""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1461
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1462
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1463
        tree = WorkingTree.open_containing(u'.')[0]
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
1464
        for path, file_class, kind, file_id, entry in tree.list_files():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1465
            if file_class != 'I':
1466
                continue
1467
            ## XXX: Slightly inefficient since this was already calculated
1468
            pat = tree.is_ignored(path)
1469
            print '%-50s %s' % (path, pat)
1470
1471
1472
class cmd_lookup_revision(Command):
1473
    """Lookup the revision-id from a revision-number
1474
1475
    example:
1476
        bzr lookup-revision 33
1477
    """
1478
    hidden = True
1479
    takes_args = ['revno']
1480
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1481
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1482
    def run(self, revno):
1483
        try:
1484
            revno = int(revno)
1485
        except ValueError:
1486
            raise BzrCommandError("not a valid revision-number: %r" % revno)
1487
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1488
        print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1489
1490
1491
class cmd_export(Command):
1492
    """Export past revision to destination directory.
1493
1494
    If no revision is specified this exports the last committed revision.
1495
1496
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
1497
    given, try to find the format with the extension. If no extension
1498
    is found exports to a directory (equivalent to --format=dir).
1499
1500
    Root may be the top directory for tar, tgz and tbz2 formats. If none
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
1501
    is given, the top directory will be the root name of the file.
1502
1503
    Note: export of tree with non-ascii filenames to zip is not supported.
1504
1551.3.11 by Aaron Bentley
Merge from Robert
1505
     Supported formats       Autodetected by extension
1506
     -----------------       -------------------------
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
1507
         dir                            -
1508
         tar                          .tar
1509
         tbz2                    .tar.bz2, .tbz2
1510
         tgz                      .tar.gz, .tgz
1511
         zip                          .zip
1512
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1513
    takes_args = ['dest']
1514
    takes_options = ['revision', 'format', 'root']
1515
    def run(self, dest, revision=None, format=None, root=None):
1516
        import os.path
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
1517
        from bzrlib.export import export
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1518
        tree = WorkingTree.open_containing(u'.')[0]
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1519
        b = tree.branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1520
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1521
            # should be tree.last_revision  FIXME
1241 by Martin Pool
- rename last_patch to last_revision
1522
            rev_id = b.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1523
        else:
1524
            if len(revision) != 1:
1525
                raise BzrError('bzr export --revision takes exactly 1 argument')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1526
            rev_id = revision[0].in_history(b).rev_id
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1527
        t = b.repository.revision_tree(rev_id)
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
1528
        try:
1529
            export(t, dest, format, root)
1530
        except errors.NoSuchExportFormat, e:
1531
            raise BzrCommandError('Unsupported export format: %s' % e.format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1532
1533
1534
class cmd_cat(Command):
1535
    """Write a file's text from a previous revision."""
1536
1537
    takes_options = ['revision']
1538
    takes_args = ['filename']
1539
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1540
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1541
    def run(self, filename, revision=None):
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1542
        if revision is not None and len(revision) != 1:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1543
            raise BzrCommandError("bzr cat --revision takes exactly one number")
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1544
        tree = None
1545
        try:
1546
            tree, relpath = WorkingTree.open_containing(filename)
1547
            b = tree.branch
1548
        except NotBranchError:
1549
            pass
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1550
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1551
        if tree is None:
1552
            b, relpath = Branch.open_containing(filename)
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1553
        if revision is None:
1554
            revision_id = b.last_revision()
1555
        else:
1556
            revision_id = revision[0].in_history(b).rev_id
1557
        b.print_file(relpath, revision_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1558
1559
1560
class cmd_local_time_offset(Command):
1561
    """Show the offset in seconds from GMT to local time."""
1562
    hidden = True    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1563
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1564
    def run(self):
1565
        print bzrlib.osutils.local_time_offset()
1566
1567
1568
1569
class cmd_commit(Command):
1570
    """Commit changes into a new revision.
1571
    
1572
    If no arguments are given, the entire tree is committed.
1573
1574
    If selected files are specified, only changes to those files are
1575
    committed.  If a directory is specified then the directory and everything 
1576
    within it is committed.
1577
1578
    A selected-file commit may fail in some cases where the committed
1579
    tree would be invalid, such as trying to commit a file in a
1580
    newly-added directory that is not itself committed.
1581
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1582
    # TODO: Run hooks on tree to-be-committed, and after commit.
1583
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1584
    # TODO: Strict commit that fails if there are deleted files.
1585
    #       (what does "deleted files" mean ??)
1586
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1587
    # TODO: Give better message for -s, --summary, used by tla people
1588
1589
    # XXX: verbose currently does nothing
1590
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1591
    takes_args = ['selected*']
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1592
    takes_options = ['message', 'verbose', 
1593
                     Option('unchanged',
1594
                            help='commit even if nothing has changed'),
1595
                     Option('file', type=str, 
1596
                            argname='msgfile',
1597
                            help='file containing commit message'),
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1598
                     Option('strict',
1599
                            help="refuse to commit if there are unknown "
1600
                            "files in the working tree."),
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1601
                     Option('local',
1602
                            help="perform a local only commit in a bound "
1603
                                 "branch. Such commits are not pushed to "
1604
                                 "the master branch until a normal commit "
1605
                                 "is performed."
1606
                            ),
1185.16.43 by Martin Pool
- clean up handling of option objects
1607
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1608
    aliases = ['ci', 'checkin']
1609
1610
    def run(self, message=None, file=None, verbose=True, selected_list=None,
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1611
            unchanged=False, strict=False, local=False):
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1612
        from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1613
        from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1614
                StrictCommitFailed)
1185.33.76 by Martin Pool
Fix import error.
1615
        from bzrlib.msgeditor import edit_commit_message, \
1616
                make_commit_message_template
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
1617
        from tempfile import TemporaryFile
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1618
1185.33.77 by Martin Pool
doc
1619
        # TODO: Need a blackbox test for invoking the external editor; may be
1620
        # slightly problematic to run this cross-platform.
1621
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
1622
        # TODO: do more checks that the commit will succeed before 
1623
        # spending the user's valuable time typing a commit message.
1624
        #
1625
        # TODO: if the commit *does* happen to fail, then save the commit 
1626
        # message to a temporary file where it can be recovered
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1627
        tree, selected_list = tree_files(selected_list)
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1628
        if local and not tree.branch.get_bound_location():
1629
            raise errors.LocalRequiresBoundBranch()
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1630
        if message is None and not file:
1185.33.76 by Martin Pool
Fix import error.
1631
            template = make_commit_message_template(tree, selected_list)
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
1632
            message = edit_commit_message(template)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1633
            if message is None:
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1634
                raise BzrCommandError("please specify a commit message"
1635
                                      " with either --message or --file")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1636
        elif message and file:
1637
            raise BzrCommandError("please specify either --message or --file")
1638
        
1639
        if file:
1640
            message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1641
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1642
        if message == "":
1643
                raise BzrCommandError("empty commit message specified")
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1644
        
1645
        if verbose:
1646
            reporter = ReportCommitToLog()
1647
        else:
1648
            reporter = NullCommitReporter()
1649
        
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1650
        try:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1651
            tree.commit(message, specific_files=selected_list,
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1652
                        allow_pointless=unchanged, strict=strict, local=local,
1653
                        reporter=reporter)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1654
        except PointlessCommit:
1655
            # FIXME: This should really happen before the file is read in;
1656
            # perhaps prepare the commit; get the message; then actually commit
1657
            raise BzrCommandError("no changes to commit",
1658
                                  ["use --unchanged to commit anyhow"])
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
1659
        except ConflictsInTree:
1660
            raise BzrCommandError("Conflicts detected in working tree.  "
1661
                'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1662
        except StrictCommitFailed:
1663
            raise BzrCommandError("Commit refused because there are unknown "
1664
                                  "files in the working tree.")
1505.1.24 by John Arbash Meinel
Updated commit to handle bound branches. Included test to handle commit after merge
1665
        except errors.BoundBranchOutOfDate, e:
1666
            raise BzrCommandError(str(e)
1587.1.12 by Robert Collins
Update help message to be more bound branch friendly.
1667
                                  + ' Either unbind, update, or'
1668
                                    ' pass --local to commit.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1669
1670
1671
class cmd_check(Command):
1672
    """Validate consistency of branch history.
1673
1674
    This command checks various invariants about the branch storage to
1675
    detect data corruption or bzr bugs.
1676
    """
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1677
    takes_args = ['branch?']
1449 by Robert Collins
teach check about ghosts
1678
    takes_options = ['verbose']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1679
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1680
    def run(self, branch=None, verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1681
        from bzrlib.check import check
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1682
        if branch is None:
1683
            tree = WorkingTree.open_containing()[0]
1684
            branch = tree.branch
1685
        else:
1686
            branch = Branch.open(branch)
1687
        check(branch, verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1688
1689
1690
class cmd_scan_cache(Command):
1691
    hidden = True
1692
    def run(self):
1693
        from bzrlib.hashcache import HashCache
1694
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1695
        c = HashCache(u'.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1696
        c.read()
1697
        c.scan()
1698
            
1699
        print '%6d stats' % c.stat_count
1700
        print '%6d in hashcache' % len(c._cache)
1701
        print '%6d files removed from cache' % c.removed_count
1702
        print '%6d hashes updated' % c.update_count
1703
        print '%6d files changed too recently to cache' % c.danger_count
1704
1705
        if c.needs_write:
1706
            c.write()
1534.5.16 by Robert Collins
Review feedback.
1707
1708
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1709
class cmd_upgrade(Command):
1710
    """Upgrade branch storage to current format.
1711
1712
    The check command or bzr developers may sometimes advise you to run
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
1713
    this command. When the default format has changed you may also be warned
1714
    during other operations to upgrade.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1715
    """
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
1716
    takes_args = ['url?']
1534.5.13 by Robert Collins
Correct buggy test.
1717
    takes_options = [
1718
                     Option('format', 
1694.2.6 by Martin Pool
[merge] bzr.dev
1719
                            help='Upgrade to a specific format. Current formats'
1720
                                 ' are: default, knit, metaweave and weave.'
1721
                                 ' Default is knit; metaweave and weave are'
1722
                                 ' deprecated',
1534.5.13 by Robert Collins
Correct buggy test.
1723
                            type=get_format_type),
1724
                    ]
1725
1726
1727
    def run(self, url='.', format=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1728
        from bzrlib.upgrade import upgrade
1694.2.6 by Martin Pool
[merge] bzr.dev
1729
        if format is None:
1730
            format = get_format_type('default')
1534.5.13 by Robert Collins
Correct buggy test.
1731
        upgrade(url, format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1732
1733
1734
class cmd_whoami(Command):
1735
    """Show bzr user id."""
1736
    takes_options = ['email']
1737
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1738
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1739
    def run(self, email=False):
1371 by Martin Pool
- raise NotBranchError if format file can't be read
1740
        try:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1741
            b = WorkingTree.open_containing(u'.')[0].branch
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1742
            config = bzrlib.config.BranchConfig(b)
1371 by Martin Pool
- raise NotBranchError if format file can't be read
1743
        except NotBranchError:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1744
            config = bzrlib.config.GlobalConfig()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1745
        
1746
        if email:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1747
            print config.user_email()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1748
        else:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1749
            print config.username()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1750
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
1751
1185.35.14 by Aaron Bentley
Implemented nick command
1752
class cmd_nick(Command):
1551.3.11 by Aaron Bentley
Merge from Robert
1753
    """Print or set the branch nickname.  
1754
1185.35.14 by Aaron Bentley
Implemented nick command
1755
    If unset, the tree root directory name is used as the nickname
1756
    To print the current nickname, execute with no argument.  
1757
    """
1758
    takes_args = ['nickname?']
1759
    def run(self, nickname=None):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1760
        branch = Branch.open_containing(u'.')[0]
1185.35.14 by Aaron Bentley
Implemented nick command
1761
        if nickname is None:
1762
            self.printme(branch)
1763
        else:
1764
            branch.nick = nickname
1765
1766
    @display_command
1767
    def printme(self, branch):
1768
        print branch.nick 
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1769
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
1770
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1771
class cmd_selftest(Command):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1772
    """Run internal test suite.
1773
    
1774
    This creates temporary test directories in the working directory,
1775
    but not existing data is affected.  These directories are deleted
1776
    if the tests pass, or left behind to help in debugging if they
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1777
    fail and --keep-output is specified.
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1778
    
1779
    If arguments are given, they are regular expressions that say
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1780
    which tests should run.
1552 by Martin Pool
Improved help text for bzr selftest
1781
1782
    If the global option '--no-plugins' is given, plugins are not loaded
1783
    before running the selftests.  This has two effects: features provided or
1784
    modified by plugins will not be tested, and tests provided by plugins will
1785
    not be run.
1786
1787
    examples:
1788
        bzr selftest ignore
1789
        bzr --no-plugins selftest -v
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1790
    """
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1791
    # TODO: --list should give a list of all available tests
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
1792
1793
    # NB: this is used from the class without creating an instance, which is
1794
    # why it does not have a self parameter.
1795
    def get_transport_type(typestring):
1796
        """Parse and return a transport specifier."""
1797
        if typestring == "sftp":
1798
            from bzrlib.transport.sftp import SFTPAbsoluteServer
1799
            return SFTPAbsoluteServer
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1800
        if typestring == "memory":
1801
            from bzrlib.transport.memory import MemoryServer
1802
            return MemoryServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
1803
        if typestring == "fakenfs":
1558.10.2 by Robert Collins
Refactor the FakeNFS support into a TransportDecorator.
1804
            from bzrlib.transport.fakenfs import FakeNFSServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
1805
            return FakeNFSServer
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
1806
        msg = "No known transport type %s. Supported types are: sftp\n" %\
1807
            (typestring)
1808
        raise BzrCommandError(msg)
1809
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1810
    hidden = True
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1811
    takes_args = ['testspecs*']
1552 by Martin Pool
Improved help text for bzr selftest
1812
    takes_options = ['verbose',
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1813
                     Option('one', help='stop when one test fails'),
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1814
                     Option('keep-output', 
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
1815
                            help='keep output directories when tests fail'),
1816
                     Option('transport', 
1817
                            help='Use a different transport by default '
1818
                                 'throughout the test suite.',
1819
                            type=get_transport_type),
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1820
                    ]
1821
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1822
    def run(self, testspecs_list=None, verbose=False, one=False,
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
1823
            keep_output=False, transport=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1824
        import bzrlib.ui
1185.31.25 by John Arbash Meinel
Renamed all of the tests from selftest/foo.py to tests/test_foo.py
1825
        from bzrlib.tests import selftest
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1826
        # we don't want progress meters from the tests to go to the
1827
        # real output; and we don't want log messages cluttering up
1828
        # the real logs.
1829
        save_ui = bzrlib.ui.ui_factory
1830
        bzrlib.trace.info('running tests...')
1831
        try:
1832
            bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1833
            if testspecs_list is not None:
1834
                pattern = '|'.join(testspecs_list)
1835
            else:
1836
                pattern = ".*"
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1837
            result = selftest(verbose=verbose, 
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1838
                              pattern=pattern,
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1839
                              stop_on_failure=one, 
1534.4.25 by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
1840
                              keep_output=keep_output,
1841
                              transport=transport)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1842
            if result:
1843
                bzrlib.trace.info('tests passed')
1844
            else:
1845
                bzrlib.trace.info('tests failed')
1846
            return int(not result)
1847
        finally:
1848
            bzrlib.ui.ui_factory = save_ui
1849
1850
1185.62.8 by John Arbash Meinel
Deprecating bzrlib.get_bzr_revision, in favor of bzrlib.builtins._get_bzr_branch
1851
def _get_bzr_branch():
1852
    """If bzr is run from a branch, return Branch or None"""
1853
    import bzrlib.errors
1854
    from bzrlib.branch import Branch
1855
    from bzrlib.osutils import abspath
1856
    from os.path import dirname
1857
    
1858
    try:
1859
        branch = Branch.open(dirname(abspath(dirname(__file__))))
1860
        return branch
1861
    except bzrlib.errors.BzrError:
1862
        return None
1863
    
1864
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1865
def show_version():
1866
    print "bzr (bazaar-ng) %s" % bzrlib.__version__
1867
    # is bzrlib itself in a branch?
1185.62.8 by John Arbash Meinel
Deprecating bzrlib.get_bzr_revision, in favor of bzrlib.builtins._get_bzr_branch
1868
    branch = _get_bzr_branch()
1869
    if branch:
1870
        rh = branch.revision_history()
1871
        revno = len(rh)
1185.62.1 by John Arbash Meinel
bzr --version prints branch nickname.
1872
        print "  bzr checkout, revision %d" % (revno,)
1873
        print "  nick: %s" % (branch.nick,)
1185.62.8 by John Arbash Meinel
Deprecating bzrlib.get_bzr_revision, in favor of bzrlib.builtins._get_bzr_branch
1874
        if rh:
1875
            print "  revid: %s" % (rh[-1],)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1876
    print bzrlib.__copyright__
1877
    print "http://bazaar-ng.org/"
1878
    print
1879
    print "bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and"
1880
    print "you may use, modify and redistribute it under the terms of the GNU"
1881
    print "General Public License version 2 or later."
1882
1883
1884
class cmd_version(Command):
1885
    """Show version of bzr."""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1886
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1887
    def run(self):
1888
        show_version()
1889
1890
class cmd_rocks(Command):
1891
    """Statement of optimism."""
1892
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1893
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1894
    def run(self):
1895
        print "it sure does!"
1896
1897
1898
class cmd_find_merge_base(Command):
1899
    """Find and print a base revision for merging two branches.
1900
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1901
    # TODO: Options to specify revisions on either side, as if
1902
    #       merging only part of the history.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1903
    takes_args = ['branch', 'other']
1904
    hidden = True
1905
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1906
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1907
    def run(self, branch, other):
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1908
        from bzrlib.revision import common_ancestor, MultipleRevisionSources
1909
        
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1910
        branch1 = Branch.open_containing(branch)[0]
1911
        branch2 = Branch.open_containing(other)[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1912
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1913
        history_1 = branch1.revision_history()
1914
        history_2 = branch2.revision_history()
1915
1241 by Martin Pool
- rename last_patch to last_revision
1916
        last1 = branch1.last_revision()
1917
        last2 = branch2.last_revision()
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1918
1551.2.2 by Aaron Bentley
Fix find-merge-base for new API [recommit]
1919
        source = MultipleRevisionSources(branch1.repository, 
1920
                                         branch2.repository)
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1921
        
1922
        base_rev_id = common_ancestor(last1, last2, source)
1923
1924
        print 'merge base is revision %s' % base_rev_id
1925
        
1926
        return
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1927
1928
        if base_revno is None:
1929
            raise bzrlib.errors.UnrelatedBranches()
1930
1931
        print ' r%-6d in %s' % (base_revno, branch)
1932
1933
        other_revno = branch2.revision_id_to_revno(base_revid)
1934
        
1935
        print ' r%-6d in %s' % (other_revno, other)
1936
1937
1938
1939
class cmd_merge(Command):
1940
    """Perform a three-way merge.
1941
    
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1942
    The branch is the branch you will merge from.  By default, it will
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1943
    merge the latest revision.  If you specify a revision, that
1944
    revision will be merged.  If you specify two revisions, the first
1945
    will be used as a BASE, and the second one as OTHER.  Revision
1946
    numbers are always relative to the specified branch.
1947
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
1948
    By default, bzr will try to merge in all new work from the other
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1949
    branch, automatically determining an appropriate base.  If this
1950
    fails, you may need to give an explicit base.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1951
    
1551.2.18 by Aaron Bentley
Updated docs to clarify conflict handling
1952
    Merge will do its best to combine the changes in two branches, but there
1953
    are some kinds of problems only a human can fix.  When it encounters those,
1954
    it will mark a conflict.  A conflict means that you need to fix something,
1955
    before you should commit.
1956
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
1957
    Use bzr resolve when you have fixed a problem.  See also bzr conflicts.
1551.2.18 by Aaron Bentley
Updated docs to clarify conflict handling
1958
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1959
    If there is no default branch set, the first merge will set it. After
1960
    that, you can omit the branch to use the default.  To change the
1614.2.2 by Olaf Conradi
Merge command:
1961
    default, use --remember.
1962
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1963
    Examples:
1964
1965
    To merge the latest revision from bzr.dev
1966
    bzr merge ../bzr.dev
1967
1968
    To merge changes up to and including revision 82 from bzr.dev
1969
    bzr merge -r 82 ../bzr.dev
1970
1971
    To merge the changes introduced by 82, without previous changes:
1972
    bzr merge -r 81..82 ../bzr.dev
1973
    
1974
    merge refuses to run if there are any uncommitted changes, unless
1975
    --force is given.
1976
    """
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1977
    takes_args = ['branch?']
1614.2.2 by Olaf Conradi
Merge command:
1978
    takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
1185.18.1 by Aaron Bentley
Added --show-base to merge
1979
                     Option('show-base', help="Show base revision text in "
1980
                            "conflicts")]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1981
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1982
    def run(self, branch=None, revision=None, force=False, merge_type=None,
1614.2.2 by Olaf Conradi
Merge command:
1983
            show_base=False, reprocess=False, remember=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1984
        if merge_type is None:
1534.7.139 by Aaron Bentley
ApplyMerge3 -> Merge3Merger
1985
            merge_type = Merge3Merger
1614.2.2 by Olaf Conradi
Merge command:
1986
1987
        tree = WorkingTree.open_containing(u'.')[0]
1988
        stored_loc = tree.branch.get_parent()
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1989
        if branch is None:
1614.2.2 by Olaf Conradi
Merge command:
1990
            if stored_loc is None:
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1991
                raise BzrCommandError("No merge branch known or specified.")
1185.12.12 by Aaron Bentley
Made merge use pull location or die if no branch specified.
1992
            else:
1685.1.37 by John Arbash Meinel
builtins now use urlfordisplay to display nicer paths to the user.
1993
                print (u"Using saved branch: %s" 
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
1994
                    % urlutils.unescape_for_display(stored_loc))
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1995
                branch = stored_loc
1614.2.2 by Olaf Conradi
Merge command:
1996
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1997
        if revision is None or len(revision) < 1:
1998
            base = [None, None]
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
1999
            other = [branch, -1]
1645.1.1 by Aaron Bentley
Implement single-file merge
2000
            other_branch, path = Branch.open_containing(branch)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2001
        else:
2002
            if len(revision) == 1:
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
2003
                base = [None, None]
1645.1.1 by Aaron Bentley
Implement single-file merge
2004
                other_branch, path = Branch.open_containing(branch)
1185.12.46 by Aaron Bentley
Fixed -r brokenness in merge
2005
                revno = revision[0].in_history(other_branch).revno
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2006
                other = [branch, revno]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2007
            else:
2008
                assert len(revision) == 2
2009
                if None in revision:
2010
                    raise BzrCommandError(
2011
                        "Merge doesn't permit that revision specifier.")
1685.1.19 by John Arbash Meinel
pull/merge/branch/missing should all save the absolute path to the other branch, not the relative one
2012
                other_branch, path = Branch.open_containing(branch)
2013
2014
                base = [branch, revision[0].in_history(other_branch).revno]
2015
                other = [branch, revision[1].in_history(other_branch).revno]
2016
2017
        if tree.branch.get_parent() is None or remember:
2018
            tree.branch.set_parent(other_branch.base)
2019
1645.1.1 by Aaron Bentley
Implement single-file merge
2020
        if path != "":
2021
            interesting_files = [path]
2022
        else:
2023
            interesting_files = None
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2024
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2025
        try:
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2026
            try:
2027
                conflict_count = merge(other, base, check_clean=(not force),
2028
                                       merge_type=merge_type, 
2029
                                       reprocess=reprocess,
2030
                                       show_base=show_base, 
1645.1.1 by Aaron Bentley
Implement single-file merge
2031
                                       pb=pb, file_list=interesting_files)
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2032
            finally:
2033
                pb.finished()
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
2034
            if conflict_count != 0:
2035
                return 1
2036
            else:
2037
                return 0
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2038
        except bzrlib.errors.AmbiguousBase, e:
1173 by Martin Pool
- message typo
2039
            m = ("sorry, bzr can't determine the right merge base yet\n"
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2040
                 "candidates are:\n  "
2041
                 + "\n  ".join(e.bases)
2042
                 + "\n"
2043
                 "please specify an explicit base with -r,\n"
2044
                 "and (if you want) report this to the bzr developers\n")
2045
            log_error(m)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2046
2047
1185.35.4 by Aaron Bentley
Implemented remerge
2048
class cmd_remerge(Command):
2049
    """Redo a merge.
2050
    """
2051
    takes_args = ['file*']
2052
    takes_options = ['merge-type', 'reprocess',
2053
                     Option('show-base', help="Show base revision text in "
2054
                            "conflicts")]
2055
2056
    def run(self, file_list=None, merge_type=None, show_base=False,
2057
            reprocess=False):
2058
        from bzrlib.merge import merge_inner, transform_tree
2059
        if merge_type is None:
1534.7.139 by Aaron Bentley
ApplyMerge3 -> Merge3Merger
2060
            merge_type = Merge3Merger
1508.1.15 by Robert Collins
Merge from mpool.
2061
        tree, file_list = tree_files(file_list)
2062
        tree.lock_write()
1185.35.4 by Aaron Bentley
Implemented remerge
2063
        try:
1508.1.15 by Robert Collins
Merge from mpool.
2064
            pending_merges = tree.pending_merges() 
1185.35.4 by Aaron Bentley
Implemented remerge
2065
            if len(pending_merges) != 1:
2066
                raise BzrCommandError("Sorry, remerge only works after normal"
2067
                                      + " merges.  Not cherrypicking or"
2068
                                      + "multi-merges.")
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2069
            repository = tree.branch.repository
1508.1.15 by Robert Collins
Merge from mpool.
2070
            base_revision = common_ancestor(tree.branch.last_revision(), 
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2071
                                            pending_merges[0], repository)
2072
            base_tree = repository.revision_tree(base_revision)
2073
            other_tree = repository.revision_tree(pending_merges[0])
1185.35.4 by Aaron Bentley
Implemented remerge
2074
            interesting_ids = None
2075
            if file_list is not None:
2076
                interesting_ids = set()
2077
                for filename in file_list:
1508.1.15 by Robert Collins
Merge from mpool.
2078
                    file_id = tree.path2id(filename)
1558.2.1 by Aaron Bentley
Ensure remerge errors when file-id is None
2079
                    if file_id is None:
2080
                        raise NotVersionedError(filename)
1185.35.4 by Aaron Bentley
Implemented remerge
2081
                    interesting_ids.add(file_id)
1508.1.15 by Robert Collins
Merge from mpool.
2082
                    if tree.kind(file_id) != "directory":
1185.35.4 by Aaron Bentley
Implemented remerge
2083
                        continue
1185.35.13 by Aaron Bentley
Merged Martin
2084
                    
1508.1.15 by Robert Collins
Merge from mpool.
2085
                    for name, ie in tree.inventory.iter_entries(file_id):
1185.35.4 by Aaron Bentley
Implemented remerge
2086
                        interesting_ids.add(ie.file_id)
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
2087
            transform_tree(tree, tree.basis_tree(), interesting_ids)
1185.35.4 by Aaron Bentley
Implemented remerge
2088
            if file_list is None:
1508.1.15 by Robert Collins
Merge from mpool.
2089
                restore_files = list(tree.iter_conflicts())
1185.35.4 by Aaron Bentley
Implemented remerge
2090
            else:
2091
                restore_files = file_list
2092
            for filename in restore_files:
2093
                try:
1508.1.15 by Robert Collins
Merge from mpool.
2094
                    restore(tree.abspath(filename))
1185.35.4 by Aaron Bentley
Implemented remerge
2095
                except NotConflicted:
2096
                    pass
1551.5.1 by Aaron Bentley
Stop using deprecated api in remerge
2097
            conflicts =  merge_inner(tree.branch, other_tree, base_tree,
2098
                                     this_tree=tree,
1185.35.4 by Aaron Bentley
Implemented remerge
2099
                                     interesting_ids = interesting_ids, 
2100
                                     other_rev_id=pending_merges[0], 
2101
                                     merge_type=merge_type, 
2102
                                     show_base=show_base,
2103
                                     reprocess=reprocess)
2104
        finally:
1508.1.15 by Robert Collins
Merge from mpool.
2105
            tree.unlock()
1185.35.4 by Aaron Bentley
Implemented remerge
2106
        if conflicts > 0:
2107
            return 1
2108
        else:
2109
            return 0
2110
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2111
class cmd_revert(Command):
2112
    """Reverse all changes since the last commit.
2113
2114
    Only versioned files are affected.  Specify filenames to revert only 
2115
    those files.  By default, any files that are changed will be backed up
2116
    first.  Backup files have a '~' appended to their name.
2117
    """
2118
    takes_options = ['revision', 'no-backup']
2119
    takes_args = ['file*']
2120
    aliases = ['merge-revert']
2121
2122
    def run(self, revision=None, no_backup=False, file_list=None):
2123
        from bzrlib.commands import parse_spec
2124
        if file_list is not None:
2125
            if len(file_list) == 0:
2126
                raise BzrCommandError("No files specified")
1457.1.9 by Robert Collins
Change cmd_revert implementation to call workingtree.Revert.
2127
        else:
2128
            file_list = []
1185.50.53 by John Arbash Meinel
[patch] Aaron Bentley: make revert work in a subdirectory.
2129
        
2130
        tree, file_list = tree_files(file_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2131
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2132
            # FIXME should be tree.last_revision
1558.4.2 by Aaron Bentley
Revert in checkout works properly
2133
            rev_id = tree.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2134
        elif len(revision) != 1:
2135
            raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
2136
        else:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2137
            rev_id = revision[0].in_history(tree.branch).rev_id
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2138
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
2139
        try:
2140
            tree.revert(file_list, 
2141
                        tree.branch.repository.revision_tree(rev_id),
2142
                        not no_backup, pb)
2143
        finally:
2144
            pb.finished()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2145
2146
2147
class cmd_assert_fail(Command):
2148
    """Test reporting of assertion failures"""
2149
    hidden = True
2150
    def run(self):
2151
        assert False, "always fails"
2152
2153
2154
class cmd_help(Command):
2155
    """Show help on a command or other topic.
2156
2157
    For a list of all available commands, say 'bzr help commands'."""
1553.4.3 by Michael Ellerman
Add custom description for help's --long option, this fixes bug #31217.
2158
    takes_options = [Option('long', 'show help on all commands')]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2159
    takes_args = ['topic?']
1616.1.15 by Martin Pool
Handle 'bzr ?', etc.
2160
    aliases = ['?', '--help', '-?', '-h']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2161
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2162
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2163
    def run(self, topic=None, long=False):
2164
        import help
2165
        if topic is None and long:
2166
            topic = "commands"
2167
        help.help(topic)
2168
2169
2170
class cmd_shell_complete(Command):
2171
    """Show appropriate completions for context.
2172
2173
    For a list of all available commands, say 'bzr shell-complete'."""
2174
    takes_args = ['context?']
2175
    aliases = ['s-c']
2176
    hidden = True
2177
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2178
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2179
    def run(self, context=None):
2180
        import shellcomplete
2181
        shellcomplete.shellcomplete(context)
2182
2183
1228 by Martin Pool
- add fetch command as builtin
2184
class cmd_fetch(Command):
2185
    """Copy in history from another branch but don't merge it.
2186
2187
    This is an internal method used for pull and merge."""
2188
    hidden = True
2189
    takes_args = ['from_branch', 'to_branch']
2190
    def run(self, from_branch, to_branch):
2191
        from bzrlib.fetch import Fetcher
2192
        from bzrlib.branch import Branch
1185.16.100 by mbp at sourcefrog
Update fetch command for new Branch constructors.
2193
        from_b = Branch.open(from_branch)
2194
        to_b = Branch.open(to_branch)
1185.65.27 by Robert Collins
Tweak storage towards mergability.
2195
        Fetcher(to_b, from_b)
1228 by Martin Pool
- add fetch command as builtin
2196
2197
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2198
class cmd_missing(Command):
1185.54.3 by Aaron Bentley
Factored out find_unmerged
2199
    """Show unmerged/unpulled revisions between two branches.
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2200
1185.54.3 by Aaron Bentley
Factored out find_unmerged
2201
    OTHER_BRANCH may be local or remote."""
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2202
    takes_args = ['other_branch?']
2203
    takes_options = [Option('reverse', 'Reverse the order of revisions'),
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2204
                     Option('mine-only', 
2205
                            'Display changes in the local branch only'),
2206
                     Option('theirs-only', 
2207
                            'Display changes in the remote branch only'), 
1553.2.3 by Erik BÃ¥gfors
cover the missing command with formatters as well
2208
                     'log-format',
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2209
                     'line',
2210
                     'long', 
2211
                     'short',
2212
                     'show-ids',
1185.54.19 by Aaron Bentley
All tests pass
2213
                     'verbose'
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2214
                     ]
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2215
2216
    def run(self, other_branch=None, reverse=False, mine_only=False,
1553.2.6 by Erik BÃ¥gfors
Make default formatter work for the missing command
2217
            theirs_only=False, log_format=None, long=False, short=False, line=False, 
1185.54.19 by Aaron Bentley
All tests pass
2218
            show_ids=False, verbose=False):
2219
        from bzrlib.missing import find_unmerged, iter_log_data
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2220
        from bzrlib.log import log_formatter
1185.46.5 by Aaron Bentley
Use unicode pathname in cmd_missing
2221
        local_branch = bzrlib.branch.Branch.open_containing(u".")[0]
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
2222
        parent = local_branch.get_parent()
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2223
        if other_branch is None:
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
2224
            other_branch = parent
2225
            if other_branch is None:
2226
                raise BzrCommandError("No missing location known or specified.")
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2227
            print "Using last location: " + local_branch.get_parent()
2228
        remote_branch = bzrlib.branch.Branch.open(other_branch)
1551.2.46 by abentley
Made bzr missing . work on win32
2229
        if remote_branch.base == local_branch.base:
2230
            remote_branch = local_branch
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2231
        local_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2232
        try:
1551.2.46 by abentley
Made bzr missing . work on win32
2233
            remote_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2234
            try:
2235
                local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2236
                if (log_format == None):
2237
                    default = bzrlib.config.BranchConfig(local_branch).log_format()
2238
                    log_format = get_log_format(long=long, short=short, line=line, default=default)
2239
                lf = log_formatter(log_format, sys.stdout,
2240
                                   show_ids=show_ids,
2241
                                   show_timezone='original')
2242
                if reverse is False:
2243
                    local_extra.reverse()
2244
                    remote_extra.reverse()
2245
                if local_extra and not theirs_only:
2246
                    print "You have %d extra revision(s):" % len(local_extra)
2247
                    for data in iter_log_data(local_extra, local_branch.repository,
2248
                                              verbose):
2249
                        lf.show(*data)
2250
                    printed_local = True
2251
                else:
2252
                    printed_local = False
2253
                if remote_extra and not mine_only:
2254
                    if printed_local is True:
2255
                        print "\n\n"
2256
                    print "You are missing %d revision(s):" % len(remote_extra)
2257
                    for data in iter_log_data(remote_extra, remote_branch.repository, 
2258
                                              verbose):
2259
                        lf.show(*data)
2260
                if not remote_extra and not local_extra:
2261
                    status_code = 0
2262
                    print "Branches are up to date."
2263
                else:
2264
                    status_code = 1
2265
            finally:
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2266
                remote_branch.unlock()
2267
        finally:
2268
            local_branch.unlock()
2269
        if not status_code and parent is None and other_branch is not None:
2270
            local_branch.lock_write()
2271
            try:
2272
                # handle race conditions - a parent might be set while we run.
2273
                if local_branch.get_parent() is None:
1685.1.19 by John Arbash Meinel
pull/merge/branch/missing should all save the absolute path to the other branch, not the relative one
2274
                    local_branch.set_parent(remote_branch.base)
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2275
            finally:
2276
                local_branch.unlock()
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2277
        return status_code
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2278
2279
2280
class cmd_plugins(Command):
2281
    """List plugins"""
2282
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2283
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2284
    def run(self):
2285
        import bzrlib.plugin
2286
        from inspect import getdoc
1516 by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a
2287
        for name, plugin in bzrlib.plugin.all_plugins().items():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2288
            if hasattr(plugin, '__path__'):
2289
                print plugin.__path__[0]
2290
            elif hasattr(plugin, '__file__'):
2291
                print plugin.__file__
2292
            else:
2293
                print `plugin`
2294
                
2295
            d = getdoc(plugin)
2296
            if d:
2297
                print '\t', d.split('\n')[0]
2298
2299
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2300
class cmd_testament(Command):
2301
    """Show testament (signing-form) of a revision."""
2302
    takes_options = ['revision', 'long']
2303
    takes_args = ['branch?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2304
    @display_command
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2305
    def run(self, branch=u'.', revision=None, long=False):
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2306
        from bzrlib.testament import Testament
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2307
        b = WorkingTree.open_containing(branch)[0].branch
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2308
        b.lock_read()
2309
        try:
2310
            if revision is None:
2311
                rev_id = b.last_revision()
2312
            else:
2313
                rev_id = revision[0].in_history(b).rev_id
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2314
            t = Testament.from_revision(b.repository, rev_id)
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2315
            if long:
2316
                sys.stdout.writelines(t.as_text_lines())
2317
            else:
2318
                sys.stdout.write(t.as_short_text())
2319
        finally:
2320
            b.unlock()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2321
2322
2323
class cmd_annotate(Command):
2324
    """Show the origin of each line in a file.
2325
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2326
    This prints out the given file with an annotation on the left side
2327
    indicating which revision, author and date introduced the change.
2328
2329
    If the origin is the same for a run of consecutive lines, it is 
2330
    shown only at the top, unless the --all option is given.
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2331
    """
2332
    # TODO: annotate directories; showing when each file was last changed
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2333
    # TODO: if the working copy is modified, show annotations on that 
2334
    #       with new uncommitted lines marked
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2335
    aliases = ['blame', 'praise']
2336
    takes_args = ['filename']
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2337
    takes_options = [Option('all', help='show annotations on all lines'),
2338
                     Option('long', help='show date in annotations'),
1694.2.6 by Martin Pool
[merge] bzr.dev
2339
                     'revision'
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2340
                     ]
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2341
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2342
    @display_command
1694.2.6 by Martin Pool
[merge] bzr.dev
2343
    def run(self, filename, all=False, long=False, revision=None):
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2344
        from bzrlib.annotate import annotate_file
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2345
        tree, relpath = WorkingTree.open_containing(filename)
2346
        branch = tree.branch
2347
        branch.lock_read()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2348
        try:
1694.2.6 by Martin Pool
[merge] bzr.dev
2349
            if revision is None:
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2350
                revision_id = branch.last_revision()
1694.2.6 by Martin Pool
[merge] bzr.dev
2351
            elif len(revision) != 1:
2352
                raise BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2353
            else:
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2354
                revision_id = revision[0].in_history(branch).rev_id
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
2355
            file_id = tree.inventory.path2id(relpath)
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2356
            tree = branch.repository.revision_tree(revision_id)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2357
            file_version = tree.inventory[file_id].revision
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2358
            annotate_file(branch, file_version, file_id, long, all, sys.stdout)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2359
        finally:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2360
            branch.unlock()
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
2361
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2362
2363
class cmd_re_sign(Command):
2364
    """Create a digital signature for an existing revision."""
2365
    # TODO be able to replace existing ones.
2366
2367
    hidden = True # is this right ?
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2368
    takes_args = ['revision_id*']
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2369
    takes_options = ['revision']
2370
    
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2371
    def run(self, revision_id_list=None, revision=None):
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2372
        import bzrlib.config as config
2373
        import bzrlib.gpg as gpg
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2374
        if revision_id_list is not None and revision is not None:
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2375
            raise BzrCommandError('You can only supply one of revision_id or --revision')
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2376
        if revision_id_list is None and revision is None:
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2377
            raise BzrCommandError('You must supply either --revision or a revision_id')
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2378
        b = WorkingTree.open_containing(u'.')[0].branch
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2379
        gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2380
        if revision_id_list is not None:
2381
            for revision_id in revision_id_list:
2382
                b.repository.sign_revision(revision_id, gpg_strategy)
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2383
        elif revision is not None:
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2384
            if len(revision) == 1:
2385
                revno, rev_id = revision[0].in_history(b)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2386
                b.repository.sign_revision(rev_id, gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2387
            elif len(revision) == 2:
2388
                # are they both on rh- if so we can walk between them
2389
                # might be nice to have a range helper for arbitrary
2390
                # revision paths. hmm.
2391
                from_revno, from_revid = revision[0].in_history(b)
2392
                to_revno, to_revid = revision[1].in_history(b)
2393
                if to_revid is None:
2394
                    to_revno = b.revno()
2395
                if from_revno is None or to_revno is None:
2396
                    raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2397
                for revno in range(from_revno, to_revno + 1):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2398
                    b.repository.sign_revision(b.get_rev_id(revno), 
2399
                                               gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2400
            else:
2401
                raise BzrCommandError('Please supply either one revision, or a range.')
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2402
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2403
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2404
class cmd_bind(Command):
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2405
    """Bind the current branch to a master branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2406
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2407
    After binding, commits must succeed on the master branch
2408
    before they are executed on the local one.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2409
    """
2410
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2411
    takes_args = ['location']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2412
    takes_options = []
2413
2414
    def run(self, location=None):
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2415
        b, relpath = Branch.open_containing(u'.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2416
        b_other = Branch.open(location)
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2417
        try:
2418
            b.bind(b_other)
2419
        except DivergedBranches:
2420
            raise BzrCommandError('These branches have diverged.'
1505.1.12 by John Arbash Meinel
Fixing up the error message for a failed bind.
2421
                                  ' Try merging, and then bind again.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2422
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2423
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2424
class cmd_unbind(Command):
1702.1.1 by Martin Pool
(patch) Fix for unbind help text (olaf)
2425
    """Unbind the current branch from its master branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2426
2427
    After unbinding, the local branch is considered independent.
1702.1.1 by Martin Pool
(patch) Fix for unbind help text (olaf)
2428
    All subsequent commits will be local.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2429
    """
2430
2431
    takes_args = []
2432
    takes_options = []
2433
2434
    def run(self):
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2435
        b, relpath = Branch.open_containing(u'.')
2436
        if not b.unbind():
2437
            raise BzrCommandError('Local branch is not bound')
2438
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2439
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2440
class cmd_uncommit(bzrlib.commands.Command):
2441
    """Remove the last committed revision.
2442
2443
    By supplying the --all flag, it will not only remove the entry 
2444
    from revision_history, but also remove all of the entries in the
2445
    stores.
2446
2447
    --verbose will print out what is being removed.
2448
    --dry-run will go through all the motions, but not actually
2449
    remove anything.
2450
    
2451
    In the future, uncommit will create a changeset, which can then
2452
    be re-applied.
1553.5.34 by Martin Pool
Stub lock-breaking command
2453
    """
1185.62.11 by John Arbash Meinel
Added TODO for bzr uncommit to remove unreferenced information.
2454
1553.5.34 by Martin Pool
Stub lock-breaking command
2455
    # TODO: jam 20060108 Add an option to allow uncommit to remove
2456
    # unreferenced information in 'branch-as-repostory' branches.
2457
    # TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2458
    # information in shared branches as well.
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
2459
    takes_options = ['verbose', 'revision',
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2460
                    Option('dry-run', help='Don\'t actually make changes'),
2461
                    Option('force', help='Say yes to all questions.')]
2462
    takes_args = ['location?']
2463
    aliases = []
2464
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
2465
    def run(self, location=None, 
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2466
            dry_run=False, verbose=False,
2467
            revision=None, force=False):
2468
        from bzrlib.branch import Branch
2469
        from bzrlib.log import log_formatter
2470
        import sys
2471
        from bzrlib.uncommit import uncommit
2472
2473
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2474
            location = u'.'
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2475
        control, relpath = bzrdir.BzrDir.open_containing(location)
2476
        try:
2477
            tree = control.open_workingtree()
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
2478
            b = tree.branch
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2479
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2480
            tree = None
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
2481
            b = control.open_branch()
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2482
2483
        if revision is None:
2484
            revno = b.revno()
2485
            rev_id = b.last_revision()
2486
        else:
2487
            revno, rev_id = revision[0].in_history(b)
2488
        if rev_id is None:
2489
            print 'No revisions to uncommit.'
2490
2491
        for r in range(revno, b.revno()+1):
2492
            rev_id = b.get_rev_id(r)
2493
            lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2494
            lf.show(r, b.repository.get_revision(rev_id), None)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2495
2496
        if dry_run:
2497
            print 'Dry-run, pretending to remove the above revisions.'
2498
            if not force:
2499
                val = raw_input('Press <enter> to continue')
2500
        else:
2501
            print 'The above revision(s) will be removed.'
2502
            if not force:
2503
                val = raw_input('Are you sure [y/N]? ')
2504
                if val.lower() not in ('y', 'yes'):
2505
                    print 'Canceled'
2506
                    return 0
2507
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2508
        uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2509
                revno=revno)
2510
2511
1553.5.34 by Martin Pool
Stub lock-breaking command
2512
class cmd_break_lock(Command):
2513
    """Break a dead lock on a repository, branch or working directory.
2514
1553.5.35 by Martin Pool
Start break-lock --show
2515
    CAUTION: Locks should only be broken when you are sure that the process
1553.5.34 by Martin Pool
Stub lock-breaking command
2516
    holding the lock has been stopped.
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2517
2518
    You can get information on what locks are open via the 'bzr info' command.
1553.5.35 by Martin Pool
Start break-lock --show
2519
    
2520
    example:
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2521
        bzr break-lock
1553.5.34 by Martin Pool
Stub lock-breaking command
2522
    """
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2523
    takes_args = ['location?']
2524
2525
    def run(self, location=None, show=False):
2526
        if location is None:
2527
            location = u'.'
2528
        control, relpath = bzrdir.BzrDir.open_containing(location)
1687.1.17 by Robert Collins
Test break lock on old format branches.
2529
        try:
2530
            control.break_lock()
2531
        except NotImplementedError:
2532
            pass
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2533
        
1553.5.35 by Martin Pool
Start break-lock --show
2534
2535
2536
# command-line interpretation helper for merge-related commands
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2537
def merge(other_revision, base_revision,
2538
          check_clean=True, ignore_zero=False,
1534.7.118 by Aaron Bentley
Dirty merge of the mainline
2539
          this_dir=None, backup_files=False, merge_type=Merge3Merger,
1553.5.35 by Martin Pool
Start break-lock --show
2540
          file_list=None, show_base=False, reprocess=False,
1534.9.6 by Aaron Bentley
Disable merge progress bars, except from the merge command
2541
          pb=DummyProgress()):
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2542
    """Merge changes into a tree.
2543
2544
    base_revision
2545
        list(path, revno) Base for three-way merge.  
2546
        If [None, None] then a base will be automatically determined.
2547
    other_revision
2548
        list(path, revno) Other revision for three-way merge.
2549
    this_dir
2550
        Directory to merge changes into; '.' by default.
2551
    check_clean
2552
        If true, this_dir must have no uncommitted changes before the
2553
        merge begins.
2554
    ignore_zero - If true, suppress the "zero conflicts" message when 
2555
        there are no conflicts; should be set when doing something we expect
2556
        to complete perfectly.
2557
    file_list - If supplied, merge only changes to selected files.
2558
2559
    All available ancestors of other_revision and base_revision are
2560
    automatically pulled into the branch.
2561
2562
    The revno may be -1 to indicate the last revision on the branch, which is
2563
    the typical case.
2564
2565
    This function is intended for use from the command line; programmatic
2566
    clients might prefer to call merge.merge_inner(), which has less magic 
2567
    behavior.
2568
    """
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
2569
    from bzrlib.merge import Merger
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2570
    if this_dir is None:
2571
        this_dir = u'.'
1534.4.28 by Robert Collins
first cut at merge from integration.
2572
    this_tree = WorkingTree.open_containing(this_dir)[0]
1534.7.118 by Aaron Bentley
Dirty merge of the mainline
2573
    if show_base and not merge_type is Merge3Merger:
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2574
        raise BzrCommandError("Show-base is not supported for this merge"
2575
                              " type. %s" % merge_type)
1551.6.8 by Aaron Bentley
Implemented reprocess for weave
2576
    if reprocess and not merge_type.supports_reprocess:
1551.6.14 by Aaron Bentley
Tweaks from merge review
2577
        raise BzrCommandError("Conflict reduction is not supported for merge"
2578
                              " type %s." % merge_type)
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2579
    if reprocess and show_base:
1551.6.14 by Aaron Bentley
Tweaks from merge review
2580
        raise BzrCommandError("Cannot do conflict reduction and show base.")
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
2581
    try:
2582
        merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2583
        merger.pp = ProgressPhase("Merge phase", 5, pb)
2584
        merger.pp.next_phase()
2585
        merger.check_basis(check_clean)
2586
        merger.set_other(other_revision)
2587
        merger.pp.next_phase()
2588
        merger.set_base(base_revision)
2589
        if merger.base_rev_id == merger.other_rev_id:
2590
            note('Nothing to do.')
2591
            return 0
2592
        merger.backup_files = backup_files
2593
        merger.merge_type = merge_type 
2594
        merger.set_interesting_files(file_list)
2595
        merger.show_base = show_base 
2596
        merger.reprocess = reprocess
2597
        conflicts = merger.do_merge()
1645.1.1 by Aaron Bentley
Implement single-file merge
2598
        if file_list is None:
2599
            merger.set_pending()
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
2600
    finally:
2601
        pb.clear()
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2602
    return conflicts
2603
2604
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
2605
# these get imported and then picked up by the scan for cmd_*
2606
# TODO: Some more consistent way to split command definitions across files;
2607
# we do need to load at least some information about them to know of 
1616.1.7 by Martin Pool
New developer commands 'weave-list' and 'weave-join'.
2608
# aliases.  ideally we would avoid loading the implementation until the
2609
# details were needed.
1185.35.4 by Aaron Bentley
Implemented remerge
2610
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
2611
from bzrlib.sign_my_commits import cmd_sign_my_commits
1616.1.17 by Martin Pool
New 'weave-plan-merge' and 'weave-merge-text' commands lifted from weave.py
2612
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
2613
        cmd_weave_plan_merge, cmd_weave_merge_text