/brz/remove-bazaar

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