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