/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2052.3.2 by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical
1
# Copyright (C) 2004, 2005, 2006 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
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
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
19
import os
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
20
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
21
from bzrlib.lazy_import import lazy_import
22
lazy_import(globals(), """
1685.1.52 by John Arbash Meinel
[merge] bzr.dev 1704
23
import codecs
1508.1.20 by Robert Collins
Create a checkout command.
24
import errno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
25
import sys
2089.1.1 by wang
If a commit fails, the commit message is stored in a file at the root of
26
import tempfile
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
27
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
28
import bzrlib
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
29
from bzrlib import (
30
    branch,
31
    bundle,
32
    bzrdir,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
33
    delta,
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
34
    config,
35
    errors,
36
    ignores,
37
    log,
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
38
    merge as _mod_merge,
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
39
    osutils,
40
    repository,
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
41
    symbol_versioning,
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
42
    transport,
1996.3.30 by John Arbash Meinel
Don't import 'bzrlib.tree' directly in bzrlib.builtins
43
    tree as _mod_tree,
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
44
    ui,
45
    urlutils,
46
    )
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
47
from bzrlib.branch import Branch
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
48
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
49
from bzrlib.conflicts import ConflictList
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
50
from bzrlib.revision import common_ancestor
51
from bzrlib.revisionspec import RevisionSpec
52
from bzrlib.workingtree import WorkingTree
53
""")
54
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
55
from bzrlib.commands import Command, display_command
2221.4.2 by Aaron Bentley
Implement RegistryOption on init
56
from bzrlib.option import Option, RegistryOption
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
57
from bzrlib.progress import DummyProgress, ProgressPhase
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
58
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
59
60
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
61
def tree_files(file_list, default_branch=u'.'):
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
62
    try:
1508.1.15 by Robert Collins
Merge from mpool.
63
        return internal_tree_files(file_list, default_branch)
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
64
    except errors.FileInWrongBranch, e:
65
        raise errors.BzrCommandError("%s is not in the same branch as %s" %
66
                                     (e.path, file_list[0]))
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
67
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
68
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
69
# XXX: Bad function name; should possibly also be a class method of
70
# WorkingTree rather than a function.
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
71
def internal_tree_files(file_list, default_branch=u'.'):
1658.1.8 by Martin Pool
(internal_tree_files) Better docstring
72
    """Convert command-line paths to a WorkingTree and relative paths.
73
74
    This is typically used for command-line processors that take one or
75
    more filenames, and infer the workingtree that contains them.
76
77
    The filenames given are not required to exist.
78
79
    :param file_list: Filenames to convert.  
80
2091.3.2 by Aaron Bentley
Traverse non-terminal symlinks for mv et al
81
    :param default_branch: Fallback tree path to use if file_list is empty or
82
        None.
1658.1.8 by Martin Pool
(internal_tree_files) Better docstring
83
84
    :return: workingtree, [relative_paths]
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
85
    """
86
    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
87
        return WorkingTree.open_containing(default_branch)[0], file_list
2091.3.5 by Aaron Bentley
Move realpath functionality into osutils
88
    tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
89
    new_list = []
90
    for filename in file_list:
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
91
        try:
2091.3.7 by Aaron Bentley
Rename real_parent to dereferenced_path
92
            new_list.append(tree.relpath(osutils.dereference_path(filename)))
1185.31.45 by John Arbash Meinel
Refactoring Exceptions found some places where the wrong exception was caught.
93
        except errors.PathNotChild:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
94
            raise errors.FileInWrongBranch(tree.branch, filename)
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
95
    return tree, new_list
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
96
97
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
98
@symbol_versioning.deprecated_function(symbol_versioning.zero_fifteen)
1553.5.78 by Martin Pool
New bzr init --format option and test
99
def get_format_type(typestring):
100
    """Parse and return a format specifier."""
2204.4.6 by Aaron Bentley
Fix default to work with RepositoryFormat.set_default_format
101
    # Have to use BzrDirMetaFormat1 directly, so that
102
    # RepositoryFormat.set_default_format works
103
    if typestring == "default":
104
        return bzrdir.BzrDirMetaFormat1()
2204.4.3 by Aaron Bentley
Reimplement get_format_type in terms of FormatRegistry
105
    try:
106
        return bzrdir.format_registry.make_bzrdir(typestring)
107
    except KeyError:
108
        msg = 'Unknown bzr format "%s". See "bzr help formats".' % typestring
109
        raise errors.BzrCommandError(msg)
1553.5.78 by Martin Pool
New bzr init --format option and test
110
111
1185.16.112 by mbp at sourcefrog
todo
112
# TODO: Make sure no commands unconditionally use the working directory as a
113
# branch.  If a filename argument is used, the first of them should be used to
114
# specify the branch.  (Perhaps this can be factored out into some kind of
115
# Argument class, representing a file in a branch, where the first occurrence
116
# opens the branch?)
117
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
118
class cmd_status(Command):
119
    """Display status summary.
120
121
    This reports on versioned and unknown files, reporting them
122
    grouped by state.  Possible states are:
123
1551.10.10 by Aaron Bentley
Add help text
124
    added
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
125
        Versioned in the working copy but not in the previous revision.
126
1551.10.10 by Aaron Bentley
Add help text
127
    removed
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
128
        Versioned in the previous revision but removed or deleted
129
        in the working copy.
130
1551.10.10 by Aaron Bentley
Add help text
131
    renamed
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
132
        Path of this file changed from the previous revision;
133
        the text may also have changed.  This includes files whose
134
        parent directory was renamed.
135
1551.10.10 by Aaron Bentley
Add help text
136
    modified
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
137
        Text has changed since the previous revision.
138
1551.10.10 by Aaron Bentley
Add help text
139
    kind changed
140
        File kind has been changed (e.g. from file to directory).
141
142
    unknown
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
143
        Not versioned and not matching an ignore pattern.
144
145
    To see ignored files use 'bzr ignored'.  For details in the
146
    changes to file texts, use 'bzr diff'.
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
147
    
1551.10.10 by Aaron Bentley
Add help text
148
    --short gives a status flags for each item, similar to the SVN's status
149
    command.
150
151
    Column 1: versioning / renames
152
      + File versioned
153
      - File unversioned
154
      R File renamed
155
      ? File unknown
156
      C File has conflicts
157
      P Entry for a pending merge (not a file)
158
159
    Column 2: Contents
160
      N File created
161
      D File deleted
162
      K File kind changed
163
      M File modified
164
165
    Column 3: Execute
166
      * The execute bit was changed
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
167
168
    If no arguments are specified, the status of the entire working
169
    directory is shown.  Otherwise, only the status of the specified
170
    files or directories is reported.  If a directory is given, status
171
    is reported for everything inside that directory.
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
172
173
    If a revision argument is given, the status is calculated against
174
    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
175
    """
1185.16.76 by Martin Pool
doc
176
    
177
    # TODO: --no-recurse, --recurse options
178
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
179
    takes_args = ['file*']
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
180
    takes_options = ['show-ids', 'revision', 'short']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
181
    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()
182
183
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
184
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
185
    @display_command
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
186
    def run(self, show_ids=False, file_list=None, revision=None, short=False):
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
187
        from bzrlib.status import show_tree_status
1185.85.15 by John Arbash Meinel
Updated bzr status, adding test_cat
188
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
189
        tree, file_list = tree_files(file_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
190
            
1773.1.2 by Robert Collins
Remove --all option from status.
191
        show_tree_status(tree, show_ids=show_ids,
1185.85.84 by John Arbash Meinel
[merge] bzr.dev 1573, lots of updates
192
                         specific_files=file_list, revision=revision,
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
193
                         to_file=self.outf,
194
                         short=short)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
195
196
197
class cmd_cat_revision(Command):
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
198
    """Write out metadata for a revision.
199
    
200
    The revision to print can either be specified by a specific
201
    revision identifier, or you can use --revision.
202
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
203
204
    hidden = True
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
205
    takes_args = ['revision_id?']
206
    takes_options = ['revision']
1685.1.76 by Wouter van Heyst
codecleanup
207
    # cat-revision is more for frontends so should be exact
208
    encoding = 'strict'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
209
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
210
    @display_command
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
211
    def run(self, revision_id=None, revision=None):
212
213
        if revision_id is not None and revision is not None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
214
            raise errors.BzrCommandError('You can only supply one of'
215
                                         ' revision_id or --revision')
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
216
        if revision_id is None and revision is None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
217
            raise errors.BzrCommandError('You must supply either'
218
                                         ' --revision or a revision_id')
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
219
        b = WorkingTree.open_containing(u'.')[0].branch
1185.85.72 by John Arbash Meinel
Fix some of the tests.
220
221
        # TODO: jam 20060112 should cat-revision always output utf-8?
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
222
        if revision_id is not None:
1185.85.78 by John Arbash Meinel
[merge] jam-integration 1512, includes Storage changes.
223
            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.
224
        elif revision is not None:
225
            for rev in revision:
226
                if rev is None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
227
                    raise errors.BzrCommandError('You cannot specify a NULL'
228
                                                 ' revision.')
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
229
                revno, rev_id = rev.in_history(b)
1185.85.78 by John Arbash Meinel
[merge] jam-integration 1512, includes Storage changes.
230
                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
231
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
232
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
233
class cmd_remove_tree(Command):
234
    """Remove the working tree from a given branch/checkout.
235
236
    Since a lightweight checkout is little more than a working tree
237
    this will refuse to run against one.
238
    """
239
2127.2.2 by Daniel Silverstone
Refactor the remove-tree stuff after review from J-A-M
240
    hidden = True
241
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
242
    takes_args = ['location?']
243
2127.2.2 by Daniel Silverstone
Refactor the remove-tree stuff after review from J-A-M
244
    def run(self, location='.'):
245
        d = bzrdir.BzrDir.open(location)
246
        
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
247
        try:
248
            working = d.open_workingtree()
2127.2.2 by Daniel Silverstone
Refactor the remove-tree stuff after review from J-A-M
249
        except errors.NoWorkingTree:
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
250
            raise errors.BzrCommandError("No working tree to remove")
2127.2.2 by Daniel Silverstone
Refactor the remove-tree stuff after review from J-A-M
251
        except errors.NotLocalUrl:
252
            raise errors.BzrCommandError("You cannot remove the working tree of a "
253
                                         "remote path")
254
        
255
        working_path = working.bzrdir.root_transport.base
256
        branch_path = working.branch.bzrdir.root_transport.base
257
        if working_path != branch_path:
258
            raise errors.BzrCommandError("You cannot remove the working tree from "
259
                                         "a lightweight checkout")
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
260
        
261
        d.destroy_workingtree()
262
        
263
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
264
class cmd_revno(Command):
265
    """Show current revision number.
266
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
267
    This is equal to the number of revisions on this branch.
268
    """
269
1185.50.16 by John Arbash Meinel
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location'
270
    takes_args = ['location?']
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
271
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
272
    @display_command
1185.50.16 by John Arbash Meinel
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location'
273
    def run(self, location=u'.'):
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
274
        self.outf.write(str(Branch.open_containing(location)[0].revno()))
275
        self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
276
1182 by Martin Pool
- more disentangling of xml storage format from objects
277
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
278
class cmd_revision_info(Command):
279
    """Show revision number and revision id for a given revision identifier.
280
    """
281
    hidden = True
282
    takes_args = ['revision_info*']
283
    takes_options = ['revision']
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
284
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
285
    @display_command
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
286
    def run(self, revision=None, revision_info_list=[]):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
287
288
        revs = []
289
        if revision is not None:
290
            revs.extend(revision)
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
291
        if revision_info_list is not None:
292
            for rev in revision_info_list:
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
293
                revs.append(RevisionSpec.from_string(rev))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
294
        if len(revs) == 0:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
295
            raise errors.BzrCommandError('You must supply a revision identifier')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
296
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
297
        b = WorkingTree.open_containing(u'.')[0].branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
298
299
        for rev in revs:
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
300
            revinfo = rev.in_history(b)
301
            if revinfo.revno is None:
302
                print '     %s' % revinfo.rev_id
303
            else:
304
                print '%4d %s' % (revinfo.revno, revinfo.rev_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
305
306
    
307
class cmd_add(Command):
308
    """Add specified files or directories.
309
310
    In non-recursive mode, all the named items are added, regardless
311
    of whether they were previously ignored.  A warning is given if
312
    any of the named files are already versioned.
313
314
    In recursive mode (the default), files are treated the same way
315
    but the behaviour for directories is different.  Directories that
316
    are already versioned do not give a warning.  All directories,
317
    whether already versioned or not, are searched for files or
318
    subdirectories that are neither versioned or ignored, and these
319
    are added.  This search proceeds recursively into versioned
320
    directories.  If no names are given '.' is assumed.
321
322
    Therefore simply saying 'bzr add' will version all files that
323
    are currently unknown.
324
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
325
    Adding a file whose parent directory is not versioned will
326
    implicitly add the parent, and so on up to the root. This means
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
327
    you should never need to explicitly add a directory, they'll just
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
328
    get added when you add a file in the directory.
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
329
330
    --dry-run will show which files would be added, but not actually 
331
    add them.
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
332
333
    --file-ids-from will try to use the file ids from the supplied path.
334
    It looks up ids trying to find a matching parent directory with the
335
    same filename, and then by pure path.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
336
    """
337
    takes_args = ['file*']
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
338
    takes_options = ['no-recurse', 'dry-run', 'verbose',
339
                     Option('file-ids-from', type=unicode,
340
                            help='Lookup file ids from here')]
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()
341
    encoding_type = 'replace'
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
342
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
343
    def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
344
            file_ids_from=None):
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
345
        import bzrlib.add
346
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
347
        if file_ids_from is not None:
348
            try:
349
                base_tree, base_path = WorkingTree.open_containing(
350
                                            file_ids_from)
351
            except errors.NoWorkingTree:
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
352
                base_branch, base_path = Branch.open_containing(
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
353
                                            file_ids_from)
354
                base_tree = base_branch.basis_tree()
355
356
            action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
357
                          to_file=self.outf, should_print=(not is_quiet()))
358
        else:
359
            action = bzrlib.add.AddAction(to_file=self.outf,
360
                should_print=(not is_quiet()))
361
362
        added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
1757.2.6 by Robert Collins
Steps towards a nicer smart add - unwind the conditional add logic - having parents not in the inventory was overly complicating the rest of the code.
363
                                              action=action, save=not dry_run)
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
364
        if len(ignored) > 0:
1711.1.2 by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were
365
            if verbose:
366
                for glob in sorted(ignored.keys()):
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
367
                    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()
368
                        self.outf.write("ignored %s matching \"%s\"\n" 
369
                                        % (path, glob))
1711.1.2 by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were
370
            else:
371
                match_len = 0
372
                for glob, paths in ignored.items():
373
                    match_len += len(paths)
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
374
                self.outf.write("ignored %d file(s).\n" % match_len)
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()
375
            self.outf.write("If you wish to add some of these files,"
376
                            " please add them by name.\n")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
377
378
379
class cmd_mkdir(Command):
380
    """Create a new versioned directory.
381
382
    This is equivalent to creating the directory and then adding it.
383
    """
1685.1.80 by Wouter van Heyst
more code cleanup
384
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
385
    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()
386
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
387
388
    def run(self, dir_list):
389
        for d in dir_list:
390
            os.mkdir(d)
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
391
            wt, dd = WorkingTree.open_containing(d)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
392
            wt.add([dd])
1685.1.80 by Wouter van Heyst
more code cleanup
393
            self.outf.write('added %s\n' % d)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
394
395
396
class cmd_relpath(Command):
397
    """Show path of a file relative to root"""
1685.1.80 by Wouter van Heyst
more code cleanup
398
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
399
    takes_args = ['filename']
400
    hidden = True
401
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
402
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
403
    def run(self, filename):
1185.85.19 by John Arbash Meinel
Updated bzr relpath
404
        # TODO: jam 20050106 Can relpath return a munged path if
405
        #       sys.stdout encoding cannot represent it?
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
406
        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()
407
        self.outf.write(relpath)
408
        self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
409
410
411
class cmd_inventory(Command):
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
412
    """Show inventory of the current working copy or a revision.
413
414
    It is possible to limit the output to a particular entry
2027.4.2 by John Arbash Meinel
Fix bug #3631, allow 'bzr inventory filename'
415
    type using the --kind option.  For example: --kind file.
416
417
    It is also possible to restrict the list of files to a specific
418
    set. For example: bzr inventory --show-ids this/file
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
419
420
    See also: bzr ls
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
421
    """
1685.1.80 by Wouter van Heyst
more code cleanup
422
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
423
    hidden = True
1551.10.14 by Aaron Bentley
Add some blank lines
424
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
425
    takes_options = ['revision', 'show-ids', 'kind']
1551.10.14 by Aaron Bentley
Add some blank lines
426
2027.4.2 by John Arbash Meinel
Fix bug #3631, allow 'bzr inventory filename'
427
    takes_args = ['file*']
428
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
429
    @display_command
2027.4.2 by John Arbash Meinel
Fix bug #3631, allow 'bzr inventory filename'
430
    def run(self, revision=None, show_ids=False, kind=None, file_list=None):
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
431
        if kind and kind not in ['file', 'directory', 'symlink']:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
432
            raise errors.BzrCommandError('invalid kind specified')
2027.4.3 by John Arbash Meinel
Change how 'bzr inventory' finds paths
433
434
        work_tree, file_list = tree_files(file_list)
435
436
        if revision is not None:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
437
            if len(revision) > 1:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
438
                raise errors.BzrCommandError('bzr inventory --revision takes'
439
                                             ' exactly one revision identifier')
2027.4.3 by John Arbash Meinel
Change how 'bzr inventory' finds paths
440
            revision_id = revision[0].in_history(work_tree.branch).rev_id
441
            tree = work_tree.branch.repository.revision_tree(revision_id)
442
                        
443
            # We include work_tree as well as 'tree' here
444
            # So that doing '-r 10 path/foo' will lookup whatever file
445
            # exists now at 'path/foo' even if it has been renamed, as
446
            # well as whatever files existed in revision 10 at path/foo
447
            trees = [tree, work_tree]
448
        else:
449
            tree = work_tree
450
            trees = [tree]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
451
2027.4.5 by John Arbash Meinel
make None the only invalid file list
452
        if file_list is not None:
1996.3.30 by John Arbash Meinel
Don't import 'bzrlib.tree' directly in bzrlib.builtins
453
            file_ids = _mod_tree.find_ids_across_trees(file_list, trees,
2027.4.3 by John Arbash Meinel
Change how 'bzr inventory' finds paths
454
                                                      require_versioned=True)
455
            # find_ids_across_trees may include some paths that don't
456
            # exist in 'tree'.
457
            entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
458
                             for file_id in file_ids if file_id in tree)
2027.4.2 by John Arbash Meinel
Fix bug #3631, allow 'bzr inventory filename'
459
        else:
2027.4.3 by John Arbash Meinel
Change how 'bzr inventory' finds paths
460
            entries = tree.inventory.entries()
2027.4.2 by John Arbash Meinel
Fix bug #3631, allow 'bzr inventory filename'
461
462
        for path, entry in entries:
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
463
            if kind and kind != entry.kind:
464
                continue
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
465
            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()
466
                self.outf.write('%-50s %s\n' % (path, entry.file_id))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
467
            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()
468
                self.outf.write(path)
469
                self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
470
471
472
class cmd_mv(Command):
473
    """Move or rename a file.
474
475
    usage:
476
        bzr mv OLDNAME NEWNAME
477
        bzr mv SOURCE... DESTINATION
478
479
    If the last argument is a versioned directory, all the other names
480
    are moved into it.  Otherwise, there must be exactly two arguments
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
481
    and the file is changed to a new name.
482
483
    If OLDNAME does not exist on the filesystem but is versioned and
484
    NEWNAME does exist on the filesystem but is not versioned, mv
485
    assumes that the file has been manually moved and only updates
486
    its internal inventory to reflect that change.
487
    The same is valid when moving many SOURCE files to a DESTINATION.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
488
489
    Files cannot be moved between branches.
490
    """
1685.1.80 by Wouter van Heyst
more code cleanup
491
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
492
    takes_args = ['names*']
2206.1.2 by Marius Kruger
* Made whitespace and puntuation improvements, as requested.
493
    takes_options = [Option("after", help="move only the bzr identifier"
494
        " of the file (file has already been moved). Use this flag if"
495
        " bzr is not able to detect this itself.")]
1616.1.8 by Martin Pool
Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
496
    aliases = ['move', 'rename']
1185.85.26 by John Arbash Meinel
bzr mv should succeed even if it can't display the paths.
497
    encoding_type = 'replace'
498
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
499
    def run(self, names_list, after=False):
1846.1.1 by Wouter van Heyst
Don't fail on 'bzr mv', extract move tests from OldTests.
500
        if names_list is None:
501
            names_list = []
502
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
503
        if len(names_list) < 2:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
504
            raise errors.BzrCommandError("missing file argument")
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
505
        tree, rel_names = tree_files(names_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
506
        
507
        if os.path.isdir(names_list[-1]):
508
            # move into existing directory
2123.3.5 by Steffen Eichenberg
specifying named parameters
509
            for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
1185.85.25 by John Arbash Meinel
updated 'bzr mv'
510
                self.outf.write("%s => %s\n" % pair)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
511
        else:
512
            if len(names_list) != 2:
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
513
                raise errors.BzrCommandError('to mv multiple files the'
514
                                             ' destination must be a versioned'
515
                                             ' directory')
2123.3.5 by Steffen Eichenberg
specifying named parameters
516
            tree.rename_one(rel_names[0], rel_names[1], after=after)
1185.85.25 by John Arbash Meinel
updated 'bzr mv'
517
            self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
518
            
519
    
520
class cmd_pull(Command):
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
521
    """Turn this branch into a mirror of another branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
522
523
    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
524
    considered diverged if the destination branch's most recent commit is one
525
    that has not been merged (directly or indirectly) into the parent.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
526
1661.1.1 by Martin Pool
[merge] olaf's --remember changes
527
    If branches have diverged, you can use 'bzr merge' to integrate the changes
528
    from one into the other.  Once one branch has merged, the other should
529
    be able to pull it again.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
530
1185.12.92 by Aaron Bentley
Fixed pull help, renamed clobber to overwrite
531
    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
532
    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
533
534
    If there is no default location set, the first pull will set it.  After
535
    that, you can omit the location to use the default.  To change the
1785.1.4 by John Arbash Meinel
Update help for the new --remember semantics.
536
    default, use --remember. The value will only be saved if the remote
537
    location can be accessed.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
538
    """
1685.1.80 by Wouter van Heyst
more code cleanup
539
1185.76.1 by Erik Bågfors
Support for --revision in pull
540
    takes_options = ['remember', 'overwrite', 'revision', 'verbose']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
541
    takes_args = ['location?']
1185.85.27 by John Arbash Meinel
Updated bzr branch and bzr pull
542
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
543
1551.11.10 by Aaron Bentley
Add change reporting to pull
544
    def run(self, location=None, remember=False, overwrite=False,
545
            revision=None, verbose=False):
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
546
        # FIXME: too much stuff is in the command class
547
        try:
548
            tree_to = WorkingTree.open_containing(u'.')[0]
549
            branch_to = tree_to.branch
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
550
        except errors.NoWorkingTree:
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
551
            tree_to = None
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
552
            branch_to = Branch.open_containing(u'.')[0]
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
553
554
        reader = None
555
        if location is not None:
556
            try:
1773.4.3 by Martin Pool
[merge] bzr.dev
557
                reader = bundle.read_bundle_from_url(location)
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
558
            except errors.NotABundle:
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
559
                pass # Continue on considering this url a Branch
560
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
561
        stored_loc = branch_to.get_parent()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
562
        if location is None:
563
            if stored_loc is None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
564
                raise errors.BzrCommandError("No pull location known or"
565
                                             " specified.")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
566
            else:
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
567
                display_url = urlutils.unescape_for_display(stored_loc,
568
                        self.outf.encoding)
569
                self.outf.write("Using saved location: %s\n" % display_url)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
570
                location = stored_loc
1185.56.1 by Michael Ellerman
Simplify handling of DivergedBranches in cmd_pull()
571
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
572
573
        if reader is not None:
574
            install_bundle(branch_to.repository, reader)
575
            branch_from = branch_to
576
        else:
577
            branch_from = Branch.open(location)
578
579
            if branch_to.get_parent() is None or remember:
580
                branch_to.set_parent(branch_from.base)
581
582
        rev_id = None
1185.76.4 by Erik Bågfors
expanded tabs
583
        if revision is None:
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
584
            if reader is not None:
1793.2.2 by Aaron Bentley
Move BundleReader into v07 serializer
585
                rev_id = reader.target
1185.76.3 by Erik Bågfors
changes for pull --revision based on input from John
586
        elif len(revision) == 1:
1614.2.12 by Olaf Conradi
Merge bzr.dev
587
            rev_id = revision[0].in_history(branch_from).rev_id
1185.76.4 by Erik Bågfors
expanded tabs
588
        else:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
589
            raise errors.BzrCommandError('bzr pull --revision takes one value.')
1185.76.1 by Erik Bågfors
Support for --revision in pull
590
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
591
        old_rh = branch_to.revision_history()
592
        if tree_to is not None:
1551.11.10 by Aaron Bentley
Add change reporting to pull
593
            count = tree_to.pull(branch_from, overwrite, rev_id,
594
            delta.ChangeReporter(tree_to.inventory))
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
595
        else:
1614.2.12 by Olaf Conradi
Merge bzr.dev
596
            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
597
        note('%d revision(s) pulled.' % (count,))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
598
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
599
        if verbose:
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
600
            new_rh = branch_to.revision_history()
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
601
            if old_rh != new_rh:
602
                # Something changed
603
                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
604
                show_changed_revisions(branch_to, old_rh, new_rh,
1185.85.27 by John Arbash Meinel
Updated bzr branch and bzr pull
605
                                       to_file=self.outf)
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
606
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
607
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
608
class cmd_push(Command):
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
609
    """Update a mirror of this branch.
610
    
611
    The target branch will not have its working tree populated because this
612
    is both expensive, and is not supported on remote file systems.
613
    
614
    Some smart servers or protocols *may* put the working tree in place in
615
    the future.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
616
617
    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
618
    considered diverged if the destination branch's most recent commit is one
619
    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.
620
621
    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
622
    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.
623
    
624
    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
625
    do a merge (see bzr help merge) from the other branch, and commit that.
626
    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
627
628
    If there is no default push location set, the first push will set it.
629
    After that, you can omit the location to use the default.  To change the
1785.1.4 by John Arbash Meinel
Update help for the new --remember semantics.
630
    default, use --remember. The value will only be saved if the remote
631
    location can be accessed.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
632
    """
1685.1.80 by Wouter van Heyst
more code cleanup
633
1185.85.31 by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag.
634
    takes_options = ['remember', 'overwrite', 'verbose',
1495 by Robert Collins
Add a --create-prefix to the new push command.
635
                     Option('create-prefix', 
636
                            help='Create the path leading up to the branch '
637
                                 'if it does not already exist')]
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
638
    takes_args = ['location?']
1185.85.31 by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag.
639
    encoding_type = 'replace'
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
640
1495 by Robert Collins
Add a --create-prefix to the new push command.
641
    def run(self, location=None, remember=False, overwrite=False,
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
642
            create_prefix=False, verbose=False):
1185.33.45 by Martin Pool
[merge] refactoring of branch vs working tree, etc (robertc)
643
        # FIXME: Way too big!  Put this into a function called from the
644
        # command.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
645
        
1692.3.1 by Robert Collins
Fix push to work with just a branch, no need for a working tree.
646
        br_from = Branch.open_containing('.')[0]
647
        stored_loc = br_from.get_push_location()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
648
        if location is None:
649
            if stored_loc is None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
650
                raise errors.BzrCommandError("No push location known or specified.")
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
651
            else:
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
652
                display_url = urlutils.unescape_for_display(stored_loc,
653
                        self.outf.encoding)
1785.1.1 by John Arbash Meinel
Fix the output of 'bzr push' so that it prints the location correctly.
654
                self.outf.write("Using saved location: %s\n" % display_url)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
655
                location = stored_loc
1685.1.22 by John Arbash Meinel
cmd_push was passing the location directly to relpath, rather than a URL
656
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
657
        to_transport = transport.get_transport(location)
658
        location_url = to_transport.base
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
659
660
        old_rh = []
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
661
        try:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
662
            dir_to = bzrdir.BzrDir.open(location_url)
1563.2.38 by Robert Collins
make push preserve tree formats.
663
            br_to = dir_to.open_branch()
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
664
        except errors.NotBranchError:
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
665
            # create a branch.
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
666
            to_transport = to_transport.clone('..')
1495 by Robert Collins
Add a --create-prefix to the new push command.
667
            if not create_prefix:
668
                try:
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
669
                    relurl = to_transport.relpath(location_url)
1685.1.24 by John Arbash Meinel
cmd_push should use URLs throughout.
670
                    mutter('creating directory %s => %s', location_url, relurl)
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
671
                    to_transport.mkdir(relurl)
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
672
                except errors.NoSuchFile:
673
                    raise errors.BzrCommandError("Parent directory of %s "
674
                                                 "does not exist." % location)
1495 by Robert Collins
Add a --create-prefix to the new push command.
675
            else:
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
676
                current = to_transport.base
677
                needed = [(to_transport, to_transport.relpath(location_url))]
1495 by Robert Collins
Add a --create-prefix to the new push command.
678
                while needed:
679
                    try:
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
680
                        to_transport, relpath = needed[-1]
681
                        to_transport.mkdir(relpath)
1495 by Robert Collins
Add a --create-prefix to the new push command.
682
                        needed.pop()
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
683
                    except errors.NoSuchFile:
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
684
                        new_transport = to_transport.clone('..')
1495 by Robert Collins
Add a --create-prefix to the new push command.
685
                        needed.append((new_transport,
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
686
                                       new_transport.relpath(to_transport.base)))
687
                        if new_transport.base == to_transport.base:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
688
                            raise errors.BzrCommandError("Could not create "
689
                                                         "path prefix.")
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
690
            dir_to = br_from.bzrdir.clone(location_url,
1711.2.3 by John Arbash Meinel
Fix push to only push revisions in the current ancestry. (bug???)
691
                revision_id=br_from.last_revision())
1563.2.38 by Robert Collins
make push preserve tree formats.
692
            br_to = dir_to.open_branch()
2249.4.2 by Wouter van Heyst
Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible.
693
            count = br_to.last_revision_info()[0]
1785.1.2 by John Arbash Meinel
Push should only save the location if it can actually connect (doesn't need to succeed)
694
            # We successfully created the target, remember it
695
            if br_from.get_push_location() is None or remember:
696
                br_from.set_push_location(br_to.base)
1692.3.6 by Robert Collins
Show the correct number of revisions pushed when pushing a new branch (Robert Collins).
697
        else:
1785.1.2 by John Arbash Meinel
Push should only save the location if it can actually connect (doesn't need to succeed)
698
            # We were able to connect to the remote location, so remember it
699
            # we don't need to successfully push because of possible divergence.
700
            if br_from.get_push_location() is None or remember:
701
                br_from.set_push_location(br_to.base)
1692.3.6 by Robert Collins
Show the correct number of revisions pushed when pushing a new branch (Robert Collins).
702
            old_rh = br_to.revision_history()
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.
703
            try:
1692.3.6 by Robert Collins
Show the correct number of revisions pushed when pushing a new branch (Robert Collins).
704
                try:
705
                    tree_to = dir_to.open_workingtree()
706
                except errors.NotLocalUrl:
707
                    warning('This transport does not update the working '
708
                            'tree of: %s' % (br_to.base,))
2245.2.2 by Robert Collins
Update cmd_push to invoke the correct 'push' method on branch, rather than pull. This does not alter tests because the behaviour for push and pull is still symmetrical.
709
                    count = br_from.push(br_to, overwrite)
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
710
                except errors.NoWorkingTree:
2245.2.2 by Robert Collins
Update cmd_push to invoke the correct 'push' method on branch, rather than pull. This does not alter tests because the behaviour for push and pull is still symmetrical.
711
                    count = br_from.push(br_to, overwrite)
1692.3.6 by Robert Collins
Show the correct number of revisions pushed when pushing a new branch (Robert Collins).
712
                else:
2245.2.2 by Robert Collins
Update cmd_push to invoke the correct 'push' method on branch, rather than pull. This does not alter tests because the behaviour for push and pull is still symmetrical.
713
                    tree_to.lock_write()
714
                    try:
715
                        count = br_from.push(tree_to.branch, overwrite)
716
                        tree_to.update()
717
                    finally:
718
                        tree_to.unlock()
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
719
            except errors.DivergedBranches:
1996.3.36 by John Arbash Meinel
[merge] bzr.dev 2070
720
                raise errors.BzrCommandError('These branches have diverged.'
721
                                        '  Try using "merge" and then "push".')
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
722
        note('%d revision(s) pushed.' % (count,))
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
723
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
724
        if verbose:
725
            new_rh = br_to.revision_history()
726
            if old_rh != new_rh:
727
                # Something changed
728
                from bzrlib.log import show_changed_revisions
1185.85.31 by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag.
729
                show_changed_revisions(br_to, old_rh, new_rh,
730
                                       to_file=self.outf)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
731
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
732
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
733
class cmd_branch(Command):
734
    """Create a new copy of a branch.
735
736
    If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
737
    be used.  In other words, "branch ../foo/bar" will attempt to create ./bar.
738
739
    To retrieve the branch as of a particular revision, supply the --revision
740
    parameter, as in "branch foo/bar -r 5".
1185.10.2 by Aaron Bentley
Updated help message
741
742
    --basis is to speed up branching from remote branches.  When specified, it
743
    copies all the file-contents, inventory and revision data from the basis
744
    branch before copying anything from the remote branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
745
    """
746
    takes_args = ['from_location', 'to_location?']
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
747
    takes_options = ['revision', 'basis']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
748
    aliases = ['get', 'clone']
749
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
750
    def run(self, from_location, to_location=None, revision=None, basis=None):
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
751
        if revision is None:
752
            revision = [None]
753
        elif len(revision) > 1:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
754
            raise errors.BzrCommandError(
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
755
                'bzr branch --revision takes exactly 1 revision value')
756
        try:
757
            br_from = Branch.open(from_location)
758
        except OSError, e:
759
            if e.errno == errno.ENOENT:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
760
                raise errors.BzrCommandError('Source location "%s" does not'
761
                                             ' exist.' % to_location)
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
762
            else:
763
                raise
764
        br_from.lock_read()
765
        try:
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
766
            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.
767
                basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
768
            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.
769
                basis_dir = None
1185.8.4 by Aaron Bentley
Fixed branch -r
770
            if len(revision) == 1 and revision[0] is not None:
1390 by Robert Collins
pair programming worx... merge integration and weave
771
                revision_id = revision[0].in_history(br_from)[1]
1185.8.4 by Aaron Bentley
Fixed branch -r
772
            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.
773
                # FIXME - wt.last_revision, fallback to branch, fall back to
774
                # None or perhaps NULL_REVISION to mean copy nothing
775
                # RBC 20060209
776
                revision_id = br_from.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
777
            if to_location is None:
778
                to_location = os.path.basename(from_location.rstrip("/\\"))
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
779
                name = None
780
            else:
781
                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
782
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
783
            to_transport = transport.get_transport(to_location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
784
            try:
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
785
                to_transport.mkdir('.')
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
786
            except errors.FileExists:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
787
                raise errors.BzrCommandError('Target directory "%s" already'
788
                                             ' exists.' % to_location)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
789
            except errors.NoSuchFile:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
790
                raise errors.BzrCommandError('Parent of "%s" does not exist.'
791
                                             % to_location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
792
            try:
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
793
                # preserve whatever source format we have.
1685.1.20 by John Arbash Meinel
More changes to get 'bzr branch' and 'bzr pull' to work
794
                dir = br_from.bzrdir.sprout(to_transport.base,
795
                        revision_id, basis_dir)
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
796
                branch = dir.open_branch()
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
797
            except errors.NoSuchRevision:
1685.1.80 by Wouter van Heyst
more code cleanup
798
                to_transport.delete_tree('.')
1466 by Robert Collins
revision may be None in cmd_branch, do not treat as an int.
799
                msg = "The branch %s has no revision %s." % (from_location, revision[0])
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
800
                raise errors.BzrCommandError(msg)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
801
            except errors.UnlistableBranch:
802
                osutils.rmtree(to_location)
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
803
                msg = "The branch %s cannot be used as a --basis" % (basis,)
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
804
                raise errors.BzrCommandError(msg)
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
805
            if name:
1185.65.27 by Robert Collins
Tweak storage towards mergability.
806
                branch.control_files.put_utf8('branch-name', name)
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
807
            note('Branched %d revision(s).' % branch.revno())
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
808
        finally:
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
809
            br_from.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
810
811
1508.1.20 by Robert Collins
Create a checkout command.
812
class cmd_checkout(Command):
813
    """Create a new checkout of an existing branch.
814
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
815
    If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
816
    the branch found in '.'. This is useful if you have removed the working tree
817
    or if it was never created - i.e. if you pushed the branch to its current
818
    location using SFTP.
819
    
1508.1.20 by Robert Collins
Create a checkout command.
820
    If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
821
    be used.  In other words, "checkout ../foo/bar" will attempt to create ./bar.
822
823
    To retrieve the branch as of a particular revision, supply the --revision
824
    parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
825
    out of date [so you cannot commit] but it may be useful (i.e. to examine old
826
    code.)
827
828
    --basis is to speed up checking out from remote branches.  When specified, it
829
    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.
830
    branch being checked out.
1508.1.20 by Robert Collins
Create a checkout command.
831
    """
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
832
    takes_args = ['branch_location?', 'to_location?']
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
833
    takes_options = ['revision', # , 'basis']
834
                     Option('lightweight',
835
                            help="perform a lightweight checkout. Lightweight "
836
                                 "checkouts depend on access to the branch for "
837
                                 "every operation. Normal checkouts can perform "
838
                                 "common operations like diff and status without "
839
                                 "such access, and also support local commits."
840
                            ),
841
                     ]
1733.2.8 by Michael Ellerman
Add CVS compatible aliases for checkout and annotate, from fullermd.
842
    aliases = ['co']
1508.1.20 by Robert Collins
Create a checkout command.
843
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
844
    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'
845
            lightweight=False):
1508.1.20 by Robert Collins
Create a checkout command.
846
        if revision is None:
847
            revision = [None]
848
        elif len(revision) > 1:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
849
            raise errors.BzrCommandError(
1508.1.20 by Robert Collins
Create a checkout command.
850
                'bzr checkout --revision takes exactly 1 revision value')
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
851
        if branch_location is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
852
            branch_location = osutils.getcwd()
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
853
            to_location = branch_location
1508.1.20 by Robert Collins
Create a checkout command.
854
        source = Branch.open(branch_location)
855
        if len(revision) == 1 and revision[0] is not None:
856
            revision_id = revision[0].in_history(source)[1]
857
        else:
858
            revision_id = None
859
        if to_location is None:
860
            to_location = os.path.basename(branch_location.rstrip("/\\"))
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
861
        # if the source and to_location are the same, 
862
        # and there is no working tree,
863
        # then reconstitute a branch
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
864
        if (osutils.abspath(to_location) ==
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
865
            osutils.abspath(branch_location)):
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
866
            try:
867
                source.bzrdir.open_workingtree()
868
            except errors.NoWorkingTree:
869
                source.bzrdir.create_workingtree()
870
                return
1508.1.20 by Robert Collins
Create a checkout command.
871
        try:
872
            os.mkdir(to_location)
873
        except OSError, e:
874
            if e.errno == errno.EEXIST:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
875
                raise errors.BzrCommandError('Target directory "%s" already'
876
                                             ' exists.' % to_location)
1508.1.20 by Robert Collins
Create a checkout command.
877
            if e.errno == errno.ENOENT:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
878
                raise errors.BzrCommandError('Parent of "%s" does not exist.'
879
                                             % to_location)
1508.1.20 by Robert Collins
Create a checkout command.
880
            else:
881
                raise
2204.4.13 by Aaron Bentley
Update all test cases to avoid set_default_format
882
        source.create_checkout(to_location, revision_id, lightweight)
1508.1.20 by Robert Collins
Create a checkout command.
883
884
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
885
class cmd_renames(Command):
886
    """Show list of renamed files.
887
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
888
    # TODO: Option to show renames between two historical versions.
889
890
    # TODO: Only show renames under dir, rather than in the whole branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
891
    takes_args = ['dir?']
892
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
893
    @display_command
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
894
    def run(self, dir=u'.'):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
895
        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()
896
        old_inv = tree.basis_tree().inventory
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
897
        new_inv = tree.read_working_inventory()
1996.3.30 by John Arbash Meinel
Don't import 'bzrlib.tree' directly in bzrlib.builtins
898
        renames = list(_mod_tree.find_renames(old_inv, new_inv))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
899
        renames.sort()
900
        for old_name, new_name in renames:
1185.85.32 by John Arbash Meinel
Updated bzr renames
901
            self.outf.write("%s => %s\n" % (old_name, new_name))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
902
903
1508.1.24 by Robert Collins
Add update command for use with checkouts.
904
class cmd_update(Command):
905
    """Update a tree to have the latest code committed to its branch.
906
    
907
    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.
908
    conflicts. If you have any local changes, you will still 
909
    need to commit them after the update for the update to be complete.
910
    
911
    If you want to discard your local changes, you can just do a 
912
    'bzr revert' instead of 'bzr commit' after the update.
1508.1.24 by Robert Collins
Add update command for use with checkouts.
913
    """
914
    takes_args = ['dir?']
1815.3.1 by Stefan (metze) Metzmacher
add 'up' as alias for 'update'
915
    aliases = ['up']
1508.1.24 by Robert Collins
Add update command for use with checkouts.
916
917
    def run(self, dir='.'):
918
        tree = WorkingTree.open_containing(dir)[0]
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
919
        master = tree.branch.get_master_branch()
920
        if master is not None:
921
            tree.lock_write()
922
        else:
923
            tree.lock_tree_write()
1508.1.24 by Robert Collins
Add update command for use with checkouts.
924
        try:
2014.1.1 by John Arbash Meinel
Stop using pending_merges() in 'bzr update'
925
            existing_pending_merges = tree.get_parent_ids()[1:]
1948.2.1 by Robert Collins
fix race condition in cmd_update that could lead to failure-to-unlock warnings.
926
            last_rev = tree.last_revision()
1830.1.1 by John Arbash Meinel
Print up to date even if bound, also always print out current revno.
927
            if last_rev == tree.branch.last_revision():
1587.1.11 by Robert Collins
Local commits appear to be working properly.
928
                # may be up to date, check master too.
929
                master = tree.branch.get_master_branch()
1830.1.1 by John Arbash Meinel
Print up to date even if bound, also always print out current revno.
930
                if master is None or last_rev == master.last_revision():
931
                    revno = tree.branch.revision_id_to_revno(last_rev)
932
                    note("Tree is up to date at revision %d." % (revno,))
933
                    return 0
1508.1.24 by Robert Collins
Add update command for use with checkouts.
934
            conflicts = tree.update()
1830.1.1 by John Arbash Meinel
Print up to date even if bound, also always print out current revno.
935
            revno = tree.branch.revision_id_to_revno(tree.last_revision())
936
            note('Updated to revision %d.' % (revno,))
2014.1.1 by John Arbash Meinel
Stop using pending_merges() in 'bzr update'
937
            if tree.get_parent_ids()[1:] != existing_pending_merges:
1711.2.108 by John Arbash Meinel
Assert that update informs the user about where their local commits went.
938
                note('Your local commits will now show as pending merges with '
1878.3.2 by Adeodato Simó
Update with suggestions from John Arbash Meinel.
939
                     "'bzr status', and can be committed with 'bzr commit'.")
1508.1.24 by Robert Collins
Add update command for use with checkouts.
940
            if conflicts != 0:
941
                return 1
942
            else:
943
                return 0
944
        finally:
945
            tree.unlock()
946
947
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
948
class cmd_info(Command):
1694.2.6 by Martin Pool
[merge] bzr.dev
949
    """Show information about a working tree, branch or repository.
950
951
    This command will show all known locations and formats associated to the
952
    tree, branch or repository.  Statistical information is included with
953
    each report.
954
955
    Branches and working trees will also report any missing revisions.
956
    """
957
    takes_args = ['location?']
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
958
    takes_options = ['verbose']
1694.2.6 by Martin Pool
[merge] bzr.dev
959
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
960
    @display_command
1694.2.6 by Martin Pool
[merge] bzr.dev
961
    def run(self, location=None, verbose=False):
962
        from bzrlib.info import show_bzrdir_info
963
        show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
964
                         verbose=verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
965
966
967
class cmd_remove(Command):
968
    """Make a file unversioned.
969
970
    This makes bzr stop tracking changes to a versioned file.  It does
971
    not delete the working copy.
1551.6.26 by Aaron Bentley
Add support for remove --new
972
973
    You can specify one or more files, and/or --new.  If you specify --new,
974
    only 'added' files will be removed.  If you specify both, then new files
975
    in the specified directories will be removed.  If the directories are
976
    also new, they will also be removed.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
977
    """
1551.6.26 by Aaron Bentley
Add support for remove --new
978
    takes_args = ['file*']
979
    takes_options = ['verbose', Option('new', help='remove newly-added files')]
1424 by Robert Collins
add rm alias to remove
980
    aliases = ['rm']
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
981
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
982
    
1551.6.26 by Aaron Bentley
Add support for remove --new
983
    def run(self, file_list, verbose=False, new=False):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
984
        tree, file_list = tree_files(file_list)
1551.6.26 by Aaron Bentley
Add support for remove --new
985
        if new is False:
986
            if file_list is None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
987
                raise errors.BzrCommandError('Specify one or more files to'
988
                                             ' remove, or use --new.')
1551.6.26 by Aaron Bentley
Add support for remove --new
989
        else:
1852.10.3 by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.
990
            added = tree.changes_from(tree.basis_tree(),
991
                specific_files=file_list).added
992
            file_list = sorted([f[0] for f in added], reverse=True)
1551.6.26 by Aaron Bentley
Add support for remove --new
993
            if len(file_list) == 0:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
994
                raise errors.BzrCommandError('No matching files.')
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
995
        tree.remove(file_list, verbose=verbose, to_file=self.outf)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
996
997
998
class cmd_file_id(Command):
999
    """Print file_id of a particular file or directory.
1000
1001
    The file_id is assigned when the file is first added and remains the
1002
    same through all revisions where the file exists, even when it is
1003
    moved or renamed.
1004
    """
1685.1.80 by Wouter van Heyst
more code cleanup
1005
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1006
    hidden = True
1007
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
1008
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1009
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1010
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1011
        tree, relpath = WorkingTree.open_containing(filename)
1012
        i = tree.inventory.path2id(relpath)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1013
        if i is None:
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
1014
            raise errors.NotVersionedError(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1015
        else:
1685.1.80 by Wouter van Heyst
more code cleanup
1016
            self.outf.write(i + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1017
1018
1019
class cmd_file_path(Command):
1020
    """Print path of file_ids to a file or directory.
1021
1022
    This prints one line for each directory down to the target,
1185.85.35 by John Arbash Meinel
Updated file-path
1023
    starting at the branch root.
1024
    """
1685.1.80 by Wouter van Heyst
more code cleanup
1025
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1026
    hidden = True
1027
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
1028
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1029
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1030
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1031
        tree, relpath = WorkingTree.open_containing(filename)
1032
        inv = tree.inventory
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1033
        fid = inv.path2id(relpath)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1034
        if fid is None:
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
1035
            raise errors.NotVersionedError(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1036
        for fip in inv.get_idpath(fid):
1685.1.80 by Wouter van Heyst
more code cleanup
1037
            self.outf.write(fip + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1038
1039
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
1040
class cmd_reconcile(Command):
1041
    """Reconcile bzr metadata in a branch.
1042
1043
    This can correct data mismatches that may have been caused by
1044
    previous ghost operations or bzr upgrades. You should only
1045
    need to run this command if 'bzr check' or a bzr developer 
1046
    advises you to run it.
1047
1048
    If a second branch is provided, cross-branch reconciliation is
1049
    also attempted, which will check that data like the tree root
1050
    id which was not present in very early bzr versions is represented
1051
    correctly in both branches.
1052
1053
    At the same time it is run it may recompress data resulting in 
1054
    a potential saving in disk space or performance gain.
1055
1056
    The branch *MUST* be on a listable system such as local disk or sftp.
1057
    """
1058
    takes_args = ['branch?']
1059
1060
    def run(self, branch="."):
1061
        from bzrlib.reconcile import reconcile
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1062
        dir = bzrdir.BzrDir.open(branch)
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
1063
        reconcile(dir)
1064
1065
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1066
class cmd_revision_history(Command):
1733.2.1 by Michael Ellerman
Add an optional location parameter to the 'revision-history' command.
1067
    """Display the list of revision ids on a branch."""
1068
    takes_args = ['location?']
1069
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1070
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1071
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1072
    @display_command
1733.2.1 by Michael Ellerman
Add an optional location parameter to the 'revision-history' command.
1073
    def run(self, location="."):
1074
        branch = Branch.open_containing(location)[0]
1075
        for revid in branch.revision_history():
1733.2.4 by Michael Ellerman
Merge bzr.dev, fix minor conflict in cmd_revision_history().
1076
            self.outf.write(revid)
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1077
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1078
1079
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
1080
class cmd_ancestry(Command):
1081
    """List all revisions merged into this branch."""
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
1082
    takes_args = ['location?']
1083
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
1084
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1085
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1086
    @display_command
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
1087
    def run(self, location="."):
1088
        try:
1089
            wt = WorkingTree.open_containing(location)[0]
1090
        except errors.NoWorkingTree:
1091
            b = Branch.open(location)
1092
            last_revision = b.last_revision()
1093
        else:
1094
            b = wt.branch
1095
            last_revision = wt.last_revision()
1096
1097
        revision_ids = b.repository.get_ancestry(last_revision)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1098
        assert revision_ids[0] is None
1668.1.14 by Martin Pool
merge olaf - InvalidRevisionId fixes
1099
        revision_ids.pop(0)
1100
        for revision_id in revision_ids:
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
1101
            self.outf.write(revision_id + '\n')
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
1102
1103
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1104
class cmd_init(Command):
1105
    """Make a directory into a versioned branch.
1106
1107
    Use this to create an empty branch, or before importing an
1108
    existing project.
1109
1662.1.19 by Martin Pool
Better error message when initting existing tree
1110
    If there is a repository in a parent directory of the location, then 
1111
    the history of the branch will be stored in the repository.  Otherwise
1112
    init creates a standalone branch which carries its own history in 
1113
    .bzr.
1114
1115
    If there is already a branch at the location but it has no working tree,
1116
    the tree can be populated with 'bzr checkout'.
1117
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1118
    Recipe for importing a tree of files:
1119
        cd ~/project
1120
        bzr init
1185.12.93 by Aaron Bentley
Fixed obsolete help
1121
        bzr add .
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1122
        bzr status
1123
        bzr commit -m 'imported project'
1124
    """
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
1125
    takes_args = ['location?']
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1126
    takes_options = [
2221.4.9 by Aaron Bentley
Zap trailing whitespace
1127
                     RegistryOption('format',
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
1128
                            help='Specify a format for this branch. See "bzr '
1129
                            'help formats" for details',
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
1130
                            converter=bzrdir.format_registry.make_bzrdir,
2221.4.9 by Aaron Bentley
Zap trailing whitespace
1131
                            registry=bzrdir.format_registry,
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
1132
                            value_switches=True, title="Branch Format"),
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1133
                     ]
1134
    def run(self, location=None, format=None):
1135
        if format is None:
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
1136
            format = bzrdir.format_registry.make_bzrdir('default')
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
1137
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1138
            location = u'.'
1830.4.5 by Wouter van Heyst
cleanup
1139
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1140
        to_transport = transport.get_transport(location)
1830.4.5 by Wouter van Heyst
cleanup
1141
1142
        # The path has to exist to initialize a
1143
        # branch inside of it.
1144
        # Just using os.mkdir, since I don't
1145
        # believe that we want to create a bunch of
1146
        # locations if the user supplies an extended path
1147
        # TODO: create-prefix
1148
        try:
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1149
            to_transport.mkdir('.')
1830.4.8 by Wouter van Heyst
clean up imports (and get if collapsing right)
1150
        except errors.FileExists:
1830.4.5 by Wouter van Heyst
cleanup
1151
            pass
1830.4.1 by Wouter van Heyst
Allow bzr init to create remote branches
1152
                    
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1153
        try:
1662.1.19 by Martin Pool
Better error message when initting existing tree
1154
            existing_bzrdir = bzrdir.BzrDir.open(location)
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
1155
        except errors.NotBranchError:
1662.1.19 by Martin Pool
Better error message when initting existing tree
1156
            # really a NotBzrDir error...
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1157
            bzrdir.BzrDir.create_branch_convenience(location, format=format)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1158
        else:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
1159
            from bzrlib.transport.local import LocalTransport
1662.1.19 by Martin Pool
Better error message when initting existing tree
1160
            if existing_bzrdir.has_branch():
1830.4.8 by Wouter van Heyst
clean up imports (and get if collapsing right)
1161
                if (isinstance(to_transport, LocalTransport)
1162
                    and not existing_bzrdir.has_workingtree()):
1830.4.1 by Wouter van Heyst
Allow bzr init to create remote branches
1163
                        raise errors.BranchExistsWithoutWorkingTree(location)
1164
                raise errors.AlreadyBranchError(location)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1165
            else:
1662.1.19 by Martin Pool
Better error message when initting existing tree
1166
                existing_bzrdir.create_branch()
1167
                existing_bzrdir.create_workingtree()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1168
1169
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1170
class cmd_init_repository(Command):
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1171
    """Create a shared repository to hold branches.
1172
1173
    New branches created under the repository directory will store their revisions
1174
    in the repository, not in the branch directory, if the branch format supports
1175
    shared storage.
1176
1662.1.11 by Martin Pool
Better help for init-repo (Erik)
1177
    example:
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1178
        bzr init-repo repo
1662.1.11 by Martin Pool
Better help for init-repo (Erik)
1179
        bzr init repo/trunk
1180
        bzr checkout --lightweight repo/trunk trunk-checkout
1181
        cd trunk-checkout
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1182
        (add files here)
1183
    """
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1184
    takes_args = ["location"] 
2221.4.9 by Aaron Bentley
Zap trailing whitespace
1185
    takes_options = [RegistryOption('format',
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
1186
                            help='Specify a format for this repository. See'
1187
                                 ' "bzr help formats" for details',
2221.4.9 by Aaron Bentley
Zap trailing whitespace
1188
                            registry=bzrdir.format_registry,
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
1189
                            converter=bzrdir.format_registry.make_bzrdir,
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
1190
                            value_switches=True, title='Repository format'),
1624.2.4 by Erik Bågfors
rename --tree to --trees
1191
                     Option('trees',
1624.2.1 by Erik Bågfors
support for --tree in bzr init-repo
1192
                             help='Allows branches in repository to have'
1193
                             ' a working tree')]
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1194
    aliases = ["init-repo"]
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1195
    def run(self, location, format=None, trees=False):
1196
        if format is None:
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
1197
            format = bzrdir.format_registry.make_bzrdir('default')
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1198
1199
        if location is None:
1200
            location = '.'
1201
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1202
        to_transport = transport.get_transport(location)
1830.4.5 by Wouter van Heyst
cleanup
1203
        try:
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1204
            to_transport.mkdir('.')
1830.4.8 by Wouter van Heyst
clean up imports (and get if collapsing right)
1205
        except errors.FileExists:
1830.4.5 by Wouter van Heyst
cleanup
1206
            pass
1207
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1208
        newdir = format.initialize_on_transport(to_transport)
1558.5.2 by Aaron Bentley
Created *shared* repositories...
1209
        repo = newdir.create_repository(shared=True)
1624.2.4 by Erik Bågfors
rename --tree to --trees
1210
        repo.set_make_working_trees(trees)
1558.5.1 by Aaron Bentley
Added make-repository command
1211
1212
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1213
class cmd_diff(Command):
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1214
    """Show differences in the working tree or between revisions.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1215
    
1216
    If files are listed, only the changes in those files are listed.
1217
    Otherwise, all changes for the tree are listed.
1218
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1219
    "bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1220
    produces patches suitable for "patch -p1".
1221
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1222
    examples:
1223
        bzr diff
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1224
            Shows the difference in the working tree versus the last commit
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1225
        bzr diff -r1
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1226
            Difference between the working tree and revision 1
1185.1.2 by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd
1227
        bzr diff -r1..2
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1228
            Difference between revision 2 and revision 1
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1229
        bzr diff --diff-prefix old/:new/
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1230
            Same as 'bzr diff' but prefix paths with old/ and 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.
1231
        bzr diff bzr.mine bzr.dev
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1232
            Show the differences between the two working trees
1694.2.4 by Martin Pool
When a diff prefix is given, don't show it in === summary lines, only on the diffs themselves.
1233
        bzr diff foo.c
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1234
            Show just the differences for 'foo.c'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1235
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1236
    # TODO: Option to use external diff command; could be GNU diff, wdiff,
1237
    #       or a graphical diff.
1238
1239
    # TODO: Python difflib is not exactly the same as unidiff; should
1240
    #       either fix it up or prefer to use an external diff.
1241
1242
    # TODO: Selected-file diff is inefficient and doesn't show you
1243
    #       deleted files.
1244
1245
    # TODO: This probably handles non-Unix newlines poorly.
2197.2.1 by Martin Pool
Refactor cmd_diff
1246
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1247
    takes_args = ['file*']
2190.2.1 by Martin Pool
remove global registration of short options
1248
    takes_options = ['revision', 'diff-options',
2193.3.1 by Martin Pool
Finish removal of global short-option table
1249
        Option('prefix', type=str,
1250
               short_name='p',
2190.2.1 by Martin Pool
remove global registration of short options
1251
               help='Set prefixes to added to old and new filenames, as '
1252
                    'two values separated by a colon.'),
1253
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1254
    aliases = ['di', 'dif']
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1255
    encoding_type = 'exact'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1256
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1257
    @display_command
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1258
    def run(self, revision=None, file_list=None, diff_options=None,
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1259
            prefix=None):
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1260
        from bzrlib.diff import diff_cmd_helper, show_diff_trees
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1261
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1262
        if (prefix is None) or (prefix == '0'):
1263
            # diff -p0 format
1694.2.1 by Martin Pool
Remove 'a/', 'b/' default prefixes on diff output.
1264
            old_label = ''
1265
            new_label = ''
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1266
        elif prefix == '1':
1267
            old_label = 'old/'
1268
            new_label = 'new/'
2197.2.1 by Martin Pool
Refactor cmd_diff
1269
        elif ':' in prefix:
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1270
            old_label, new_label = prefix.split(":")
2197.2.1 by Martin Pool
Refactor cmd_diff
1271
        else:
1272
            raise BzrCommandError(
1273
                "--prefix expects two values separated by a colon")
1274
1275
        if revision and len(revision) > 2:
1276
            raise errors.BzrCommandError('bzr diff --revision takes exactly'
1277
                                         ' one or two revision specifiers')
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1278
        
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1279
        try:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1280
            tree1, file_list = internal_tree_files(file_list)
1281
            tree2 = None
1508.1.15 by Robert Collins
Merge from mpool.
1282
            b = None
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1283
            b2 = None
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
1284
        except errors.FileInWrongBranch:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1285
            if len(file_list) != 2:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
1286
                raise errors.BzrCommandError("Files are in different branches")
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1287
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1288
            tree1, file1 = WorkingTree.open_containing(file_list[0])
1289
            tree2, file2 = WorkingTree.open_containing(file_list[1])
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1290
            if file1 != "" or file2 != "":
1508.1.15 by Robert Collins
Merge from mpool.
1291
                # FIXME diff those two files. rbc 20051123
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
1292
                raise errors.BzrCommandError("Files are in different branches")
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1293
            file_list = None
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
1294
        except errors.NotBranchError:
1881.1.2 by Matthieu Moy
Formatting and style for the last patch.
1295
            if (revision is not None and len(revision) == 2
1881.1.4 by Matthieu Moy
needs_tree -> needs_branch
1296
                and not revision[0].needs_branch()
1297
                and not revision[1].needs_branch()):
1711.2.100 by John Arbash Meinel
clean up comment.
1298
                # If both revision specs include a branch, we can
1299
                # diff them without needing a local working tree
1881.1.2 by Matthieu Moy
Formatting and style for the last patch.
1300
                tree1, tree2 = None, None
1881.1.1 by Matthieu Moy
Fixed and tested "bzr diff" outside a working tree.
1301
            else:
1302
                raise
2197.2.1 by Martin Pool
Refactor cmd_diff
1303
1304
        if tree2 is not None:
1305
            if revision is not None:
1306
                # FIXME: but there should be a clean way to diff between
1307
                # non-default versions of two trees, it's not hard to do
1308
                # internally...
1309
                raise errors.BzrCommandError(
1310
                        "Sorry, diffing arbitrary revisions across branches "
1311
                        "is not implemented yet")
1312
            return show_diff_trees(tree1, tree2, sys.stdout, 
1313
                                   specific_files=file_list,
1314
                                   external_diff_options=diff_options,
1315
                                   old_label=old_label, new_label=new_label)
1316
1317
        return diff_cmd_helper(tree1, file_list, diff_options,
1318
                               revision_specs=revision,
1319
                               old_label=old_label, new_label=new_label)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1320
1321
1322
class cmd_deleted(Command):
1323
    """List files deleted in the working tree.
1324
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1325
    # TODO: Show files deleted since a previous revision, or
1326
    # between two revisions.
1327
    # TODO: Much more efficient way to do this: read in new
1328
    # directories with readdir, rather than stating each one.  Same
1329
    # level of effort but possibly much less IO.  (Or possibly not,
1330
    # if the directories are very large...)
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1331
    takes_options = ['show-ids']
1332
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1333
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1334
    def run(self, show_ids=False):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1335
        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()
1336
        old = tree.basis_tree()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1337
        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
1338
            if not tree.has_id(ie.file_id):
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1339
                self.outf.write(path)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1340
                if show_ids:
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1341
                    self.outf.write(' ')
1342
                    self.outf.write(ie.file_id)
1343
                self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1344
1345
1346
class cmd_modified(Command):
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
1347
    """List files modified in working tree.
1348
1349
    See also: "bzr status".
1350
    """
1551.10.14 by Aaron Bentley
Add some blank lines
1351
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1352
    hidden = True
1551.10.14 by Aaron Bentley
Add some blank lines
1353
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1354
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1355
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1356
        tree = WorkingTree.open_containing(u'.')[0]
1852.10.3 by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.
1357
        td = tree.changes_from(tree.basis_tree())
1398 by Robert Collins
integrate in Gustavos x-bit patch
1358
        for path, id, kind, text_modified, meta_modified in td.modified:
1685.1.80 by Wouter van Heyst
more code cleanup
1359
            self.outf.write(path + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1360
1361
1362
class cmd_added(Command):
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
1363
    """List files added in working tree.
1364
1365
    See also: "bzr status".
1366
    """
1551.10.14 by Aaron Bentley
Add some blank lines
1367
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1368
    hidden = True
1551.10.14 by Aaron Bentley
Add some blank lines
1369
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1370
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1371
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1372
        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()
1373
        basis_inv = wt.basis_tree().inventory
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1374
        inv = wt.inventory
1375
        for file_id in inv:
1376
            if file_id in basis_inv:
1377
                continue
1731.1.33 by Aaron Bentley
Revert no-special-root changes
1378
            if inv.is_root(file_id) and len(basis_inv) == 0:
1379
                continue
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1380
            path = inv.id2path(file_id)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1381
            if not os.access(osutils.abspath(path), os.F_OK):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1382
                continue
1685.1.80 by Wouter van Heyst
more code cleanup
1383
            self.outf.write(path + '\n')
1185.85.53 by John Arbash Meinel
Updated cmd_root
1384
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1385
1386
class cmd_root(Command):
1387
    """Show the tree root directory.
1388
1389
    The root is the nearest enclosing directory with a .bzr control
1390
    directory."""
1391
    takes_args = ['filename?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1392
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1393
    def run(self, filename=None):
1394
        """Print the branch root."""
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1395
        tree = WorkingTree.open_containing(filename)[0]
1685.1.80 by Wouter van Heyst
more code cleanup
1396
        self.outf.write(tree.basedir + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1397
1398
1399
class cmd_log(Command):
1626.1.2 by Martin Pool
Better help message for log command.
1400
    """Show log of a branch, file, or directory.
1401
1402
    By default show the log of the branch containing the working directory.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1403
1185.16.153 by Martin Pool
[patch] fix help for bzr log (Matthieu)
1404
    To request a range of logs, you can use the command -r begin..end
1405
    -r revision requests a specific revision, -r ..end or -r begin.. are
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1406
    also valid.
1626.1.2 by Martin Pool
Better help message for log command.
1407
1408
    examples:
1409
        bzr log
1410
        bzr log foo.c
1411
        bzr log -r -10.. http://server/branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1412
    """
1413
1393.1.55 by Martin Pool
doc
1414
    # TODO: Make --revision support uuid: and hash: [future tag:] notation.
1415
1626.1.2 by Martin Pool
Better help message for log command.
1416
    takes_args = ['location?']
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1417
    takes_options = [Option('forward', 
1418
                            help='show from oldest to newest'),
1626.1.2 by Martin Pool
Better help message for log command.
1419
                     'timezone', 
1420
                     Option('verbose', 
2193.3.3 by Martin Pool
Fix up other short options
1421
                             short_name='v',
1626.1.2 by Martin Pool
Better help message for log command.
1422
                             help='show files changed in each revision'),
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1423
                     'show-ids', 'revision',
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1424
                     'log-format',
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1425
                     Option('message',
2193.3.3 by Martin Pool
Fix up other short options
1426
                            short_name='m',
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1427
                            help='show revisions whose message matches this regexp',
1428
                            type=str),
1185.16.57 by Martin Pool
[merge] from aaron
1429
                     ]
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()
1430
    encoding_type = 'replace'
1431
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1432
    @display_command
1626.1.2 by Martin Pool
Better help message for log command.
1433
    def run(self, location=None, timezone='original',
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1434
            verbose=False,
1435
            show_ids=False,
1436
            forward=False,
1437
            revision=None,
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1438
            log_format=None,
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1439
            message=None):
1440
        from bzrlib.log import show_log
1185.16.49 by mbp at sourcefrog
- more refactoring and tests of commandline
1441
        assert message is None or isinstance(message, basestring), \
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1442
            "invalid message argument %r" % message
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1443
        direction = (forward and 'forward') or 'reverse'
1444
        
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1445
        # log everything
1446
        file_id = None
1626.1.2 by Martin Pool
Better help message for log command.
1447
        if location:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1448
            # find the file id to log:
1449
1626.1.2 by Martin Pool
Better help message for log command.
1450
            dir, fp = bzrdir.BzrDir.open_containing(location)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1451
            b = dir.open_branch()
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1452
            if fp != '':
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1453
                try:
1454
                    # might be a tree:
1455
                    inv = dir.open_workingtree().inventory
1456
                except (errors.NotBranchError, errors.NotLocalUrl):
1457
                    # either no tree, or is remote.
1458
                    inv = b.basis_tree().inventory
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1459
                file_id = inv.path2id(fp)
2100.1.1 by wang
Running ``bzr log`` on nonexistent file gives an error instead of the
1460
                if file_id is None:
1461
                    raise errors.BzrCommandError(
1462
                        "Path does not have any revision history: %s" %
1463
                        location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1464
        else:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1465
            # local dir only
1466
            # FIXME ? log the current subdir only RBC 20060203 
1907.4.10 by Matthieu Moy
Cut long lines, prevent "path" component from being used in revno:branch/path.
1467
            if revision is not None \
1468
                    and len(revision) > 0 and revision[0].get_branch():
1907.4.2 by Matthieu Moy
Make log work nicely with revno:N:path too.
1469
                location = revision[0].get_branch()
1470
            else:
1471
                location = '.'
1472
            dir, relpath = bzrdir.BzrDir.open_containing(location)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1473
            b = dir.open_branch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1474
1475
        if revision is None:
1476
            rev1 = None
1477
            rev2 = None
1478
        elif len(revision) == 1:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1479
            rev1 = rev2 = revision[0].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1480
        elif len(revision) == 2:
1907.4.2 by Matthieu Moy
Make log work nicely with revno:N:path too.
1481
            if revision[1].get_branch() != revision[0].get_branch():
1907.4.4 by Matthieu Moy
Explain the error messages in the code.
1482
                # b is taken from revision[0].get_branch(), and
1483
                # show_log will use its revision_history. Having
1484
                # different branches will lead to weird behaviors.
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
1485
                raise errors.BzrCommandError(
1907.4.2 by Matthieu Moy
Make log work nicely with revno:N:path too.
1486
                    "Log doesn't accept two revisions in different branches.")
1553.4.2 by Michael Ellerman
Make bzr log -r .. work, fixes bug #4609. Add a bunch of tests to make sure
1487
            if revision[0].spec is None:
1488
                # missing begin-range means first revision
1489
                rev1 = 1
1490
            else:
1491
                rev1 = revision[0].in_history(b).revno
1492
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
1493
            if revision[1].spec is None:
1494
                # missing end-range means last known revision
1495
                rev2 = b.revno()
1496
            else:
1497
                rev2 = revision[1].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1498
        else:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
1499
            raise errors.BzrCommandError('bzr log --revision takes one or two values.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1500
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
1501
        # By this point, the revision numbers are converted to the +ve
1502
        # form if they were supplied in the -ve form, so we can do
1503
        # this comparison in relative safety
1504
        if rev1 > rev2:
1505
            (rev2, rev1) = (rev1, rev2)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1506
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
1507
        if log_format is None:
1508
            log_format = log.log_formatter_registry.get_default(b)
1509
1510
        lf = log_format(show_ids=show_ids, to_file=self.outf,
1511
                        show_timezone=timezone)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1512
1513
        show_log(b,
1514
                 lf,
1515
                 file_id,
1516
                 verbose=verbose,
1517
                 direction=direction,
1518
                 start_revision=rev1,
1519
                 end_revision=rev2,
1520
                 search=message)
1521
1185.85.4 by John Arbash Meinel
currently broken, trying to fix things up.
1522
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
1523
def get_log_format(long=False, short=False, line=False, default='long'):
1524
    log_format = default
1525
    if long:
1526
        log_format = 'long'
1527
    if short:
1528
        log_format = 'short'
1529
    if line:
1530
        log_format = 'line'
1531
    return log_format
1532
1533
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1534
class cmd_touching_revisions(Command):
1535
    """Return revision-ids which affected a particular file.
1536
1685.1.80 by Wouter van Heyst
more code cleanup
1537
    A more user-friendly interface is "bzr log FILE".
1538
    """
1539
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1540
    hidden = True
1541
    takes_args = ["filename"]
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1542
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1543
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1544
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1545
        tree, relpath = WorkingTree.open_containing(filename)
1546
        b = tree.branch
1547
        inv = tree.read_working_inventory()
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1548
        file_id = inv.path2id(relpath)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1549
        for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1550
            self.outf.write("%6d %s\n" % (revno, what))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1551
1552
1553
class cmd_ls(Command):
1554
    """List files in a tree.
1555
    """
1551.9.24 by Aaron Bentley
Unhide ls, add kind flag
1556
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
1557
    takes_args = ['path?']
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1558
    # TODO: Take a revision or remote path and list that tree instead.
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1559
    takes_options = ['verbose', 'revision',
1560
                     Option('non-recursive',
1561
                            help='don\'t recurse into sub-directories'),
1562
                     Option('from-root',
1563
                            help='Print all paths from the root of the branch.'),
1564
                     Option('unknown', help='Print unknown files'),
1565
                     Option('versioned', help='Print versioned files'),
1566
                     Option('ignored', help='Print ignored files'),
1567
1568
                     Option('null', help='Null separate the files'),
1551.9.27 by Aaron Bentley
Implement show-ids for all output formats
1569
                     'kind', 'show-ids'
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1570
                    ]
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1571
    @display_command
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1572
    def run(self, revision=None, verbose=False, 
1573
            non_recursive=False, from_root=False,
1574
            unknown=False, versioned=False, ignored=False,
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
1575
            null=False, kind=None, show_ids=False, path=None):
1551.9.24 by Aaron Bentley
Unhide ls, add kind flag
1576
1577
        if kind and kind not in ('file', 'directory', 'symlink'):
1578
            raise errors.BzrCommandError('invalid kind specified')
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1579
1580
        if verbose and null:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
1581
            raise errors.BzrCommandError('Cannot set both --verbose and --null')
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1582
        all = not (unknown or versioned or ignored)
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1583
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1584
        selection = {'I':ignored, '?':unknown, 'V':versioned}
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1585
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
1586
        if path is None:
1587
            fs_path = '.'
1588
            prefix = ''
1589
        else:
1590
            if from_root:
1591
                raise errors.BzrCommandError('cannot specify both --from-root'
1592
                                             ' and PATH')
1593
            fs_path = path
1594
            prefix = path
2215.3.3 by Aaron Bentley
Get ls working on branches
1595
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1596
            fs_path)
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1597
        if from_root:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1598
            relpath = u''
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1599
        elif relpath:
1600
            relpath += '/'
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1601
        if revision is not None:
2215.3.3 by Aaron Bentley
Get ls working on branches
1602
            tree = branch.repository.revision_tree(
1603
                revision[0].in_history(branch).rev_id)
1604
        elif tree is None:
1605
            tree = branch.basis_tree()
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1606
1551.9.24 by Aaron Bentley
Unhide ls, add kind flag
1607
        for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1608
            if fp.startswith(relpath):
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
1609
                fp = osutils.pathjoin(prefix, fp[len(relpath):])
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1610
                if non_recursive and '/' in fp:
1611
                    continue
1612
                if not all and not selection[fc]:
1613
                    continue
1551.9.24 by Aaron Bentley
Unhide ls, add kind flag
1614
                if kind is not None and fkind != kind:
1615
                    continue
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1616
                if verbose:
1617
                    kindch = entry.kind_character()
1551.9.27 by Aaron Bentley
Implement show-ids for all output formats
1618
                    outstring = '%-8s %s%s' % (fc, fp, kindch)
1619
                    if show_ids and fid is not None:
1620
                        outstring = "%-50s %s" % (outstring, fid)
1621
                    self.outf.write(outstring + '\n')
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1622
                elif null:
1685.1.80 by Wouter van Heyst
more code cleanup
1623
                    self.outf.write(fp + '\0')
1551.9.27 by Aaron Bentley
Implement show-ids for all output formats
1624
                    if show_ids:
1625
                        if fid is not None:
1626
                            self.outf.write(fid)
1627
                        self.outf.write('\0')
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()
1628
                    self.outf.flush()
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1629
                else:
1551.9.27 by Aaron Bentley
Implement show-ids for all output formats
1630
                    if fid is not None:
1631
                        my_id = fid
1632
                    else:
1633
                        my_id = ''
1634
                    if show_ids:
1635
                        self.outf.write('%-50s %s\n' % (fp, my_id))
1636
                    else:
1637
                        self.outf.write(fp + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1638
1639
1640
class cmd_unknowns(Command):
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
1641
    """List unknown files.
1642
1643
    See also: "bzr ls --unknown".
1644
    """
1551.10.14 by Aaron Bentley
Add some blank lines
1645
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
1646
    hidden = True
1551.10.14 by Aaron Bentley
Add some blank lines
1647
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1648
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1649
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1650
        for f in WorkingTree.open_containing(u'.')[0].unknowns():
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
1651
            self.outf.write(osutils.quotefn(f) + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1652
1653
1654
class cmd_ignore(Command):
2063.5.1 by wang
"bzr ignore" takes multiple arguments. Fixes bug 29488.
1655
    """Ignore specified files or patterns.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1656
1657
    To remove patterns from the ignore list, edit the .bzrignore file.
1658
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1659
    Trailing slashes on patterns are ignored. 
2135.2.2 by Kent Gibson
Ignore pattern matcher (glob.py) patches:
1660
    If the pattern contains a slash or is a regular expression, it is compared 
1661
    to the whole path from the branch root.  Otherwise, it is compared to only
1662
    the last component of the path.  To match a file only in the root 
1663
    directory, prepend './'.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1664
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1665
    Ignore patterns specifying absolute paths are not allowed.
1666
2135.2.2 by Kent Gibson
Ignore pattern matcher (glob.py) patches:
1667
    Ignore patterns may include globbing wildcards such as:
1668
      ? - Matches any single character except '/'
1669
      * - Matches 0 or more characters except '/'
1670
      /**/ - Matches 0 or more directories in a path
1671
      [a-z] - Matches a single character from within a group of characters
1672
 
1673
    Ignore patterns may also be Python regular expressions.  
1674
    Regular expression ignore patterns are identified by a 'RE:' prefix 
1675
    followed by the regular expression.  Regular expression ignore patterns
1676
    may not include named or numbered groups.
1677
1678
    Note: ignore patterns containing shell wildcards must be quoted from 
1679
    the shell on Unix.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1680
1681
    examples:
1682
        bzr ignore ./Makefile
1683
        bzr ignore '*.class'
2135.2.2 by Kent Gibson
Ignore pattern matcher (glob.py) patches:
1684
        bzr ignore 'lib/**/*.o'
1685
        bzr ignore 'RE:lib/.*\.o'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1686
    """
2063.5.1 by wang
"bzr ignore" takes multiple arguments. Fixes bug 29488.
1687
    takes_args = ['name_pattern*']
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
1688
    takes_options = [
1689
                     Option('old-default-rules',
1690
                            help='Out the ignore rules bzr < 0.9 always used.')
1691
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1692
    
2063.5.2 by wang
Don't use mutable values as default argument definitions.
1693
    def run(self, name_pattern_list=None, old_default_rules=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1694
        from bzrlib.atomicfile import AtomicFile
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
1695
        if old_default_rules is not None:
1696
            # dump the rules and exit
1836.1.12 by John Arbash Meinel
Move ignores into a file of their own, make DEFAULT_IGNORE a deprecated list. Create deprecated_list in symbol versioning.
1697
            for pattern in ignores.OLD_DEFAULTS:
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
1698
                print pattern
1699
            return
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1700
        if not name_pattern_list:
2063.5.5 by wang
resolve a conflict
1701
            raise errors.BzrCommandError("ignore requires at least one "
2063.5.4 by wang
Copy Kent Gibson's changes that incorporates John Arbash Meinel's
1702
                                  "NAME_PATTERN or --old-default-rules")
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1703
        for name_pattern in name_pattern_list:
1704
            if name_pattern[0] == '/':
1705
                raise errors.BzrCommandError(
1706
                    "NAME_PATTERN should not be an absolute path")
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1707
        tree, relpath = WorkingTree.open_containing(u'.')
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1708
        ifn = tree.abspath('.bzrignore')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1709
        if os.path.exists(ifn):
1710
            f = open(ifn, 'rt')
1711
            try:
1712
                igns = f.read().decode('utf-8')
1713
            finally:
1714
                f.close()
1715
        else:
1716
            igns = ''
1717
1718
        # TODO: If the file already uses crlf-style termination, maybe
1719
        # we should use that for the newly added lines?
1720
1721
        if igns and igns[-1] != '\n':
1722
            igns += '\n'
2063.5.3 by wang
Change error message. Use spaces instead of tabs.
1723
        for name_pattern in name_pattern_list:
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
1724
            igns += name_pattern.rstrip('/') + '\n'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1725
2063.5.4 by wang
Copy Kent Gibson's changes that incorporates John Arbash Meinel's
1726
        f = AtomicFile(ifn, 'wb')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1727
        try:
1728
            f.write(igns.encode('utf-8'))
1729
            f.commit()
1730
        finally:
1731
            f.close()
1732
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1733
        inv = tree.inventory
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1734
        if inv.path2id('.bzrignore'):
1735
            mutter('.bzrignore is already versioned')
1736
        else:
1737
            mutter('need to make new .bzrignore file versioned')
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
1738
            tree.add(['.bzrignore'])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1739
1740
1741
class cmd_ignored(Command):
1742
    """List ignored files and the patterns that matched them.
1743
1744
    See also: bzr ignore"""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1745
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1746
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1747
        tree = WorkingTree.open_containing(u'.')[0]
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
1748
        for path, file_class, kind, file_id, entry in tree.list_files():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1749
            if file_class != 'I':
1750
                continue
1751
            ## XXX: Slightly inefficient since this was already calculated
1752
            pat = tree.is_ignored(path)
1753
            print '%-50s %s' % (path, pat)
1754
1755
1756
class cmd_lookup_revision(Command):
1757
    """Lookup the revision-id from a revision-number
1758
1759
    example:
1760
        bzr lookup-revision 33
1761
    """
1762
    hidden = True
1763
    takes_args = ['revno']
1764
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1765
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1766
    def run(self, revno):
1767
        try:
1768
            revno = int(revno)
1769
        except ValueError:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
1770
            raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1771
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1772
        print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1773
1774
1775
class cmd_export(Command):
1776
    """Export past revision to destination directory.
1777
1778
    If no revision is specified this exports the last committed revision.
1779
1780
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
1781
    given, try to find the format with the extension. If no extension
1782
    is found exports to a directory (equivalent to --format=dir).
1783
1784
    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
1785
    is given, the top directory will be the root name of the file.
1786
2099.1.1 by Daniel Silverstone
Add source branch support to export command
1787
    If branch is omitted then the branch containing the CWD will be used.
1788
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
1789
    Note: export of tree with non-ascii filenames to zip is not supported.
1790
1551.3.11 by Aaron Bentley
Merge from Robert
1791
     Supported formats       Autodetected by extension
1792
     -----------------       -------------------------
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
1793
         dir                            -
1794
         tar                          .tar
1795
         tbz2                    .tar.bz2, .tbz2
1796
         tgz                      .tar.gz, .tgz
1797
         zip                          .zip
1798
    """
2099.1.1 by Daniel Silverstone
Add source branch support to export command
1799
    takes_args = ['dest', 'branch?']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1800
    takes_options = ['revision', 'format', 'root']
2099.1.1 by Daniel Silverstone
Add source branch support to export command
1801
    def run(self, dest, branch=None, revision=None, format=None, root=None):
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
1802
        from bzrlib.export import export
2099.1.1 by Daniel Silverstone
Add source branch support to export command
1803
1804
        if branch is None:
1805
            tree = WorkingTree.open_containing(u'.')[0]
1806
            b = tree.branch
1807
        else:
1808
            b = Branch.open(branch)
1809
            
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1810
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1811
            # should be tree.last_revision  FIXME
1241 by Martin Pool
- rename last_patch to last_revision
1812
            rev_id = b.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1813
        else:
1814
            if len(revision) != 1:
2067.3.3 by Martin Pool
merge bzr.dev and reconcile several changes, also some test fixes
1815
                raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1816
            rev_id = revision[0].in_history(b).rev_id
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1817
        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.
1818
        try:
1819
            export(t, dest, format, root)
1820
        except errors.NoSuchExportFormat, e:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
1821
            raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1822
1823
1824
class cmd_cat(Command):
1825
    """Write a file's text from a previous revision."""
1826
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
1827
    takes_options = ['revision', 'name-from-revision']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1828
    takes_args = ['filename']
2178.4.4 by Alexander Belchenko
encoding_type = 'exact' force sys.stdout to be binary stream on win32
1829
    encoding_type = 'exact'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1830
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1831
    @display_command
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
1832
    def run(self, filename, revision=None, name_from_revision=False):
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1833
        if revision is not None and len(revision) != 1:
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
1834
            raise errors.BzrCommandError("bzr cat --revision takes exactly"
1835
                                        " one number")
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
1836
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1837
        tree = None
1907.4.5 by Matthieu Moy
Make bzr cat -r revno:N:foo consistant with bzr cat -r branch:foo.
1838
        try:
1839
            tree, relpath = WorkingTree.open_containing(filename)
1840
            b = tree.branch
2158.1.1 by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
1841
        except (errors.NotBranchError, errors.NotLocalUrl):
1907.4.5 by Matthieu Moy
Make bzr cat -r revno:N:foo consistant with bzr cat -r branch:foo.
1842
            pass
1843
2158.1.1 by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
1844
        if revision is not None and revision[0].get_branch() is not None:
1845
            b = Branch.open(revision[0].get_branch())
1907.4.5 by Matthieu Moy
Make bzr cat -r revno:N:foo consistant with bzr cat -r branch:foo.
1846
        if tree is None:
1847
            b, relpath = Branch.open_containing(filename)
2158.1.1 by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
1848
            tree = b.basis_tree()
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1849
        if revision is None:
1850
            revision_id = b.last_revision()
1851
        else:
1852
            revision_id = revision[0].in_history(b).rev_id
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
1853
1854
        cur_file_id = tree.path2id(relpath)
1855
        rev_tree = b.repository.revision_tree(revision_id)
1856
        old_file_id = rev_tree.path2id(relpath)
1857
        
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
1858
        if name_from_revision:
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
1859
            if old_file_id is None:
1860
                raise errors.BzrCommandError("%r is not present in revision %s"
1861
                                                % (filename, revision_id))
1862
            else:
1863
                rev_tree.print_file(old_file_id)
2073.2.2 by wang
Make the decision tree a little clearer. Add more tests for exceptions.
1864
        elif cur_file_id is not None:
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
1865
            rev_tree.print_file(cur_file_id)
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
1866
        elif old_file_id is not None:
1867
            rev_tree.print_file(old_file_id)
1868
        else:
1869
            raise errors.BzrCommandError("%r is not present in revision %s" %
1870
                                         (filename, revision_id))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1871
1872
1873
class cmd_local_time_offset(Command):
1874
    """Show the offset in seconds from GMT to local time."""
1875
    hidden = True    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1876
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1877
    def run(self):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1878
        print osutils.local_time_offset()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1879
1880
1881
1882
class cmd_commit(Command):
1883
    """Commit changes into a new revision.
1884
    
1885
    If no arguments are given, the entire tree is committed.
1886
1887
    If selected files are specified, only changes to those files are
1888
    committed.  If a directory is specified then the directory and everything 
1889
    within it is committed.
1890
1891
    A selected-file commit may fail in some cases where the committed
1892
    tree would be invalid, such as trying to commit a file in a
1893
    newly-added directory that is not itself committed.
1894
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1895
    # TODO: Run hooks on tree to-be-committed, and after commit.
1896
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1897
    # TODO: Strict commit that fails if there are deleted files.
1898
    #       (what does "deleted files" mean ??)
1899
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1900
    # TODO: Give better message for -s, --summary, used by tla people
1901
1902
    # XXX: verbose currently does nothing
1903
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1904
    takes_args = ['selected*']
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1905
    takes_options = ['message', 'verbose', 
1906
                     Option('unchanged',
1907
                            help='commit even if nothing has changed'),
1908
                     Option('file', type=str, 
2193.3.3 by Martin Pool
Fix up other short options
1909
                            short_name='F',
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1910
                            argname='msgfile',
1911
                            help='file containing commit message'),
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1912
                     Option('strict',
1913
                            help="refuse to commit if there are unknown "
1914
                            "files in the working tree."),
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1915
                     Option('local',
1916
                            help="perform a local only commit in a bound "
1917
                                 "branch. Such commits are not pushed to "
1918
                                 "the master branch until a normal commit "
1919
                                 "is performed."
1920
                            ),
1185.16.43 by Martin Pool
- clean up handling of option objects
1921
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1922
    aliases = ['ci', 'checkin']
1923
1924
    def run(self, message=None, file=None, verbose=True, selected_list=None,
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1925
            unchanged=False, strict=False, local=False):
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1926
        from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1927
        from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1928
                StrictCommitFailed)
1185.33.76 by Martin Pool
Fix import error.
1929
        from bzrlib.msgeditor import edit_commit_message, \
1930
                make_commit_message_template
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1931
1185.33.77 by Martin Pool
doc
1932
        # TODO: Need a blackbox test for invoking the external editor; may be
1933
        # slightly problematic to run this cross-platform.
1934
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
1935
        # TODO: do more checks that the commit will succeed before 
1936
        # spending the user's valuable time typing a commit message.
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1937
        tree, selected_list = tree_files(selected_list)
1704.2.11 by Martin Pool
Handle 'bzr commit DIR' when dir contains pending merges.
1938
        if selected_list == ['']:
1939
            # workaround - commit of root of tree should be exactly the same
1940
            # as just default commit in that tree, and succeed even though
1941
            # selected-file merge commit is not done yet
1942
            selected_list = []
1943
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1944
        if local and not tree.branch.get_bound_location():
1945
            raise errors.LocalRequiresBoundBranch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1946
2149.1.4 by Aaron Bentley
Add additional test that callback is called with a Commit instance
1947
        def get_message(commit_obj):
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
1948
            """Callback to get commit message"""
1949
            my_message = message
1950
            if my_message is None and not file:
1951
                template = make_commit_message_template(tree, selected_list)
1952
                my_message = edit_commit_message(template)
1953
                if my_message is None:
1954
                    raise errors.BzrCommandError("please specify a commit"
1955
                        " message with either --message or --file")
1956
            elif my_message and file:
1957
                raise errors.BzrCommandError(
1958
                    "please specify either --message or --file")
1959
            if file:
1960
                my_message = codecs.open(file, 'rt', 
1961
                                         bzrlib.user_encoding).read()
1962
            if my_message == "":
1963
                raise errors.BzrCommandError("empty commit message specified")
1964
            return my_message
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1965
        
1966
        if verbose:
1967
            reporter = ReportCommitToLog()
1968
        else:
1969
            reporter = NullCommitReporter()
2089.1.1 by wang
If a commit fails, the commit message is stored in a file at the root of
1970
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1971
        try:
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
1972
            tree.commit(message_callback=get_message,
1973
                        specific_files=selected_list,
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1974
                        allow_pointless=unchanged, strict=strict, local=local,
1975
                        reporter=reporter)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1976
        except PointlessCommit:
1977
            # FIXME: This should really happen before the file is read in;
1978
            # perhaps prepare the commit; get the message; then actually commit
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
1979
            raise errors.BzrCommandError("no changes to commit."
1980
                              " use --unchanged to commit anyhow")
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
1981
        except ConflictsInTree:
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
1982
            raise errors.BzrCommandError('Conflicts detected in working '
1983
                'tree.  Use "bzr conflicts" to list, "bzr resolve FILE" to'
1984
                ' resolve.')
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1985
        except StrictCommitFailed:
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
1986
            raise errors.BzrCommandError("Commit refused because there are"
1987
                              " unknown 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
1988
        except errors.BoundBranchOutOfDate, e:
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
1989
            raise errors.BzrCommandError(str(e) + "\n"
1990
            'To commit to master branch, run update and then commit.\n'
1991
            'You can also pass --local to commit to continue working '
1992
            'disconnected.')
2111.1.1 by Martin Pool
Fix #32054, save message if commit fails.
1993
1994
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1995
class cmd_check(Command):
1996
    """Validate consistency of branch history.
1997
1998
    This command checks various invariants about the branch storage to
1999
    detect data corruption or bzr bugs.
2000
    """
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
2001
    takes_args = ['branch?']
1449 by Robert Collins
teach check about ghosts
2002
    takes_options = ['verbose']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2003
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
2004
    def run(self, branch=None, verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2005
        from bzrlib.check import check
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
2006
        if branch is None:
2007
            tree = WorkingTree.open_containing()[0]
2008
            branch = tree.branch
2009
        else:
2010
            branch = Branch.open(branch)
2011
        check(branch, verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2012
2013
2014
class cmd_upgrade(Command):
2015
    """Upgrade branch storage to current format.
2016
2017
    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.
2018
    this command. When the default format has changed you may also be warned
2019
    during other operations to upgrade.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2020
    """
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
2021
    takes_args = ['url?']
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2022
    takes_options = [
2221.4.9 by Aaron Bentley
Zap trailing whitespace
2023
                    RegistryOption('format',
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
2024
                        help='Upgrade to a specific format.  See "bzr help'
2025
                             ' formats" for details',
2221.4.9 by Aaron Bentley
Zap trailing whitespace
2026
                        registry=bzrdir.format_registry,
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
2027
                        converter=bzrdir.format_registry.make_bzrdir,
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
2028
                        value_switches=True, title='Branch format'),
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2029
                    ]
2030
2031
2032
    def run(self, url='.', format=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2033
        from bzrlib.upgrade import upgrade
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2034
        if format is None:
2204.5.5 by Aaron Bentley
Remove RepositoryFormat.set_default_format, deprecate get_format_type
2035
            format = bzrdir.format_registry.make_bzrdir('default')
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2036
        upgrade(url, format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2037
2038
2039
class cmd_whoami(Command):
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2040
    """Show or set bzr user id.
2041
    
2042
    examples:
2043
        bzr whoami --email
2044
        bzr whoami 'Frank Chu <fchu@example.com>'
2045
    """
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2046
    takes_options = [ Option('email',
2047
                             help='display email address only'),
2048
                      Option('branch',
2049
                             help='set identity for the current branch instead of '
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2050
                                  'globally'),
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2051
                    ]
2052
    takes_args = ['name?']
2053
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2054
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2055
    @display_command
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2056
    def run(self, email=False, branch=False, name=None):
2057
        if name is None:
2058
            # use branch if we're inside one; otherwise global config
2059
            try:
1816.2.10 by Robey Pointer
code style changes
2060
                c = Branch.open_containing('.')[0].get_config()
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2061
            except errors.NotBranchError:
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2062
                c = config.GlobalConfig()
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2063
            if email:
1816.2.10 by Robey Pointer
code style changes
2064
                self.outf.write(c.user_email() + '\n')
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2065
            else:
1816.2.10 by Robey Pointer
code style changes
2066
                self.outf.write(c.username() + '\n')
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2067
            return
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
2068
1840.1.2 by Robey Pointer
instead of raising an error, just display an exception if 'whoami' is given a name that doesn't look like it contains an email address
2069
        # display a warning if an email address isn't included in the given name.
2070
        try:
2071
            config.extract_email_address(name)
2055.2.2 by John Arbash Meinel
Switch extract_email_address() to use a more specific exception
2072
        except errors.NoEmailInUsername, e:
1840.1.5 by Robey Pointer
change the warning message for a 'whoami' with no email address, on jam's recommendation
2073
            warning('"%s" does not seem to contain an email address.  '
2074
                    'This is allowed, but not recommended.', name)
1840.1.1 by Robey Pointer
raise an exception if 'whoami' is given a name without a decodable email address
2075
        
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2076
        # use global config unless --branch given
2077
        if branch:
1816.2.10 by Robey Pointer
code style changes
2078
            c = Branch.open_containing('.')[0].get_config()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2079
        else:
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
2080
            c = config.GlobalConfig()
2081
        c.set_user_option('email', name)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2082
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.
2083
1185.35.14 by Aaron Bentley
Implemented nick command
2084
class cmd_nick(Command):
1551.3.11 by Aaron Bentley
Merge from Robert
2085
    """Print or set the branch nickname.  
2086
1185.35.14 by Aaron Bentley
Implemented nick command
2087
    If unset, the tree root directory name is used as the nickname
2088
    To print the current nickname, execute with no argument.  
2089
    """
2090
    takes_args = ['nickname?']
2091
    def run(self, nickname=None):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2092
        branch = Branch.open_containing(u'.')[0]
1185.35.14 by Aaron Bentley
Implemented nick command
2093
        if nickname is None:
2094
            self.printme(branch)
2095
        else:
2096
            branch.nick = nickname
2097
2098
    @display_command
2099
    def printme(self, branch):
2100
        print branch.nick 
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2101
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.
2102
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2103
class cmd_selftest(Command):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
2104
    """Run internal test suite.
2105
    
2213.2.1 by Martin Pool
Add selftest --first flag
2106
    This creates temporary test directories in the working directory, but not
2107
    existing data is affected.  These directories are deleted if the tests
2108
    pass, or left behind to help in debugging if they fail and --keep-output
2109
    is specified.
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
2110
    
2213.2.1 by Martin Pool
Add selftest --first flag
2111
    If arguments are given, they are regular expressions that say which tests
2112
    should run.  Tests matching any expression are run, and other tests are
2113
    not run.
2114
2115
    Alternatively if --first is given, matching tests are run first and then
2116
    all other tests are run.  This is useful if you have been working in a
2117
    particular area, but want to make sure nothing else was broken.
1552 by Martin Pool
Improved help text for bzr selftest
2118
2119
    If the global option '--no-plugins' is given, plugins are not loaded
2120
    before running the selftests.  This has two effects: features provided or
2121
    modified by plugins will not be tested, and tests provided by plugins will
2122
    not be run.
2123
2213.2.1 by Martin Pool
Add selftest --first flag
2124
    examples::
1552 by Martin Pool
Improved help text for bzr selftest
2125
        bzr selftest ignore
2213.2.1 by Martin Pool
Add selftest --first flag
2126
            run only tests relating to 'ignore'
1552 by Martin Pool
Improved help text for bzr selftest
2127
        bzr --no-plugins selftest -v
2213.2.1 by Martin Pool
Add selftest --first flag
2128
            disable plugins and list tests as they're run
1185.16.58 by mbp at sourcefrog
- run all selftests by default
2129
    """
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
2130
    # 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.
2131
2132
    # NB: this is used from the class without creating an instance, which is
2133
    # why it does not have a self parameter.
2134
    def get_transport_type(typestring):
2135
        """Parse and return a transport specifier."""
2136
        if typestring == "sftp":
2137
            from bzrlib.transport.sftp import SFTPAbsoluteServer
2138
            return SFTPAbsoluteServer
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
2139
        if typestring == "memory":
2140
            from bzrlib.transport.memory import MemoryServer
2141
            return MemoryServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
2142
        if typestring == "fakenfs":
1558.10.2 by Robert Collins
Refactor the FakeNFS support into a TransportDecorator.
2143
            from bzrlib.transport.fakenfs import FakeNFSServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
2144
            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.
2145
        msg = "No known transport type %s. Supported types are: sftp\n" %\
2146
            (typestring)
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2147
        raise errors.BzrCommandError(msg)
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.
2148
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2149
    hidden = True
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
2150
    takes_args = ['testspecs*']
1552 by Martin Pool
Improved help text for bzr selftest
2151
    takes_options = ['verbose',
1185.16.58 by mbp at sourcefrog
- run all selftests by default
2152
                     Option('one', help='stop when one test fails'),
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
2153
                     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.
2154
                            help='keep output directories when tests fail'),
2155
                     Option('transport', 
2156
                            help='Use a different transport by default '
2157
                                 'throughout the test suite.',
2158
                            type=get_transport_type),
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
2159
                     Option('benchmark', help='run the bzr bencharks.'),
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
2160
                     Option('lsprof-timed',
2161
                            help='generate lsprof output for benchmarked'
2162
                                 ' sections of code.'),
1908.2.4 by John Arbash Meinel
Add the ability to specify a benchmark cache directory.
2163
                     Option('cache-dir', type=str,
2164
                            help='a directory to cache intermediate'
2165
                                 ' benchmark steps'),
2172.4.3 by Alexander Belchenko
Change name of option to '--clean-output' and provide tests
2166
                     Option('clean-output',
2172.4.2 by Alexander Belchenko
Update NEWS and help for '--clean' option
2167
                            help='clean temporary tests directories'
2168
                                 ' without running tests'),
2213.2.1 by Martin Pool
Add selftest --first flag
2169
                     Option('first',
2170
                            help='run all tests, but run specified tests first',
2171
                            )
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
2172
                     ]
2204.3.4 by Alexander Belchenko
Command 'selftest' use 'replace' encoding_type to prevent sudden traceback
2173
    encoding_type = 'replace'
1185.16.58 by mbp at sourcefrog
- run all selftests by default
2174
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
2175
    def run(self, testspecs_list=None, verbose=None, one=False,
2176
            keep_output=False, transport=None, benchmark=None,
2213.2.1 by Martin Pool
Add selftest --first flag
2177
            lsprof_timed=None, cache_dir=None, clean_output=False,
2178
            first=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2179
        import bzrlib.ui
1707.2.2 by Robert Collins
Start on bench_add, an add benchtest.
2180
        from bzrlib.tests import selftest
2181
        import bzrlib.benchmarks as benchmarks
1908.2.16 by John Arbash Meinel
Move all the new TreeCreator classes into separate files.
2182
        from bzrlib.benchmarks import tree_creator
1908.2.4 by John Arbash Meinel
Add the ability to specify a benchmark cache directory.
2183
2172.4.3 by Alexander Belchenko
Change name of option to '--clean-output' and provide tests
2184
        if clean_output:
2185
            from bzrlib.tests import clean_selftest_output
2186
            clean_selftest_output()
2172.4.1 by Alexander Belchenko
'bzr selftest --clean' allows easily clean temporary tests directories
2187
            return 0
2188
1908.2.4 by John Arbash Meinel
Add the ability to specify a benchmark cache directory.
2189
        if cache_dir is not None:
1908.2.16 by John Arbash Meinel
Move all the new TreeCreator classes into separate files.
2190
            tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2191
        print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
2192
        print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
2193
        print
2095.4.1 by Martin Pool
Better progress bars during tests
2194
        if testspecs_list is not None:
2195
            pattern = '|'.join(testspecs_list)
2196
        else:
2197
            pattern = ".*"
2198
        if benchmark:
2199
            test_suite_factory = benchmarks.test_suite
2200
            if verbose is None:
2201
                verbose = True
2202
            # TODO: should possibly lock the history file...
2197.1.1 by Martin Pool
Use line buffering to write .perf_history
2203
            benchfile = open(".perf_history", "at", buffering=1)
2095.4.1 by Martin Pool
Better progress bars during tests
2204
        else:
2205
            test_suite_factory = None
2206
            if verbose is None:
2207
                verbose = False
2208
            benchfile = None
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2209
        try:
2095.4.1 by Martin Pool
Better progress bars during tests
2210
            result = selftest(verbose=verbose, 
2211
                              pattern=pattern,
2212
                              stop_on_failure=one, 
2213
                              keep_output=keep_output,
2214
                              transport=transport,
2215
                              test_suite_factory=test_suite_factory,
2216
                              lsprof_timed=lsprof_timed,
2213.2.1 by Martin Pool
Add selftest --first flag
2217
                              bench_history=benchfile,
2218
                              matching_tests_first=first,
2219
                              )
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2220
        finally:
2095.4.1 by Martin Pool
Better progress bars during tests
2221
            if benchfile is not None:
2222
                benchfile.close()
2223
        if result:
2224
            info('tests passed')
2225
        else:
2226
            info('tests failed')
2227
        return int(not result)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2228
2229
2230
class cmd_version(Command):
2231
    """Show version of bzr."""
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2232
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2233
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2234
    def run(self):
1819.1.8 by Martin Pool
Improved reporting of bzrlib revision_id
2235
        from bzrlib.version import show_version
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2236
        show_version()
2237
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2238
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2239
class cmd_rocks(Command):
2240
    """Statement of optimism."""
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2241
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2242
    hidden = True
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2243
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2244
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2245
    def run(self):
2246
        print "it sure does!"
2247
2248
2249
class cmd_find_merge_base(Command):
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2250
    """Find and print a base revision for merging two branches."""
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
2251
    # TODO: Options to specify revisions on either side, as if
2252
    #       merging only part of the history.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2253
    takes_args = ['branch', 'other']
2254
    hidden = True
2255
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2256
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2257
    def run(self, branch, other):
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
2258
        from bzrlib.revision import MultipleRevisionSources
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2259
        
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
2260
        branch1 = Branch.open_containing(branch)[0]
2261
        branch2 = Branch.open_containing(other)[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2262
1241 by Martin Pool
- rename last_patch to last_revision
2263
        last1 = branch1.last_revision()
2264
        last2 = branch2.last_revision()
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2265
1551.2.2 by Aaron Bentley
Fix find-merge-base for new API [recommit]
2266
        source = MultipleRevisionSources(branch1.repository, 
2267
                                         branch2.repository)
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2268
        
2269
        base_rev_id = common_ancestor(last1, last2, source)
2270
2271
        print 'merge base is revision %s' % base_rev_id
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2272
2273
2274
class cmd_merge(Command):
2275
    """Perform a three-way merge.
2276
    
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2277
    The branch is the branch you will merge from.  By default, it will merge
2278
    the latest revision.  If you specify a revision, that revision will be
2279
    merged.  If you specify two revisions, the first will be used as a BASE,
2280
    and the second one as OTHER.  Revision numbers are always relative to the
2281
    specified branch.
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2282
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
2283
    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
2284
    branch, automatically determining an appropriate base.  If this
2285
    fails, you may need to give an explicit base.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2286
    
1551.2.18 by Aaron Bentley
Updated docs to clarify conflict handling
2287
    Merge will do its best to combine the changes in two branches, but there
2288
    are some kinds of problems only a human can fix.  When it encounters those,
2289
    it will mark a conflict.  A conflict means that you need to fix something,
2290
    before you should commit.
2291
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
2292
    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
2293
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2294
    If there is no default branch set, the first merge will set it. After
2295
    that, you can omit the branch to use the default.  To change the
1785.1.4 by John Arbash Meinel
Update help for the new --remember semantics.
2296
    default, use --remember. The value will only be saved if the remote
2297
    location can be accessed.
1614.2.2 by Olaf Conradi
Merge command:
2298
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2299
    Examples:
2300
2301
    To merge the latest revision from bzr.dev
2302
    bzr merge ../bzr.dev
2303
2304
    To merge changes up to and including revision 82 from bzr.dev
2305
    bzr merge -r 82 ../bzr.dev
2306
2307
    To merge the changes introduced by 82, without previous changes:
2308
    bzr merge -r 81..82 ../bzr.dev
2309
    
2310
    merge refuses to run if there are any uncommitted changes, unless
2311
    --force is given.
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2312
2313
    The following merge types are available:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2314
    """
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2315
    takes_args = ['branch?']
1614.2.2 by Olaf Conradi
Merge command:
2316
    takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
1185.18.1 by Aaron Bentley
Added --show-base to merge
2317
                     Option('show-base', help="Show base revision text in "
2199.1.2 by John Arbash Meinel
Update documentation as per Martin's suggestion.
2318
                            "conflicts"),
1910.1.1 by Aaron Bentley
Merge takes --uncommitted parameter
2319
                     Option('uncommitted', help='Apply uncommitted changes'
2149.2.1 by Jan Hudec
Option --pull for merge command.
2320
                            ' from a working copy, instead of branch changes'),
2199.1.2 by John Arbash Meinel
Update documentation as per Martin's suggestion.
2321
                     Option('pull', help='If the destination is already'
2322
                             ' completely merged into the source, pull from the'
2323
                             ' source rather than merging. When this happens,'
2324
                             ' you do not need to commit the result.'),
2149.2.1 by Jan Hudec
Option --pull for merge command.
2325
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2326
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2327
    def help(self):
2328
        from inspect import getdoc
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
2329
        return getdoc(self) + '\n' + _mod_merge.merge_type_help()
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2330
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2331
    def run(self, branch=None, revision=None, force=False, merge_type=None,
1910.1.1 by Aaron Bentley
Merge takes --uncommitted parameter
2332
            show_base=False, reprocess=False, remember=False, 
2149.2.1 by Jan Hudec
Option --pull for merge command.
2333
            uncommitted=False, pull=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2334
        if merge_type is None:
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
2335
            merge_type = _mod_merge.Merge3Merger
1614.2.2 by Olaf Conradi
Merge command:
2336
2337
        tree = WorkingTree.open_containing(u'.')[0]
1551.11.9 by Aaron Bentley
Apply change reporting to merge
2338
        change_reporter = delta.ChangeReporter(tree.inventory)
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
2339
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2340
        if branch is not None:
2341
            try:
1773.4.3 by Martin Pool
[merge] bzr.dev
2342
                reader = bundle.read_bundle_from_url(branch)
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2343
            except errors.NotABundle:
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2344
                pass # Continue on considering this url a Branch
1185.82.25 by Aaron Bentley
Added changeset-merging functionality
2345
            else:
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2346
                conflicts = merge_bundle(reader, tree, not force, merge_type,
1551.11.9 by Aaron Bentley
Apply change reporting to merge
2347
                                         reprocess, show_base, change_reporter)
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2348
                if conflicts == 0:
2349
                    return 0
2350
                else:
2351
                    return 1
1185.82.25 by Aaron Bentley
Added changeset-merging functionality
2352
1907.4.10 by Matthieu Moy
Cut long lines, prevent "path" component from being used in revno:branch/path.
2353
        if revision is None \
2354
                or len(revision) < 1 or revision[0].needs_branch():
1907.4.1 by Matthieu Moy
Fixed merge to work nicely with -r revno:N:path
2355
            branch = self._get_remembered_parent(tree, branch, 'Merging from')
1614.2.6 by Olaf Conradi
Add testcase for --remember when merge fails. It should still remember
2356
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2357
        if revision is None or len(revision) < 1:
1910.1.1 by Aaron Bentley
Merge takes --uncommitted parameter
2358
            if uncommitted:
2359
                base = [branch, -1]
2360
                other = [branch, None]
2361
            else:
2362
                base = [None, None]
2363
                other = [branch, -1]
1645.1.1 by Aaron Bentley
Implement single-file merge
2364
            other_branch, path = Branch.open_containing(branch)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2365
        else:
1910.1.1 by Aaron Bentley
Merge takes --uncommitted parameter
2366
            if uncommitted:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2367
                raise errors.BzrCommandError('Cannot use --uncommitted and'
2368
                                             ' --revision at the same time.')
1907.4.1 by Matthieu Moy
Fixed merge to work nicely with -r revno:N:path
2369
            branch = revision[0].get_branch() or branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2370
            if len(revision) == 1:
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
2371
                base = [None, None]
1907.4.11 by Matthieu Moy
Canceled an incorrect "path = None".
2372
                other_branch, path = Branch.open_containing(branch)
1185.12.46 by Aaron Bentley
Fixed -r brokenness in merge
2373
                revno = revision[0].in_history(other_branch).revno
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2374
                other = [branch, revno]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2375
            else:
2376
                assert len(revision) == 2
2377
                if None in revision:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2378
                    raise errors.BzrCommandError(
1907.4.10 by Matthieu Moy
Cut long lines, prevent "path" component from being used in revno:branch/path.
2379
                        "Merge doesn't permit empty revision specifier.")
1907.4.12 by Matthieu Moy
Made merge work with two revisions in different branches.
2380
                base_branch, path = Branch.open_containing(branch)
2381
                branch1 = revision[1].get_branch() or branch
2382
                other_branch, path1 = Branch.open_containing(branch1)
2383
                if revision[0].get_branch() is not None:
2384
                    # then path was obtained from it, and is None.
2385
                    path = path1
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
2386
1907.4.12 by Matthieu Moy
Made merge work with two revisions in different branches.
2387
                base = [branch, revision[0].in_history(base_branch).revno]
2388
                other = [branch1, revision[1].in_history(other_branch).revno]
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
2389
2390
        if tree.branch.get_parent() is None or remember:
2391
            tree.branch.set_parent(other_branch.base)
2392
1645.1.1 by Aaron Bentley
Implement single-file merge
2393
        if path != "":
2394
            interesting_files = [path]
2395
        else:
2396
            interesting_files = None
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2397
        pb = ui.ui_factory.nested_progress_bar()
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2398
        try:
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2399
            try:
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
2400
                conflict_count = _merge_helper(
2401
                    other, base, check_clean=(not force),
2402
                    merge_type=merge_type,
2403
                    reprocess=reprocess,
2404
                    show_base=show_base,
2149.2.1 by Jan Hudec
Option --pull for merge command.
2405
                    pull=pull,
1551.11.9 by Aaron Bentley
Apply change reporting to merge
2406
                    pb=pb,
2407
                    file_list=interesting_files,
2408
                    change_reporter=change_reporter)
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2409
            finally:
2410
                pb.finished()
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
2411
            if conflict_count != 0:
2412
                return 1
2413
            else:
2414
                return 0
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2415
        except errors.AmbiguousBase, e:
1173 by Martin Pool
- message typo
2416
            m = ("sorry, bzr can't determine the right merge base yet\n"
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2417
                 "candidates are:\n  "
2418
                 + "\n  ".join(e.bases)
2419
                 + "\n"
2420
                 "please specify an explicit base with -r,\n"
2421
                 "and (if you want) report this to the bzr developers\n")
2422
            log_error(m)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2423
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2424
    # TODO: move up to common parent; this isn't merge-specific anymore. 
2425
    def _get_remembered_parent(self, tree, supplied_location, verb_string):
2426
        """Use tree.branch's parent if none was supplied.
2427
2428
        Report if the remembered location was used.
2429
        """
2430
        if supplied_location is not None:
2431
            return supplied_location
2432
        stored_location = tree.branch.get_parent()
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
2433
        mutter("%s", stored_location)
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2434
        if stored_location is None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2435
            raise errors.BzrCommandError("No location specified or remembered")
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2436
        display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2437
        self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2438
        return stored_location
2439
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2440
1185.35.4 by Aaron Bentley
Implemented remerge
2441
class cmd_remerge(Command):
2442
    """Redo a merge.
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2443
2444
    Use this if you want to try a different merge technique while resolving
2445
    conflicts.  Some merge techniques are better than others, and remerge 
2446
    lets you try different ones on different files.
2447
2448
    The options for remerge have the same meaning and defaults as the ones for
2449
    merge.  The difference is that remerge can (only) be run when there is a
2450
    pending merge, and it lets you specify particular files.
2451
2452
    Examples:
2453
    $ bzr remerge --show-base
2454
        Re-do the merge of all conflicted files, and show the base text in
2455
        conflict regions, in addition to the usual THIS and OTHER texts.
2456
2457
    $ bzr remerge --merge-type weave --reprocess foobar
2458
        Re-do the merge of "foobar", using the weave merge algorithm, with
2459
        additional processing to reduce the size of conflict regions.
2460
    
2461
    The following merge types are available:"""
1185.35.4 by Aaron Bentley
Implemented remerge
2462
    takes_args = ['file*']
2463
    takes_options = ['merge-type', 'reprocess',
2464
                     Option('show-base', help="Show base revision text in "
2465
                            "conflicts")]
2466
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2467
    def help(self):
2468
        from inspect import getdoc
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
2469
        return getdoc(self) + '\n' + _mod_merge.merge_type_help()
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2470
1185.35.4 by Aaron Bentley
Implemented remerge
2471
    def run(self, file_list=None, merge_type=None, show_base=False,
2472
            reprocess=False):
2473
        if merge_type is None:
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
2474
            merge_type = _mod_merge.Merge3Merger
1508.1.15 by Robert Collins
Merge from mpool.
2475
        tree, file_list = tree_files(file_list)
2476
        tree.lock_write()
1185.35.4 by Aaron Bentley
Implemented remerge
2477
        try:
1908.6.8 by Robert Collins
Remove remerges dependence on pending_merges, also makes it simpler.
2478
            parents = tree.get_parent_ids()
2479
            if len(parents) != 2:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2480
                raise errors.BzrCommandError("Sorry, remerge only works after normal"
2481
                                             " merges.  Not cherrypicking or"
2482
                                             " multi-merges.")
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2483
            repository = tree.branch.repository
1908.6.8 by Robert Collins
Remove remerges dependence on pending_merges, also makes it simpler.
2484
            base_revision = common_ancestor(parents[0],
2485
                                            parents[1], repository)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2486
            base_tree = repository.revision_tree(base_revision)
1908.6.8 by Robert Collins
Remove remerges dependence on pending_merges, also makes it simpler.
2487
            other_tree = repository.revision_tree(parents[1])
1185.35.4 by Aaron Bentley
Implemented remerge
2488
            interesting_ids = None
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2489
            new_conflicts = []
2490
            conflicts = tree.conflicts()
1185.35.4 by Aaron Bentley
Implemented remerge
2491
            if file_list is not None:
2492
                interesting_ids = set()
2493
                for filename in file_list:
1508.1.15 by Robert Collins
Merge from mpool.
2494
                    file_id = tree.path2id(filename)
1558.2.1 by Aaron Bentley
Ensure remerge errors when file-id is None
2495
                    if file_id is None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2496
                        raise errors.NotVersionedError(filename)
1185.35.4 by Aaron Bentley
Implemented remerge
2497
                    interesting_ids.add(file_id)
1508.1.15 by Robert Collins
Merge from mpool.
2498
                    if tree.kind(file_id) != "directory":
1185.35.4 by Aaron Bentley
Implemented remerge
2499
                        continue
1185.35.13 by Aaron Bentley
Merged Martin
2500
                    
1508.1.15 by Robert Collins
Merge from mpool.
2501
                    for name, ie in tree.inventory.iter_entries(file_id):
1185.35.4 by Aaron Bentley
Implemented remerge
2502
                        interesting_ids.add(ie.file_id)
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2503
                new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
2080.2.1 by John Arbash Meinel
Make 'bzr remerge' not use deprecated WorkingTree.iter_conflicts
2504
            else:
2080.2.3 by John Arbash Meinel
remerge only supports text or content conflicts
2505
                # Remerge only supports resolving contents conflicts
2506
                allowed_conflicts = ('text conflict', 'contents conflict')
2507
                restore_files = [c.path for c in conflicts
2508
                                 if c.typestring in allowed_conflicts]
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
2509
            _mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2510
            tree.set_conflicts(ConflictList(new_conflicts))
2080.2.1 by John Arbash Meinel
Make 'bzr remerge' not use deprecated WorkingTree.iter_conflicts
2511
            if file_list is not None:
1185.35.4 by Aaron Bentley
Implemented remerge
2512
                restore_files = file_list
2513
            for filename in restore_files:
2514
                try:
1508.1.15 by Robert Collins
Merge from mpool.
2515
                    restore(tree.abspath(filename))
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2516
                except errors.NotConflicted:
1185.35.4 by Aaron Bentley
Implemented remerge
2517
                    pass
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
2518
            conflicts = _mod_merge.merge_inner(
2519
                                      tree.branch, other_tree, base_tree,
2520
                                      this_tree=tree,
2521
                                      interesting_ids=interesting_ids,
2522
                                      other_rev_id=parents[1],
2523
                                      merge_type=merge_type,
2524
                                      show_base=show_base,
2525
                                      reprocess=reprocess)
1185.35.4 by Aaron Bentley
Implemented remerge
2526
        finally:
1508.1.15 by Robert Collins
Merge from mpool.
2527
            tree.unlock()
1185.35.4 by Aaron Bentley
Implemented remerge
2528
        if conflicts > 0:
2529
            return 1
2530
        else:
2531
            return 0
2532
2023.1.1 by ghigo
add topics help
2533
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2534
class cmd_revert(Command):
1551.8.27 by Aaron Bentley
Update docs again
2535
    """Revert files to a previous revision.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2536
1551.8.27 by Aaron Bentley
Update docs again
2537
    Giving a list of files will revert only those files.  Otherwise, all files
2538
    will be reverted.  If the revision is not specified with '--revision', the
2539
    last committed revision is used.
1551.8.26 by Aaron Bentley
Update revert help text
2540
2541
    To remove only some changes, without reverting to a prior version, use
2542
    merge instead.  For example, "merge . --r-2..-3" will remove the changes
2543
    introduced by -2, without affecting the changes introduced by -1.  Or
2544
    to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
2545
    
2546
    By default, any files that have been manually changed will be backed up
2547
    first.  (Files changed only by merge are not backed up.)  Backup files have
1551.8.27 by Aaron Bentley
Update docs again
2548
    '.~#~' appended to their name, where # is a number.
2549
2550
    When you provide files, you can use their current pathname or the pathname
2551
    from the target revision.  So you can use revert to "undelete" a file by
2552
    name.  If you name a directory, all the contents of that directory will be
2553
    reverted.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2554
    """
2555
    takes_options = ['revision', 'no-backup']
2556
    takes_args = ['file*']
2557
    aliases = ['merge-revert']
2558
2559
    def run(self, revision=None, no_backup=False, file_list=None):
2560
        if file_list is not None:
2561
            if len(file_list) == 0:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2562
                raise errors.BzrCommandError("No files specified")
1457.1.9 by Robert Collins
Change cmd_revert implementation to call workingtree.Revert.
2563
        else:
2564
            file_list = []
1185.50.53 by John Arbash Meinel
[patch] Aaron Bentley: make revert work in a subdirectory.
2565
        
2566
        tree, file_list = tree_files(file_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2567
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2568
            # FIXME should be tree.last_revision
1558.4.2 by Aaron Bentley
Revert in checkout works properly
2569
            rev_id = tree.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2570
        elif len(revision) != 1:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2571
            raise errors.BzrCommandError('bzr revert --revision takes exactly 1 argument')
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
2572
        else:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2573
            rev_id = revision[0].in_history(tree.branch).rev_id
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2574
        pb = ui.ui_factory.nested_progress_bar()
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2575
        try:
2576
            tree.revert(file_list, 
2577
                        tree.branch.repository.revision_tree(rev_id),
2225.1.1 by Aaron Bentley
Added revert change display, with tests
2578
                        not no_backup, pb, report_changes=True)
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2579
        finally:
2580
            pb.finished()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2581
2582
2583
class cmd_assert_fail(Command):
2584
    """Test reporting of assertion failures"""
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
2585
    # intended just for use in testing
2586
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2587
    hidden = True
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
2588
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2589
    def run(self):
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
2590
        raise AssertionError("always fails")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2591
2592
2593
class cmd_help(Command):
2594
    """Show help on a command or other topic.
2595
2023.1.1 by ghigo
add topics help
2596
    For a list of all available commands, say 'bzr help commands'.
2597
    """
1993.4.6 by John Arbash Meinel
Cleanup the cmd_help class
2598
    takes_options = [Option('long', 'show help on all commands')]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2599
    takes_args = ['topic?']
1616.1.15 by Martin Pool
Handle 'bzr ?', etc.
2600
    aliases = ['?', '--help', '-?', '-h']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2601
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2602
    @display_command
1993.4.6 by John Arbash Meinel
Cleanup the cmd_help class
2603
    def run(self, topic=None, long=False):
2023.1.1 by ghigo
add topics help
2604
        import bzrlib.help
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2605
        if topic is None and long:
2606
            topic = "commands"
2023.1.1 by ghigo
add topics help
2607
        bzrlib.help.help(topic)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2608
2609
2610
class cmd_shell_complete(Command):
2611
    """Show appropriate completions for context.
2612
2023.1.1 by ghigo
add topics help
2613
    For a list of all available commands, say 'bzr shell-complete'.
2614
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2615
    takes_args = ['context?']
2616
    aliases = ['s-c']
2617
    hidden = True
2618
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2619
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2620
    def run(self, context=None):
2621
        import shellcomplete
2622
        shellcomplete.shellcomplete(context)
2623
2624
1228 by Martin Pool
- add fetch command as builtin
2625
class cmd_fetch(Command):
2626
    """Copy in history from another branch but don't merge it.
2627
2023.1.1 by ghigo
add topics help
2628
    This is an internal method used for pull and merge.
2629
    """
1228 by Martin Pool
- add fetch command as builtin
2630
    hidden = True
2631
    takes_args = ['from_branch', 'to_branch']
2632
    def run(self, from_branch, to_branch):
2633
        from bzrlib.fetch import Fetcher
1185.16.100 by mbp at sourcefrog
Update fetch command for new Branch constructors.
2634
        from_b = Branch.open(from_branch)
2635
        to_b = Branch.open(to_branch)
1185.65.27 by Robert Collins
Tweak storage towards mergability.
2636
        Fetcher(to_b, from_b)
1228 by Martin Pool
- add fetch command as builtin
2637
2638
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2639
class cmd_missing(Command):
1185.54.3 by Aaron Bentley
Factored out find_unmerged
2640
    """Show unmerged/unpulled revisions between two branches.
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2641
2023.1.1 by ghigo
add topics help
2642
    OTHER_BRANCH may be local or remote.
2643
    """
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2644
    takes_args = ['other_branch?']
2645
    takes_options = [Option('reverse', 'Reverse the order of revisions'),
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2646
                     Option('mine-only', 
2647
                            'Display changes in the local branch only'),
2648
                     Option('theirs-only', 
2649
                            'Display changes in the remote branch only'), 
1553.2.3 by Erik Bågfors
cover the missing command with formatters as well
2650
                     'log-format',
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2651
                     'show-ids',
1185.54.19 by Aaron Bentley
All tests pass
2652
                     'verbose'
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2653
                     ]
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
2654
    encoding_type = 'replace'
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2655
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
2656
    @display_command
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2657
    def run(self, other_branch=None, reverse=False, mine_only=False,
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2658
            theirs_only=False, log_format=None, long=False, short=False, line=False, 
1185.54.19 by Aaron Bentley
All tests pass
2659
            show_ids=False, verbose=False):
2660
        from bzrlib.missing import find_unmerged, iter_log_data
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2661
        from bzrlib.log import log_formatter
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2662
        local_branch = Branch.open_containing(u".")[0]
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
2663
        parent = local_branch.get_parent()
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2664
        if other_branch is None:
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
2665
            other_branch = parent
2666
            if other_branch is None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2667
                raise errors.BzrCommandError("No peer location known or specified.")
2193.4.1 by Alexander Belchenko
'bzr missing' without specifying location show remembered location unescaped
2668
            display_url = urlutils.unescape_for_display(parent,
2669
                                                        self.outf.encoding)
2670
            print "Using last location: " + display_url
2671
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2672
        remote_branch = Branch.open(other_branch)
1551.2.46 by abentley
Made bzr missing . work on win32
2673
        if remote_branch.base == local_branch.base:
2674
            remote_branch = local_branch
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2675
        local_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2676
        try:
1551.2.46 by abentley
Made bzr missing . work on win32
2677
            remote_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2678
            try:
2679
                local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
2680
                if (log_format is None):
2221.4.10 by Aaron Bentley
Implement log options using RegistryOption
2681
                    log_format = log.log_formatter_registry.get_default(
2682
                        local_branch)
2683
                lf = log_format(to_file=self.outf,
2684
                                show_ids=show_ids,
2685
                                show_timezone='original')
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2686
                if reverse is False:
2687
                    local_extra.reverse()
2688
                    remote_extra.reverse()
2689
                if local_extra and not theirs_only:
2690
                    print "You have %d extra revision(s):" % len(local_extra)
2691
                    for data in iter_log_data(local_extra, local_branch.repository,
2692
                                              verbose):
2693
                        lf.show(*data)
2694
                    printed_local = True
2695
                else:
2696
                    printed_local = False
2697
                if remote_extra and not mine_only:
2698
                    if printed_local is True:
2699
                        print "\n\n"
2700
                    print "You are missing %d revision(s):" % len(remote_extra)
2701
                    for data in iter_log_data(remote_extra, remote_branch.repository, 
2702
                                              verbose):
2703
                        lf.show(*data)
2704
                if not remote_extra and not local_extra:
2705
                    status_code = 0
2706
                    print "Branches are up to date."
2707
                else:
2708
                    status_code = 1
2709
            finally:
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2710
                remote_branch.unlock()
2711
        finally:
2712
            local_branch.unlock()
2713
        if not status_code and parent is None and other_branch is not None:
2714
            local_branch.lock_write()
2715
            try:
2716
                # handle race conditions - a parent might be set while we run.
2717
                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
2718
                    local_branch.set_parent(remote_branch.base)
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2719
            finally:
2720
                local_branch.unlock()
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2721
        return status_code
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2722
2723
2724
class cmd_plugins(Command):
2725
    """List plugins"""
2726
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2727
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2728
    def run(self):
2729
        import bzrlib.plugin
2730
        from inspect import getdoc
1516 by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a
2731
        for name, plugin in bzrlib.plugin.all_plugins().items():
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
2732
            if getattr(plugin, '__path__', None) is not None:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2733
                print plugin.__path__[0]
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
2734
            elif getattr(plugin, '__file__', None) is not None:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2735
                print plugin.__file__
2736
            else:
1963.2.4 by Robey Pointer
remove usage of hasattr
2737
                print repr(plugin)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2738
                
2739
            d = getdoc(plugin)
2740
            if d:
2741
                print '\t', d.split('\n')[0]
2742
2743
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2744
class cmd_testament(Command):
2745
    """Show testament (signing-form) of a revision."""
1857.1.12 by Aaron Bentley
Fix a bunch of test cases that assumed --merge-type or log-format
2746
    takes_options = ['revision', 
2747
                     Option('long', help='Produce long-format testament'), 
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
2748
                     Option('strict', help='Produce a strict-format'
2749
                            ' testament')]
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2750
    takes_args = ['branch?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2751
    @display_command
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
2752
    def run(self, branch=u'.', revision=None, long=False, strict=False):
2753
        from bzrlib.testament import Testament, StrictTestament
2754
        if strict is True:
2755
            testament_class = StrictTestament
2756
        else:
2757
            testament_class = Testament
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2758
        b = WorkingTree.open_containing(branch)[0].branch
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2759
        b.lock_read()
2760
        try:
2761
            if revision is None:
2762
                rev_id = b.last_revision()
2763
            else:
2764
                rev_id = revision[0].in_history(b).rev_id
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
2765
            t = testament_class.from_revision(b.repository, rev_id)
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2766
            if long:
2767
                sys.stdout.writelines(t.as_text_lines())
2768
            else:
2769
                sys.stdout.write(t.as_short_text())
2770
        finally:
2771
            b.unlock()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2772
2773
2774
class cmd_annotate(Command):
2775
    """Show the origin of each line in a file.
2776
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2777
    This prints out the given file with an annotation on the left side
2778
    indicating which revision, author and date introduced the change.
2779
2780
    If the origin is the same for a run of consecutive lines, it is 
2781
    shown only at the top, unless the --all option is given.
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2782
    """
2783
    # 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
2784
    # TODO: if the working copy is modified, show annotations on that 
2785
    #       with new uncommitted lines marked
1733.2.8 by Michael Ellerman
Add CVS compatible aliases for checkout and annotate, from fullermd.
2786
    aliases = ['ann', 'blame', 'praise']
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2787
    takes_args = ['filename']
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2788
    takes_options = [Option('all', help='show annotations on all lines'),
2789
                     Option('long', help='show date in annotations'),
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
2790
                     'revision',
2791
                     'show-ids',
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2792
                     ]
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2793
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2794
    @display_command
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
2795
    def run(self, filename, all=False, long=False, revision=None,
2796
            show_ids=False):
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2797
        from bzrlib.annotate import annotate_file
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2798
        tree, relpath = WorkingTree.open_containing(filename)
2799
        branch = tree.branch
2800
        branch.lock_read()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2801
        try:
1694.2.6 by Martin Pool
[merge] bzr.dev
2802
            if revision is None:
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2803
                revision_id = branch.last_revision()
1694.2.6 by Martin Pool
[merge] bzr.dev
2804
            elif len(revision) != 1:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2805
                raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
1694.2.6 by Martin Pool
[merge] bzr.dev
2806
            else:
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2807
                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).
2808
            file_id = tree.inventory.path2id(relpath)
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2809
            tree = branch.repository.revision_tree(revision_id)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2810
            file_version = tree.inventory[file_id].revision
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
2811
            annotate_file(branch, file_version, file_id, long, all, sys.stdout,
2812
                          show_ids=show_ids)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2813
        finally:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2814
            branch.unlock()
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
2815
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2816
2817
class cmd_re_sign(Command):
2818
    """Create a digital signature for an existing revision."""
2819
    # TODO be able to replace existing ones.
2820
2821
    hidden = True # is this right ?
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2822
    takes_args = ['revision_id*']
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2823
    takes_options = ['revision']
2824
    
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2825
    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.
2826
        import bzrlib.gpg as gpg
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2827
        if revision_id_list is not None and revision is not None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2828
            raise errors.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
2829
        if revision_id_list is None and revision is None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2830
            raise errors.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)
2831
        b = WorkingTree.open_containing(u'.')[0].branch
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
2832
        gpg_strategy = gpg.GPGStrategy(b.get_config())
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2833
        if revision_id_list is not None:
2834
            for revision_id in revision_id_list:
2835
                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.
2836
        elif revision is not None:
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2837
            if len(revision) == 1:
2838
                revno, rev_id = revision[0].in_history(b)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2839
                b.repository.sign_revision(rev_id, gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2840
            elif len(revision) == 2:
2841
                # are they both on rh- if so we can walk between them
2842
                # might be nice to have a range helper for arbitrary
2843
                # revision paths. hmm.
2844
                from_revno, from_revid = revision[0].in_history(b)
2845
                to_revno, to_revid = revision[1].in_history(b)
2846
                if to_revid is None:
2847
                    to_revno = b.revno()
2848
                if from_revno is None or to_revno is None:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2849
                    raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2850
                for revno in range(from_revno, to_revno + 1):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2851
                    b.repository.sign_revision(b.get_rev_id(revno), 
2852
                                               gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2853
            else:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2854
                raise errors.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.
2855
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2856
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2857
class cmd_bind(Command):
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2858
    """Bind the current branch to a master branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2859
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2860
    After binding, commits must succeed on the master branch
2861
    before they are executed on the local one.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2862
    """
2863
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2864
    takes_args = ['location']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2865
    takes_options = []
2866
2867
    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
2868
        b, relpath = Branch.open_containing(u'.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2869
        b_other = Branch.open(location)
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2870
        try:
2871
            b.bind(b_other)
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2872
        except errors.DivergedBranches:
2873
            raise errors.BzrCommandError('These branches have diverged.'
2874
                                         ' Try merging, and then bind again.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2875
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2876
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2877
class cmd_unbind(Command):
1702.1.1 by Martin Pool
(patch) Fix for unbind help text (olaf)
2878
    """Unbind the current branch from its master branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2879
2880
    After unbinding, the local branch is considered independent.
1702.1.1 by Martin Pool
(patch) Fix for unbind help text (olaf)
2881
    All subsequent commits will be local.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2882
    """
2883
2884
    takes_args = []
2885
    takes_options = []
2886
2887
    def run(self):
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2888
        b, relpath = Branch.open_containing(u'.')
2889
        if not b.unbind():
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
2890
            raise errors.BzrCommandError('Local branch is not bound')
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2891
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2892
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2893
class cmd_uncommit(Command):
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2894
    """Remove the last committed revision.
2895
2896
    --verbose will print out what is being removed.
2897
    --dry-run will go through all the motions, but not actually
2898
    remove anything.
2899
    
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
2900
    In the future, uncommit will create a revision bundle, which can then
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2901
    be re-applied.
1553.5.34 by Martin Pool
Stub lock-breaking command
2902
    """
1185.62.11 by John Arbash Meinel
Added TODO for bzr uncommit to remove unreferenced information.
2903
1553.5.34 by Martin Pool
Stub lock-breaking command
2904
    # TODO: jam 20060108 Add an option to allow uncommit to remove
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
2905
    # unreferenced information in 'branch-as-repository' branches.
1553.5.34 by Martin Pool
Stub lock-breaking command
2906
    # TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2907
    # information in shared branches as well.
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
2908
    takes_options = ['verbose', 'revision',
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2909
                    Option('dry-run', help='Don\'t actually make changes'),
2910
                    Option('force', help='Say yes to all questions.')]
2911
    takes_args = ['location?']
2912
    aliases = []
2913
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
2914
    def run(self, location=None,
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2915
            dry_run=False, verbose=False,
2916
            revision=None, force=False):
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
2917
        from bzrlib.log import log_formatter, show_log
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2918
        import sys
2919
        from bzrlib.uncommit import uncommit
2920
2921
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2922
            location = u'.'
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2923
        control, relpath = bzrdir.BzrDir.open_containing(location)
2924
        try:
2925
            tree = control.open_workingtree()
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
2926
            b = tree.branch
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2927
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2928
            tree = None
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
2929
            b = control.open_branch()
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2930
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
2931
        rev_id = None
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2932
        if revision is None:
2933
            revno = b.revno()
2934
        else:
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
2935
            # 'bzr uncommit -r 10' actually means uncommit
2936
            # so that the final tree is at revno 10.
2937
            # but bzrlib.uncommit.uncommit() actually uncommits
2938
            # the revisions that are supplied.
2939
            # So we need to offset it by one
2940
            revno = revision[0].in_history(b).revno+1
2941
2942
        if revno <= b.revno():
2943
            rev_id = b.get_rev_id(revno)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2944
        if rev_id is None:
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
2945
            self.outf.write('No revisions to uncommit.\n')
2946
            return 1
2947
2948
        lf = log_formatter('short',
2949
                           to_file=self.outf,
2950
                           show_timezone='original')
2951
2952
        show_log(b,
2953
                 lf,
2954
                 verbose=False,
2955
                 direction='forward',
2956
                 start_revision=revno,
2957
                 end_revision=b.revno())
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2958
2959
        if dry_run:
2960
            print 'Dry-run, pretending to remove the above revisions.'
2961
            if not force:
2962
                val = raw_input('Press <enter> to continue')
2963
        else:
2964
            print 'The above revision(s) will be removed.'
2965
            if not force:
2966
                val = raw_input('Are you sure [y/N]? ')
2967
                if val.lower() not in ('y', 'yes'):
2968
                    print 'Canceled'
2969
                    return 0
2970
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2971
        uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2972
                revno=revno)
2973
2974
1553.5.34 by Martin Pool
Stub lock-breaking command
2975
class cmd_break_lock(Command):
2976
    """Break a dead lock on a repository, branch or working directory.
2977
1553.5.35 by Martin Pool
Start break-lock --show
2978
    CAUTION: Locks should only be broken when you are sure that the process
1553.5.34 by Martin Pool
Stub lock-breaking command
2979
    holding the lock has been stopped.
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2980
2981
    You can get information on what locks are open via the 'bzr info' command.
1553.5.35 by Martin Pool
Start break-lock --show
2982
    
2983
    example:
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2984
        bzr break-lock
1553.5.34 by Martin Pool
Stub lock-breaking command
2985
    """
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2986
    takes_args = ['location?']
2987
2988
    def run(self, location=None, show=False):
2989
        if location is None:
2990
            location = u'.'
2991
        control, relpath = bzrdir.BzrDir.open_containing(location)
1687.1.17 by Robert Collins
Test break lock on old format branches.
2992
        try:
2993
            control.break_lock()
2994
        except NotImplementedError:
2995
            pass
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2996
        
1553.5.35 by Martin Pool
Start break-lock --show
2997
1910.17.2 by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue
2998
class cmd_wait_until_signalled(Command):
2999
    """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
3000
3001
    This just prints a line to signal when it is ready, then blocks on stdin.
3002
    """
3003
3004
    hidden = True
3005
3006
    def run(self):
1910.17.6 by Andrew Bennetts
Use sys.stdout consistently, rather than mixed with print.
3007
        sys.stdout.write("running\n")
1910.17.2 by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue
3008
        sys.stdout.flush()
3009
        sys.stdin.readline()
3010
1553.5.35 by Martin Pool
Start break-lock --show
3011
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3012
class cmd_serve(Command):
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
3013
    """Run the bzr server."""
3014
3015
    aliases = ['server']
3016
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3017
    takes_options = [
3018
        Option('inet',
3019
               help='serve on stdin/out for use from inetd or sshd'),
3020
        Option('port',
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
3021
               help='listen for connections on nominated port of the form '
3022
                    '[hostname:]portnumber. Passing 0 as the port number will '
3023
                    'result in a dynamically allocated port.',
3024
               type=str),
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3025
        Option('directory',
3026
               help='serve contents of directory',
3027
               type=unicode),
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
3028
        Option('allow-writes',
3029
               help='By default the server is a readonly server. Supplying '
3030
                    '--allow-writes enables write access to the contents of '
3031
                    'the served directory and below. '
3032
                ),
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3033
        ]
3034
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
3035
    def run(self, port=None, inet=False, directory=None, allow_writes=False):
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3036
        from bzrlib.transport import smart
3037
        from bzrlib.transport import get_transport
3038
        if directory is None:
3039
            directory = os.getcwd()
2044.2.1 by Lukáš Lalinský
Use urlutils.local_path_to_url to get an URL from the directory path.
3040
        url = urlutils.local_path_to_url(directory)
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
3041
        if not allow_writes:
3042
            url = 'readonly+' + url
3043
        t = get_transport(url)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3044
        if inet:
2018.2.14 by Andrew Bennetts
Seperate SmartServer{Pipe,Socket}StreamMedium out of SmartServerStreamMedium. Use recv to make the socket server medium better.
3045
            server = smart.SmartServerPipeStreamMedium(sys.stdin, sys.stdout, t)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3046
        elif port is not None:
1910.19.7 by Andrew Bennetts
Allow specifying the host/interface to bzr serve, and use the new test
3047
            if ':' in port:
3048
                host, port = port.split(':')
3049
            else:
3050
                host = '127.0.0.1'
3051
            server = smart.SmartTCPServer(t, host=host, port=int(port))
3052
            print 'listening on port: ', server.port
3053
            sys.stdout.flush()
1910.19.8 by Andrew Bennetts
Give a sensible error if insufficient options are passed to 'bzr serve'.
3054
        else:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
3055
            raise errors.BzrCommandError("bzr serve requires one of --inet or --port")
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
3056
        server.serve()
3057
1553.5.35 by Martin Pool
Start break-lock --show
3058
3059
# command-line interpretation helper for merge-related commands
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
3060
def _merge_helper(other_revision, base_revision,
3061
                  check_clean=True, ignore_zero=False,
3062
                  this_dir=None, backup_files=False,
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
3063
                  merge_type=None,
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
3064
                  file_list=None, show_base=False, reprocess=False,
2149.2.1 by Jan Hudec
Option --pull for merge command.
3065
                  pull=False,
1551.11.9 by Aaron Bentley
Apply change reporting to merge
3066
                  pb=DummyProgress(),
3067
                  change_reporter=None):
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
3068
    """Merge changes into a tree.
3069
3070
    base_revision
3071
        list(path, revno) Base for three-way merge.  
3072
        If [None, None] then a base will be automatically determined.
3073
    other_revision
3074
        list(path, revno) Other revision for three-way merge.
3075
    this_dir
3076
        Directory to merge changes into; '.' by default.
3077
    check_clean
3078
        If true, this_dir must have no uncommitted changes before the
3079
        merge begins.
3080
    ignore_zero - If true, suppress the "zero conflicts" message when 
3081
        there are no conflicts; should be set when doing something we expect
3082
        to complete perfectly.
3083
    file_list - If supplied, merge only changes to selected files.
3084
3085
    All available ancestors of other_revision and base_revision are
3086
    automatically pulled into the branch.
3087
3088
    The revno may be -1 to indicate the last revision on the branch, which is
3089
    the typical case.
3090
3091
    This function is intended for use from the command line; programmatic
3092
    clients might prefer to call merge.merge_inner(), which has less magic 
3093
    behavior.
3094
    """
1996.3.7 by John Arbash Meinel
lazy import versionedfile, late-load bzrlib.merge
3095
    # Loading it late, so that we don't always have to import bzrlib.merge
3096
    if merge_type is None:
3097
        merge_type = _mod_merge.Merge3Merger
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
3098
    if this_dir is None:
3099
        this_dir = u'.'
1534.4.28 by Robert Collins
first cut at merge from integration.
3100
    this_tree = WorkingTree.open_containing(this_dir)[0]
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
3101
    if show_base and not merge_type is _mod_merge.Merge3Merger:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
3102
        raise errors.BzrCommandError("Show-base is not supported for this merge"
3103
                                     " type. %s" % merge_type)
1551.6.8 by Aaron Bentley
Implemented reprocess for weave
3104
    if reprocess and not merge_type.supports_reprocess:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
3105
        raise errors.BzrCommandError("Conflict reduction is not supported for merge"
3106
                                     " type %s." % merge_type)
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
3107
    if reprocess and show_base:
1996.3.34 by John Arbash Meinel
Update builtins to use errors.foo. Now errors can be avoided entirely for a bzr rocks run
3108
        raise errors.BzrCommandError("Cannot do conflict reduction and show base.")
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
3109
    try:
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
3110
        merger = _mod_merge.Merger(this_tree.branch, this_tree=this_tree,
1551.11.9 by Aaron Bentley
Apply change reporting to merge
3111
                                   pb=pb, change_reporter=change_reporter)
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
3112
        merger.pp = ProgressPhase("Merge phase", 5, pb)
3113
        merger.pp.next_phase()
3114
        merger.check_basis(check_clean)
3115
        merger.set_other(other_revision)
3116
        merger.pp.next_phase()
3117
        merger.set_base(base_revision)
3118
        if merger.base_rev_id == merger.other_rev_id:
3119
            note('Nothing to do.')
3120
            return 0
2149.2.1 by Jan Hudec
Option --pull for merge command.
3121
        if file_list is None:
3122
            if pull and merger.base_rev_id == merger.this_rev_id:
3123
                count = merger.this_tree.pull(merger.this_branch,
3124
                        False, merger.other_rev_id)
3125
                note('%d revision(s) pulled.' % (count,))
3126
                return 0
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
3127
        merger.backup_files = backup_files
3128
        merger.merge_type = merge_type 
3129
        merger.set_interesting_files(file_list)
3130
        merger.show_base = show_base 
3131
        merger.reprocess = reprocess
3132
        conflicts = merger.do_merge()
1645.1.1 by Aaron Bentley
Implement single-file merge
3133
        if file_list is None:
3134
            merger.set_pending()
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
3135
    finally:
3136
        pb.clear()
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
3137
    return conflicts
3138
3139
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
3140
# Compatibility
3141
merge = _merge_helper
3142
3143
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
3144
# these get imported and then picked up by the scan for cmd_*
3145
# TODO: Some more consistent way to split command definitions across files;
3146
# 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'.
3147
# aliases.  ideally we would avoid loading the implementation until the
3148
# details were needed.
2022.1.2 by John Arbash Meinel
rename version_info => cmd_version_info
3149
from bzrlib.cmd_version_info import cmd_version_info
1185.35.4 by Aaron Bentley
Implemented remerge
3150
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
3151
from bzrlib.bundle.commands import cmd_bundle_revisions
1185.78.6 by John Arbash Meinel
Adding sign-my-commits as a builtin, along with some simple tests.
3152
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
3153
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
3154
        cmd_weave_plan_merge, cmd_weave_merge_text