/brz/remove-bazaar

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