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