/brz/remove-bazaar

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