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