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