~bzr-pqm/bzr/bzr.dev

6466.2.2 by Jelmer Vernooij
Review feedback from mgz.
1
# Copyright (C) 2005-2012 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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
16
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
17
"""builtin bzr commands"""
18
6379.6.1 by Jelmer Vernooij
Import absolute_import in a few places.
19
from __future__ import absolute_import
20
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
21
import os
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
22
6207.3.11 by Jelmer Vernooij
Make sure bzrlib.bzrdir is imported.
23
import bzrlib.bzrdir
24
6111.3.3 by Martin von Gagern
Document the call to disallow_proxying in cmd_selftest.
25
from bzrlib import lazy_import
26
lazy_import.lazy_import(globals(), """
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
27
import cStringIO
6357.1.2 by Martin Packman
Don't complain on mkdir -p if a directory exists
28
import errno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
29
import sys
1551.12.8 by Aaron Bentley
Add merge-directive command
30
import time
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
31
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
32
import bzrlib
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
33
from bzrlib import (
2376.4.22 by Jonathan Lange
Variety of whitespace cleanups, tightening of tests and docstring changes in
34
    bugtracker,
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
35
    bundle,
3770.1.2 by John Arbash Meinel
Add a --raw output for dump-btree.
36
    btree_index,
6207.3.3 by jelmer at samba
Fix tests and the like.
37
    controldir,
4879.2.1 by Neil Martinsen-Burrell
switch should use directory services when creating a branch
38
    directory_service,
2225.1.1 by Aaron Bentley
Added revert change display, with tests
39
    delta,
5345.5.9 by Vincent Ladeuil
Implements 'bzr lock --config <file>'.
40
    config as _mod_config,
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
41
    errors,
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
42
    globbing,
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
43
    hooks,
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
44
    log,
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
45
    merge as _mod_merge,
1551.12.8 by Aaron Bentley
Add merge-directive command
46
    merge_directive,
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
47
    osutils,
2796.2.5 by Aaron Bentley
Implement reconfigure command
48
    reconfigure,
3193.8.18 by Aaron Bentley
Move all rename-guessing into RenameMap
49
    rename_map,
2598.5.1 by Aaron Bentley
Start eliminating the use of None to indicate null revision
50
    revision as _mod_revision,
4789.28.3 by John Arbash Meinel
Add a static_tuple.as_tuples() helper.
51
    static_tuple,
4766.2.1 by Alexander Sack
add --commit-time Option to built-in 'commit' command (LP: #459276)
52
    timestamp,
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
53
    transport,
54
    ui,
55
    urlutils,
3586.1.20 by Ian Clatworthy
centralise formatting of view file lists
56
    views,
5971.1.60 by Jonathan Riddell
move checking for gpgme availability into gpg.py
57
    gpg,
1836.1.26 by John Arbash Meinel
[merge] bzr.dev 1869
58
    )
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
59
from bzrlib.branch import Branch
2120.7.2 by Aaron Bentley
Move autoresolve functionality to workingtree
60
from bzrlib.conflicts import ConflictList
5017.3.45 by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry.
61
from bzrlib.transport import memory
3936.3.40 by Ian Clatworthy
review feedback from jam
62
from bzrlib.revisionspec import RevisionSpec, RevisionInfo
2535.2.1 by Adeodato Simó
New SMTPConnection class, a reduced version of that in bzr-email.
63
from bzrlib.smtp_connection import SMTPConnection
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
64
from bzrlib.workingtree import WorkingTree
6143.1.1 by Jonathan Riddell
use ngettext for plurals
65
from bzrlib.i18n import gettext, ngettext
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
66
""")
67
5127.1.1 by Martin Pool
version-info is lazily loaded
68
from bzrlib.commands import (
69
    Command,
70
    builtin_command_registry,
71
    display_command,
72
    )
3921.3.9 by Marius Kruger
* add some blackbox tests and another whitebox test
73
from bzrlib.option import (
74
    ListOption,
75
    Option,
76
    RegistryOption,
77
    custom_help,
78
    _parse_revision_str,
79
    )
3874.1.4 by Vincent Ladeuil
Fixed as per Aarons' comment.
80
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
5904.1.1 by Martin Pool
Pyflakes-driven cleanups
81
from bzrlib import (
82
    symbol_versioning,
83
    )
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
84
85
6437.21.6 by Jelmer Vernooij
Fix remaining switch tests.
86
def _get_branch_location(control_dir, possible_transports=None):
6436.2.1 by Jelmer Vernooij
Add methods for looking up sibling branches.
87
    """Return location of branch for this control dir."""
88
    try:
6466.2.1 by Jelmer Vernooij
List sibling branches in ``bzr branches``.
89
        target = control_dir.get_branch_reference()
6436.2.1 by Jelmer Vernooij
Add methods for looking up sibling branches.
90
    except errors.NotBranchError:
6466.2.1 by Jelmer Vernooij
List sibling branches in ``bzr branches``.
91
        return control_dir.root_transport.base
92
    if target is not None:
93
        return target
94
    this_branch = control_dir.open_branch(
95
        possible_transports=possible_transports)
96
    # This may be a heavy checkout, where we want the master branch
97
    master_location = this_branch.get_bound_location()
98
    if master_location is not None:
99
        return master_location
100
    # If not, use a local sibling
101
    return this_branch.base
6436.2.1 by Jelmer Vernooij
Add methods for looking up sibling branches.
102
103
6437.21.6 by Jelmer Vernooij
Fix remaining switch tests.
104
def _is_colocated(control_dir, possible_transports=None):
105
    """Check if the branch in control_dir is colocated.
106
107
    :param control_dir: Control directory
6466.2.4 by Jelmer Vernooij
More doc tweaks; thanks mgz.
108
    :return: Tuple with boolean indicating whether the branch is colocated
6466.2.1 by Jelmer Vernooij
List sibling branches in ``bzr branches``.
109
        and the full URL to the actual branch
6437.21.6 by Jelmer Vernooij
Fix remaining switch tests.
110
    """
111
    # This path is meant to be relative to the existing branch
112
    this_url = _get_branch_location(control_dir,
113
        possible_transports=possible_transports)
114
    # Perhaps the target control dir supports colocated branches?
115
    try:
116
        root = controldir.ControlDir.open(this_url,
117
            possible_transports=possible_transports)
118
    except errors.NotBranchError:
119
        return (False, this_url)
120
    else:
121
        try:
122
            wt = control_dir.open_workingtree()
123
        except (errors.NoWorkingTree, errors.NotLocalUrl):
124
            return (False, this_url)
125
        else:
126
            return (
127
                root._format.colocated_branches and
128
                control_dir.control_url == root.control_url,
129
                this_url)
130
131
132
def lookup_new_sibling_branch(control_dir, location, possible_transports=None):
6436.2.2 by Jelmer Vernooij
Better name.
133
    """Lookup the location for a new sibling branch.
134
6466.2.4 by Jelmer Vernooij
More doc tweaks; thanks mgz.
135
    :param control_dir: Control directory to find sibling branches from
6436.2.2 by Jelmer Vernooij
Better name.
136
    :param location: Name of the new branch
137
    :return: Full location to the new branch
138
    """
6436.2.1 by Jelmer Vernooij
Add methods for looking up sibling branches.
139
    location = directory_service.directories.dereference(location)
140
    if '/' not in location and '\\' not in location:
6437.21.6 by Jelmer Vernooij
Fix remaining switch tests.
141
        (colocated, this_url) = _is_colocated(control_dir, possible_transports)
6436.2.1 by Jelmer Vernooij
Add methods for looking up sibling branches.
142
143
        if colocated:
144
            return urlutils.join_segment_parameters(this_url,
145
                {"branch": urlutils.escape(location)})
146
        else:
147
            return urlutils.join(this_url, '..', urlutils.escape(location))
148
    return location
149
150
6437.40.1 by Jelmer Vernooij
Support colocated branches in 'bzr rmbranch'.
151
def open_sibling_branch(control_dir, location, possible_transports=None):
6466.2.3 by Jelmer Vernooij
merge bzr.dev.
152
    """Open a branch, possibly a sibling of another.
6466.2.1 by Jelmer Vernooij
List sibling branches in ``bzr branches``.
153
6436.2.2 by Jelmer Vernooij
Better name.
154
    :param control_dir: Control directory relative to which to lookup the
155
        location.
156
    :param location: Location to look up
157
    :return: branch to open
158
    """
6436.2.1 by Jelmer Vernooij
Add methods for looking up sibling branches.
159
    try:
6436.2.2 by Jelmer Vernooij
Better name.
160
        # Perhaps it's a colocated branch?
6437.21.6 by Jelmer Vernooij
Fix remaining switch tests.
161
        return control_dir.open_branch(location, 
162
            possible_transports=possible_transports)
6436.2.1 by Jelmer Vernooij
Add methods for looking up sibling branches.
163
    except (errors.NotBranchError, errors.NoColocatedBranchSupport):
6437.40.1 by Jelmer Vernooij
Support colocated branches in 'bzr rmbranch'.
164
        this_url = _get_branch_location(control_dir)
165
        return Branch.open(
166
            urlutils.join(
167
                this_url, '..', urlutils.escape(location)))
168
169
170
def open_nearby_branch(near=None, location=None, possible_transports=None):
171
    """Open a nearby branch.
172
173
    :param near: Optional location of container from which to open branch
174
    :param location: Location of the branch
175
    :return: Branch instance
176
    """
177
    if near is None:
178
        if location is None:
179
            location = "."
6436.2.1 by Jelmer Vernooij
Add methods for looking up sibling branches.
180
        try:
6437.40.1 by Jelmer Vernooij
Support colocated branches in 'bzr rmbranch'.
181
            return Branch.open(location,
182
                possible_transports=possible_transports)
6436.2.1 by Jelmer Vernooij
Add methods for looking up sibling branches.
183
        except errors.NotBranchError:
6437.40.1 by Jelmer Vernooij
Support colocated branches in 'bzr rmbranch'.
184
            near = "."
185
    cdir = controldir.ControlDir.open(near,
186
        possible_transports=possible_transports)
187
    return open_sibling_branch(cdir, location,
188
        possible_transports=possible_transports)
6436.2.1 by Jelmer Vernooij
Add methods for looking up sibling branches.
189
190
6466.2.1 by Jelmer Vernooij
List sibling branches in ``bzr branches``.
191
def iter_sibling_branches(control_dir, possible_transports=None):
192
    """Iterate over the siblings of a branch.
193
6466.2.2 by Jelmer Vernooij
Review feedback from mgz.
194
    :param control_dir: Control directory for which to look up the siblings
6466.2.1 by Jelmer Vernooij
List sibling branches in ``bzr branches``.
195
    :return: Iterator over tuples with branch name and branch object
196
    """
197
    seen_urls = set()
198
    try:
199
        reference = control_dir.get_branch_reference()
200
    except errors.NotBranchError:
201
        # There is no active branch, just return the colocated branches.
202
        for name, branch in control_dir.get_branches().iteritems():
203
            yield name, branch
204
        return
205
    if reference is not None:
6466.2.2 by Jelmer Vernooij
Review feedback from mgz.
206
        ref_branch = Branch.open(reference,
207
            possible_transports=possible_transports)
6466.2.1 by Jelmer Vernooij
List sibling branches in ``bzr branches``.
208
    else:
209
        ref_branch = None
210
    if ref_branch is None or ref_branch.name:
211
        if ref_branch is not None:
212
            control_dir = ref_branch.bzrdir
213
        for name, branch in control_dir.get_branches().iteritems():
214
            yield name, branch
215
    else:
216
        repo = ref_branch.bzrdir.find_repository()
217
        for branch in repo.find_branches(using=True):
6466.2.2 by Jelmer Vernooij
Review feedback from mgz.
218
            name = urlutils.relative_url(repo.user_url,
219
                branch.user_url).rstrip("/")
6466.2.1 by Jelmer Vernooij
List sibling branches in ``bzr branches``.
220
            yield name, branch
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
221
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
222
3586.1.34 by Ian Clatworthy
fix tree/path handling for add
223
def tree_files_for_add(file_list):
4301.2.2 by Aaron Bentley
Update style
224
    """
225
    Return a tree and list of absolute paths from a file list.
226
227
    Similar to tree_files, but add handles files a bit differently, so it a
228
    custom implementation.  In particular, MutableTreeTree.smart_add expects
229
    absolute paths, which it immediately converts to relative paths.
230
    """
231
    # FIXME Would be nice to just return the relative paths like
232
    # internal_tree_files does, but there are a large number of unit tests
233
    # that assume the current interface to mutabletree.smart_add
3586.1.34 by Ian Clatworthy
fix tree/path handling for add
234
    if file_list:
4301.1.1 by Geoff Bache
Fixing bug 183831, where 'bzr add' fails with a python stack if the path contains a symbolic link
235
        tree, relpath = WorkingTree.open_containing(file_list[0])
4301.2.5 by Aaron Bentley
Move file_list updates after view_files check.
236
        if tree.supports_views():
237
            view_files = tree.views.lookup_view()
238
            if view_files:
239
                for filename in file_list:
240
                    if not osutils.is_inside_any(view_files, filename):
241
                        raise errors.FileOutsideView(filename, view_files)
4301.2.4 by Aaron Bentley
Further cleanups
242
        file_list = file_list[:]
4301.2.3 by Aaron Bentley
Clean up tree_add_files
243
        file_list[0] = tree.abspath(relpath)
3586.1.34 by Ian Clatworthy
fix tree/path handling for add
244
    else:
245
        tree = WorkingTree.open_containing(u'.')[0]
246
        if tree.supports_views():
247
            view_files = tree.views.lookup_view()
248
            if view_files:
249
                file_list = view_files
250
                view_str = views.view_display_str(view_files)
6138.2.2 by Jonathan Riddell
gettext builtin.py's note() usage
251
                note(gettext("Ignoring files outside view. View is %s") % view_str)
4301.2.3 by Aaron Bentley
Clean up tree_add_files
252
    return tree, file_list
3586.1.34 by Ian Clatworthy
fix tree/path handling for add
253
254
3984.3.5 by Daniel Watkins
Changed from option type to helper function.
255
def _get_one_revision(command_name, revisions):
256
    if revisions is None:
257
        return None
258
    if len(revisions) != 1:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
259
        raise errors.BzrCommandError(gettext(
260
            'bzr %s --revision takes exactly one revision identifier') % (
3984.3.5 by Daniel Watkins
Changed from option type to helper function.
261
                command_name,))
262
    return revisions[0]
263
264
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
265
def _get_one_revision_tree(command_name, revisions, branch=None, tree=None):
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
266
    """Get a revision tree. Not suitable for commands that change the tree.
267
    
268
    Specifically, the basis tree in dirstate trees is coupled to the dirstate
269
    and doing a commit/uncommit/pull will at best fail due to changing the
270
    basis revision data.
271
272
    If tree is passed in, it should be already locked, for lifetime management
273
    of the trees internal cached state.
274
    """
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
275
    if branch is None:
276
        branch = tree.branch
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
277
    if revisions is None:
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
278
        if tree is not None:
279
            rev_tree = tree.basis_tree()
280
        else:
281
            rev_tree = branch.basis_tree()
282
    else:
3984.3.5 by Daniel Watkins
Changed from option type to helper function.
283
        revision = _get_one_revision(command_name, revisions)
284
        rev_tree = revision.as_tree(branch)
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
285
    return rev_tree
286
287
3586.1.31 by Ian Clatworthy
view filtering for pull, update & merge
288
def _get_view_info_for_change_reporter(tree):
289
    """Get the view information from a tree for change reporting."""
290
    view_info = None
291
    try:
292
        current_view = tree.views.get_view_info()[0]
293
        if current_view is not None:
294
            view_info = (current_view, tree.views.lookup_view())
295
    except errors.ViewsNotSupported:
296
        pass
297
    return view_info
298
299
5171.3.9 by Martin von Gagern
Rename function to _open_directory_or_containing_tree_or_branch.
300
def _open_directory_or_containing_tree_or_branch(filename, directory):
5171.3.3 by Martin von Gagern
Add --directory option to ls, cat and annotate.
301
    """Open the tree or branch containing the specified file, unless
302
    the --directory option is used to specify a different branch."""
303
    if directory is not None:
304
        return (None, Branch.open(directory), filename)
6207.3.3 by jelmer at samba
Fix tests and the like.
305
    return controldir.ControlDir.open_containing_tree_or_branch(filename)
5171.3.3 by Martin von Gagern
Add --directory option to ls, cat and annotate.
306
307
1185.16.112 by mbp at sourcefrog
todo
308
# TODO: Make sure no commands unconditionally use the working directory as a
309
# branch.  If a filename argument is used, the first of them should be used to
310
# specify the branch.  (Perhaps this can be factored out into some kind of
311
# Argument class, representing a file in a branch, where the first occurrence
312
# opens the branch?)
313
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
314
class cmd_status(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
315
    __doc__ = """Display status summary.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
316
317
    This reports on versioned and unknown files, reporting them
318
    grouped by state.  Possible states are:
319
1551.10.10 by Aaron Bentley
Add help text
320
    added
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
321
        Versioned in the working copy but not in the previous revision.
322
1551.10.10 by Aaron Bentley
Add help text
323
    removed
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
324
        Versioned in the previous revision but removed or deleted
325
        in the working copy.
326
1551.10.10 by Aaron Bentley
Add help text
327
    renamed
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
328
        Path of this file changed from the previous revision;
329
        the text may also have changed.  This includes files whose
330
        parent directory was renamed.
331
1551.10.10 by Aaron Bentley
Add help text
332
    modified
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
333
        Text has changed since the previous revision.
334
1551.10.10 by Aaron Bentley
Add help text
335
    kind changed
336
        File kind has been changed (e.g. from file to directory).
337
338
    unknown
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
339
        Not versioned and not matching an ignore pattern.
340
5945.2.1 by Martin von Gagern
Make kind markers optional.
341
    Additionally for directories, symlinks and files with a changed
342
    executable bit, Bazaar indicates their type using a trailing
343
    character: '/', '@' or '*' respectively. These decorations can be
5945.2.2 by Martin von Gagern
Change from no_decorate to classify as name for the argument.
344
    disabled using the '--no-classify' option.
4798.5.2 by Neil Martinsen-Burrell
Put discussion of type indicators in the appropriate place under status
345
2374.1.1 by Ian Clatworthy
Help and man page fixes
346
    To see ignored files use 'bzr ignored'.  For details on the
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
347
    changes to file texts, use 'bzr diff'.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
348
2792.1.1 by Ian Clatworthy
Add short options to status to assist migrating svn users (Daniel Watkins)
349
    Note that --short or -S gives status flags for each item, similar
350
    to Subversion's status command. To get output similar to svn -q,
4798.5.2 by Neil Martinsen-Burrell
Put discussion of type indicators in the appropriate place under status
351
    use bzr status -SV.
1551.10.10 by Aaron Bentley
Add help text
352
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
353
    If no arguments are specified, the status of the entire working
354
    directory is shown.  Otherwise, only the status of the specified
355
    files or directories is reported.  If a directory is given, status
356
    is reported for everything inside that directory.
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
357
3936.2.2 by Ian Clatworthy
add NEWS item & improve status help
358
    Before merges are committed, the pending merge tip revisions are
359
    shown. To see all pending merge revisions, use the -v option.
360
    To skip the display of pending merge information altogether, use
361
    the no-pending option or specify a file/directory.
362
5432.7.2 by John C Barstow
Rewrite docs for bzr st revision argument
363
    To compare the working directory to a specific revision, pass a
364
    single revision to the revision argument.
365
5432.7.1 by John C Barstow
Clarify the usage of the revision argument for 'bzr st'
366
    To see which files have changed in a specific revision, or between
5432.7.2 by John C Barstow
Rewrite docs for bzr st revision argument
367
    two revisions, pass a revision range to the revision argument.
368
    This will produce the same results as calling 'bzr diff --summarize'.
1185.3.2 by Martin Pool
- remove -r option from status command because it's not used
369
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
370
6478.1.1 by Jelmer Vernooij
Add short option '-N' for '--no-recurse'.
371
    # TODO: --no-recurse/-N, --recurse options
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
372
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
373
    takes_args = ['file*']
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
374
    takes_options = ['show-ids', 'revision', 'change', 'verbose',
2792.1.1 by Ian Clatworthy
Add short options to status to assist migrating svn users (Daniel Watkins)
375
                     Option('short', help='Use short status indicators.',
2663.1.7 by Daniel Watkins
Capitalised short names.
376
                            short_name='S'),
2663.1.5 by Daniel Watkins
Changed 'bzr stat --quiet' to 'bzr stat -(vs|sv)', as per list suggestions.
377
                     Option('versioned', help='Only show versioned files.',
3270.6.1 by James Westby
Add --no-pending to status to not show the pending merges. (#202830)
378
                            short_name='V'),
379
                     Option('no-pending', help='Don\'t show pending merges.',
380
                           ),
5945.2.2 by Martin von Gagern
Change from no_decorate to classify as name for the argument.
381
                     Option('no-classify',
382
                            help='Do not mark object type using indicator.',
5945.2.1 by Martin von Gagern
Make kind markers optional.
383
                           ),
2663.1.5 by Daniel Watkins
Changed 'bzr stat --quiet' to 'bzr stat -(vs|sv)', as per list suggestions.
384
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
385
    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()
386
387
    encoding_type = 'replace'
2520.1.3 by Daniel Watkins
'help status' now points to 'help status-flags'.
388
    _see_also = ['diff', 'revert', 'status-flags']
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
389
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
390
    @display_command
2318.2.1 by Kent Gibson
Apply status versioned patch
391
    def run(self, show_ids=False, file_list=None, revision=None, short=False,
5945.2.1 by Martin von Gagern
Make kind markers optional.
392
            versioned=False, no_pending=False, verbose=False,
5945.2.2 by Martin von Gagern
Change from no_decorate to classify as name for the argument.
393
            no_classify=False):
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
394
        from bzrlib.status import show_tree_status
1185.85.15 by John Arbash Meinel
Updated bzr status, adding test_cat
395
2745.4.2 by Lukáš Lalinsky
Allow options to be stored in attributes that differ from their 'name' and use this to let '--change' and '--revision' to override each other.
396
        if revision and len(revision) > 2:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
397
            raise errors.BzrCommandError(gettext('bzr status --revision takes exactly'
398
                                         ' one or two revision specifiers'))
2745.4.1 by Lukáš Lalinsky
New option -C/--change for diff and status to show changes in one revision. (#56299)
399
5346.4.5 by Martin Pool
Deprecate and avoid internal_tree_files and tree_files.
400
        tree, relfile_list = WorkingTree.open_containing_paths(file_list)
3636.1.1 by Robert Collins
Stop passing specific_file lists to show_tree_status when the specific
401
        # Avoid asking for specific files when that is not needed.
402
        if relfile_list == ['']:
403
            relfile_list = None
404
            # Don't disable pending merges for full trees other than '.'.
405
            if file_list == ['.']:
406
                no_pending = True
407
        # A specific path within a tree was given.
408
        elif relfile_list is not None:
409
            no_pending = True
1773.1.2 by Robert Collins
Remove --all option from status.
410
        show_tree_status(tree, show_ids=show_ids,
3636.1.1 by Robert Collins
Stop passing specific_file lists to show_tree_status when the specific
411
                         specific_files=relfile_list, revision=revision,
3270.6.1 by James Westby
Add --no-pending to status to not show the pending merges. (#202830)
412
                         to_file=self.outf, short=short, versioned=versioned,
5945.2.1 by Martin von Gagern
Make kind markers optional.
413
                         show_pending=(not no_pending), verbose=verbose,
5945.2.2 by Martin von Gagern
Change from no_decorate to classify as name for the argument.
414
                         classify=not no_classify)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
415
416
417
class cmd_cat_revision(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
418
    __doc__ = """Write out metadata for a revision.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
419
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
420
    The revision to print can either be specified by a specific
421
    revision identifier, or you can use --revision.
422
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
423
424
    hidden = True
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
425
    takes_args = ['revision_id?']
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
426
    takes_options = ['directory', 'revision']
1685.1.76 by Wouter van Heyst
codecleanup
427
    # cat-revision is more for frontends so should be exact
428
    encoding = 'strict'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
429
5035.2.1 by Jelmer Vernooij
Repository.get_revision_xml() has been removed.
430
    def print_revision(self, revisions, revid):
431
        stream = revisions.get_record_stream([(revid,)], 'unordered', True)
432
        record = stream.next()
433
        if record.storage_kind == 'absent':
434
            raise errors.NoSuchRevision(revisions, revid)
435
        revtext = record.get_bytes_as('fulltext')
436
        self.outf.write(revtext.decode('utf-8'))
437
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
438
    @display_command
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
439
    def run(self, revision_id=None, revision=None, directory=u'.'):
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
440
        if revision_id is not None and revision is not None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
441
            raise errors.BzrCommandError(gettext('You can only supply one of'
442
                                         ' revision_id or --revision'))
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
443
        if revision_id is None and revision is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
444
            raise errors.BzrCommandError(gettext('You must supply either'
445
                                         ' --revision or a revision_id'))
5616.4.1 by Jelmer Vernooij
'bzr cat-revision' no longer requires a working tree.
446
6207.3.3 by jelmer at samba
Fix tests and the like.
447
        b = controldir.ControlDir.open_containing_tree_or_branch(directory)[1]
1185.85.72 by John Arbash Meinel
Fix some of the tests.
448
5035.2.1 by Jelmer Vernooij
Repository.get_revision_xml() has been removed.
449
        revisions = b.repository.revisions
450
        if revisions is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
451
            raise errors.BzrCommandError(gettext('Repository %r does not support '
452
                'access to raw revision texts'))
3770.1.1 by John Arbash Meinel
First draft of a basic dump-btree command.
453
5035.2.1 by Jelmer Vernooij
Repository.get_revision_xml() has been removed.
454
        b.repository.lock_read()
455
        try:
456
            # TODO: jam 20060112 should cat-revision always output utf-8?
457
            if revision_id is not None:
458
                revision_id = osutils.safe_revision_id(revision_id, warn=False)
459
                try:
460
                    self.print_revision(revisions, revision_id)
461
                except errors.NoSuchRevision:
6138.2.4 by Jonathan Riddell
use format strings where there are multiple substitutions to allow for translations
462
                    msg = gettext("The repository {0} contains no revision {1}.").format(
5035.2.1 by Jelmer Vernooij
Repository.get_revision_xml() has been removed.
463
                        b.repository.base, revision_id)
464
                    raise errors.BzrCommandError(msg)
465
            elif revision is not None:
466
                for rev in revision:
467
                    if rev is None:
468
                        raise errors.BzrCommandError(
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
469
                            gettext('You cannot specify a NULL revision.'))
5035.2.1 by Jelmer Vernooij
Repository.get_revision_xml() has been removed.
470
                    rev_id = rev.as_revision_id(b)
471
                    self.print_revision(revisions, rev_id)
472
        finally:
473
            b.repository.unlock()
474
        
3770.1.1 by John Arbash Meinel
First draft of a basic dump-btree command.
475
476
class cmd_dump_btree(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
477
    __doc__ = """Dump the contents of a btree index file to stdout.
3770.1.4 by John Arbash Meinel
Clarify the help text a bit.
478
479
    PATH is a btree index file, it can be any URL. This includes things like
480
    .bzr/repository/pack-names, or .bzr/repository/indices/a34b3a...ca4a4.iix
481
482
    By default, the tuples stored in the index file will be displayed. With
483
    --raw, we will uncompress the pages, but otherwise display the raw bytes
484
    stored in the index.
3770.1.1 by John Arbash Meinel
First draft of a basic dump-btree command.
485
    """
486
487
    # TODO: Do we want to dump the internal nodes as well?
488
    # TODO: It would be nice to be able to dump the un-parsed information,
489
    #       rather than only going through iter_all_entries. However, this is
490
    #       good enough for a start
491
    hidden = True
3770.1.2 by John Arbash Meinel
Add a --raw output for dump-btree.
492
    encoding_type = 'exact'
3770.1.1 by John Arbash Meinel
First draft of a basic dump-btree command.
493
    takes_args = ['path']
3770.1.2 by John Arbash Meinel
Add a --raw output for dump-btree.
494
    takes_options = [Option('raw', help='Write the uncompressed bytes out,'
3770.1.5 by John Arbash Meinel
Add a trailing period for the option '--raw'
495
                                        ' rather than the parsed tuples.'),
3770.1.2 by John Arbash Meinel
Add a --raw output for dump-btree.
496
                    ]
497
498
    def run(self, path, raw=False):
3770.1.1 by John Arbash Meinel
First draft of a basic dump-btree command.
499
        dirname, basename = osutils.split(path)
500
        t = transport.get_transport(dirname)
3770.1.2 by John Arbash Meinel
Add a --raw output for dump-btree.
501
        if raw:
502
            self._dump_raw_bytes(t, basename)
503
        else:
504
            self._dump_entries(t, basename)
505
506
    def _get_index_and_bytes(self, trans, basename):
507
        """Create a BTreeGraphIndex and raw bytes."""
508
        bt = btree_index.BTreeGraphIndex(trans, basename, None)
509
        bytes = trans.get_bytes(basename)
510
        bt._file = cStringIO.StringIO(bytes)
511
        bt._size = len(bytes)
512
        return bt, bytes
513
514
    def _dump_raw_bytes(self, trans, basename):
515
        import zlib
516
517
        # We need to parse at least the root node.
518
        # This is because the first page of every row starts with an
519
        # uncompressed header.
520
        bt, bytes = self._get_index_and_bytes(trans, basename)
3770.1.3 by John Arbash Meinel
Simplify the --raw mode.
521
        for page_idx, page_start in enumerate(xrange(0, len(bytes),
522
                                                     btree_index._PAGE_SIZE)):
523
            page_end = min(page_start + btree_index._PAGE_SIZE, len(bytes))
524
            page_bytes = bytes[page_start:page_end]
525
            if page_idx == 0:
3770.1.2 by John Arbash Meinel
Add a --raw output for dump-btree.
526
                self.outf.write('Root node:\n')
3770.1.3 by John Arbash Meinel
Simplify the --raw mode.
527
                header_end, data = bt._parse_header_from_bytes(page_bytes)
528
                self.outf.write(page_bytes[:header_end])
529
                page_bytes = data
530
            self.outf.write('\nPage %d\n' % (page_idx,))
5651.2.1 by Eric Siegerman
Fix traceback attempting to "bzr dump-btree --raw btree-with-0-rows".
531
            if len(page_bytes) == 0:
532
                self.outf.write('(empty)\n');
533
            else:
534
                decomp_bytes = zlib.decompress(page_bytes)
535
                self.outf.write(decomp_bytes)
536
                self.outf.write('\n')
3770.1.2 by John Arbash Meinel
Add a --raw output for dump-btree.
537
538
    def _dump_entries(self, trans, basename):
3770.1.1 by John Arbash Meinel
First draft of a basic dump-btree command.
539
        try:
3770.1.2 by John Arbash Meinel
Add a --raw output for dump-btree.
540
            st = trans.stat(basename)
3770.1.1 by John Arbash Meinel
First draft of a basic dump-btree command.
541
        except errors.TransportNotPossible:
542
            # We can't stat, so we'll fake it because we have to do the 'get()'
543
            # anyway.
3770.1.2 by John Arbash Meinel
Add a --raw output for dump-btree.
544
            bt, _ = self._get_index_and_bytes(trans, basename)
3770.1.1 by John Arbash Meinel
First draft of a basic dump-btree command.
545
        else:
3770.1.2 by John Arbash Meinel
Add a --raw output for dump-btree.
546
            bt = btree_index.BTreeGraphIndex(trans, basename, st.st_size)
3770.1.1 by John Arbash Meinel
First draft of a basic dump-btree command.
547
        for node in bt.iter_all_entries():
548
            # Node is made up of:
549
            # (index, key, value, [references])
5091.1.1 by Andrew Bennetts
Fix dump-btree to handle *.cix and *.six files.
550
            try:
551
                refs = node[3]
552
            except IndexError:
553
                refs_as_tuples = None
554
            else:
555
                refs_as_tuples = static_tuple.as_tuples(refs)
4679.8.9 by John Arbash Meinel
Cast objects back to tuples for 'dump-btree'
556
            as_tuple = (tuple(node[1]), node[2], refs_as_tuples)
557
            self.outf.write('%s\n' % (as_tuple,))
3770.1.1 by John Arbash Meinel
First draft of a basic dump-btree command.
558
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
559
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
560
class cmd_remove_tree(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
561
    __doc__ = """Remove the working tree from a given branch/checkout.
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
562
563
    Since a lightweight checkout is little more than a working tree
564
    this will refuse to run against one.
2374.1.3 by Ian Clatworthy
Minor man page fixes for add, commit, export
565
2374.1.4 by Ian Clatworthy
Include feedback from mailing list.
566
    To re-create the working tree, use "bzr checkout".
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
567
    """
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
568
    _see_also = ['checkout', 'working-trees']
4748.1.1 by Jared Hance
Fixed bug by changing location to a list and iterating through list.
569
    takes_args = ['location*']
3667.2.1 by Lukáš Lalinský
Make `bzr remove-tree` not remove trees with uncommitted changes by default
570
    takes_options = [
571
        Option('force',
572
               help='Remove the working tree even if it has '
5268.3.1 by Matt Giuca
remove-tree now refuses to run without --force if there are shelved changes.
573
                    'uncommitted or shelved changes.'),
3667.2.1 by Lukáš Lalinský
Make `bzr remove-tree` not remove trees with uncommitted changes by default
574
        ]
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
575
4748.1.1 by Jared Hance
Fixed bug by changing location to a list and iterating through list.
576
    def run(self, location_list, force=False):
577
        if not location_list:
578
            location_list=['.']
579
580
        for location in location_list:
6207.3.3 by jelmer at samba
Fix tests and the like.
581
            d = controldir.ControlDir.open(location)
582
4748.1.1 by Jared Hance
Fixed bug by changing location to a list and iterating through list.
583
            try:
584
                working = d.open_workingtree()
585
            except errors.NoWorkingTree:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
586
                raise errors.BzrCommandError(gettext("No working tree to remove"))
4748.1.1 by Jared Hance
Fixed bug by changing location to a list and iterating through list.
587
            except errors.NotLocalUrl:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
588
                raise errors.BzrCommandError(gettext("You cannot remove the working tree"
589
                                             " of a remote path"))
4748.1.1 by Jared Hance
Fixed bug by changing location to a list and iterating through list.
590
            if not force:
591
                if (working.has_changes()):
592
                    raise errors.UncommittedChanges(working)
5268.3.1 by Matt Giuca
remove-tree now refuses to run without --force if there are shelved changes.
593
                if working.get_shelf_manager().last_shelf() is not None:
594
                    raise errors.ShelvedChanges(working)
4748.1.1 by Jared Hance
Fixed bug by changing location to a list and iterating through list.
595
5158.6.9 by Martin Pool
Simplify various code to use user_url
596
            if working.user_url != working.branch.user_url:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
597
                raise errors.BzrCommandError(gettext("You cannot remove the working tree"
598
                                             " from a lightweight checkout"))
4748.1.1 by Jared Hance
Fixed bug by changing location to a list and iterating through list.
599
4748.1.9 by Andrew Bennetts
Fix bug introduced by the change to take multiple locations, and add a test for multiple locations.
600
            d.destroy_workingtree()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
601
2127.2.1 by Daniel Silverstone
Add remove-tree and its blackbox tests
602
5630.2.8 by John Arbash Meinel
Rename the command to 'repair-workingtree' as mentioned by vila.
603
class cmd_repair_workingtree(Command):
5630.2.1 by John Arbash Meinel
Rough outline of what I'm trying to accomplish, docs, etc.
604
    __doc__ = """Reset the working tree state file.
605
606
    This is not meant to be used normally, but more as a way to recover from
607
    filesystem corruption, etc. This rebuilds the working inventory back to a
608
    'known good' state. Any new modifications (adding a file, renaming, etc)
609
    will be lost, though modified files will still be detected as such.
610
611
    Most users will want something more like "bzr revert" or "bzr update"
612
    unless the state file has become corrupted.
613
614
    By default this attempts to recover the current state by looking at the
615
    headers of the state file. If the state file is too corrupted to even do
616
    that, you can supply --revision to force the state of the tree.
617
    """
618
5630.2.7 by John Arbash Meinel
Handle --force flags and propmting the user for what they might really want.
619
    takes_options = ['revision', 'directory',
620
        Option('force',
621
               help='Reset the tree even if it doesn\'t appear to be'
622
                    ' corrupted.'),
623
    ]
5630.2.1 by John Arbash Meinel
Rough outline of what I'm trying to accomplish, docs, etc.
624
    hidden = True
625
5630.2.7 by John Arbash Meinel
Handle --force flags and propmting the user for what they might really want.
626
    def run(self, revision=None, directory='.', force=False):
627
        tree, _ = WorkingTree.open_containing(directory)
628
        self.add_cleanup(tree.lock_tree_write().unlock)
629
        if not force:
630
            try:
631
                tree.check_state()
632
            except errors.BzrError:
633
                pass # There seems to be a real error here, so we'll reset
634
            else:
635
                # Refuse
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
636
                raise errors.BzrCommandError(gettext(
5630.2.7 by John Arbash Meinel
Handle --force flags and propmting the user for what they might really want.
637
                    'The tree does not appear to be corrupt. You probably'
638
                    ' want "bzr revert" instead. Use "--force" if you are'
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
639
                    ' sure you want to reset the working tree.'))
5630.2.7 by John Arbash Meinel
Handle --force flags and propmting the user for what they might really want.
640
        if revision is None:
641
            revision_ids = None
642
        else:
643
            revision_ids = [r.as_revision_id(tree.branch) for r in revision]
644
        try:
645
            tree.reset_state(revision_ids)
646
        except errors.BzrError, e:
647
            if revision_ids is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
648
                extra = (gettext(', the header appears corrupt, try passing -r -1'
649
                         ' to set the state to the last commit'))
5630.2.7 by John Arbash Meinel
Handle --force flags and propmting the user for what they might really want.
650
            else:
651
                extra = ''
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
652
            raise errors.BzrCommandError(gettext('failed to reset the tree state{0}').format(extra))
5630.2.1 by John Arbash Meinel
Rough outline of what I'm trying to accomplish, docs, etc.
653
654
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
655
class cmd_revno(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
656
    __doc__ = """Show current revision number.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
657
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
658
    This is equal to the number of revisions on this branch.
659
    """
660
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
661
    _see_also = ['info']
1185.50.16 by John Arbash Meinel
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location'
662
    takes_args = ['location?']
4409.1.1 by Matthew Fuller
Add a --tree option to revno.
663
    takes_options = [
6259.2.5 by Martin Packman
Add full stops to various option help text so test_option_grammar passes
664
        Option('tree', help='Show revno of working tree.'),
6202.1.1 by Jelmer Vernooij
'bzr revno' now takes a --revision argument.
665
        'revision',
4409.1.1 by Matthew Fuller
Add a --tree option to revno.
666
        ]
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
667
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
668
    @display_command
6202.1.1 by Jelmer Vernooij
'bzr revno' now takes a --revision argument.
669
    def run(self, tree=False, location=u'.', revision=None):
670
        if revision is not None and tree:
671
            raise errors.BzrCommandError(gettext("--tree and --revision can "
672
                "not be used together"))
673
4409.1.21 by Vincent Ladeuil
Fix failing test.
674
        if tree:
675
            try:
676
                wt = WorkingTree.open_containing(location)[0]
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
677
                self.add_cleanup(wt.lock_read().unlock)
4409.1.21 by Vincent Ladeuil
Fix failing test.
678
            except (errors.NoWorkingTree, errors.NotLocalUrl):
679
                raise errors.NoWorkingTree(location)
6202.1.1 by Jelmer Vernooij
'bzr revno' now takes a --revision argument.
680
            b = wt.branch
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
681
            revid = wt.last_revision()
4409.1.21 by Vincent Ladeuil
Fix failing test.
682
        else:
683
            b = Branch.open_containing(location)[0]
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
684
            self.add_cleanup(b.lock_read().unlock)
6202.1.1 by Jelmer Vernooij
'bzr revno' now takes a --revision argument.
685
            if revision:
686
                if len(revision) != 1:
687
                    raise errors.BzrCommandError(gettext(
6566.1.1 by Matthew Fuller
The revno command should give errors referencing revision numbers, not
688
                        "Revision numbers only make sense for single "
689
                        "revisions, not ranges"))
6202.1.1 by Jelmer Vernooij
'bzr revno' now takes a --revision argument.
690
                revid = revision[0].as_revision_id(b)
691
            else:
692
                revid = b.last_revision()
693
        try:
694
            revno_t = b.revision_id_to_dotted_revno(revid)
695
        except errors.NoSuchRevision:
696
            revno_t = ('???',)
697
        revno = ".".join(str(n) for n in revno_t)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
698
        self.cleanup_now()
6202.1.1 by Jelmer Vernooij
'bzr revno' now takes a --revision argument.
699
        self.outf.write(revno + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
700
1182 by Martin Pool
- more disentangling of xml storage format from objects
701
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
702
class cmd_revision_info(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
703
    __doc__ = """Show revision number and revision id for a given revision identifier.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
704
    """
705
    hidden = True
706
    takes_args = ['revision_info*']
3886.1.1 by Michael Hudson
support -d in the revision-info command
707
    takes_options = [
708
        'revision',
5171.3.1 by Martin von Gagern
Turn --directory and -d into a global option.
709
        custom_help('directory',
3886.1.1 by Michael Hudson
support -d in the revision-info command
710
            help='Branch to examine, '
5171.3.1 by Martin von Gagern
Turn --directory and -d into a global option.
711
                 'rather than the one containing the working directory.'),
6259.2.5 by Martin Packman
Add full stops to various option help text so test_option_grammar passes
712
        Option('tree', help='Show revno of working tree.'),
3886.1.1 by Michael Hudson
support -d in the revision-info command
713
        ]
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
714
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
715
    @display_command
4409.1.3 by Matthew Fuller
Add --tree option to revision-info too.
716
    def run(self, revision=None, directory=u'.', tree=False,
717
            revision_info_list=[]):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
718
4409.1.10 by John Arbash Meinel
Clean up 'bzr revision-info' to support revision not in the branch history.
719
        try:
720
            wt = WorkingTree.open_containing(directory)[0]
721
            b = wt.branch
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
722
            self.add_cleanup(wt.lock_read().unlock)
4409.1.10 by John Arbash Meinel
Clean up 'bzr revision-info' to support revision not in the branch history.
723
        except (errors.NoWorkingTree, errors.NotLocalUrl):
724
            wt = None
725
            b = Branch.open_containing(directory)[0]
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
726
            self.add_cleanup(b.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
727
        revision_ids = []
728
        if revision is not None:
729
            revision_ids.extend(rev.as_revision_id(b) for rev in revision)
730
        if revision_info_list is not None:
731
            for rev_str in revision_info_list:
732
                rev_spec = RevisionSpec.from_string(rev_str)
733
                revision_ids.append(rev_spec.as_revision_id(b))
734
        # No arguments supplied, default to the last revision
735
        if len(revision_ids) == 0:
736
            if tree:
737
                if wt is None:
738
                    raise errors.NoWorkingTree(directory)
739
                revision_ids.append(wt.last_revision())
4409.1.3 by Matthew Fuller
Add --tree option to revision-info too.
740
            else:
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
741
                revision_ids.append(b.last_revision())
742
743
        revinfos = []
744
        maxlen = 0
745
        for revision_id in revision_ids:
746
            try:
747
                dotted_revno = b.revision_id_to_dotted_revno(revision_id)
748
                revno = '.'.join(str(i) for i in dotted_revno)
749
            except errors.NoSuchRevision:
750
                revno = '???'
751
            maxlen = max(maxlen, len(revno))
752
            revinfos.append([revno, revision_id])
753
754
        self.cleanup_now()
4409.2.1 by Matthew Fuller
Rework revision-info command so that it:
755
        for ri in revinfos:
4409.1.17 by Matthew Fuller
Merge in revision-info cleanups and changes.
756
            self.outf.write('%*s %s\n' % (maxlen, ri[0], ri[1]))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
757
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
758
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
759
class cmd_add(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
760
    __doc__ = """Add specified files or directories.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
761
762
    In non-recursive mode, all the named items are added, regardless
763
    of whether they were previously ignored.  A warning is given if
764
    any of the named files are already versioned.
765
766
    In recursive mode (the default), files are treated the same way
767
    but the behaviour for directories is different.  Directories that
768
    are already versioned do not give a warning.  All directories,
769
    whether already versioned or not, are searched for files or
770
    subdirectories that are neither versioned or ignored, and these
771
    are added.  This search proceeds recursively into versioned
772
    directories.  If no names are given '.' is assumed.
773
6159.1.1 by Jelmer Vernooij
Add note about warning on nested trees.
774
    A warning will be printed when nested trees are encountered,
775
    unless they are explicitly ignored.
776
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
777
    Therefore simply saying 'bzr add' will version all files that
778
    are currently unknown.
779
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
780
    Adding a file whose parent directory is not versioned will
781
    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).
782
    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
783
    get added when you add a file in the directory.
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
784
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
785
    --dry-run will show which files would be added, but not actually
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
786
    add them.
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
787
788
    --file-ids-from will try to use the file ids from the supplied path.
789
    It looks up ids trying to find a matching parent directory with the
2374.1.3 by Ian Clatworthy
Minor man page fixes for add, commit, export
790
    same filename, and then by pure path. This option is rarely needed
791
    but can be useful when adding the same logical file into two
792
    branches that will be merged later (without showing the two different
2374.1.4 by Ian Clatworthy
Include feedback from mailing list.
793
    adds as a conflict). It is also useful when merging another project
794
    into a subdirectory of this one.
4595.1.1 by Jason Spashett
Further tweaks to bzr add
795
    
4595.1.2 by Martin Pool
typo
796
    Any files matching patterns in the ignore list will not be added
4595.1.1 by Jason Spashett
Further tweaks to bzr add
797
    unless they are explicitly mentioned.
6046.2.5 by Shannon Weyrick
Document add.maximum_file_size more
798
    
6046.2.9 by Shannon Weyrick
Make it explicit in docs that large file skips happen only in recursive mode. Add test.
799
    In recursive mode, files larger than the configuration option 
800
    add.maximum_file_size will be skipped. Named items are never skipped due
801
    to file size.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
802
    """
803
    takes_args = ['file*']
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
804
    takes_options = [
805
        Option('no-recurse',
6478.1.1 by Jelmer Vernooij
Add short option '-N' for '--no-recurse'.
806
               help="Don't recursively add the contents of directories.",
807
               short_name='N'),
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
808
        Option('dry-run',
809
               help="Show what would be done, but don't actually do anything."),
810
        'verbose',
811
        Option('file-ids-from',
812
               type=unicode,
813
               help='Lookup file ids from this tree.'),
814
        ]
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()
815
    encoding_type = 'replace'
4595.1.1 by Jason Spashett
Further tweaks to bzr add
816
    _see_also = ['remove', 'ignore']
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
817
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
818
    def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
819
            file_ids_from=None):
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
820
        import bzrlib.add
821
2255.7.69 by Robert Collins
Fix all blackbox add tests, and the add --from-ids case in the UI.
822
        base_tree = None
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
823
        if file_ids_from is not None:
824
            try:
825
                base_tree, base_path = WorkingTree.open_containing(
826
                                            file_ids_from)
827
            except errors.NoWorkingTree:
1996.3.1 by John Arbash Meinel
Demandloading builtins.py drops our load time from 350ms to 291ms
828
                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
829
                                            file_ids_from)
830
                base_tree = base_branch.basis_tree()
831
832
            action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
833
                          to_file=self.outf, should_print=(not is_quiet()))
834
        else:
6046.2.4 by Shannon Weyrick
Change AddAction interface to include a method for deciding whether to
835
            action = bzrlib.add.AddWithSkipLargeAction(to_file=self.outf,
1911.3.2 by John Arbash Meinel
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
836
                should_print=(not is_quiet()))
837
2255.7.69 by Robert Collins
Fix all blackbox add tests, and the add --from-ids case in the UI.
838
        if base_tree:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
839
            self.add_cleanup(base_tree.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
840
        tree, file_list = tree_files_for_add(file_list)
841
        added, ignored = tree.smart_add(file_list, not
842
            no_recurse, action=action, save=not dry_run)
843
        self.cleanup_now()
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
844
        if len(ignored) > 0:
1711.1.2 by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were
845
            if verbose:
846
                for glob in sorted(ignored.keys()):
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
847
                    for path in ignored[glob]:
6138.2.4 by Jonathan Riddell
use format strings where there are multiple substitutions to allow for translations
848
                        self.outf.write(
849
                         gettext("ignored {0} matching \"{1}\"\n").format(
850
                         path, glob))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
851
852
853
class cmd_mkdir(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
854
    __doc__ = """Create a new versioned directory.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
855
856
    This is equivalent to creating the directory and then adding it.
857
    """
1685.1.80 by Wouter van Heyst
more code cleanup
858
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
859
    takes_args = ['dir+']
6352.1.1 by Jelmer Vernooij
add blackbox tests for mkdir.
860
    takes_options = [
4744.4.1 by Jared Hance
Added -p (--parents) option to "bzr mkdir" (For adding directories recursively)
861
        Option(
862
            'parents',
4744.4.10 by Jared Hance
Fix help message and change "None" to "False" because it is a boolean variable.
863
            help='No error if existing, make parent directories as needed.',
4744.4.1 by Jared Hance
Added -p (--parents) option to "bzr mkdir" (For adding directories recursively)
864
            short_name='p'
865
            )
6352.1.1 by Jelmer Vernooij
add blackbox tests for mkdir.
866
        ]
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()
867
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
868
6352.1.5 by Jelmer Vernooij
make add_files a class method rather than nested.
869
    @classmethod
870
    def add_file_with_parents(cls, wt, relpath):
871
        if wt.path2id(relpath) is not None:
872
            return
873
        cls.add_file_with_parents(wt, osutils.dirname(relpath))
874
        wt.add([relpath])
875
876
    @classmethod
877
    def add_file_single(cls, wt, relpath):
878
        wt.add([relpath])
879
4744.4.10 by Jared Hance
Fix help message and change "None" to "False" because it is a boolean variable.
880
    def run(self, dir_list, parents=False):
6352.1.2 by Jelmer Vernooij
Merge mkdir work from Jared Hance.
881
        if parents:
6352.1.5 by Jelmer Vernooij
make add_files a class method rather than nested.
882
            add_file = self.add_file_with_parents
6352.1.2 by Jelmer Vernooij
Merge mkdir work from Jared Hance.
883
        else:
6352.1.5 by Jelmer Vernooij
make add_files a class method rather than nested.
884
            add_file = self.add_file_single
6352.1.4 by Jelmer Vernooij
Fix tests.
885
        for dir in dir_list:
886
            wt, relpath = WorkingTree.open_containing(dir)
4744.4.10 by Jared Hance
Fix help message and change "None" to "False" because it is a boolean variable.
887
            if parents:
6357.1.2 by Martin Packman
Don't complain on mkdir -p if a directory exists
888
                try:
889
                    os.makedirs(dir)
890
                except OSError, e:
891
                    if e.errno != errno.EEXIST:
892
                        raise
4744.4.2 by Jared Hance
Forgot to use -p originally and automatically assumed to recursively add. Fixed.
893
            else:
6352.1.4 by Jelmer Vernooij
Fix tests.
894
                os.mkdir(dir)
6352.1.5 by Jelmer Vernooij
make add_files a class method rather than nested.
895
            add_file(wt, relpath)
6352.1.2 by Jelmer Vernooij
Merge mkdir work from Jared Hance.
896
            if not is_quiet():
6352.1.4 by Jelmer Vernooij
Fix tests.
897
                self.outf.write(gettext('added %s\n') % dir)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
898
899
900
class cmd_relpath(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
901
    __doc__ = """Show path of a file relative to root"""
1685.1.80 by Wouter van Heyst
more code cleanup
902
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
903
    takes_args = ['filename']
904
    hidden = True
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
905
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
906
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
907
    def run(self, filename):
1185.85.19 by John Arbash Meinel
Updated bzr relpath
908
        # TODO: jam 20050106 Can relpath return a munged path if
909
        #       sys.stdout encoding cannot represent it?
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
910
        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()
911
        self.outf.write(relpath)
912
        self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
913
914
915
class cmd_inventory(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
916
    __doc__ = """Show inventory of the current working copy or a revision.
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
917
918
    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'
919
    type using the --kind option.  For example: --kind file.
920
921
    It is also possible to restrict the list of files to a specific
922
    set. For example: bzr inventory --show-ids this/file
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
923
    """
1685.1.80 by Wouter van Heyst
more code cleanup
924
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
925
    hidden = True
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
926
    _see_also = ['ls']
2598.1.11 by Martin Pool
Insist that all options have a help string and fix those that don't.
927
    takes_options = [
928
        'revision',
929
        'show-ids',
930
        Option('kind',
2598.1.12 by Martin Pool
Fix up --kind options
931
               help='List entries of a particular kind: file, directory, symlink.',
932
               type=unicode),
2598.1.11 by Martin Pool
Insist that all options have a help string and fix those that don't.
933
        ]
2027.4.2 by John Arbash Meinel
Fix bug #3631, allow 'bzr inventory filename'
934
    takes_args = ['file*']
935
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
936
    @display_command
2027.4.2 by John Arbash Meinel
Fix bug #3631, allow 'bzr inventory filename'
937
    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'
938
        if kind and kind not in ['file', 'directory', 'symlink']:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
939
            raise errors.BzrCommandError(gettext('invalid kind %r specified') % (kind,))
2027.4.3 by John Arbash Meinel
Change how 'bzr inventory' finds paths
940
3984.3.7 by Daniel Watkins
Fixed incorrect calls.
941
        revision = _get_one_revision('inventory', revision)
5346.4.5 by Martin Pool
Deprecate and avoid internal_tree_files and tree_files.
942
        work_tree, file_list = WorkingTree.open_containing_paths(file_list)
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
943
        self.add_cleanup(work_tree.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
944
        if revision is not None:
945
            tree = revision.as_tree(work_tree.branch)
946
947
            extra_trees = [work_tree]
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
948
            self.add_cleanup(tree.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
949
        else:
950
            tree = work_tree
951
            extra_trees = []
952
6405.2.7 by Jelmer Vernooij
Fix more tests.
953
        self.add_cleanup(tree.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
954
        if file_list is not None:
955
            file_ids = tree.paths2ids(file_list, trees=extra_trees,
956
                                      require_versioned=True)
957
            # find_ids_across_trees may include some paths that don't
958
            # exist in 'tree'.
6405.2.7 by Jelmer Vernooij
Fix more tests.
959
            entries = tree.iter_entries_by_dir(specific_file_ids=file_ids)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
960
        else:
6405.2.7 by Jelmer Vernooij
Fix more tests.
961
            entries = tree.iter_entries_by_dir()
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
962
6405.2.7 by Jelmer Vernooij
Fix more tests.
963
        for path, entry in sorted(entries):
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
964
            if kind and kind != entry.kind:
965
                continue
6405.2.7 by Jelmer Vernooij
Fix more tests.
966
            if path == "":
967
                continue
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
968
            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()
969
                self.outf.write('%-50s %s\n' % (path, entry.file_id))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
970
            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()
971
                self.outf.write(path)
972
                self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
973
974
975
class cmd_mv(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
976
    __doc__ = """Move or rename a file.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
977
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
978
    :Usage:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
979
        bzr mv OLDNAME NEWNAME
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
980
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
981
        bzr mv SOURCE... DESTINATION
982
983
    If the last argument is a versioned directory, all the other names
984
    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
985
    and the file is changed to a new name.
986
987
    If OLDNAME does not exist on the filesystem but is versioned and
988
    NEWNAME does exist on the filesystem but is not versioned, mv
989
    assumes that the file has been manually moved and only updates
990
    its internal inventory to reflect that change.
991
    The same is valid when moving many SOURCE files to a DESTINATION.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
992
993
    Files cannot be moved between branches.
994
    """
1685.1.80 by Wouter van Heyst
more code cleanup
995
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
996
    takes_args = ['names*']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
997
    takes_options = [Option("after", help="Move only the bzr identifier"
998
        " of the file, because the file has already been moved."),
3193.8.37 by Aaron Bentley
Finish up conversion to mv --auto.
999
        Option('auto', help='Automatically guess renames.'),
1000
        Option('dry-run', help='Avoid making changes when guessing renames.'),
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
1001
        ]
1616.1.8 by Martin Pool
Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
1002
    aliases = ['move', 'rename']
1185.85.26 by John Arbash Meinel
bzr mv should succeed even if it can't display the paths.
1003
    encoding_type = 'replace'
1004
3193.8.37 by Aaron Bentley
Finish up conversion to mv --auto.
1005
    def run(self, names_list, after=False, auto=False, dry_run=False):
3193.8.35 by Aaron Bentley
Implement mv --auto.
1006
        if auto:
3193.8.37 by Aaron Bentley
Finish up conversion to mv --auto.
1007
            return self.run_auto(names_list, after, dry_run)
1008
        elif dry_run:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1009
            raise errors.BzrCommandError(gettext('--dry-run requires --auto.'))
1846.1.1 by Wouter van Heyst
Don't fail on 'bzr mv', extract move tests from OldTests.
1010
        if names_list is None:
1011
            names_list = []
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1012
        if len(names_list) < 2:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1013
            raise errors.BzrCommandError(gettext("missing file argument"))
5346.4.5 by Martin Pool
Deprecate and avoid internal_tree_files and tree_files.
1014
        tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
6220.3.5 by Jonathan Riddell
check all files being moved
1015
        for file_name in rel_names[0:-1]:
1016
            if file_name == '':
1017
                raise errors.BzrCommandError(gettext("can not move root of branch"))
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1018
        self.add_cleanup(tree.lock_tree_write().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1019
        self._run(tree, names_list, rel_names, after)
3246.1.1 by Alexander Belchenko
Allow rename (change case of name) directory on case-insensitive filesystem.
1020
3193.8.37 by Aaron Bentley
Finish up conversion to mv --auto.
1021
    def run_auto(self, names_list, after, dry_run):
3193.8.36 by Aaron Bentley
Get remaining behaviour under test.
1022
        if names_list is not None and len(names_list) > 1:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1023
            raise errors.BzrCommandError(gettext('Only one path may be specified to'
1024
                                         ' --auto.'))
3193.8.37 by Aaron Bentley
Finish up conversion to mv --auto.
1025
        if after:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1026
            raise errors.BzrCommandError(gettext('--after cannot be specified with'
1027
                                         ' --auto.'))
5346.4.5 by Martin Pool
Deprecate and avoid internal_tree_files and tree_files.
1028
        work_tree, file_list = WorkingTree.open_containing_paths(
5346.4.6 by Martin Pool
Update parameter name
1029
            names_list, default_directory='.')
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1030
        self.add_cleanup(work_tree.lock_tree_write().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1031
        rename_map.RenameMap.guess_renames(work_tree, dry_run)
3193.8.35 by Aaron Bentley
Implement mv --auto.
1032
3201.2.1 by Lukáš Lalinský
Make 'mv a b' work for already renamed directories, like it does for files
1033
    def _run(self, tree, names_list, rel_names, after):
1034
        into_existing = osutils.isdir(names_list[-1])
1035
        if into_existing and len(names_list) == 2:
3249.4.1 by Alexander Belchenko
merge Lukas' patch and update it with case-insensitive rename check.
1036
            # special cases:
1037
            # a. case-insensitive filesystem and change case of dir
1038
            # b. move directory after the fact (if the source used to be
1039
            #    a directory, but now doesn't exist in the working tree
1040
            #    and the target is an existing directory, just rename it)
1041
            if (not tree.case_sensitive
1042
                and rel_names[0].lower() == rel_names[1].lower()):
3201.2.1 by Lukáš Lalinský
Make 'mv a b' work for already renamed directories, like it does for files
1043
                into_existing = False
3249.4.1 by Alexander Belchenko
merge Lukas' patch and update it with case-insensitive rename check.
1044
            else:
3794.5.6 by Mark Hammond
Don't always call osutils.canonical_relpath() on the args, but let the necessary commands do what is right for them; cmd_move and cmd_commit both now use . Move and commit call Have the move and checkin commands use get_canonical_path(). Lots new move tests.
1045
                # 'fix' the case of a potential 'from'
3794.5.20 by Mark Hammond
Use get_canonical_inventory_path and get_canonical_inventory_paths, and handle more edge cases in 'mv'
1046
                from_id = tree.path2id(
1047
                            tree.get_canonical_inventory_path(rel_names[0]))
3249.4.1 by Alexander Belchenko
merge Lukas' patch and update it with case-insensitive rename check.
1048
                if (not osutils.lexists(names_list[0]) and
6445.2.1 by Jelmer Vernooij
Avoid inventory access.
1049
                    from_id and tree.stored_kind(from_id) == "directory"):
3249.4.1 by Alexander Belchenko
merge Lukas' patch and update it with case-insensitive rename check.
1050
                    into_existing = False
1051
        # move/rename
3201.2.1 by Lukáš Lalinský
Make 'mv a b' work for already renamed directories, like it does for files
1052
        if into_existing:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1053
            # move into existing directory
3794.5.6 by Mark Hammond
Don't always call osutils.canonical_relpath() on the args, but let the necessary commands do what is right for them; cmd_move and cmd_commit both now use . Move and commit call Have the move and checkin commands use get_canonical_path(). Lots new move tests.
1054
            # All entries reference existing inventory items, so fix them up
1055
            # for cicp file-systems.
3794.5.20 by Mark Hammond
Use get_canonical_inventory_path and get_canonical_inventory_paths, and handle more edge cases in 'mv'
1056
            rel_names = tree.get_canonical_inventory_paths(rel_names)
4795.2.1 by Gordon Tyler
Fixed cmd_mv to use trace.note so that it obeys the --quiet option.
1057
            for src, dest in tree.move(rel_names[:-1], rel_names[-1], after=after):
4795.2.4 by Gordon Tyler
Reverted cmd_mv back to using self.outf.write but checking for is_quiet.
1058
                if not is_quiet():
1059
                    self.outf.write("%s => %s\n" % (src, dest))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1060
        else:
1061
            if len(names_list) != 2:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1062
                raise errors.BzrCommandError(gettext('to mv multiple files the'
2123.3.1 by Steffen Eichenberg
the mv command is now able to move files that have already been moved on the file system
1063
                                             ' destination must be a versioned'
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1064
                                             ' directory'))
3794.5.6 by Mark Hammond
Don't always call osutils.canonical_relpath() on the args, but let the necessary commands do what is right for them; cmd_move and cmd_commit both now use . Move and commit call Have the move and checkin commands use get_canonical_path(). Lots new move tests.
1065
1066
            # for cicp file-systems: the src references an existing inventory
1067
            # item:
3794.5.20 by Mark Hammond
Use get_canonical_inventory_path and get_canonical_inventory_paths, and handle more edge cases in 'mv'
1068
            src = tree.get_canonical_inventory_path(rel_names[0])
3794.5.6 by Mark Hammond
Don't always call osutils.canonical_relpath() on the args, but let the necessary commands do what is right for them; cmd_move and cmd_commit both now use . Move and commit call Have the move and checkin commands use get_canonical_path(). Lots new move tests.
1069
            # Find the canonical version of the destination:  In all cases, the
1070
            # parent of the target must be in the inventory, so we fetch the
3794.5.20 by Mark Hammond
Use get_canonical_inventory_path and get_canonical_inventory_paths, and handle more edge cases in 'mv'
1071
            # canonical version from there (we do not always *use* the
1072
            # canonicalized tail portion - we may be attempting to rename the
1073
            # case of the tail)
1074
            canon_dest = tree.get_canonical_inventory_path(rel_names[1])
1075
            dest_parent = osutils.dirname(canon_dest)
1076
            spec_tail = osutils.basename(rel_names[1])
1077
            # For a CICP file-system, we need to avoid creating 2 inventory
1078
            # entries that differ only by case.  So regardless of the case
1079
            # we *want* to use (ie, specified by the user or the file-system),
1080
            # we must always choose to use the case of any existing inventory
1081
            # items.  The only exception to this is when we are attempting a
1082
            # case-only rename (ie, canonical versions of src and dest are
1083
            # the same)
1084
            dest_id = tree.path2id(canon_dest)
1085
            if dest_id is None or tree.path2id(src) == dest_id:
1086
                # No existing item we care about, so work out what case we
1087
                # are actually going to use.
1088
                if after:
1089
                    # If 'after' is specified, the tail must refer to a file on disk.
1090
                    if dest_parent:
1091
                        dest_parent_fq = osutils.pathjoin(tree.basedir, dest_parent)
1092
                    else:
1093
                        # pathjoin with an empty tail adds a slash, which breaks
1094
                        # relpath :(
1095
                        dest_parent_fq = tree.basedir
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1096
3794.5.20 by Mark Hammond
Use get_canonical_inventory_path and get_canonical_inventory_paths, and handle more edge cases in 'mv'
1097
                    dest_tail = osutils.canonical_relpath(
1098
                                    dest_parent_fq,
1099
                                    osutils.pathjoin(dest_parent_fq, spec_tail))
3794.5.6 by Mark Hammond
Don't always call osutils.canonical_relpath() on the args, but let the necessary commands do what is right for them; cmd_move and cmd_commit both now use . Move and commit call Have the move and checkin commands use get_canonical_path(). Lots new move tests.
1100
                else:
3794.5.20 by Mark Hammond
Use get_canonical_inventory_path and get_canonical_inventory_paths, and handle more edge cases in 'mv'
1101
                    # not 'after', so case as specified is used
1102
                    dest_tail = spec_tail
1103
            else:
1104
                # Use the existing item so 'mv' fails with AlreadyVersioned.
1105
                dest_tail = os.path.basename(canon_dest)
3794.5.11 by Mark Hammond
whitespace/logging changes.
1106
            dest = osutils.pathjoin(dest_parent, dest_tail)
3794.5.20 by Mark Hammond
Use get_canonical_inventory_path and get_canonical_inventory_paths, and handle more edge cases in 'mv'
1107
            mutter("attempting to move %s => %s", src, dest)
3794.5.6 by Mark Hammond
Don't always call osutils.canonical_relpath() on the args, but let the necessary commands do what is right for them; cmd_move and cmd_commit both now use . Move and commit call Have the move and checkin commands use get_canonical_path(). Lots new move tests.
1108
            tree.rename_one(src, dest, after=after)
4795.2.4 by Gordon Tyler
Reverted cmd_mv back to using self.outf.write but checking for is_quiet.
1109
            if not is_quiet():
1110
                self.outf.write("%s => %s\n" % (src, dest))
3246.1.1 by Alexander Belchenko
Allow rename (change case of name) directory on case-insensitive filesystem.
1111
1112
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1113
class cmd_pull(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
1114
    __doc__ = """Turn this branch into a mirror of another branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1115
4840.1.1 by Patrick Regan
Added extra clarification to pull cmd.
1116
    By default, this command only works on branches that have not diverged.
1117
    Branches are considered diverged if the destination branch's most recent 
1118
    commit is one that has not been merged (directly or indirectly) into the 
1119
    parent.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1120
1661.1.1 by Martin Pool
[merge] olaf's --remember changes
1121
    If branches have diverged, you can use 'bzr merge' to integrate the changes
1122
    from one into the other.  Once one branch has merged, the other should
1123
    be able to pull it again.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1124
4840.1.1 by Patrick Regan
Added extra clarification to pull cmd.
1125
    If you want to replace your local changes and just want your branch to
1126
    match the remote one, use pull --overwrite. This will work even if the two
1127
    branches have diverged.
1614.2.3 by Olaf Conradi
In commands push and pull, moved help text for --remember down. It's not
1128
5861.1.3 by Vincent Ladeuil
Fix the docs for push/pull/send regarding --no-remember.
1129
    If there is no default location set, the first pull will set it (use
6105.2.4 by Martin von Gagern
Drive-by typo correction in command docstrings.
1130
    --no-remember to avoid setting it). After that, you can omit the
5861.1.3 by Vincent Ladeuil
Fix the docs for push/pull/send regarding --no-remember.
1131
    location to use the default.  To change the default, use --remember. The
1132
    value will only be saved if the remote location can be accessed.
3313.1.1 by Ian Clatworthy
Improve doc on send/merge relationship (Peter Schuller)
1133
6175.2.4 by Vincent Ladeuil
Add script tests and documentation.
1134
    The --verbose option will display the revisions pulled using the log_format
1135
    configuration option. You can use a different format by overriding it with
1136
    -Olog_format=<other_format>.
1137
3313.1.1 by Ian Clatworthy
Improve doc on send/merge relationship (Peter Schuller)
1138
    Note: The location can be specified either in the form of a branch,
1139
    or in the form of a path to a file containing a merge directive generated
1140
    with bzr send.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1141
    """
1685.1.80 by Wouter van Heyst
more code cleanup
1142
4095.2.1 by Neil Martinsen-Burrell
Better help for bzr send
1143
    _see_also = ['push', 'update', 'status-flags', 'send']
1551.17.4 by Aaron Bentley
Make pull -v description more specific
1144
    takes_options = ['remember', 'overwrite', 'revision',
2768.1.5 by Ian Clatworthy
Wrap new std verbose option with new help instead of declaring a new one
1145
        custom_help('verbose',
1551.17.4 by Aaron Bentley
Make pull -v description more specific
1146
            help='Show logs of pulled revisions.'),
5171.3.1 by Martin von Gagern
Turn --directory and -d into a global option.
1147
        custom_help('directory',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
1148
            help='Branch to pull into, '
5171.3.1 by Martin von Gagern
Turn --directory and -d into a global option.
1149
                 'rather than the one containing the working directory.'),
4056.6.1 by Gary van der Merwe
Add --local option to pull.
1150
        Option('local',
1151
            help="Perform a local pull in a bound "
1152
                 "branch.  Local pulls are not applied to "
1153
                 "the master branch."
1154
            ),
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
1155
        Option('show-base',
6159.2.3 by Jelmer Vernooij
Add --overwrite-tags arguments to push and pull.
1156
            help="Show base revision text in conflicts."),
1157
        Option('overwrite-tags',
1158
            help="Overwrite tags only."),
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
1159
        ]
2520.1.6 by Daniel Watkins
Fixed 'pull' help.
1160
    takes_args = ['location?']
1185.85.27 by John Arbash Meinel
Updated bzr branch and bzr pull
1161
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1162
5861.1.10 by Vincent Ladeuil
Fix --no-remember for the first pull.
1163
    def run(self, location=None, remember=None, overwrite=False,
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
1164
            revision=None, verbose=False,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
1165
            directory=None, local=False,
6159.2.3 by Jelmer Vernooij
Add --overwrite-tags arguments to push and pull.
1166
            show_base=False, overwrite_tags=False):
6159.2.4 by Jelmer Vernooij
Add --overwrite-tags flag.
1167
1168
        if overwrite:
1169
            overwrite = ["history", "tags"]
1170
        elif overwrite_tags:
1171
            overwrite = ["tags"]
1172
        else:
1173
            overwrite = []
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1174
        # FIXME: too much stuff is in the command class
1551.14.11 by Aaron Bentley
rename rev_id and other_rev_id
1175
        revision_id = None
1551.14.7 by Aaron Bentley
test suite fixes
1176
        mergeable = None
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
1177
        if directory is None:
1178
            directory = u'.'
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1179
        try:
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
1180
            tree_to = WorkingTree.open_containing(directory)[0]
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1181
            branch_to = tree_to.branch
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1182
            self.add_cleanup(tree_to.lock_write().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
1183
        except errors.NoWorkingTree:
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1184
            tree_to = None
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
1185
            branch_to = Branch.open_containing(directory)[0]
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1186
            self.add_cleanup(branch_to.lock_write().unlock)
6556.1.1 by Vincent Ladeuil
Warn instead of failing on pull --show-base in a treeless branch
1187
            if show_base:
1188
                warning(gettext("No working tree, ignoring --show-base"))
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
1189
4056.6.4 by Gary van der Merwe
Implement pull --local.
1190
        if local and not branch_to.get_bound_location():
1191
            raise errors.LocalRequiresBoundBranch()
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
1192
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
1193
        possible_transports = []
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
1194
        if location is not None:
3251.4.10 by Aaron Bentley
Pull of launchpad locations works (abentley, #181945)
1195
            try:
1196
                mergeable = bundle.read_mergeable_from_url(location,
1197
                    possible_transports=possible_transports)
1198
            except errors.NotABundle:
1199
                mergeable = None
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
1200
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1201
        stored_loc = branch_to.get_parent()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1202
        if location is None:
1203
            if stored_loc is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1204
                raise errors.BzrCommandError(gettext("No pull location known or"
1205
                                             " specified."))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1206
            else:
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
1207
                display_url = urlutils.unescape_for_display(stored_loc,
1208
                        self.outf.encoding)
3200.1.1 by James Westby
Make pull --quiet more quiet. Fixes #185907.
1209
                if not is_quiet():
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
1210
                    self.outf.write(gettext("Using saved parent location: %s\n") % display_url)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1211
                location = stored_loc
1185.56.1 by Michael Ellerman
Simplify handling of DivergedBranches in cmd_pull()
1212
3993.1.1 by Ian Clatworthy
helper function when only one revision required (Daniel Watkins)
1213
        revision = _get_one_revision('pull', revision)
1551.14.4 by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables'
1214
        if mergeable is not None:
1215
            if revision is not None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1216
                raise errors.BzrCommandError(gettext(
1217
                    'Cannot use -r with merge directives or bundles'))
2520.4.109 by Aaron Bentley
start work on directive cherry-picking
1218
            mergeable.install_revisions(branch_to.repository)
1219
            base_revision_id, revision_id, verified = \
1220
                mergeable.get_merge_request(branch_to.repository)
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
1221
            branch_from = branch_to
1222
        else:
3251.4.10 by Aaron Bentley
Pull of launchpad locations works (abentley, #181945)
1223
            branch_from = Branch.open(location,
1224
                possible_transports=possible_transports)
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1225
            self.add_cleanup(branch_from.lock_read().unlock)
5861.1.11 by Vincent Ladeuil
Add news entry and same comments.
1226
            # Remembers if asked explicitly or no previous location is set
5861.1.10 by Vincent Ladeuil
Fix --no-remember for the first pull.
1227
            if (remember
1228
                or (remember is None and branch_to.get_parent() is None)):
6404.6.7 by Vincent Ladeuil
Change set/remove to require a lock for the branch config files.
1229
                # FIXME: This shouldn't be done before the pull
1230
                # succeeds... -- vila 2012-01-02
1231
                branch_to.set_parent(branch_from.base)
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
1232
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1233
        if revision is not None:
1234
            revision_id = revision.as_revision_id(branch_from)
1235
1236
        if tree_to is not None:
1237
            view_info = _get_view_info_for_change_reporter(tree_to)
1238
            change_reporter = delta._ChangeReporter(
1239
                unversioned_filter=tree_to.is_ignored,
1240
                view_info=view_info)
1241
            result = tree_to.pull(
1242
                branch_from, overwrite, revision_id, change_reporter,
6105.2.5 by Martin von Gagern
Adjust line wrapping.
1243
                local=local, show_base=show_base)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1244
        else:
1245
            result = branch_to.pull(
1246
                branch_from, overwrite, revision_id, local=local)
1247
1248
        result.report(self.outf)
1249
        if verbose and result.old_revid != result.new_revid:
1250
            log.show_branch_change(
1251
                branch_to, self.outf, result.old_revno,
1252
                result.old_revid)
5616.6.1 by Jelmer Vernooij
Exit with 1 if there were tag conflicts during pull.
1253
        if getattr(result, 'tag_conflicts', None):
1254
            return 1
1255
        else:
1256
            return 0
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
1257
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1258
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1259
class cmd_push(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
1260
    __doc__ = """Update a mirror of this branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1261
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1262
    The target branch will not have its working tree populated because this
1263
    is both expensive, and is not supported on remote file systems.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1264
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
1265
    Some smart servers or protocols *may* put the working tree in place in
1266
    the future.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1267
1268
    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
1269
    considered diverged if the destination branch's most recent commit is one
1270
    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.
1271
1272
    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
1273
    the other branch completely, discarding its unmerged changes.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1274
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1275
    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
1276
    do a merge (see bzr help merge) from the other branch, and commit that.
1277
    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
1278
5861.1.3 by Vincent Ladeuil
Fix the docs for push/pull/send regarding --no-remember.
1279
    If there is no default push location set, the first push will set it (use
6105.2.4 by Martin von Gagern
Drive-by typo correction in command docstrings.
1280
    --no-remember to avoid setting it).  After that, you can omit the
5861.1.3 by Vincent Ladeuil
Fix the docs for push/pull/send regarding --no-remember.
1281
    location to use the default.  To change the default, use --remember. The
1282
    value will only be saved if the remote location can be accessed.
6175.2.4 by Vincent Ladeuil
Add script tests and documentation.
1283
1284
    The --verbose option will display the revisions pushed using the log_format
1285
    configuration option. You can use a different format by overriding it with
1286
    -Olog_format=<other_format>.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1287
    """
1685.1.80 by Wouter van Heyst
more code cleanup
1288
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
1289
    _see_also = ['pull', 'update', 'working-trees']
3256.1.2 by Daniel Watkins
Added revision argument to push.
1290
    takes_options = ['remember', 'overwrite', 'verbose', 'revision',
2279.3.1 by mbp at sourcefrog
Add a -d option to push, pull, merge (ported from tags branch)
1291
        Option('create-prefix',
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
1292
               help='Create the path leading up to the branch '
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
1293
                    'if it does not already exist.'),
5171.3.1 by Martin von Gagern
Turn --directory and -d into a global option.
1294
        custom_help('directory',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
1295
            help='Branch to push from, '
5171.3.1 by Martin von Gagern
Turn --directory and -d into a global option.
1296
                 'rather than the one containing the working directory.'),
2279.3.1 by mbp at sourcefrog
Add a -d option to push, pull, merge (ported from tags branch)
1297
        Option('use-existing-dir',
1298
               help='By default push will fail if the target'
1299
                    ' directory exists, but does not already'
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
1300
                    ' have a control directory.  This flag will'
2279.3.1 by mbp at sourcefrog
Add a -d option to push, pull, merge (ported from tags branch)
1301
                    ' allow push to proceed.'),
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
1302
        Option('stacked',
1303
            help='Create a stacked branch that references the public location '
1304
                'of the parent branch.'),
1305
        Option('stacked-on',
3221.19.4 by Ian Clatworthy
shallow -> stacked
1306
            help='Create a stacked branch that refers to another branch '
3221.19.2 by Ian Clatworthy
tweaks to ui during review by igc
1307
                'for the commit history. Only the work not present in the '
1308
                'referenced branch is included in the branch created.',
3221.11.12 by Robert Collins
Basic push --reference support, requires url, slow.
1309
            type=unicode),
4420.1.2 by Vincent Ladeuil
Fix bug #284038 by adding a --strict option to push.
1310
        Option('strict',
1311
               help='Refuse to push if there are uncommitted changes in'
4464.3.11 by Vincent Ladeuil
Add a check for tree/branch sync and tweak help.
1312
               ' the working tree, --no-strict disables the check.'),
5448.6.1 by Matthew Gordon
Added --no-tree option to pull. Needs testing and help text.
1313
        Option('no-tree',
5448.6.3 by Matthew Gordon
Added help text for pull --no-tree.
1314
               help="Don't populate the working tree, even for protocols"
1315
               " that support it."),
6159.2.3 by Jelmer Vernooij
Add --overwrite-tags arguments to push and pull.
1316
        Option('overwrite-tags',
1317
              help="Overwrite tags only."),
2279.3.1 by mbp at sourcefrog
Add a -d option to push, pull, merge (ported from tags branch)
1318
        ]
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1319
    takes_args = ['location?']
1185.85.31 by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag.
1320
    encoding_type = 'replace'
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1321
5861.1.9 by Vincent Ladeuil
Fix --no-remember for the first push.
1322
    def run(self, location=None, remember=None, overwrite=False,
3221.14.3 by Ian Clatworthy
Merge bzr.dev r3466
1323
        create_prefix=False, verbose=False, revision=None,
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
1324
        use_existing_dir=False, directory=None, stacked_on=None,
6159.2.3 by Jelmer Vernooij
Add --overwrite-tags arguments to push and pull.
1325
        stacked=False, strict=None, no_tree=False,
1326
        overwrite_tags=False):
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
1327
        from bzrlib.push import _show_push_branch
1328
6159.2.4 by Jelmer Vernooij
Add --overwrite-tags flag.
1329
        if overwrite:
1330
            overwrite = ["history", "tags"]
1331
        elif overwrite_tags:
1332
            overwrite = ["tags"]
1333
        else:
1334
            overwrite = []
1335
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
1336
        if directory is None:
1337
            directory = '.'
4420.1.2 by Vincent Ladeuil
Fix bug #284038 by adding a --strict option to push.
1338
        # Get the source branch
4453.1.4 by Vincent Ladeuil
Cleanup.
1339
        (tree, br_from,
6207.3.3 by jelmer at samba
Fix tests and the like.
1340
         _unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
4420.1.2 by Vincent Ladeuil
Fix bug #284038 by adding a --strict option to push.
1341
        # Get the tip's revision_id
3984.3.9 by Daniel Watkins
Converted cmd_push.
1342
        revision = _get_one_revision('push', revision)
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
1343
        if revision is not None:
3984.3.9 by Daniel Watkins
Converted cmd_push.
1344
            revision_id = revision.in_history(br_from).rev_id
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
1345
        else:
4294.2.1 by Robert Collins
Move directory checking for bzr push options into Branch.create_clone_on_transport.
1346
            revision_id = None
5147.2.2 by Vincent Ladeuil
Fix bug #519319 by defaulting to a warning for dirty trees.
1347
        if tree is not None and revision_id is None:
5171.2.2 by Vincent Ladeuil
Explain that the uncommitted changes are not processed when
1348
            tree.check_changed_or_out_of_date(
1349
                strict, 'push_strict',
1350
                more_error='Use --no-strict to force the push.',
1351
                more_warning='Uncommitted changes will not be pushed.')
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
1352
        # Get the stacked_on branch, if any
1353
        if stacked_on is not None:
1354
            stacked_on = urlutils.normalize_url(stacked_on)
3221.19.4 by Ian Clatworthy
shallow -> stacked
1355
        elif stacked:
3221.11.15 by Robert Collins
no parent branch causes an error on push --shallow.
1356
            parent_url = br_from.get_parent()
1357
            if parent_url:
1358
                parent = Branch.open(parent_url)
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
1359
                stacked_on = parent.get_public_branch()
1360
                if not stacked_on:
3221.11.17 by Robert Collins
no public location causes the parent to be used directly with push --shallow.
1361
                    # I considered excluding non-http url's here, thus forcing
1362
                    # 'public' branches only, but that only works for some
3221.14.3 by Ian Clatworthy
Merge bzr.dev r3466
1363
                    # users, so it's best to just depend on the user spotting an
3221.11.17 by Robert Collins
no public location causes the parent to be used directly with push --shallow.
1364
                    # error by the feedback given to them. RBC 20080227.
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
1365
                    stacked_on = parent_url
1366
            if not stacked_on:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1367
                raise errors.BzrCommandError(gettext(
1368
                    "Could not determine branch to refer to."))
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
1369
1370
        # Get the destination location
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1371
        if location is None:
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
1372
            stored_loc = br_from.get_push_location()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1373
            if stored_loc is None:
6394.1.2 by Jelmer Vernooij
Mention parent location.
1374
                parent_loc = br_from.get_parent()
1375
                if parent_loc:
6394.1.1 by Jelmer Vernooij
Suggest using :parent in "bzr push" if there was no push location specified or remembered.
1376
                    raise errors.BzrCommandError(gettext(
1377
                        "No push location known or specified. To push to the "
6394.1.2 by Jelmer Vernooij
Mention parent location.
1378
                        "parent branch (at %s), use 'bzr push :parent'." %
6394.1.3 by Jelmer Vernooij
mention parent URL
1379
                        urlutils.unescape_for_display(parent_loc,
1380
                            self.outf.encoding)))
6394.1.1 by Jelmer Vernooij
Suggest using :parent in "bzr push" if there was no push location specified or remembered.
1381
                else:
1382
                    raise errors.BzrCommandError(gettext(
1383
                        "No push location known or specified."))
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1384
            else:
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
1385
                display_url = urlutils.unescape_for_display(stored_loc,
1386
                        self.outf.encoding)
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
1387
                note(gettext("Using saved push location: %s") % display_url)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1388
                location = stored_loc
1685.1.22 by John Arbash Meinel
cmd_push was passing the location directly to relpath, rather than a URL
1389
3221.19.1 by Ian Clatworthy
refactor cmd_push to use a helper function
1390
        _show_push_branch(br_from, revision_id, location, self.outf,
1391
            verbose=verbose, overwrite=overwrite, remember=remember,
3549.1.1 by Martin Pool
rename push --reference to --stacked-on
1392
            stacked_on=stacked_on, create_prefix=create_prefix,
5448.6.1 by Matthew Gordon
Added --no-tree option to pull. Needs testing and help text.
1393
            use_existing_dir=use_existing_dir, no_tree=no_tree)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
1394
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1395
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1396
class cmd_branch(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
1397
    __doc__ = """Create a new branch that is a copy of an existing branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1398
1399
    If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
1400
    be used.  In other words, "branch ../foo/bar" will attempt to create ./bar.
2512.4.1 by Ian Clatworthy
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected
1401
    If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION
1402
    is derived from the FROM_LOCATION by stripping a leading scheme or drive
1403
    identifier, if any. For example, "branch lp:foo-bar" will attempt to
1404
    create ./foo-bar.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1405
1406
    To retrieve the branch as of a particular revision, supply the --revision
1407
    parameter, as in "branch foo/bar -r 5".
5741.3.2 by Martin Pool
Show a user warning on 'bzr clone' and 'get'
1408
1409
    The synonyms 'clone' and 'get' for this command are deprecated.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1410
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1411
1412
    _see_also = ['checkout']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1413
    takes_args = ['from_location', 'to_location?']
5353.2.1 by John Arbash Meinel
Add flags to enable accelerator trees, but default them to false.
1414
    takes_options = ['revision',
1415
        Option('hardlink', help='Hard-link working tree files where possible.'),
5353.2.2 by John Arbash Meinel
update the test suite.
1416
        Option('files-from', type=str,
1417
               help="Get file contents from this tree."),
3983.1.1 by Daniel Watkins
Merged John Klinger's original work.
1418
        Option('no-tree',
3983.1.2 by Daniel Watkins
Minor cleanup.
1419
            help="Create a branch without a working-tree."),
4596.2.1 by Lukáš Lalinský
Add support for `bzr branch --switch`
1420
        Option('switch',
1421
            help="Switch the checkout in the current directory "
1422
                 "to the new branch."),
3221.20.3 by Ian Clatworthy
shallow -> stacked
1423
        Option('stacked',
1424
            help='Create a stacked branch referring to the source branch. '
3221.11.20 by Robert Collins
Support --shallow on branch.
1425
                'The new branch will depend on the availability of the source '
1426
                'branch for all operations.'),
3696.2.3 by Daniel Watkins
Added --standalone option to branch.
1427
        Option('standalone',
1428
               help='Do not use a shared repository, even if available.'),
4479.2.1 by Alexander Belchenko
branch command now has new flag --use-existing-dir to force branching into existing directory if there is no branch yet.
1429
        Option('use-existing-dir',
1430
               help='By default branch will fail if the target'
1431
                    ' directory exists, but does not already'
1432
                    ' have a control directory.  This flag will'
1433
                    ' allow branch to proceed.'),
4927.3.1 by Ian Clatworthy
branch --bind option
1434
        Option('bind',
1435
            help="Bind new branch to from location."),
3221.11.20 by Robert Collins
Support --shallow on branch.
1436
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1437
    aliases = ['get', 'clone']
1438
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1439
    def run(self, from_location, to_location=None, revision=None,
4479.2.1 by Alexander Belchenko
branch command now has new flag --use-existing-dir to force branching into existing directory if there is no branch yet.
1440
            hardlink=False, stacked=False, standalone=False, no_tree=False,
5353.2.1 by John Arbash Meinel
Add flags to enable accelerator trees, but default them to false.
1441
            use_existing_dir=False, switch=False, bind=False,
5353.2.2 by John Arbash Meinel
update the test suite.
1442
            files_from=None):
4596.2.1 by Lukáš Lalinský
Add support for `bzr branch --switch`
1443
        from bzrlib import switch as _mod_switch
2220.2.30 by Martin Pool
split out tag-merging code and add some tests
1444
        from bzrlib.tag import _merge_tags_if_possible
5741.3.2 by Martin Pool
Show a user warning on 'bzr clone' and 'get'
1445
        if self.invoked_as in ['get', 'clone']:
1446
            ui.ui_factory.show_user_warning(
1447
                'deprecated_command',
1448
                deprecated_name=self.invoked_as,
1449
                recommended_name='branch',
1450
                deprecated_in_version='2.4')
6207.3.3 by jelmer at samba
Fix tests and the like.
1451
        accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
3123.5.11 by Aaron Bentley
Accelerate branching from a lightweight checkout
1452
            from_location)
5353.2.2 by John Arbash Meinel
update the test suite.
1453
        if not (hardlink or files_from):
1454
            # accelerator_tree is usually slower because you have to read N
1455
            # files (no readahead, lots of seeks, etc), but allow the user to
1456
            # explicitly request it
5353.2.1 by John Arbash Meinel
Add flags to enable accelerator trees, but default them to false.
1457
            accelerator_tree = None
5353.2.2 by John Arbash Meinel
update the test suite.
1458
        if files_from is not None and files_from != from_location:
1459
            accelerator_tree = WorkingTree.open(files_from)
3984.3.7 by Daniel Watkins
Fixed incorrect calls.
1460
        revision = _get_one_revision('branch', revision)
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1461
        self.add_cleanup(br_from.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1462
        if revision is not None:
1463
            revision_id = revision.as_revision_id(br_from)
1464
        else:
1465
            # FIXME - wt.last_revision, fallback to branch, fall back to
1466
            # None or perhaps NULL_REVISION to mean copy nothing
1467
            # RBC 20060209
1468
            revision_id = br_from.last_revision()
1469
        if to_location is None:
6240.3.1 by Jelmer Vernooij
Name new branches after colocated branches.
1470
            to_location = getattr(br_from, "name", None)
6437.15.1 by Jelmer Vernooij
Fix target branch locations.
1471
            if not to_location:
6240.3.1 by Jelmer Vernooij
Name new branches after colocated branches.
1472
                to_location = urlutils.derive_to_location(from_location)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1473
        to_transport = transport.get_transport(to_location)
1185.17.3 by Martin Pool
[pick] larger read lock scope for branch command
1474
        try:
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1475
            to_transport.mkdir('.')
1476
        except errors.FileExists:
6266.1.1 by Jelmer Vernooij
Support branching into colocated branch.
1477
            try:
1478
                to_dir = controldir.ControlDir.open_from_transport(
1479
                    to_transport)
1480
            except errors.NotBranchError:
1481
                if not use_existing_dir:
1482
                    raise errors.BzrCommandError(gettext('Target directory "%s" '
1483
                        'already exists.') % to_location)
1484
                else:
6207.2.1 by jelmer at samba
Fix cloning to colocated branch.
1485
                    to_dir = None
6266.1.1 by Jelmer Vernooij
Support branching into colocated branch.
1486
            else:
1487
                try:
1488
                    to_dir.open_branch()
1489
                except errors.NotBranchError:
1490
                    pass
4479.2.1 by Alexander Belchenko
branch command now has new flag --use-existing-dir to force branching into existing directory if there is no branch yet.
1491
                else:
6266.1.1 by Jelmer Vernooij
Support branching into colocated branch.
1492
                    raise errors.AlreadyBranchError(to_location)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1493
        except errors.NoSuchFile:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1494
            raise errors.BzrCommandError(gettext('Parent of "%s" does not exist.')
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1495
                                         % to_location)
6207.2.1 by jelmer at samba
Fix cloning to colocated branch.
1496
        else:
1497
            to_dir = None
1498
        if to_dir is None:
1499
            try:
1500
                # preserve whatever source format we have.
1501
                to_dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
1502
                                            possible_transports=[to_transport],
1503
                                            accelerator_tree=accelerator_tree,
1504
                                            hardlink=hardlink, stacked=stacked,
1505
                                            force_new_repo=standalone,
1506
                                            create_tree_if_local=not no_tree,
1507
                                            source_branch=br_from)
6305.3.2 by Jelmer Vernooij
Only make a single connection.
1508
                branch = to_dir.open_branch(
1509
                    possible_transports=[
6305.3.5 by Jelmer Vernooij
Avoid .control_transport, as it triggers _ensure_real.
1510
                        br_from.bzrdir.root_transport, to_transport])
6207.2.1 by jelmer at samba
Fix cloning to colocated branch.
1511
            except errors.NoSuchRevision:
1512
                to_transport.delete_tree('.')
1513
                msg = gettext("The branch {0} has no revision {1}.").format(
1514
                    from_location, revision)
1515
                raise errors.BzrCommandError(msg)
1516
        else:
6379.13.1 by Jelmer Vernooij
Fix branching into empty control directories.
1517
            try:
1518
                to_repo = to_dir.open_repository()
1519
            except errors.NoRepositoryPresent:
1520
                to_repo = to_dir.create_repository()
1521
            to_repo.fetch(br_from.repository, revision_id=revision_id)
6207.2.1 by jelmer at samba
Fix cloning to colocated branch.
1522
            branch = br_from.sprout(to_dir, revision_id=revision_id)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1523
        _merge_tags_if_possible(br_from, branch)
1524
        # If the source branch is stacked, the new branch may
1525
        # be stacked whether we asked for that explicitly or not.
1526
        # We therefore need a try/except here and not just 'if stacked:'
1527
        try:
6138.2.2 by Jonathan Riddell
gettext builtin.py's note() usage
1528
            note(gettext('Created new stacked branch referring to %s.') %
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1529
                branch.get_stacked_on_url())
1530
        except (errors.NotStacked, errors.UnstackableBranchFormat,
1531
            errors.UnstackableRepositoryFormat), e:
6143.1.1 by Jonathan Riddell
use ngettext for plurals
1532
            note(ngettext('Branched %d revision.', 'Branched %d revisions.', branch.revno()) % branch.revno())
4948.3.1 by Ian Clatworthy
branch --bind option
1533
        if bind:
1534
            # Bind to the parent
1535
            parent_branch = Branch.open(from_location)
1536
            branch.bind(parent_branch)
6138.2.2 by Jonathan Riddell
gettext builtin.py's note() usage
1537
            note(gettext('New branch bound to %s') % from_location)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1538
        if switch:
1539
            # Switch to the new branch
1540
            wt, _ = WorkingTree.open_containing('.')
1541
            _mod_switch.switch(wt.bzrdir, branch)
6138.2.2 by Jonathan Riddell
gettext builtin.py's note() usage
1542
            note(gettext('Switched to branch: %s'),
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1543
                urlutils.unescape_for_display(branch.base, 'utf-8'))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1544
1545
6060.6.1 by Jelmer Vernooij
Add 'bzr branches' command.
1546
class cmd_branches(Command):
1547
    __doc__ = """List the branches available at the current location.
1548
6110.8.1 by Jelmer Vernooij
Add --scan option to 'bzr branches'.
1549
    This command will print the names of all the branches at the current
1550
    location.
6060.6.1 by Jelmer Vernooij
Add 'bzr branches' command.
1551
    """
1552
1553
    takes_args = ['location?']
6110.8.1 by Jelmer Vernooij
Add --scan option to 'bzr branches'.
1554
    takes_options = [
6110.8.3 by Jelmer Vernooij
Rename --scan to --recursive.
1555
                  Option('recursive', short_name='R',
1556
                         help='Recursively scan for branches rather than '
1557
                              'just looking in the specified location.')]
6060.6.1 by Jelmer Vernooij
Add 'bzr branches' command.
1558
6110.8.3 by Jelmer Vernooij
Rename --scan to --recursive.
1559
    def run(self, location=".", recursive=False):
1560
        if recursive:
6110.8.1 by Jelmer Vernooij
Add --scan option to 'bzr branches'.
1561
            t = transport.get_transport(location)
1562
            if not t.listable():
1563
                raise errors.BzrCommandError(
1564
                    "Can't scan this type of location.")
6207.3.3 by jelmer at samba
Fix tests and the like.
1565
            for b in controldir.ControlDir.find_branches(t):
6110.8.1 by Jelmer Vernooij
Add --scan option to 'bzr branches'.
1566
                self.outf.write("%s\n" % urlutils.unescape_for_display(
1567
                    urlutils.relative_url(t.base, b.base),
1568
                    self.outf.encoding).rstrip("/"))
1569
        else:
6207.3.3 by jelmer at samba
Fix tests and the like.
1570
            dir = controldir.ControlDir.open_containing(location)[0]
6379.10.1 by Jelmer Vernooij
Make 'bzr branches' indicate the current branch.
1571
            try:
6436.1.3 by Jelmer Vernooij
Fix remaining tests.
1572
                active_branch = dir.open_branch(name="")
6379.10.1 by Jelmer Vernooij
Make 'bzr branches' indicate the current branch.
1573
            except errors.NotBranchError:
1574
                active_branch = None
6379.10.3 by Jelmer Vernooij
Only display active branch if it's not one of the existing colocated branches.
1575
            names = {}
6466.2.2 by Jelmer Vernooij
Review feedback from mgz.
1576
            for name, branch in iter_sibling_branches(dir):
6436.1.2 by Jelmer Vernooij
Fix some tests.
1577
                if name == "":
6379.10.3 by Jelmer Vernooij
Only display active branch if it's not one of the existing colocated branches.
1578
                    continue
1579
                active = (active_branch is not None and
1580
                          active_branch.base == branch.base)
1581
                names[name] = active
1582
            # Only mention the current branch explicitly if it's not
1583
            # one of the colocated branches
6436.1.3 by Jelmer Vernooij
Fix remaining tests.
1584
            if not any(names.values()) and active_branch is not None:
6379.10.3 by Jelmer Vernooij
Only display active branch if it's not one of the existing colocated branches.
1585
                self.outf.write("* %s\n" % gettext("(default)"))
1586
            for name in sorted(names.keys()):
1587
                active = names[name]
1588
                if active:
6379.10.1 by Jelmer Vernooij
Make 'bzr branches' indicate the current branch.
1589
                    prefix = "*"
6110.8.1 by Jelmer Vernooij
Add --scan option to 'bzr branches'.
1590
                else:
6379.10.1 by Jelmer Vernooij
Make 'bzr branches' indicate the current branch.
1591
                    prefix = " "
6379.10.3 by Jelmer Vernooij
Only display active branch if it's not one of the existing colocated branches.
1592
                self.outf.write("%s %s\n" % (
6379.10.1 by Jelmer Vernooij
Make 'bzr branches' indicate the current branch.
1593
                    prefix, name.encode(self.outf.encoding)))
6060.6.1 by Jelmer Vernooij
Add 'bzr branches' command.
1594
1595
1508.1.20 by Robert Collins
Create a checkout command.
1596
class cmd_checkout(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
1597
    __doc__ = """Create a new checkout of an existing branch.
1508.1.20 by Robert Collins
Create a checkout command.
1598
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
1599
    If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
1600
    the branch found in '.'. This is useful if you have removed the working tree
1601
    or if it was never created - i.e. if you pushed the branch to its current
1602
    location using SFTP.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1603
1508.1.20 by Robert Collins
Create a checkout command.
1604
    If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
1605
    be used.  In other words, "checkout ../foo/bar" will attempt to create ./bar.
2512.4.1 by Ian Clatworthy
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected
1606
    If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
1607
    is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
1608
    identifier, if any. For example, "checkout lp:foo-bar" will attempt to
1609
    create ./foo-bar.
1508.1.20 by Robert Collins
Create a checkout command.
1610
1611
    To retrieve the branch as of a particular revision, supply the --revision
1612
    parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
1613
    out of date [so you cannot commit] but it may be useful (i.e. to examine old
1614
    code.)
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1615
    """
1508.1.20 by Robert Collins
Create a checkout command.
1616
6523.2.1 by Wouter van Heyst
Add working-trees and remove-tree help topics to See also for checkout.
1617
    _see_also = ['checkouts', 'branch', 'working-trees', 'remove-tree']
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
1618
    takes_args = ['branch_location?', 'to_location?']
3984.3.5 by Daniel Watkins
Changed from option type to helper function.
1619
    takes_options = ['revision',
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
1620
                     Option('lightweight',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
1621
                            help="Perform a lightweight checkout.  Lightweight "
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
1622
                                 "checkouts depend on access to the branch for "
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
1623
                                 "every operation.  Normal checkouts can perform "
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
1624
                                 "common operations like diff and status without "
1625
                                 "such access, and also support local commits."
1626
                            ),
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1627
                     Option('files-from', type=str,
1628
                            help="Get file contents from this tree."),
1629
                     Option('hardlink',
1630
                            help='Hard-link working tree files where possible.'
1631
                            ),
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
1632
                     ]
1733.2.8 by Michael Ellerman
Add CVS compatible aliases for checkout and annotate, from fullermd.
1633
    aliases = ['co']
1508.1.20 by Robert Collins
Create a checkout command.
1634
2387.1.1 by Robert Collins
Remove the --basis parameter to clone etc. (Robert Collins)
1635
    def run(self, branch_location=None, to_location=None, revision=None,
5353.2.2 by John Arbash Meinel
update the test suite.
1636
            lightweight=False, files_from=None, hardlink=False):
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
1637
        if branch_location is None:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1638
            branch_location = osutils.getcwd()
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
1639
            to_location = branch_location
6207.3.3 by jelmer at samba
Fix tests and the like.
1640
        accelerator_tree, source = controldir.ControlDir.open_tree_or_branch(
3123.5.20 by Aaron Bentley
Checkout uses branch tree as a fallback accelerator
1641
            branch_location)
5353.2.2 by John Arbash Meinel
update the test suite.
1642
        if not (hardlink or files_from):
1643
            # accelerator_tree is usually slower because you have to read N
1644
            # files (no readahead, lots of seeks, etc), but allow the user to
1645
            # explicitly request it
1646
            accelerator_tree = None
3984.3.7 by Daniel Watkins
Fixed incorrect calls.
1647
        revision = _get_one_revision('checkout', revision)
5353.2.2 by John Arbash Meinel
update the test suite.
1648
        if files_from is not None and files_from != branch_location:
3123.5.20 by Aaron Bentley
Checkout uses branch tree as a fallback accelerator
1649
            accelerator_tree = WorkingTree.open(files_from)
3984.3.4 by Daniel Watkins
Converted cmd_checkout to use 1revision.
1650
        if revision is not None:
1651
            revision_id = revision.as_revision_id(source)
1508.1.20 by Robert Collins
Create a checkout command.
1652
        else:
1653
            revision_id = None
1654
        if to_location is None:
2512.4.1 by Ian Clatworthy
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected
1655
            to_location = urlutils.derive_to_location(branch_location)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1656
        # if the source and to_location are the same,
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
1657
        # and there is no working tree,
1658
        # then reconstitute a branch
1997.1.4 by Robert Collins
``bzr checkout --lightweight`` now operates on readonly branches as well
1659
        if (osutils.abspath(to_location) ==
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1660
            osutils.abspath(branch_location)):
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
1661
            try:
1662
                source.bzrdir.open_workingtree()
1663
            except errors.NoWorkingTree:
1551.15.60 by Aaron Bentley
bzr checkout -r always works, even with -r0 (#127708)
1664
                source.bzrdir.create_workingtree(revision_id)
1508.1.28 by Robert Collins
Test using bzr checkout to reconstitute working trees.
1665
                return
3123.5.2 by Aaron Bentley
Allow checkout --files_from
1666
        source.create_checkout(to_location, revision_id, lightweight,
3136.1.3 by Aaron Bentley
Implement hard-link support for branch and checkout
1667
                               accelerator_tree, hardlink)
1508.1.20 by Robert Collins
Create a checkout command.
1668
1669
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1670
class cmd_renames(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
1671
    __doc__ = """Show list of renamed files.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1672
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1673
    # TODO: Option to show renames between two historical versions.
1674
1675
    # TODO: Only show renames under dir, rather than in the whole branch.
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1676
    _see_also = ['status']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1677
    takes_args = ['dir?']
1678
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1679
    @display_command
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1680
    def run(self, dir=u'.'):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1681
        tree = WorkingTree.open_containing(dir)[0]
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1682
        self.add_cleanup(tree.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1683
        old_tree = tree.basis_tree()
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1684
        self.add_cleanup(old_tree.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1685
        renames = []
1686
        iterator = tree.iter_changes(old_tree, include_unchanged=True)
1687
        for f, paths, c, v, p, n, k, e in iterator:
1688
            if paths[0] == paths[1]:
1689
                continue
1690
            if None in (paths):
1691
                continue
1692
            renames.append(paths)
1693
        renames.sort()
1694
        for old_name, new_name in renames:
1695
            self.outf.write("%s => %s\n" % (old_name, new_name))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1696
1697
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1698
class cmd_update(Command):
6178.1.1 by Martin Pool
'bzr update' makes it clear it will only upgrade the whole tree
1699
    __doc__ = """Update a working tree to a new revision.
1700
1701
    This will perform a merge of the destination revision (the tip of the
1702
    branch, or the specified revision) into the working tree, and then make
1703
    that revision the basis revision for the working tree.  
1704
1705
    You can use this to visit an older revision, or to update a working tree
1706
    that is out of date from its branch.
1707
    
1708
    If there are any uncommitted changes in the tree, they will be carried
1709
    across and remain as uncommitted changes after the update.  To discard
1710
    these changes, use 'bzr revert'.  The uncommitted changes may conflict
1711
    with the changes brought in by the change in basis revision.
1712
1713
    If the tree's branch is bound to a master branch, bzr will also update
4916.1.11 by Martin Pool
Don't show extra message about updating from master; it's fairly redundant
1714
    the branch from the master.
6178.1.1 by Martin Pool
'bzr update' makes it clear it will only upgrade the whole tree
1715
1716
    You cannot update just a single file or directory, because each Bazaar
1717
    working tree has just a single basis revision.  If you want to restore a
1718
    file that has been removed locally, use 'bzr revert' instead of 'bzr
1719
    update'.  If you want to restore a file to its state in a previous
1720
    revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write
1721
    out the old content of that file to a new location.
6178.1.3 by Martin Pool
'update' with no arguments from a tree subdirectory now works and is tested (thanks vila)
1722
1723
    The 'dir' argument, if given, must be the location of the root of a
1724
    working tree to update.  By default, the working tree that contains the 
1725
    current working directory is used.
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1726
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1727
2625.5.1 by Daniel Watkins
'bzr update's help now includes a see also reference to 'help status-flags'.
1728
    _see_also = ['pull', 'working-trees', 'status-flags']
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1729
    takes_args = ['dir?']
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
1730
    takes_options = ['revision',
1731
                     Option('show-base',
1732
                            help="Show base revision text in conflicts."),
1733
                     ]
1815.3.1 by Stefan (metze) Metzmacher
add 'up' as alias for 'update'
1734
    aliases = ['up']
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1735
6178.1.3 by Martin Pool
'update' with no arguments from a tree subdirectory now works and is tested (thanks vila)
1736
    def run(self, dir=None, revision=None, show_base=None):
1907.5.1 by Matthieu Moy
update -r implemented
1737
        if revision is not None and len(revision) != 1:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1738
            raise errors.BzrCommandError(gettext(
6178.1.1 by Martin Pool
'bzr update' makes it clear it will only upgrade the whole tree
1739
                "bzr update --revision takes exactly one revision"))
6178.1.3 by Martin Pool
'update' with no arguments from a tree subdirectory now works and is tested (thanks vila)
1740
        if dir is None:
1741
            tree = WorkingTree.open_containing('.')[0]
1742
        else:
1743
            tree, relpath = WorkingTree.open_containing(dir)
1744
            if relpath:
1745
                # See bug 557886.
1746
                raise errors.BzrCommandError(gettext(
1747
                    "bzr update can only update a whole tree, "
1748
                    "not a file or subdirectory"))
1907.5.7 by Matthieu Moy
Coding style fixes thanks to jam.
1749
        branch = tree.branch
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1750
        possible_transports = []
2009.1.6 by Mark Hammond
more tweaks of the merge to get the tests passing.
1751
        master = branch.get_master_branch(
2806.2.2 by Vincent Ladeuil
Fix #128076 and #131396 by reusing bound branch transport.
1752
            possible_transports=possible_transports)
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
1753
        if master is not None:
4879.1.1 by Neil Martinsen-Burrell
update provides feedback on which branch it is up to date with.
1754
            branch_location = master.base
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1755
            tree.lock_write()
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
1756
        else:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1757
            branch_location = tree.branch.base
2084.2.1 by Aaron Bentley
Support updating lightweight checkouts of readonly branches
1758
            tree.lock_tree_write()
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1759
        self.add_cleanup(tree.unlock)
4879.1.3 by Vincent Ladeuil
Cleanup tests and tweak the text displayed.
1760
        # get rid of the final '/' and be ready for display
5106.2.1 by Martin Pool
Don't unconditionally strip last character of path in cmd_update
1761
        branch_location = urlutils.unescape_for_display(
1762
            branch_location.rstrip('/'),
1763
            self.outf.encoding)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1764
        existing_pending_merges = tree.get_parent_ids()[1:]
4900.1.4 by Andrew Bennetts
Merge lp:bzr
1765
        if master is None:
1766
            old_tip = None
1767
        else:
1768
            # may need to fetch data into a heavyweight checkout
1769
            # XXX: this may take some time, maybe we should display a
1770
            # message
1771
            old_tip = branch.update(possible_transports)
1772
        if revision is not None:
1773
            revision_id = revision[0].as_revision_id(branch)
1774
        else:
1775
            revision_id = branch.last_revision()
1776
        if revision_id == _mod_revision.ensure_null(tree.last_revision()):
5126.1.1 by Parth Malwankar
update -r now supports dotted revision.
1777
            revno = branch.revision_id_to_dotted_revno(revision_id)
6138.2.4 by Jonathan Riddell
use format strings where there are multiple substitutions to allow for translations
1778
            note(gettext("Tree is up to date at revision {0} of branch {1}"
1779
                        ).format('.'.join(map(str, revno)), branch_location))
4900.1.4 by Andrew Bennetts
Merge lp:bzr
1780
            return 0
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1781
        view_info = _get_view_info_for_change_reporter(tree)
4900.1.4 by Andrew Bennetts
Merge lp:bzr
1782
        change_reporter = delta._ChangeReporter(
1783
            unversioned_filter=tree.is_ignored,
1784
            view_info=view_info)
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1785
        try:
4900.1.4 by Andrew Bennetts
Merge lp:bzr
1786
            conflicts = tree.update(
1787
                change_reporter,
1788
                possible_transports=possible_transports,
1789
                revision=revision_id,
5430.7.1 by Rory Yorke
Added --show-base to pull and update (bug 202374).
1790
                old_tip=old_tip,
1791
                show_base=show_base)
4900.1.4 by Andrew Bennetts
Merge lp:bzr
1792
        except errors.NoSuchRevision, e:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1793
            raise errors.BzrCommandError(gettext(
4900.1.4 by Andrew Bennetts
Merge lp:bzr
1794
                                  "branch has no revision %s\n"
1795
                                  "bzr update --revision only works"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1796
                                  " for a revision in the branch history")
4900.1.4 by Andrew Bennetts
Merge lp:bzr
1797
                                  % (e.revision))
5126.1.1 by Parth Malwankar
update -r now supports dotted revision.
1798
        revno = tree.branch.revision_id_to_dotted_revno(
4985.3.5 by Gerard Krol
Reverting some unneeded changes.
1799
            _mod_revision.ensure_null(tree.last_revision()))
6138.2.4 by Jonathan Riddell
use format strings where there are multiple substitutions to allow for translations
1800
        note(gettext('Updated to revision {0} of branch {1}').format(
1801
             '.'.join(map(str, revno)), branch_location))
5151.1.1 by Robert Collins
``bzr update`` when a pending merge in the working tree has been merged
1802
        parent_ids = tree.get_parent_ids()
1803
        if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
6138.2.2 by Jonathan Riddell
gettext builtin.py's note() usage
1804
            note(gettext('Your local commits will now show as pending merges with '
1805
                 "'bzr status', and can be committed with 'bzr commit'."))
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1806
        if conflicts != 0:
1807
            return 1
1808
        else:
1809
            return 0
1508.1.24 by Robert Collins
Add update command for use with checkouts.
1810
1811
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1812
class cmd_info(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
1813
    __doc__ = """Show information about a working tree, branch or repository.
1694.2.6 by Martin Pool
[merge] bzr.dev
1814
1815
    This command will show all known locations and formats associated to the
4032.2.1 by Ian Clatworthy
omit branch committers from info -v (now requires -vv)
1816
    tree, branch or repository.
4035.1.2 by Ian Clatworthy
clean-up trailing whitespace
1817
4032.2.1 by Ian Clatworthy
omit branch committers from info -v (now requires -vv)
1818
    In verbose mode, statistical information is included with each report.
1819
    To see extended statistic information, use a verbosity level of 2 or
1820
    higher by specifying the verbose option multiple times, e.g. -vv.
1694.2.6 by Martin Pool
[merge] bzr.dev
1821
1822
    Branches and working trees will also report any missing revisions.
4032.2.1 by Ian Clatworthy
omit branch committers from info -v (now requires -vv)
1823
1824
    :Examples:
1825
1826
      Display information on the format and related locations:
1827
1828
        bzr info
1829
1830
      Display the above together with extended format information and
1831
      basic statistics (like the number of files in the working tree and
1832
      number of revisions in the branch and repository):
1833
4217.3.1 by Ian Clatworthy
fix info help
1834
        bzr info -v
4032.2.1 by Ian Clatworthy
omit branch committers from info -v (now requires -vv)
1835
1836
      Display the above together with number of committers to the branch:
1837
4217.3.1 by Ian Clatworthy
fix info help
1838
        bzr info -vv
1694.2.6 by Martin Pool
[merge] bzr.dev
1839
    """
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
1840
    _see_also = ['revno', 'working-trees', 'repositories']
1694.2.6 by Martin Pool
[merge] bzr.dev
1841
    takes_args = ['location?']
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
1842
    takes_options = ['verbose']
2904.3.1 by Lukáš Lalinský
Unicode-safe output from ``bzr info``.
1843
    encoding_type = 'replace'
1694.2.6 by Martin Pool
[merge] bzr.dev
1844
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1845
    @display_command
2768.1.8 by Ian Clatworthy
Get test suite fully working again
1846
    def run(self, location=None, verbose=False):
1847
        if verbose:
4032.2.1 by Ian Clatworthy
omit branch committers from info -v (now requires -vv)
1848
            noise_level = get_verbosity_level()
2768.1.8 by Ian Clatworthy
Get test suite fully working again
1849
        else:
1850
            noise_level = 0
1694.2.6 by Martin Pool
[merge] bzr.dev
1851
        from bzrlib.info import show_bzrdir_info
6207.3.3 by jelmer at samba
Fix tests and the like.
1852
        show_bzrdir_info(controldir.ControlDir.open_containing(location)[0],
2904.3.1 by Lukáš Lalinský
Unicode-safe output from ``bzr info``.
1853
                         verbose=noise_level, outfile=self.outf)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1854
1855
2292.1.13 by Marius Kruger
* merge the unversion command back into the remove command,
1856
class cmd_remove(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
1857
    __doc__ = """Remove files or directories.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1858
5340.8.6 by Marius Kruger
* Update documentation
1859
    This makes Bazaar stop tracking changes to the specified files. Bazaar will
1860
    delete them if they can easily be recovered using revert otherwise they
6503.3.1 by Jelmer Vernooij
extention -> extension.
1861
    will be backed up (adding an extension of the form .~#~). If no options or
5340.8.6 by Marius Kruger
* Update documentation
1862
    parameters are given Bazaar will scan for files that are being tracked by
1863
    Bazaar but missing in your tree and stop tracking them for you.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1864
    """
1551.6.26 by Aaron Bentley
Add support for remove --new
1865
    takes_args = ['file*']
2292.1.30 by Marius Kruger
* Minor text fixes.
1866
    takes_options = ['verbose',
3619.5.1 by Robert Collins
* ``bzr rm`` will now scan for files that are missing and remove just
1867
        Option('new', help='Only remove files that have never been committed.'),
2292.1.28 by Marius Kruger
* NEWS
1868
        RegistryOption.from_kwargs('file-deletion-strategy',
2681.1.7 by Aaron Bentley
Fix option grammar
1869
            'The file deletion mode to be used.',
2292.1.28 by Marius Kruger
* NEWS
1870
            title='Deletion Strategy', value_switches=True, enum_switch=False,
5340.8.6 by Marius Kruger
* Update documentation
1871
            safe='Backup changed files (default).',
4556.1.1 by Martin Pool
Make 'rm --keep' help more clear
1872
            keep='Delete from bzr but leave the working copy.',
6543.1.2 by Martin Packman
Remove --force argument from bzr remove
1873
            no_backup='Don\'t backup changed files.'),
1874
        ]
3619.5.2 by Robert Collins
* ``bzr rm`` is now aliased to ``bzr del`` for the convenience of svn
1875
    aliases = ['rm', 'del']
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
1876
    encoding_type = 'replace'
2292.1.1 by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file.
1877
2292.1.30 by Marius Kruger
* Minor text fixes.
1878
    def run(self, file_list, verbose=False, new=False,
2292.1.28 by Marius Kruger
* NEWS
1879
        file_deletion_strategy='safe'):
5444.3.1 by Marius Kruger
add 'bzr rm --no-backup' and deprecate the --force opting to be consitent with revert
1880
5346.4.5 by Martin Pool
Deprecate and avoid internal_tree_files and tree_files.
1881
        tree, file_list = WorkingTree.open_containing_paths(file_list)
2292.1.1 by Marius Kruger
"bzr remove" and "bzr rm" will now remove the working file.
1882
3794.5.38 by Mark Hammond
Restore missing (apparently pointless) block accidently removed.
1883
        if file_list is not None:
1884
            file_list = [f for f in file_list]
1885
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
1886
        self.add_cleanup(tree.lock_write().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1887
        # Heuristics should probably all move into tree.remove_smart or
1888
        # some such?
1889
        if new:
1890
            added = tree.changes_from(tree.basis_tree(),
1891
                specific_files=file_list).added
1892
            file_list = sorted([f[0] for f in added], reverse=True)
1893
            if len(file_list) == 0:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
1894
                raise errors.BzrCommandError(gettext('No matching files.'))
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
1895
        elif file_list is None:
1896
            # missing files show up in iter_changes(basis) as
1897
            # versioned-with-no-kind.
1898
            missing = []
1899
            for change in tree.iter_changes(tree.basis_tree()):
1900
                # Find paths in the working tree that have no kind:
1901
                if change[1][1] is not None and change[6][1] is None:
1902
                    missing.append(change[1][1])
1903
            file_list = sorted(missing, reverse=True)
1904
            file_deletion_strategy = 'keep'
1905
        tree.remove(file_list, verbose=verbose, to_file=self.outf,
1906
            keep_files=file_deletion_strategy=='keep',
5444.3.1 by Marius Kruger
add 'bzr rm --no-backup' and deprecate the --force opting to be consitent with revert
1907
            force=(file_deletion_strategy=='no-backup'))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1908
1909
1910
class cmd_file_id(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
1911
    __doc__ = """Print file_id of a particular file or directory.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1912
1913
    The file_id is assigned when the file is first added and remains the
1914
    same through all revisions where the file exists, even when it is
1915
    moved or renamed.
1916
    """
1685.1.80 by Wouter van Heyst
more code cleanup
1917
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1918
    hidden = True
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1919
    _see_also = ['inventory', 'ls']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1920
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
1921
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1922
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1923
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1924
        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.
1925
        i = tree.path2id(relpath)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1926
        if i is None:
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
1927
            raise errors.NotVersionedError(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1928
        else:
1685.1.80 by Wouter van Heyst
more code cleanup
1929
            self.outf.write(i + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1930
1931
1932
class cmd_file_path(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
1933
    __doc__ = """Print path of file_ids to a file or directory.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1934
1935
    This prints one line for each directory down to the target,
1185.85.35 by John Arbash Meinel
Updated file-path
1936
    starting at the branch root.
1937
    """
1685.1.80 by Wouter van Heyst
more code cleanup
1938
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1939
    hidden = True
1940
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
1941
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1942
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1943
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1944
        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.
1945
        fid = tree.path2id(relpath)
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
1946
        if fid is None:
2067.3.1 by Martin Pool
Clean up BzrNewError, other exception classes and users.
1947
            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.
1948
        segments = osutils.splitpath(relpath)
1949
        for pos in range(1, len(segments) + 1):
1950
            path = osutils.joinpath(segments[:pos])
1951
            self.outf.write("%s\n" % tree.path2id(path))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1952
1953
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
1954
class cmd_reconcile(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
1955
    __doc__ = """Reconcile bzr metadata in a branch.
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
1956
1957
    This can correct data mismatches that may have been caused by
1958
    previous ghost operations or bzr upgrades. You should only
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1959
    need to run this command if 'bzr check' or a bzr developer
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
1960
    advises you to run it.
1961
1962
    If a second branch is provided, cross-branch reconciliation is
1963
    also attempted, which will check that data like the tree root
1964
    id which was not present in very early bzr versions is represented
1965
    correctly in both branches.
1966
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1967
    At the same time it is run it may recompress data resulting in
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
1968
    a potential saving in disk space or performance gain.
1969
1970
    The branch *MUST* be on a listable system such as local disk or sftp.
1971
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1972
1973
    _see_also = ['check']
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
1974
    takes_args = ['branch?']
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
1975
    takes_options = [
1976
        Option('canonicalize-chks',
1977
               help='Make sure CHKs are in canonical form (repairs '
1978
                    'bug 522637).',
1979
               hidden=True),
1980
        ]
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
1981
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
1982
    def run(self, branch=".", canonicalize_chks=False):
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
1983
        from bzrlib.reconcile import reconcile
6207.3.3 by jelmer at samba
Fix tests and the like.
1984
        dir = controldir.ControlDir.open(branch)
5375.1.3 by Andrew Bennetts
Add hidden --canonicalize-chks option to reconcile to trigger GCCHKCanonicalizingPacker, improve progress reporting a little.
1985
        reconcile(dir, canonicalize_chks=canonicalize_chks)
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
1986
1987
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1988
class cmd_revision_history(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
1989
    __doc__ = """Display the list of revision ids on a branch."""
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
1990
1991
    _see_also = ['log']
1733.2.1 by Michael Ellerman
Add an optional location parameter to the 'revision-history' command.
1992
    takes_args = ['location?']
1993
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1994
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1995
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1996
    @display_command
1733.2.1 by Michael Ellerman
Add an optional location parameter to the 'revision-history' command.
1997
    def run(self, location="."):
1998
        branch = Branch.open_containing(location)[0]
6165.4.28 by Jelmer Vernooij
Fix last locking issues.
1999
        self.add_cleanup(branch.lock_read().unlock)
6165.4.27 by Jelmer Vernooij
Remove more uses of Branch.revision_history.
2000
        graph = branch.repository.get_graph()
2001
        history = list(graph.iter_lefthand_ancestry(branch.last_revision(),
6165.4.28 by Jelmer Vernooij
Fix last locking issues.
2002
            [_mod_revision.NULL_REVISION]))
6165.4.27 by Jelmer Vernooij
Remove more uses of Branch.revision_history.
2003
        for revid in reversed(history):
1733.2.4 by Michael Ellerman
Merge bzr.dev, fix minor conflict in cmd_revision_history().
2004
            self.outf.write(revid)
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
2005
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2006
2007
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
2008
class cmd_ancestry(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
2009
    __doc__ = """List all revisions merged into this branch."""
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2010
2011
    _see_also = ['log', 'revision-history']
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
2012
    takes_args = ['location?']
2013
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
2014
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
2015
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2016
    @display_command
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
2017
    def run(self, location="."):
2018
        try:
2019
            wt = WorkingTree.open_containing(location)[0]
2020
        except errors.NoWorkingTree:
2021
            b = Branch.open(location)
2022
            last_revision = b.last_revision()
2023
        else:
2024
            b = wt.branch
2025
            last_revision = wt.last_revision()
2026
5971.1.59 by Jonathan Riddell
revert mysterious unintended change to cmd_ancestry()
2027
        self.add_cleanup(b.repository.lock_read().unlock)
2028
        graph = b.repository.get_graph()
2029
        revisions = [revid for revid, parents in
2030
            graph.iter_ancestry([last_revision])]
2031
        for revision_id in reversed(revisions):
2032
            if _mod_revision.is_null(revision_id):
2033
                continue
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
2034
            self.outf.write(revision_id + '\n')
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
2035
2036
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2037
class cmd_init(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
2038
    __doc__ = """Make a directory into a versioned branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2039
2040
    Use this to create an empty branch, or before importing an
2041
    existing project.
2042
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2043
    If there is a repository in a parent directory of the location, then
1662.1.19 by Martin Pool
Better error message when initting existing tree
2044
    the history of the branch will be stored in the repository.  Otherwise
2374.1.2 by Ian Clatworthy
Improved after feedback from reviewers
2045
    init creates a standalone branch which carries its own history
2046
    in the .bzr directory.
1662.1.19 by Martin Pool
Better error message when initting existing tree
2047
2048
    If there is already a branch at the location but it has no working tree,
2049
    the tree can be populated with 'bzr checkout'.
2050
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2051
    Recipe for importing a tree of files::
2052
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2053
        cd ~/project
2054
        bzr init
1185.12.93 by Aaron Bentley
Fixed obsolete help
2055
        bzr add .
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2056
        bzr status
3035.1.1 by John Arbash Meinel
Address bug #59302 and fix documentation that uses single quotes.
2057
        bzr commit -m "imported project"
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2058
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2059
2677.1.2 by Alexander Belchenko
bzr_man: see also topics as cross-reference links
2060
    _see_also = ['init-repository', 'branch', 'checkout']
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
2061
    takes_args = ['location?']
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2062
    takes_options = [
2524.1.1 by Aaron Bentley
Revert broken changes
2063
        Option('create-prefix',
2064
               help='Create the path leading up to the branch '
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2065
                    'if it does not already exist.'),
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
2066
         RegistryOption('format',
2067
                help='Specify a format for this branch. '
2068
                'See "help formats".',
6472.2.1 by Jelmer Vernooij
Use bzrdir.controldir for generic access to control directories.
2069
                lazy_registry=('bzrlib.controldir', 'format_registry'),
6207.3.3 by jelmer at samba
Fix tests and the like.
2070
                converter=lambda name: controldir.format_registry.make_bzrdir(name),
2241.1.19 by mbp at sourcefrog
(merge) trunk
2071
                value_switches=True,
4634.39.39 by Ian Clatworthy
Fix ReST syntax errors in User Reference caused by options like --1.9 that ReST option lists don't permit
2072
                title="Branch format",
2241.1.19 by mbp at sourcefrog
(merge) trunk
2073
                ),
2230.3.42 by Aaron Bentley
add --append-revisions-only option to init
2074
         Option('append-revisions-only',
2075
                help='Never change revnos or the existing log.'
5448.6.4 by Matthew Gordon
Added --no-tree option to bzr init.
2076
                '  Append revisions to it only.'),
2077
         Option('no-tree',
2078
                'Create a branch without a working tree.')
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
2079
         ]
2524.1.1 by Aaron Bentley
Revert broken changes
2080
    def run(self, location=None, format=None, append_revisions_only=False,
5448.6.4 by Matthew Gordon
Added --no-tree option to bzr init.
2081
            create_prefix=False, no_tree=False):
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2082
        if format is None:
6207.3.3 by jelmer at samba
Fix tests and the like.
2083
            format = controldir.format_registry.make_bzrdir('default')
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
2084
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2085
            location = u'.'
1830.4.5 by Wouter van Heyst
cleanup
2086
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
2087
        to_transport = transport.get_transport(location)
1830.4.5 by Wouter van Heyst
cleanup
2088
2089
        # The path has to exist to initialize a
2090
        # branch inside of it.
2091
        # Just using os.mkdir, since I don't
2092
        # believe that we want to create a bunch of
2093
        # locations if the user supplies an extended path
2524.1.1 by Aaron Bentley
Revert broken changes
2094
        try:
2095
            to_transport.ensure_base()
2096
        except errors.NoSuchFile:
2097
            if not create_prefix:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2098
                raise errors.BzrCommandError(gettext("Parent directory of %s"
2524.1.1 by Aaron Bentley
Revert broken changes
2099
                    " does not exist."
2100
                    "\nYou may supply --create-prefix to create all"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2101
                    " leading parent directories.")
2524.1.1 by Aaron Bentley
Revert broken changes
2102
                    % location)
4294.2.1 by Robert Collins
Move directory checking for bzr push options into Branch.create_clone_on_transport.
2103
            to_transport.create_prefix()
2504.1.3 by Daniel Watkins
Implemented --create-prefix for 'init'.
2104
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
2105
        try:
6207.3.3 by jelmer at samba
Fix tests and the like.
2106
            a_bzrdir = controldir.ControlDir.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
2107
        except errors.NotBranchError:
1662.1.19 by Martin Pool
Better error message when initting existing tree
2108
            # really a NotBzrDir error...
6207.3.3 by jelmer at samba
Fix tests and the like.
2109
            create_branch = controldir.ControlDir.create_branch_convenience
5448.6.4 by Matthew Gordon
Added --no-tree option to bzr init.
2110
            if no_tree:
2111
                force_new_tree = False
2112
            else:
2113
                force_new_tree = None
2476.3.6 by Vincent Ladeuil
Fix the 'init connects multiple times' in a different way.
2114
            branch = create_branch(to_transport.base, format=format,
5448.6.4 by Matthew Gordon
Added --no-tree option to bzr init.
2115
                                   possible_transports=[to_transport],
2116
                                   force_new_tree=force_new_tree)
3697.5.4 by John Arbash Meinel
Merge vila's init[-repo] changes and add a NEWS entry.
2117
            a_bzrdir = branch.bzrdir
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
2118
        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
2119
            from bzrlib.transport.local import LocalTransport
3697.5.4 by John Arbash Meinel
Merge vila's init[-repo] changes and add a NEWS entry.
2120
            if a_bzrdir.has_branch():
1830.4.8 by Wouter van Heyst
clean up imports (and get if collapsing right)
2121
                if (isinstance(to_transport, LocalTransport)
3697.5.4 by John Arbash Meinel
Merge vila's init[-repo] changes and add a NEWS entry.
2122
                    and not a_bzrdir.has_workingtree()):
1830.4.1 by Wouter van Heyst
Allow bzr init to create remote branches
2123
                        raise errors.BranchExistsWithoutWorkingTree(location)
2124
                raise errors.AlreadyBranchError(location)
3697.5.4 by John Arbash Meinel
Merge vila's init[-repo] changes and add a NEWS entry.
2125
            branch = a_bzrdir.create_branch()
6083.2.3 by Jelmer Vernooij
Don't create working tree when there already is one.
2126
            if not no_tree and not a_bzrdir.has_workingtree():
5448.6.4 by Matthew Gordon
Added --no-tree option to bzr init.
2127
                a_bzrdir.create_workingtree()
2230.3.42 by Aaron Bentley
add --append-revisions-only option to init
2128
        if append_revisions_only:
2129
            try:
6404.6.7 by Vincent Ladeuil
Change set/remove to require a lock for the branch config files.
2130
                branch.set_append_revisions_only(True)
2230.3.42 by Aaron Bentley
add --append-revisions-only option to init
2131
            except errors.UpgradeRequired:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2132
                raise errors.BzrCommandError(gettext('This branch format cannot be set'
2133
                    ' to append-revisions-only.  Try --default.'))
3535.9.1 by Marius Kruger
print info after init and init-repo
2134
        if not is_quiet():
3922.2.1 by Marius Kruger
make `bzr init` less verbose, and update tests
2135
            from bzrlib.info import describe_layout, describe_format
2136
            try:
2137
                tree = a_bzrdir.open_workingtree(recommend_upgrade=False)
2138
            except (errors.NoWorkingTree, errors.NotLocalUrl):
2139
                tree = None
2140
            repository = branch.repository
2141
            layout = describe_layout(repository, branch, tree).lower()
2142
            format = describe_format(a_bzrdir, repository, branch, tree)
6138.2.4 by Jonathan Riddell
use format strings where there are multiple substitutions to allow for translations
2143
            self.outf.write(gettext("Created a {0} (format: {1})\n").format(
2144
                  layout, format))
3922.2.1 by Marius Kruger
make `bzr init` less verbose, and update tests
2145
            if repository.is_shared():
2146
                #XXX: maybe this can be refactored into transport.path_or_url()
2147
                url = repository.bzrdir.root_transport.external_url()
2148
                try:
2149
                    url = urlutils.local_path_from_url(url)
2150
                except errors.InvalidURL:
2151
                    pass
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
2152
                self.outf.write(gettext("Using shared repository: %s\n") % url)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2153
2154
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
2155
class cmd_init_repository(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
2156
    __doc__ = """Create a shared repository for branches to share storage space.
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
2157
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
2158
    New branches created under the repository directory will store their
4849.3.1 by Neil Martinsen-Burrell
add more description about what shared repositories are good for
2159
    revisions in the repository, not in the branch directory.  For branches
2160
    with shared history, this reduces the amount of storage needed and 
2161
    speeds up the creation of new branches.
2485.1.2 by James Westby
Update with comments from review, thanks to John and Aaron.
2162
4849.3.1 by Neil Martinsen-Burrell
add more description about what shared repositories are good for
2163
    If the --no-trees option is given then the branches in the repository
2164
    will not have working trees by default.  They will still exist as 
2165
    directories on disk, but they will not have separate copies of the 
2166
    files at a certain revision.  This can be useful for repositories that
2167
    store branches which are interacted with through checkouts or remote
2168
    branches, such as on a server.
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
2169
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2170
    :Examples:
4849.3.1 by Neil Martinsen-Burrell
add more description about what shared repositories are good for
2171
        Create a shared repository holding just branches::
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2172
2173
            bzr init-repo --no-trees repo
2174
            bzr init repo/trunk
2175
2176
        Make a lightweight checkout elsewhere::
2177
2178
            bzr checkout --lightweight repo/trunk trunk-checkout
2179
            cd trunk-checkout
2180
            (add files here)
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
2181
    """
2353.2.1 by John Arbash Meinel
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees'
2182
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2183
    _see_also = ['init', 'branch', 'checkout', 'repositories']
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
2184
    takes_args = ["location"]
2221.4.9 by Aaron Bentley
Zap trailing whitespace
2185
    takes_options = [RegistryOption('format',
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
2186
                            help='Specify a format for this repository. See'
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2187
                                 ' "bzr help formats" for details.',
6207.3.3 by jelmer at samba
Fix tests and the like.
2188
                            lazy_registry=('bzrlib.controldir', 'format_registry'),
2189
                            converter=lambda name: controldir.format_registry.make_bzrdir(name),
2221.4.12 by Aaron Bentley
Add option grouping to RegistryOption and clean up format options
2190
                            value_switches=True, title='Repository format'),
2257.2.1 by Wouter van Heyst
Change the ui level default for init-repo to --trees.
2191
                     Option('no-trees',
2353.2.1 by John Arbash Meinel
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees'
2192
                             help='Branches in the repository will default to'
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2193
                                  ' not having a working tree.'),
2353.2.1 by John Arbash Meinel
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees'
2194
                    ]
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
2195
    aliases = ["init-repo"]
2353.2.1 by John Arbash Meinel
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees'
2196
2257.2.2 by Wouter van Heyst
Actually test that `bzr init-repo --{no,}-trees` still works
2197
    def run(self, location, format=None, no_trees=False):
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2198
        if format is None:
6207.3.3 by jelmer at samba
Fix tests and the like.
2199
            format = controldir.format_registry.make_bzrdir('default')
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2200
2201
        if location is None:
2202
            location = '.'
2203
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
2204
        to_transport = transport.get_transport(location)
1830.4.5 by Wouter van Heyst
cleanup
2205
6366.1.11 by Jelmer Vernooij
Fix tests.
2206
        (repo, newdir, require_stacking, repository_policy) = (
2207
            format.initialize_on_transport_ex(to_transport,
2208
            create_prefix=True, make_working_trees=not no_trees,
2209
            shared_repo=True, force_new_repo=True,
2210
            use_existing_dir=True,
2211
            repo_format_name=format.repository_format.get_format_string()))
3535.9.1 by Marius Kruger
print info after init and init-repo
2212
        if not is_quiet():
2213
            from bzrlib.info import show_bzrdir_info
6366.1.11 by Jelmer Vernooij
Fix tests.
2214
            show_bzrdir_info(newdir, verbose=0, outfile=self.outf)
1558.5.1 by Aaron Bentley
Added make-repository command
2215
2216
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2217
class cmd_diff(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
2218
    __doc__ = """Show differences in the working tree, between revisions or branches.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2219
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
2220
    If no arguments are given, all changes for the current tree are listed.
2221
    If files are given, only the changes in those files are listed.
2222
    Remote and multiple branches can be compared by using the --old and
2223
    --new options. If not provided, the default for both is derived from
2224
    the first argument, if any, or the current tree if no arguments are
2225
    given.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2226
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
2227
    "bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
2228
    produces patches suitable for "patch -p1".
2229
5504.3.1 by Neil Martinsen-Burrell
give more information about revision ranges and the diff command
2230
    Note that when using the -r argument with a range of revisions, the
2231
    differences are computed between the two specified revisions.  That
2232
    is, the command does not show the changes introduced by the first 
2233
    revision in the range.  This differs from the interpretation of 
2234
    revision ranges used by "bzr log" which includes the first revision
2235
    in the range.
2236
2961.2.1 by Guillermo Gonzalez
* fix Bug #147938 (add exit values reference for cmd_diff help)
2237
    :Exit values:
2238
        1 - changed
2239
        2 - unrepresentable changes
2240
        3 - error
2241
        0 - no change
2242
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2243
    :Examples:
2244
        Shows the difference in the working tree versus the last commit::
2245
2246
            bzr diff
2247
2248
        Difference between the working tree and revision 1::
2249
2250
            bzr diff -r1
2251
4816.2.1 by Ian Clatworthy
Better explanation of diff -c behaviour
2252
        Difference between revision 3 and revision 1::
2253
2254
            bzr diff -r1..3
2255
2256
        Difference between revision 3 and revision 1 for branch xxx::
2257
2258
            bzr diff -r1..3 xxx
2259
5504.3.1 by Neil Martinsen-Burrell
give more information about revision ranges and the diff command
2260
        The changes introduced by revision 2 (equivalent to -r1..2)::
2261
2262
            bzr diff -c2
2263
2264
        To see the changes introduced by revision X::
4816.2.1 by Ian Clatworthy
Better explanation of diff -c behaviour
2265
        
2266
            bzr diff -cX
2267
2268
        Note that in the case of a merge, the -c option shows the changes
2269
        compared to the left hand parent. To see the changes against
2270
        another parent, use::
2271
2272
            bzr diff -r<chosen_parent>..X
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
2273
5504.3.1 by Neil Martinsen-Burrell
give more information about revision ranges and the diff command
2274
        The changes between the current revision and the previous revision
2275
        (equivalent to -c-1 and -r-2..-1)
4798.2.1 by Neil Martinsen-Burrell
add example of -c usage to diff help
2276
5504.3.1 by Neil Martinsen-Burrell
give more information about revision ranges and the diff command
2277
            bzr diff -r-2..
4798.2.1 by Neil Martinsen-Burrell
add example of -c usage to diff help
2278
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
2279
        Show just the differences for file NEWS::
2280
2281
            bzr diff NEWS
2282
2283
        Show the differences in working tree xxx for file NEWS::
2284
2285
            bzr diff xxx/NEWS
2286
2287
        Show the differences from branch xxx to this working tree:
2288
2289
            bzr diff --old xxx
2290
2291
        Show the differences between two branches for file NEWS::
2292
3072.1.4 by Ian Clatworthy
Tweak help
2293
            bzr diff --old xxx --new yyy NEWS
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
2294
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
2295
        Same as 'bzr diff' but prefix paths with old/ and new/::
2296
2297
            bzr diff --prefix old/:new/
5349.1.4 by Matthäus G. Chajdas
Allow both --using and --diff-options.
2298
            
2299
        Show the differences using a custom diff program with options::
2300
        
2301
            bzr diff --using /usr/bin/diff --diff-options -wu
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2302
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2303
    _see_also = ['status']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2304
    takes_args = ['file*']
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
2305
    takes_options = [
2598.1.11 by Martin Pool
Insist that all options have a help string and fix those that don't.
2306
        Option('diff-options', type=str,
5349.1.4 by Matthäus G. Chajdas
Allow both --using and --diff-options.
2307
               help='Pass these options to the external diff program.'),
2193.3.1 by Martin Pool
Finish removal of global short-option table
2308
        Option('prefix', type=str,
2309
               short_name='p',
2852.1.1 by Vincent Ladeuil
Fix typo.
2310
               help='Set prefixes added to old and new filenames, as '
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
2311
                    'two values separated by a colon. (eg "old/:new/").'),
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
2312
        Option('old',
3118.1.2 by Ian Clatworthy
diff on branches without working trees (Ian Clatworthy, #6700)
2313
            help='Branch/tree to compare from.',
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
2314
            type=unicode,
2315
            ),
2316
        Option('new',
3118.1.2 by Ian Clatworthy
diff on branches without working trees (Ian Clatworthy, #6700)
2317
            help='Branch/tree to compare to.',
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
2318
            type=unicode,
2319
            ),
2598.1.11 by Martin Pool
Insist that all options have a help string and fix those that don't.
2320
        'revision',
2745.4.1 by Lukáš Lalinsky
New option -C/--change for diff and status to show changes in one revision. (#56299)
2321
        'change',
3123.6.2 by Aaron Bentley
Implement diff --using natively
2322
        Option('using',
2323
            help='Use this command to compare files.',
2324
            type=unicode,
2325
            ),
5131.1.1 by Jelmer Vernooij
Add --format option to 'bzr diff'.
2326
        RegistryOption('format',
5574.9.3 by Jelmer Vernooij
Add -F as alias for 'bzr diff -F format'
2327
            short_name='F',
5131.1.1 by Jelmer Vernooij
Add --format option to 'bzr diff'.
2328
            help='Diff format to use.',
2329
            lazy_registry=('bzrlib.diff', 'format_registry'),
5574.9.3 by Jelmer Vernooij
Add -F as alias for 'bzr diff -F format'
2330
            title='Diff format'),
6524.5.2 by pauljnixon at gmail
Added a "--context" option to "bzr diff" to control the lines of context shown.
2331
        Option('context',
2332
            help='How many lines of context to show.',
2333
            type=int,
2334
            ),
2190.2.1 by Martin Pool
remove global registration of short options
2335
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2336
    aliases = ['di', 'dif']
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
2337
    encoding_type = 'exact'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2338
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2339
    @display_command
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
2340
    def run(self, revision=None, file_list=None, diff_options=None,
6524.5.2 by pauljnixon at gmail
Added a "--context" option to "bzr diff" to control the lines of context shown.
2341
            prefix=None, old=None, new=None, using=None, format=None, 
2342
            context=None):
5147.3.3 by Andrew Bennetts
Add get_trees_and_branches_to_diff_locked, leave get_trees_and_branches_to_diff unchanged for qbzr.
2343
        from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
5131.1.1 by Jelmer Vernooij
Add --format option to 'bzr diff'.
2344
            show_diff_trees)
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
2345
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
2346
        if (prefix is None) or (prefix == '0'):
2347
            # diff -p0 format
1694.2.1 by Martin Pool
Remove 'a/', 'b/' default prefixes on diff output.
2348
            old_label = ''
2349
            new_label = ''
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
2350
        elif prefix == '1':
2351
            old_label = 'old/'
2352
            new_label = 'new/'
2197.2.1 by Martin Pool
Refactor cmd_diff
2353
        elif ':' in prefix:
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
2354
            old_label, new_label = prefix.split(":")
2197.2.1 by Martin Pool
Refactor cmd_diff
2355
        else:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2356
            raise errors.BzrCommandError(gettext(
2325.1.2 by John Arbash Meinel
Add (eg "old/:new/") to errors to make it a little clearer.
2357
                '--prefix expects two values separated by a colon'
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2358
                ' (eg "old/:new/")'))
2197.2.1 by Martin Pool
Refactor cmd_diff
2359
2745.4.2 by Lukáš Lalinsky
Allow options to be stored in attributes that differ from their 'name' and use this to let '--change' and '--revision' to override each other.
2360
        if revision and len(revision) > 2:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2361
            raise errors.BzrCommandError(gettext('bzr diff --revision takes exactly'
2362
                                         ' one or two revision specifiers'))
2325.1.2 by John Arbash Meinel
Add (eg "old/:new/") to errors to make it a little clearer.
2363
5131.1.2 by Jelmer Vernooij
Refuse both --using and --format to 'bzr diff'.
2364
        if using is not None and format is not None:
6123.11.17 by Martin von Gagern
Use the same translation template for all mutually exclusive command line options.
2365
            raise errors.BzrCommandError(gettext(
2366
                '{0} and {1} are mutually exclusive').format(
2367
                '--using', '--format'))
5131.1.2 by Jelmer Vernooij
Refuse both --using and --format to 'bzr diff'.
2368
4705.1.2 by Gary van der Merwe
Start on tests for get_trees_and_branches_to_diff.
2369
        (old_tree, new_tree,
2370
         old_branch, new_branch,
5147.3.3 by Andrew Bennetts
Add get_trees_and_branches_to_diff_locked, leave get_trees_and_branches_to_diff unchanged for qbzr.
2371
         specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
5147.3.1 by Andrew Bennetts
Avoid 6 branch/repo relocks in cmd_diff.
2372
            file_list, revision, old, new, self.add_cleanup, apply_view=True)
4797.57.3 by Alexander Belchenko
diff command: win32: passing user_encoding to show_diff_trees function so we can get proper encoding for non-ascii filenames (as GNU diff does).
2373
        # GNU diff on Windows uses ANSI encoding for filenames
4797.57.10 by Alexander Belchenko
path_encoding selection logic extracted as helper function
2374
        path_encoding = osutils.get_diff_header_encoding()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2375
        return show_diff_trees(old_tree, new_tree, sys.stdout,
3072.1.1 by Ian Clatworthy
Improved diff based on feedback from abentley
2376
                               specific_files=specific_files,
2377
                               external_diff_options=diff_options,
2378
                               old_label=old_label, new_label=new_label,
4797.57.3 by Alexander Belchenko
diff command: win32: passing user_encoding to show_diff_trees function so we can get proper encoding for non-ascii filenames (as GNU diff does).
2379
                               extra_trees=extra_trees,
5258.1.1 by Alexander Belchenko
merge diff header work from my 2.1 branch
2380
                               path_encoding=path_encoding,
6524.5.2 by pauljnixon at gmail
Added a "--context" option to "bzr diff" to control the lines of context shown.
2381
                               using=using, context=context,
5131.1.1 by Jelmer Vernooij
Add --format option to 'bzr diff'.
2382
                               format_cls=format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2383
2384
2385
class cmd_deleted(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
2386
    __doc__ = """List files deleted in the working tree.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2387
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
2388
    # TODO: Show files deleted since a previous revision, or
2389
    # between two revisions.
2390
    # TODO: Much more efficient way to do this: read in new
2391
    # directories with readdir, rather than stating each one.  Same
2392
    # level of effort but possibly much less IO.  (Or possibly not,
2393
    # if the directories are very large...)
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2394
    _see_also = ['status', 'ls']
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
2395
    takes_options = ['directory', 'show-ids']
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
2396
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2397
    @display_command
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
2398
    def run(self, show_ids=False, directory=u'.'):
2399
        tree = WorkingTree.open_containing(directory)[0]
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2400
        self.add_cleanup(tree.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
2401
        old = tree.basis_tree()
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2402
        self.add_cleanup(old.lock_read().unlock)
6405.2.10 by Jelmer Vernooij
Fix more tests.
2403
        for path, ie in old.iter_entries_by_dir():
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
2404
            if not tree.has_id(ie.file_id):
2405
                self.outf.write(path)
2406
                if show_ids:
2407
                    self.outf.write(' ')
2408
                    self.outf.write(ie.file_id)
2409
                self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2410
2411
2412
class cmd_modified(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
2413
    __doc__ = """List files modified in working tree.
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
2414
    """
1551.10.14 by Aaron Bentley
Add some blank lines
2415
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2416
    hidden = True
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2417
    _see_also = ['status', 'ls']
5193.3.7 by Parth Malwankar
merged in changes from trunk and resolved conflict in builtins.py
2418
    takes_options = ['directory', 'null']
1551.10.14 by Aaron Bentley
Add some blank lines
2419
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2420
    @display_command
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
2421
    def run(self, null=False, directory=u'.'):
2422
        tree = WorkingTree.open_containing(directory)[0]
5588.3.1 by Andrew Bennetts
Fix -Drelock warnings in cmd_modified.
2423
        self.add_cleanup(tree.lock_read().unlock)
1852.10.3 by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.
2424
        td = tree.changes_from(tree.basis_tree())
5588.3.1 by Andrew Bennetts
Fix -Drelock warnings in cmd_modified.
2425
        self.cleanup_now()
1398 by Robert Collins
integrate in Gustavos x-bit patch
2426
        for path, id, kind, text_modified, meta_modified in td.modified:
3251.6.2 by Adrian Wilkins
Added null separation option for bzr modified and bzr added
2427
            if null:
2428
                self.outf.write(path + '\0')
2429
            else:
2430
                self.outf.write(osutils.quotefn(path) + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2431
2432
2433
class cmd_added(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
2434
    __doc__ = """List files added in working tree.
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
2435
    """
1551.10.14 by Aaron Bentley
Add some blank lines
2436
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2437
    hidden = True
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2438
    _see_also = ['status', 'ls']
5193.3.7 by Parth Malwankar
merged in changes from trunk and resolved conflict in builtins.py
2439
    takes_options = ['directory', 'null']
1551.10.14 by Aaron Bentley
Add some blank lines
2440
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2441
    @display_command
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
2442
    def run(self, null=False, directory=u'.'):
2443
        wt = WorkingTree.open_containing(directory)[0]
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2444
        self.add_cleanup(wt.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
2445
        basis = wt.basis_tree()
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2446
        self.add_cleanup(basis.lock_read().unlock)
6405.2.5 by Jelmer Vernooij
Add root_inventory.
2447
        root_id = wt.get_root_id()
2448
        for file_id in wt.all_file_ids():
2449
            if basis.has_id(file_id):
2450
                continue
2451
            if root_id == file_id:
2452
                continue
2453
            path = wt.id2path(file_id)
5171.3.8 by Martin von Gagern
Fix error in bzr added --directory.
2454
            if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
2455
                continue
2456
            if null:
2457
                self.outf.write(path + '\0')
2458
            else:
2459
                self.outf.write(osutils.quotefn(path) + '\n')
1185.85.53 by John Arbash Meinel
Updated cmd_root
2460
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2461
2462
class cmd_root(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
2463
    __doc__ = """Show the tree root directory.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2464
2465
    The root is the nearest enclosing directory with a .bzr control
2466
    directory."""
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2467
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2468
    takes_args = ['filename?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2469
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2470
    def run(self, filename=None):
2471
        """Print the branch root."""
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2472
        tree = WorkingTree.open_containing(filename)[0]
1685.1.80 by Wouter van Heyst
more code cleanup
2473
        self.outf.write(tree.basedir + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2474
2475
2466.9.1 by Kent Gibson
add bzr log --limit
2476
def _parse_limit(limitstring):
2477
    try:
2478
        return int(limitstring)
2479
    except ValueError:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2480
        msg = gettext("The limit argument must be an integer.")
2466.9.1 by Kent Gibson
add bzr log --limit
2481
        raise errors.BzrCommandError(msg)
2482
2483
3970.1.1 by Ian Clatworthy
log -n/--levels (Ian Clatworthy)
2484
def _parse_levels(s):
3947.1.6 by Ian Clatworthy
log -n/--level-count N option
2485
    try:
2486
        return int(s)
2487
    except ValueError:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2488
        msg = gettext("The levels argument must be an integer.")
3947.1.6 by Ian Clatworthy
log -n/--level-count N option
2489
        raise errors.BzrCommandError(msg)
2490
2491
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2492
class cmd_log(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
2493
    __doc__ = """Show historical log for a branch or subset of a branch.
3974.1.2 by Ian Clatworthy
enhanced log help
2494
2495
    log is bzr's default tool for exploring the history of a branch.
2496
    The branch to use is taken from the first parameter. If no parameters
2497
    are given, the branch containing the working directory is logged.
2498
    Here are some simple examples::
2499
2500
      bzr log                       log the current branch
2501
      bzr log foo.py                log a file in its branch
2502
      bzr log http://server/branch  log a branch on a server
2503
2504
    The filtering, ordering and information shown for each revision can
2505
    be controlled as explained below. By default, all revisions are
2506
    shown sorted (topologically) so that newer revisions appear before
2507
    older ones and descendants always appear before ancestors. If displayed,
2508
    merged revisions are shown indented under the revision in which they
2509
    were merged.
2510
2511
    :Output control:
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2512
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2513
      The log format controls how information about each revision is
2514
      displayed. The standard log formats are called ``long``, ``short``
2515
      and ``line``. The default is long. See ``bzr help log-formats``
2516
      for more details on log formats.
3974.1.2 by Ian Clatworthy
enhanced log help
2517
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2518
      The following options can be used to control what information is
2519
      displayed::
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2520
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2521
        -l N        display a maximum of N revisions
2522
        -n N        display N levels of revisions (0 for all, 1 for collapsed)
2523
        -v          display a status summary (delta) for each revision
2524
        -p          display a diff (patch) for each revision
2525
        --show-ids  display revision-ids (and file-ids), not just revnos
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2526
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2527
      Note that the default number of levels to display is a function of the
4206.1.1 by Ian Clatworthy
log mainline by default
2528
      log format. If the -n option is not used, the standard log formats show
2529
      just the top level (mainline).
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2530
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2531
      Status summaries are shown using status flags like A, M, etc. To see
2532
      the changes explained using words like ``added`` and ``modified``
2533
      instead, use the -vv option.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2534
3974.1.2 by Ian Clatworthy
enhanced log help
2535
    :Ordering control:
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2536
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2537
      To display revisions from oldest to newest, use the --forward option.
2538
      In most cases, using this option will have little impact on the total
2539
      time taken to produce a log, though --forward does not incrementally
2540
      display revisions like --reverse does when it can.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2541
3974.1.2 by Ian Clatworthy
enhanced log help
2542
    :Revision filtering:
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2543
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2544
      The -r option can be used to specify what revision or range of revisions
2545
      to filter against. The various forms are shown below::
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2546
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2547
        -rX      display revision X
2548
        -rX..    display revision X and later
2549
        -r..Y    display up to and including revision Y
2550
        -rX..Y   display from X to Y inclusive
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2551
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2552
      See ``bzr help revisionspec`` for details on how to specify X and Y.
2553
      Some common examples are given below::
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2554
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2555
        -r-1                show just the tip
2556
        -r-10..             show the last 10 mainline revisions
2557
        -rsubmit:..         show what's new on this branch
2558
        -rancestor:path..   show changes since the common ancestor of this
2559
                            branch and the one at location path
2560
        -rdate:yesterday..  show changes since yesterday
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2561
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2562
      When logging a range of revisions using -rX..Y, log starts at
2563
      revision Y and searches back in history through the primary
2564
      ("left-hand") parents until it finds X. When logging just the
2565
      top level (using -n1), an error is reported if X is not found
2566
      along the way. If multi-level logging is used (-n0), X may be
2567
      a nested merge revision and the log will be truncated accordingly.
2568
3974.1.2 by Ian Clatworthy
enhanced log help
2569
    :Path filtering:
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2570
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
2571
      If parameters are given and the first one is not a branch, the log
2572
      will be filtered to show only those revisions that changed the
2573
      nominated files or directories.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2574
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2575
      Filenames are interpreted within their historical context. To log a
2576
      deleted file, specify a revision range so that the file existed at
2577
      the end or start of the range.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2578
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2579
      Historical context is also important when interpreting pathnames of
2580
      renamed files/directories. Consider the following example:
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2581
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2582
      * revision 1: add tutorial.txt
2583
      * revision 2: modify tutorial.txt
2584
      * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2585
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2586
      In this case:
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2587
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2588
      * ``bzr log guide.txt`` will log the file added in revision 1
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2589
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2590
      * ``bzr log tutorial.txt`` will log the new file added in revision 3
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2591
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2592
      * ``bzr log -r2 -p tutorial.txt`` will show the changes made to
2593
        the original file in revision 2.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2594
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2595
      * ``bzr log -r2 -p guide.txt`` will display an error message as there
2596
        was no file called guide.txt in revision 2.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2597
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2598
      Renames are always followed by log. By design, there is no need to
2599
      explicitly ask for this (and no way to stop logging a file back
2600
      until it was last renamed).
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2601
3974.1.2 by Ian Clatworthy
enhanced log help
2602
    :Other filtering:
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2603
5935.2.2 by Jacek Sieka
Improve help message and hide --message option
2604
      The --match option can be used for finding revisions that match a
2605
      regular expression in a commit message, committer, author or bug.
2606
      Specifying the option several times will match any of the supplied
2607
      expressions. --match-author, --match-bugs, --match-committer and
2608
      --match-message can be used to only match a specific field.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2609
3974.1.2 by Ian Clatworthy
enhanced log help
2610
    :Tips & tricks:
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2611
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2612
      GUI tools and IDEs are often better at exploring history than command
4988.4.2 by Martin Pool
Change url to canonical.com or wiki, plus some doc improvements in passing
2613
      line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the
2614
      bzr-explorer shell, or the Loggerhead web interface.  See the Plugin
2615
      Guide <http://doc.bazaar.canonical.com/plugins/en/> and
2616
      <http://wiki.bazaar.canonical.com/IDEIntegration>.  
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2617
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2618
      You may find it useful to add the aliases below to ``bazaar.conf``::
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2619
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2620
        [ALIASES]
4206.1.1 by Ian Clatworthy
log mainline by default
2621
        tip = log -r-1
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
2622
        top = log -l10 --line
4206.1.1 by Ian Clatworthy
log mainline by default
2623
        show = log -v -p
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2624
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2625
      ``bzr tip`` will then show the latest revision while ``bzr top``
2626
      will show the last 10 mainline revisions. To see the details of a
2627
      particular revision X,  ``bzr show -rX``.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2628
4206.1.1 by Ian Clatworthy
log mainline by default
2629
      If you are interested in looking deeper into a particular merge X,
2630
      use ``bzr log -n0 -rX``.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2631
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2632
      ``bzr log -v`` on a branch with lots of history is currently
2633
      very slow. A fix for this issue is currently under development.
2634
      With or without that fix, it is recommended that a revision range
2635
      be given when using the -v option.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2636
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2637
      bzr has a generic full-text matching plugin, bzr-search, that can be
2638
      used to find revisions matching user names, commit messages, etc.
2639
      Among other features, this plugin can find all revisions containing
2640
      a list of words but not others.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2641
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2642
      When exploring non-mainline history on large projects with deep
2643
      history, the performance of log can be greatly improved by installing
4360.1.1 by Ian Clatworthy
(trivial) revnocache -> historycache in log help (Ian Clatworthy)
2644
      the historycache plugin. This plugin buffers historical information
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2645
      trading disk space for faster speed.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2646
    """
4202.2.1 by Ian Clatworthy
get directory logging working again
2647
    takes_args = ['file*']
3974.1.4 by Ian Clatworthy
log-formats topic and explained range searching
2648
    _see_also = ['log-formats', 'revisionspec']
2598.1.3 by Martin Pool
Option help improvements (thanks jamesw)
2649
    takes_options = [
2650
            Option('forward',
2651
                   help='Show from oldest to newest.'),
3755.1.1 by Vincent Ladeuil
Fix --verbose leaking into blackbox tests.
2652
            'timezone',
2768.1.5 by Ian Clatworthy
Wrap new std verbose option with new help instead of declaring a new one
2653
            custom_help('verbose',
2598.1.3 by Martin Pool
Option help improvements (thanks jamesw)
2654
                   help='Show files changed in each revision.'),
2655
            'show-ids',
2656
            'revision',
3734.1.1 by Vincent Ladeuil
Fix bug #248427 by adding a --change option to log.
2657
            Option('change',
2658
                   type=bzrlib.option._parse_revision_str,
2659
                   short_name='c',
2660
                   help='Show just the specified revision.'
2661
                   ' See also "help revisionspec".'),
2598.1.3 by Martin Pool
Option help improvements (thanks jamesw)
2662
            'log-format',
4081.3.9 by Martin von Gagern
Use proper registry for --authors option.
2663
            RegistryOption('authors',
4081.3.11 by Martin von Gagern
List alternatives for --authors option.
2664
                'What names to list as authors - first, all or committer.',
4081.3.8 by Martin von Gagern
Use convenience RegistryOption for --authors option to log command.
2665
                title='Authors',
4081.3.9 by Martin von Gagern
Use proper registry for --authors option.
2666
                lazy_registry=('bzrlib.log', 'author_list_registry'),
4081.3.8 by Martin von Gagern
Use convenience RegistryOption for --authors option to log command.
2667
            ),
3947.1.10 by Ian Clatworthy
review feedback from vila
2668
            Option('levels',
3947.1.5 by Ian Clatworthy
rename --merge-revisions to --include-merges
2669
                   short_name='n',
3947.1.6 by Ian Clatworthy
log -n/--level-count N option
2670
                   help='Number of levels to display - 0 for all, 1 for flat.',
2671
                   argname='N',
3970.1.1 by Ian Clatworthy
log -n/--levels (Ian Clatworthy)
2672
                   type=_parse_levels),
2598.1.3 by Martin Pool
Option help improvements (thanks jamesw)
2673
            Option('message',
2674
                   help='Show revisions whose message matches this '
2675
                        'regular expression.',
5935.2.2 by Jacek Sieka
Improve help message and hide --message option
2676
                   type=str,
2677
                   hidden=True),
2598.1.3 by Martin Pool
Option help improvements (thanks jamesw)
2678
            Option('limit',
3108.1.1 by Matt Nordhoff
bzr log: Add -l short name for the --limit argument.
2679
                   short_name='l',
2598.1.3 by Martin Pool
Option help improvements (thanks jamesw)
2680
                   help='Limit the output to the first N revisions.',
2681
                   argname='N',
2682
                   type=_parse_limit),
3943.5.1 by Ian Clatworthy
first cut at log --show-diff
2683
            Option('show-diff',
3943.5.5 by Ian Clatworthy
tweak option name as requested in bug report
2684
                   short_name='p',
2685
                   help='Show changes made in each revision as a patch.'),
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
2686
            Option('include-merged',
4221.2.1 by Ian Clatworthy
--include-merges as an alias for --levels 0 in log
2687
                   help='Show merged revisions like --levels 0 does.'),
6123.11.1 by Martin von Gagern
Rename --include-merges option to --include-sidelines.
2688
            Option('include-merges', hidden=True,
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
2689
                   help='Historical alias for --include-merged.'),
6123.11.4 by Martin von Gagern
Introduce an option "--omit-merges" for "bzr log".
2690
            Option('omit-merges',
2691
                   help='Do not report commits with more than one parent.'),
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
2692
            Option('exclude-common-ancestry',
2693
                   help='Display only the revisions that are not part'
6259.2.5 by Martin Packman
Add full stops to various option help text so test_option_grammar passes
2694
                   ' of both ancestries (require -rX..Y).'
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
2695
                   ),
5971.1.40 by Jonathan Riddell
add command line option
2696
            Option('signatures',
6259.2.5 by Martin Packman
Add full stops to various option help text so test_option_grammar passes
2697
                   help='Show digital signature validity.'),
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
2698
            ListOption('match',
2699
                short_name='m',
2700
                help='Show revisions whose properties match this '
2701
                'expression.',
2702
                type=str),
2703
            ListOption('match-message',
2704
                   help='Show revisions whose message matches this '
2705
                   'expression.',
2706
                type=str),
2707
            ListOption('match-committer',
2708
                   help='Show revisions whose committer matches this '
2709
                   'expression.',
2710
                type=str),
2711
            ListOption('match-author',
2712
                   help='Show revisions whose authors match this '
2713
                   'expression.',
2714
                type=str),
2715
            ListOption('match-bugs',
2716
                   help='Show revisions whose bugs match this '
2717
                   'expression.',
2718
                type=str)
2598.1.3 by Martin Pool
Option help improvements (thanks jamesw)
2719
            ]
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()
2720
    encoding_type = 'replace'
2721
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2722
    @display_command
4202.2.1 by Ian Clatworthy
get directory logging working again
2723
    def run(self, file_list=None, timezone='original',
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2724
            verbose=False,
2725
            show_ids=False,
2726
            forward=False,
2727
            revision=None,
3734.1.1 by Vincent Ladeuil
Fix bug #248427 by adding a --change option to log.
2728
            change=None,
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
2729
            log_format=None,
3947.1.10 by Ian Clatworthy
review feedback from vila
2730
            levels=None,
2466.9.1 by Kent Gibson
add bzr log --limit
2731
            message=None,
3943.5.1 by Ian Clatworthy
first cut at log --show-diff
2732
            limit=None,
4221.2.1 by Ian Clatworthy
--include-merges as an alias for --levels 0 in log
2733
            show_diff=False,
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
2734
            include_merged=None,
4081.3.15 by Gary van der Merwe
Merge bzr.dev.
2735
            authors=None,
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
2736
            exclude_common_ancestry=False,
5971.1.40 by Jonathan Riddell
add command line option
2737
            signatures=False,
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
2738
            match=None,
2739
            match_message=None,
2740
            match_committer=None,
2741
            match_author=None,
2742
            match_bugs=None,
6123.11.6 by Vincent Ladeuil
Add new paraneters add signature's ends, fix a test and a typo, check that no errors and no output is emitted when using assertLogRevnos.
2743
            omit_merges=False,
6123.11.10 by Martin von Gagern
Print deprecation warnings for all uses of include_merges.
2744
            include_merges=symbol_versioning.DEPRECATED_PARAMETER,
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
2745
            ):
4202.2.5 by Ian Clatworthy
apply review tweaks & update help
2746
        from bzrlib.log import (
2747
            Logger,
2748
            make_log_request_dict,
2749
            _get_info_for_log_files,
2750
            )
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2751
        direction = (forward and 'forward') or 'reverse'
6123.11.10 by Martin von Gagern
Print deprecation warnings for all uses of include_merges.
2752
        if symbol_versioning.deprecated_passed(include_merges):
2753
            ui.ui_factory.show_user_warning(
2754
                'deprecated_command_option',
2755
                deprecated_name='--include-merges',
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
2756
                recommended_name='--include-merged',
6123.11.10 by Martin von Gagern
Print deprecation warnings for all uses of include_merges.
2757
                deprecated_in_version='2.5',
2758
                command=self.invoked_as)
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
2759
            if include_merged is None:
2760
                include_merged = include_merges
6123.11.10 by Martin von Gagern
Print deprecation warnings for all uses of include_merges.
2761
            else:
6123.11.16 by Martin von Gagern
Use gettext for command errors about conflicting options.
2762
                raise errors.BzrCommandError(gettext(
6123.11.17 by Martin von Gagern
Use the same translation template for all mutually exclusive command line options.
2763
                    '{0} and {1} are mutually exclusive').format(
2764
                    '--include-merges', '--include-merged'))
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
2765
        if include_merged is None:
2766
            include_merged = False
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
2767
        if (exclude_common_ancestry
2768
            and (revision is None or len(revision) != 2)):
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2769
            raise errors.BzrCommandError(gettext(
2770
                '--exclude-common-ancestry requires -r with two revisions'))
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
2771
        if include_merged:
4221.2.2 by Ian Clatworthy
jam feedback: make --levels and --include-merges mutually exclusive
2772
            if levels is None:
2773
                levels = 0
2774
            else:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2775
                raise errors.BzrCommandError(gettext(
6123.11.17 by Martin von Gagern
Use the same translation template for all mutually exclusive command line options.
2776
                    '{0} and {1} are mutually exclusive').format(
2777
                    '--levels', '--include-merged'))
3734.1.1 by Vincent Ladeuil
Fix bug #248427 by adding a --change option to log.
2778
2779
        if change is not None:
2780
            if len(change) > 1:
2781
                raise errors.RangeInChangeOption()
2782
            if revision is not None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2783
                raise errors.BzrCommandError(gettext(
6123.11.17 by Martin von Gagern
Use the same translation template for all mutually exclusive command line options.
2784
                    '{0} and {1} are mutually exclusive').format(
2785
                    '--revision', '--change'))
3734.1.1 by Vincent Ladeuil
Fix bug #248427 by adding a --change option to log.
2786
            else:
2787
                revision = change
2788
4202.2.1 by Ian Clatworthy
get directory logging working again
2789
        file_ids = []
2790
        filter_by_dir = False
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
2791
        if file_list:
2792
            # find the file ids to log and check for directory filtering
2793
            b, file_info_list, rev1, rev2 = _get_info_for_log_files(
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2794
                revision, file_list, self.add_cleanup)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
2795
            for relpath, file_id, kind in file_info_list:
2796
                if file_id is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2797
                    raise errors.BzrCommandError(gettext(
2798
                        "Path unknown at end or start of revision range: %s") %
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
2799
                        relpath)
2800
                # If the relpath is the top of the tree, we log everything
2801
                if relpath == '':
2802
                    file_ids = []
2803
                    break
4202.2.1 by Ian Clatworthy
get directory logging working again
2804
                else:
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
2805
                    file_ids.append(file_id)
2806
                filter_by_dir = filter_by_dir or (
2807
                    kind in ['directory', 'tree-reference'])
2808
        else:
2809
            # log everything
2810
            # FIXME ? log the current subdir only RBC 20060203
2811
            if revision is not None \
2812
                    and len(revision) > 0 and revision[0].get_branch():
2813
                location = revision[0].get_branch()
2814
            else:
2815
                location = '.'
6207.3.3 by jelmer at samba
Fix tests and the like.
2816
            dir, relpath = controldir.ControlDir.open_containing(location)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
2817
            b = dir.open_branch()
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2818
            self.add_cleanup(b.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
2819
            rev1, rev2 = _get_revision_range(revision, b, self.name())
2820
6455.1.1 by Jelmer Vernooij
Convert validate_signatures_in_log to config stacks.
2821
        if b.get_config_stack().get('validate_signatures_in_log'):
5971.1.55 by Jonathan Riddell
add a config option to validate signatures
2822
            signatures = True
2823
2824
        if signatures:
5971.1.60 by Jonathan Riddell
move checking for gpgme availability into gpg.py
2825
            if not gpg.GPGStrategy.verify_signatures_available():
2826
                raise errors.GpgmeNotInstalled(None)
5971.1.55 by Jonathan Riddell
add a config option to validate signatures
2827
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
2828
        # Decide on the type of delta & diff filtering to use
2829
        # TODO: add an --all-files option to make this configurable & consistent
2830
        if not verbose:
2831
            delta_type = None
2832
        else:
2833
            delta_type = 'full'
2834
        if not show_diff:
2835
            diff_type = None
2836
        elif file_ids:
2837
            diff_type = 'partial'
2838
        else:
2839
            diff_type = 'full'
2840
2841
        # Build the log formatter
2842
        if log_format is None:
2843
            log_format = log.log_formatter_registry.get_default(b)
2844
        # Make a non-encoding output to include the diffs - bug 328007
2845
        unencoded_output = ui.ui_factory.make_output_stream(encoding_type='exact')
2846
        lf = log_format(show_ids=show_ids, to_file=self.outf,
2847
                        to_exact_file=unencoded_output,
2848
                        show_timezone=timezone,
2849
                        delta_format=get_verbosity_level(),
2850
                        levels=levels,
4081.3.2 by Martin von Gagern
Provide --authors argument to log command.
2851
                        show_advice=levels is None,
4081.3.10 by Martin von Gagern
Renamed "authors" to "author_list_handler" in several places.
2852
                        author_list_handler=authors)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
2853
2854
        # Choose the algorithm for doing the logging. It's annoying
2855
        # having multiple code paths like this but necessary until
2856
        # the underlying repository format is faster at generating
2857
        # deltas or can provide everything we need from the indices.
2858
        # The default algorithm - match-using-deltas - works for
2859
        # multiple files and directories and is faster for small
2860
        # amounts of history (200 revisions say). However, it's too
2861
        # slow for logging a single file in a repository with deep
2862
        # history, i.e. > 10K revisions. In the spirit of "do no
2863
        # evil when adding features", we continue to use the
2864
        # original algorithm - per-file-graph - for the "single
2865
        # file that isn't a directory without showing a delta" case.
2866
        partial_history = revision and b.repository._format.supports_chks
2867
        match_using_deltas = (len(file_ids) != 1 or filter_by_dir
2868
            or delta_type or partial_history)
2869
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
2870
        match_dict = {}
2871
        if match:
2872
            match_dict[''] = match
2873
        if match_message:
2874
            match_dict['message'] = match_message
2875
        if match_committer:
2876
            match_dict['committer'] = match_committer
2877
        if match_author:
2878
            match_dict['author'] = match_author
2879
        if match_bugs:
2880
            match_dict['bugs'] = match_bugs
6162.1.1 by Vincent Ladeuil
Stop reloading all ancestry for each tag when searching tags in a revision range (still breaks if X>Y in -rX..Y)
2881
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
2882
        # Build the LogRequest and execute it
2883
        if len(file_ids) == 0:
2884
            file_ids = None
2885
        rqst = make_log_request_dict(
2886
            direction=direction, specific_fileids=file_ids,
2887
            start_revision=rev1, end_revision=rev2, limit=limit,
2888
            message_search=message, delta_type=delta_type,
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
2889
            diff_type=diff_type, _match_using_deltas=match_using_deltas,
5935.2.1 by Jacek Sieka
Change the meaning of the log -m option to match and make it match message, committer, authors and bugs. --match-message and friends can be used to make more specific matches.
2890
            exclude_common_ancestry=exclude_common_ancestry, match=match_dict,
6123.11.4 by Martin von Gagern
Introduce an option "--omit-merges" for "bzr log".
2891
            signature=signatures, omit_merges=omit_merges,
5097.1.12 by Vincent Ladeuil
Implement the --exclude-common-ancestry log option.
2892
            )
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
2893
        Logger(b, rqst).show(lf)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2894
3943.6.3 by Ian Clatworthy
search the start tree if the end tree doesn't have a file
2895
3904.2.4 by Marius Kruger
* rename _get2Revisions to _get_revision_range
2896
def _get_revision_range(revisionspec_list, branch, command_name):
2897
    """Take the input of a revision option and turn it into a revision range.
2898
2899
    It returns RevisionInfo objects which can be used to obtain the rev_id's
4202.2.1 by Ian Clatworthy
get directory logging working again
2900
    of the desired revisions. It does some user input validations.
3904.2.4 by Marius Kruger
* rename _get2Revisions to _get_revision_range
2901
    """
3904.2.1 by Marius Kruger
* factor out _get2Revisions from cmd_log to be able to reuse how revesions is determined by log.
2902
    if revisionspec_list is None:
2903
        rev1 = None
2904
        rev2 = None
2905
    elif len(revisionspec_list) == 1:
2906
        rev1 = rev2 = revisionspec_list[0].in_history(branch)
2907
    elif len(revisionspec_list) == 2:
3936.3.21 by Ian Clatworthy
make log -rX.. as fast as log -rX..-1
2908
        start_spec = revisionspec_list[0]
2909
        end_spec = revisionspec_list[1]
2910
        if end_spec.get_branch() != start_spec.get_branch():
3904.2.1 by Marius Kruger
* factor out _get2Revisions from cmd_log to be able to reuse how revesions is determined by log.
2911
            # b is taken from revision[0].get_branch(), and
2912
            # show_log will use its revision_history. Having
2913
            # different branches will lead to weird behaviors.
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2914
            raise errors.BzrCommandError(gettext(
3904.2.4 by Marius Kruger
* rename _get2Revisions to _get_revision_range
2915
                "bzr %s doesn't accept two revisions in different"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2916
                " branches.") % command_name)
5092.1.2 by Vincent Ladeuil
Fix bug #519862.
2917
        if start_spec.spec is None:
2918
            # Avoid loading all the history.
5092.1.3 by Vincent Ladeuil
Tweak to fix failing test in the full test suite.
2919
            rev1 = RevisionInfo(branch, None, None)
5092.1.2 by Vincent Ladeuil
Fix bug #519862.
2920
        else:
2921
            rev1 = start_spec.in_history(branch)
3936.3.21 by Ian Clatworthy
make log -rX.. as fast as log -rX..-1
2922
        # Avoid loading all of history when we know a missing
2923
        # end of range means the last revision ...
3936.3.40 by Ian Clatworthy
review feedback from jam
2924
        if end_spec.spec is None:
3936.3.21 by Ian Clatworthy
make log -rX.. as fast as log -rX..-1
2925
            last_revno, last_revision_id = branch.last_revision_info()
2926
            rev2 = RevisionInfo(branch, last_revno, last_revision_id)
2927
        else:
2928
            rev2 = end_spec.in_history(branch)
3904.2.1 by Marius Kruger
* factor out _get2Revisions from cmd_log to be able to reuse how revesions is determined by log.
2929
    else:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
2930
        raise errors.BzrCommandError(gettext(
2931
            'bzr %s --revision takes one or two values.') % command_name)
3904.2.1 by Marius Kruger
* factor out _get2Revisions from cmd_log to be able to reuse how revesions is determined by log.
2932
    return rev1, rev2
1185.85.4 by John Arbash Meinel
currently broken, trying to fix things up.
2933
3921.3.4 by Marius Kruger
add support to filter on local and remote revisions
2934
2935
def _revision_range_to_revid_range(revision_range):
2936
    rev_id1 = None
2937
    rev_id2 = None
2938
    if revision_range[0] is not None:
2939
        rev_id1 = revision_range[0].rev_id
2940
    if revision_range[1] is not None:
2941
        rev_id2 = revision_range[1].rev_id
2942
    return rev_id1, rev_id2
2943
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
2944
def get_log_format(long=False, short=False, line=False, default='long'):
2945
    log_format = default
2946
    if long:
2947
        log_format = 'long'
2948
    if short:
2949
        log_format = 'short'
2950
    if line:
2951
        log_format = 'line'
2952
    return log_format
2953
2954
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2955
class cmd_touching_revisions(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
2956
    __doc__ = """Return revision-ids which affected a particular file.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2957
1685.1.80 by Wouter van Heyst
more code cleanup
2958
    A more user-friendly interface is "bzr log FILE".
2959
    """
2960
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2961
    hidden = True
2962
    takes_args = ["filename"]
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
2963
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2964
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2965
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2966
        tree, relpath = WorkingTree.open_containing(filename)
4634.90.3 by Andrew Bennetts
Fix other bugs revealed by clearing chk_map page cache during blackbox tests.
2967
        file_id = tree.path2id(relpath)
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2968
        b = tree.branch
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
2969
        self.add_cleanup(b.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
2970
        touching_revs = log.find_touching_revisions(b, file_id)
2971
        for revno, revision_id, what in touching_revs:
2972
            self.outf.write("%6d %s\n" % (revno, what))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2973
2974
2975
class cmd_ls(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
2976
    __doc__ = """List files in a tree.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2977
    """
1551.9.24 by Aaron Bentley
Unhide ls, add kind flag
2978
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
2979
    _see_also = ['status', 'cat']
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
2980
    takes_args = ['path?']
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
2981
    takes_options = [
2982
            'verbose',
2983
            'revision',
4206.2.1 by Ian Clatworthy
ls should be non-recursive by default
2984
            Option('recursive', short_name='R',
2985
                   help='Recurse into subdirectories.'),
5193.3.3 by Parth Malwankar
removed -l for --from-root as that can be confusing as ls -l
2986
            Option('from-root',
2598.1.3 by Martin Pool
Option help improvements (thanks jamesw)
2987
                   help='Print paths relative to the root of the branch.'),
5193.3.1 by Parth Malwankar
added short options for ls.
2988
            Option('unknown', short_name='u',
2989
                help='Print unknown files.'),
3382.2.1 by Jerad Cramp
Fixed bug #165086. Command 'bzr ls' now accepts '-V' as an alias for '--versioned'.
2990
            Option('versioned', help='Print versioned files.',
2991
                   short_name='V'),
5193.3.1 by Parth Malwankar
added short options for ls.
2992
            Option('ignored', short_name='i',
2993
                help='Print ignored files.'),
2994
            Option('kind', short_name='k',
2598.1.12 by Martin Pool
Fix up --kind options
2995
                   help='List entries of a particular kind: file, directory, symlink.',
2996
                   type=unicode),
5193.3.4 by Parth Malwankar
--null is now a _standard_option
2997
            'null',
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
2998
            'show-ids',
5171.3.3 by Martin von Gagern
Add --directory option to ls, cat and annotate.
2999
            'directory',
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
3000
            ]
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3001
    @display_command
2598.1.12 by Martin Pool
Fix up --kind options
3002
    def run(self, revision=None, verbose=False,
4206.2.1 by Ian Clatworthy
ls should be non-recursive by default
3003
            recursive=False, from_root=False,
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
3004
            unknown=False, versioned=False, ignored=False,
5171.3.3 by Martin von Gagern
Add --directory option to ls, cat and annotate.
3005
            null=False, kind=None, show_ids=False, path=None, directory=None):
1551.9.24 by Aaron Bentley
Unhide ls, add kind flag
3006
3007
        if kind and kind not in ('file', 'directory', 'symlink'):
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3008
            raise errors.BzrCommandError(gettext('invalid kind specified'))
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
3009
3010
        if verbose and null:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3011
            raise errors.BzrCommandError(gettext('Cannot set both --verbose and --null'))
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
3012
        all = not (unknown or versioned or ignored)
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
3013
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
3014
        selection = {'I':ignored, '?':unknown, 'V':versioned}
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
3015
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
3016
        if path is None:
3017
            fs_path = '.'
3018
        else:
3019
            if from_root:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3020
                raise errors.BzrCommandError(gettext('cannot specify both --from-root'
3021
                                             ' and PATH'))
2215.3.1 by Aaron Bentley
Allow ls to take a PATH
3022
            fs_path = path
5171.3.6 by Martin von Gagern
Fix --directory option to ls command.
3023
        tree, branch, relpath = \
5171.3.9 by Martin von Gagern
Rename function to _open_directory_or_containing_tree_or_branch.
3024
            _open_directory_or_containing_tree_or_branch(fs_path, directory)
4370.6.3 by Ian Clatworthy
minimise differences to trunk code
3025
3026
        # Calculate the prefix to use
3027
        prefix = None
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
3028
        if from_root:
4370.6.3 by Ian Clatworthy
minimise differences to trunk code
3029
            if relpath:
3030
                prefix = relpath + '/'
4832.1.1 by Benjamin Peterson
avoid getting extra slashes in the output when ls' argument ends with a slash
3031
        elif fs_path != '.' and not fs_path.endswith('/'):
4370.6.3 by Ian Clatworthy
minimise differences to trunk code
3032
            prefix = fs_path + '/'
4456.1.2 by Ian Clatworthy
fix tabs in builtins.py
3033
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
3034
        if revision is not None or tree is None:
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
3035
            tree = _get_one_revision_tree('ls', revision, branch=branch)
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
3036
4032.4.5 by Eduardo Padoan
Check if the tree supports views only once when ls is called.
3037
        apply_view = False
4048.1.2 by Ian Clatworthy
fix broken test for ls -r
3038
        if isinstance(tree, WorkingTree) and tree.supports_views():
4032.4.2 by Eduardo Padoan
Make ls show only files on the current view.
3039
            view_files = tree.views.lookup_view()
3040
            if view_files:
4032.4.5 by Eduardo Padoan
Check if the tree supports views only once when ls is called.
3041
                apply_view = True
4032.4.2 by Eduardo Padoan
Make ls show only files on the current view.
3042
                view_str = views.view_display_str(view_files)
6138.2.2 by Jonathan Riddell
gettext builtin.py's note() usage
3043
                note(gettext("Ignoring files outside view. View is %s") % view_str)
4032.4.2 by Eduardo Padoan
Make ls show only files on the current view.
3044
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
3045
        self.add_cleanup(tree.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
3046
        for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
3047
            from_dir=relpath, recursive=recursive):
3048
            # Apply additional masking
3049
            if not all and not selection[fc]:
3050
                continue
3051
            if kind is not None and fkind != kind:
3052
                continue
3053
            if apply_view:
3054
                try:
3055
                    if relpath:
3056
                        fullpath = osutils.pathjoin(relpath, fp)
3057
                    else:
3058
                        fullpath = fp
3059
                    views.check_path_in_view(tree, fullpath)
3060
                except errors.FileOutsideView:
3061
                    continue
4370.6.3 by Ian Clatworthy
minimise differences to trunk code
3062
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
3063
            # Output the entry
3064
            if prefix:
3065
                fp = osutils.pathjoin(prefix, fp)
3066
            kindch = entry.kind_character()
3067
            outstring = fp + kindch
3068
            ui.ui_factory.clear_term()
3069
            if verbose:
3070
                outstring = '%-8s %s' % (fc, outstring)
3071
                if show_ids and fid is not None:
3072
                    outstring = "%-50s %s" % (outstring, fid)
3073
                self.outf.write(outstring + '\n')
3074
            elif null:
3075
                self.outf.write(fp + '\0')
3076
                if show_ids:
3077
                    if fid is not None:
3078
                        self.outf.write(fid)
3079
                    self.outf.write('\0')
3080
                self.outf.flush()
3081
            else:
3082
                if show_ids:
3083
                    if fid is not None:
3084
                        my_id = fid
3085
                    else:
3086
                        my_id = ''
3087
                    self.outf.write('%-50s %s\n' % (outstring, my_id))
3088
                else:
4456.1.1 by Ian Clatworthy
(igc) fix ls DIR --from-root and improve ls performance
3089
                    self.outf.write(outstring + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3090
4370.6.3 by Ian Clatworthy
minimise differences to trunk code
3091
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3092
class cmd_unknowns(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
3093
    __doc__ = """List unknown files.
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
3094
    """
1551.10.14 by Aaron Bentley
Add some blank lines
3095
1551.10.13 by Aaron Bentley
Hide 'unknowns', document alterntatives to hidden commands
3096
    hidden = True
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3097
    _see_also = ['ls']
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
3098
    takes_options = ['directory']
1551.10.14 by Aaron Bentley
Add some blank lines
3099
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3100
    @display_command
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
3101
    def run(self, directory=u'.'):
3102
        for f in WorkingTree.open_containing(directory)[0].unknowns():
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
3103
            self.outf.write(osutils.quotefn(f) + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3104
3105
3106
class cmd_ignore(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
3107
    __doc__ = """Ignore specified files or patterns.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3108
3398.1.26 by Ian Clatworthy
jam feedback - make patterns a separate help topic
3109
    See ``bzr help patterns`` for details on the syntax of patterns.
3110
4800.2.2 by Patrick Regan
Reworded ignore to keep extra verbage down.
3111
    If a .bzrignore file does not exist, the ignore command
4800.2.1 by Patrick Regan
Added clarifying text about ignore command.
3112
    will create one and add the specified files or patterns to the newly
3113
    created file. The ignore command will also automatically add the 
4800.2.2 by Patrick Regan
Reworded ignore to keep extra verbage down.
3114
    .bzrignore file to be versioned. Creating a .bzrignore file without
4800.2.1 by Patrick Regan
Added clarifying text about ignore command.
3115
    the use of the ignore command will require an explicit add command.
3116
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3117
    To remove patterns from the ignore list, edit the .bzrignore file.
3398.1.26 by Ian Clatworthy
jam feedback - make patterns a separate help topic
3118
    After adding, editing or deleting that file either indirectly by
3119
    using this command or directly by using an editor, be sure to commit
3120
    it.
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
3121
    
5168.3.3 by Parth Malwankar
Removed --old-default-rules flag.
3122
    Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
3123
    the global ignore file can be found in the application data directory as
3124
    C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
5168.3.7 by Parth Malwankar
fixed doc.
3125
    Global ignores are not touched by this command. The global ignore file
5168.3.5 by Parth Malwankar
clarification on global ignores.
3126
    can be edited directly using an editor.
5168.3.3 by Parth Malwankar
Removed --old-default-rules flag.
3127
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
3128
    Patterns prefixed with '!' are exceptions to ignore patterns and take
3129
    precedence over regular ignores.  Such exceptions are used to specify
3130
    files that should be versioned which would otherwise be ignored.
3131
    
3132
    Patterns prefixed with '!!' act as regular ignore patterns, but have
3133
    precedence over the '!' exception patterns.
2135.2.2 by Kent Gibson
Ignore pattern matcher (glob.py) patches:
3134
5504.1.1 by Neil Martinsen-Burrell
document the comment character in ignore files
3135
    :Notes: 
3136
        
3137
    * Ignore patterns containing shell wildcards must be quoted from
3138
      the shell on Unix.
3139
3140
    * Ignore patterns starting with "#" act as comments in the ignore file.
3141
      To ignore patterns that begin with that character, use the "RE:" prefix.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3142
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3143
    :Examples:
3144
        Ignore the top level Makefile::
3145
3146
            bzr ignore ./Makefile
3147
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
3148
        Ignore .class files in all directories...::
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3149
3035.1.1 by John Arbash Meinel
Address bug #59302 and fix documentation that uses single quotes.
3150
            bzr ignore "*.class"
3151
4948.5.2 by John Whitley
NEWS and various documentation updates for ignore exclusions.
3152
        ...but do not ignore "special.class"::
3153
3154
            bzr ignore "!special.class"
3155
5504.1.1 by Neil Martinsen-Burrell
document the comment character in ignore files
3156
        Ignore files whose name begins with the "#" character::
3157
3158
            bzr ignore "RE:^#"
3159
3035.1.1 by John Arbash Meinel
Address bug #59302 and fix documentation that uses single quotes.
3160
        Ignore .o files under the lib directory::
3161
3162
            bzr ignore "lib/**/*.o"
3163
3164
        Ignore .o files under the lib directory::
3165
3166
            bzr ignore "RE:lib/.*\.o"
3257.1.1 by Adeodato Simó
Add an example of some bzrignore cool stuff with Python regexes.
3167
3168
        Ignore everything but the "debian" toplevel directory::
3169
3170
            bzr ignore "RE:(?!debian/).*"
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
3171
        
3172
        Ignore everything except the "local" toplevel directory,
5749.2.2 by mbp at sourcefrog
Tweak ReST syntax to avoid formatting error
3173
        but always ignore autosave files ending in ~, even under local/::
4948.5.7 by John Whitley
Terminology change: exclusion => exception.
3174
        
3175
            bzr ignore "*"
3176
            bzr ignore "!./local"
3177
            bzr ignore "!!*~"
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3178
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3179
3398.1.26 by Ian Clatworthy
jam feedback - make patterns a separate help topic
3180
    _see_also = ['status', 'ignored', 'patterns']
2063.5.1 by wang
"bzr ignore" takes multiple arguments. Fixes bug 29488.
3181
    takes_args = ['name_pattern*']
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
3182
    takes_options = ['directory',
5168.3.1 by Parth Malwankar
bzr ignore now support --default-rules option
3183
        Option('default-rules',
5168.3.3 by Parth Malwankar
Removed --old-default-rules flag.
3184
               help='Display the default ignore rules that bzr uses.')
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3185
        ]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3186
5171.3.11 by Martin von Gagern
merge from trunk.
3187
    def run(self, name_pattern_list=None, default_rules=None,
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
3188
            directory=u'.'):
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
3189
        from bzrlib import ignores
5168.3.3 by Parth Malwankar
Removed --old-default-rules flag.
3190
        if default_rules is not None:
3191
            # dump the default rules and exit
3192
            for pattern in ignores.USER_DEFAULTS:
3193
                self.outf.write("%s\n" % pattern)
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
3194
            return
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
3195
        if not name_pattern_list:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3196
            raise errors.BzrCommandError(gettext("ignore requires at least one "
3197
                "NAME_PATTERN or --default-rules."))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3198
        name_pattern_list = [globbing.normalize_pattern(p)
2298.8.4 by Kent Gibson
Fix whitespace and alignment.
3199
                             for p in name_pattern_list]
5339.3.5 by Parth Malwankar
clean bad pattern handling code in cmd_ignore
3200
        bad_patterns = ''
6143.1.1 by Jonathan Riddell
use ngettext for plurals
3201
        bad_patterns_count = 0
5339.3.1 by Parth Malwankar
'bzr ignore' now fails on bad pattern.
3202
        for p in name_pattern_list:
3203
            if not globbing.Globster.is_pattern_valid(p):
6143.1.1 by Jonathan Riddell
use ngettext for plurals
3204
                bad_patterns_count += 1
5339.3.5 by Parth Malwankar
clean bad pattern handling code in cmd_ignore
3205
                bad_patterns += ('\n  %s' % p)
5339.3.1 by Parth Malwankar
'bzr ignore' now fails on bad pattern.
3206
        if bad_patterns:
6143.1.1 by Jonathan Riddell
use ngettext for plurals
3207
            msg = (ngettext('Invalid ignore pattern found. %s', 
3208
                            'Invalid ignore patterns found. %s',
3209
                            bad_patterns_count) % bad_patterns)
5339.3.5 by Parth Malwankar
clean bad pattern handling code in cmd_ignore
3210
            ui.ui_factory.show_error(msg)
5339.3.1 by Parth Malwankar
'bzr ignore' now fails on bad pattern.
3211
            raise errors.InvalidPattern('')
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
3212
        for name_pattern in name_pattern_list:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3213
            if (name_pattern[0] == '/' or
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
3214
                (len(name_pattern) > 1 and name_pattern[1] == ':')):
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3215
                raise errors.BzrCommandError(gettext(
3216
                    "NAME_PATTERN should not be an absolute path"))
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
3217
        tree, relpath = WorkingTree.open_containing(directory)
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
3218
        ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2747.5.1 by Daniel Watkins
'ignore' now outputs a list of versioned files that match the given pattern.
3219
        ignored = globbing.Globster(name_pattern_list)
3220
        matches = []
5326.1.1 by Parth Malwankar
locking for cmd_ignore is now in add_cleanup.
3221
        self.add_cleanup(tree.lock_read().unlock)
2747.5.1 by Daniel Watkins
'ignore' now outputs a list of versioned files that match the given pattern.
3222
        for entry in tree.list_files():
3223
            id = entry[3]
3224
            if id is not None:
3225
                filename = entry[0]
3226
                if ignored.match(filename):
4988.8.3 by Ed Bayiates Home
More builtin command UIFactory updates
3227
                    matches.append(filename)
2747.5.1 by Daniel Watkins
'ignore' now outputs a list of versioned files that match the given pattern.
3228
        if len(matches) > 0:
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
3229
            self.outf.write(gettext("Warning: the following files are version "
3230
                  "controlled and match your ignore pattern:\n%s"
4988.8.3 by Ed Bayiates Home
More builtin command UIFactory updates
3231
                  "\nThese files will continue to be version controlled"
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
3232
                  " unless you 'bzr remove' them.\n") % ("\n".join(matches),))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3233
3603.3.1 by Robert Collins
* The help for ``bzr ignored`` now sugests ``bzr ls --ignored`` for
3234
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3235
class cmd_ignored(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
3236
    __doc__ = """List ignored files and the patterns that matched them.
3603.3.1 by Robert Collins
* The help for ``bzr ignored`` now sugests ``bzr ls --ignored`` for
3237
3238
    List all the ignored files and the ignore pattern that caused the file to
3239
    be ignored.
3240
3241
    Alternatively, to list just the files::
3242
3243
        bzr ls --ignored
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3244
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3245
3123.2.1 by Lukáš Lalinský
Use self.outf instead of sys.stdout in cmd_ignored.
3246
    encoding_type = 'replace'
3603.3.1 by Robert Collins
* The help for ``bzr ignored`` now sugests ``bzr ls --ignored`` for
3247
    _see_also = ['ignore', 'ls']
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
3248
    takes_options = ['directory']
3123.2.1 by Lukáš Lalinský
Use self.outf instead of sys.stdout in cmd_ignored.
3249
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3250
    @display_command
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
3251
    def run(self, directory=u'.'):
3252
        tree = WorkingTree.open_containing(directory)[0]
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
3253
        self.add_cleanup(tree.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
3254
        for path, file_class, kind, file_id, entry in tree.list_files():
3255
            if file_class != 'I':
3256
                continue
3257
            ## XXX: Slightly inefficient since this was already calculated
3258
            pat = tree.is_ignored(path)
3259
            self.outf.write('%-50s %s\n' % (path, pat))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3260
3261
3262
class cmd_lookup_revision(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
3263
    __doc__ = """Lookup the revision-id from a revision-number
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3264
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3265
    :Examples:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3266
        bzr lookup-revision 33
3267
    """
3268
    hidden = True
3269
    takes_args = ['revno']
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
3270
    takes_options = ['directory']
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3271
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3272
    @display_command
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
3273
    def run(self, revno, directory=u'.'):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3274
        try:
3275
            revno = int(revno)
3276
        except ValueError:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3277
            raise errors.BzrCommandError(gettext("not a valid revision-number: %r")
4988.8.4 by Vincent Ladeuil
Fix lines too long, fix inverted assertions.
3278
                                         % revno)
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
3279
        revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
4988.8.4 by Vincent Ladeuil
Fix lines too long, fix inverted assertions.
3280
        self.outf.write("%s\n" % revid)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3281
3282
3283
class cmd_export(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
3284
    __doc__ = """Export current or past revision to a destination directory or archive.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3285
3286
    If no revision is specified this exports the last committed revision.
3287
3288
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
3289
    given, try to find the format with the extension. If no extension
3290
    is found exports to a directory (equivalent to --format=dir).
3291
2374.1.4 by Ian Clatworthy
Include feedback from mailing list.
3292
    If root is supplied, it will be used as the root directory inside
3293
    container formats (tar, zip, etc). If it is not supplied it will default
3294
    to the exported filename. The root option has no effect for 'dir' format.
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
3295
2374.1.2 by Ian Clatworthy
Improved after feedback from reviewers
3296
    If branch is omitted then the branch containing the current working
3297
    directory will be used.
2099.1.1 by Daniel Silverstone
Add source branch support to export command
3298
2374.1.3 by Ian Clatworthy
Minor man page fixes for add, commit, export
3299
    Note: Export of tree with non-ASCII filenames to zip is not supported.
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
3300
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3301
      =================       =========================
3302
      Supported formats       Autodetected by extension
3303
      =================       =========================
2666.1.5 by Ian Clatworthy
Incorporate feedback from Alex B. & James W.
3304
         dir                         (none)
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
3305
         tar                          .tar
3306
         tbz2                    .tar.bz2, .tbz2
3307
         tgz                      .tar.gz, .tgz
3308
         zip                          .zip
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3309
      =================       =========================
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
3310
    """
5724.1.1 by John Arbash Meinel
'bzr export' needs to use 'exact' encoding.
3311
    encoding = 'exact'
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
3312
    takes_args = ['dest', 'branch_or_subdir?']
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
3313
    takes_options = ['directory',
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
3314
        Option('format',
3315
               help="Type of file to export to.",
3316
               type=unicode),
3317
        'revision',
3368.2.48 by Ian Clatworthy
apply first round of poolie's review feedback
3318
        Option('filters', help='Apply content filters to export the '
3319
                'convenient form.'),
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
3320
        Option('root',
3321
               type=str,
3322
               help="Name of the root directory inside the exported file."),
5076.2.3 by Jelmer Vernooij
Review comments from Rob.
3323
        Option('per-file-timestamps',
3324
               help='Set modification time of files to that of the last '
3325
                    'revision in which it was changed.'),
6331.2.2 by Jelmer Vernooij
Add --uncommitted option to export.
3326
        Option('uncommitted',
3327
               help='Export the working tree contents rather than that of the '
3328
                    'last revision.'),
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
3329
        ]
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
3330
    def run(self, dest, branch_or_subdir=None, revision=None, format=None,
6331.2.2 by Jelmer Vernooij
Add --uncommitted option to export.
3331
        root=None, filters=False, per_file_timestamps=False, uncommitted=False,
3332
        directory=u'.'):
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
3333
        from bzrlib.export import export
2099.1.1 by Daniel Silverstone
Add source branch support to export command
3334
3613.2.1 by Robert Collins
Teach export how to export a subdirectory. (Robert Collins)
3335
        if branch_or_subdir is None:
6331.2.2 by Jelmer Vernooij
Add --uncommitted option to export.
3336
            branch_or_subdir = directory
3337
3338
        (tree, b, subdir) = controldir.ControlDir.open_containing_tree_or_branch(
3339
            branch_or_subdir)
3340
        if tree is not None:
3341
            self.add_cleanup(tree.lock_read().unlock)
3342
3343
        if uncommitted:
3344
            if tree is None:
3345
                raise errors.BzrCommandError(
3346
                    gettext("--uncommitted requires a working tree"))
3347
            export_tree = tree
2099.1.1 by Daniel Silverstone
Add source branch support to export command
3348
        else:
6331.2.2 by Jelmer Vernooij
Add --uncommitted option to export.
3349
            export_tree = _get_one_revision_tree('export', revision, branch=b, tree=tree)
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
3350
        try:
6331.2.2 by Jelmer Vernooij
Add --uncommitted option to export.
3351
            export(export_tree, dest, format, root, subdir, filtered=filters,
5076.2.3 by Jelmer Vernooij
Review comments from Rob.
3352
                   per_file_timestamps=per_file_timestamps)
1185.31.12 by John Arbash Meinel
Refactored the export code to make it easier to add new export formats.
3353
        except errors.NoSuchExportFormat, e:
6331.2.2 by Jelmer Vernooij
Add --uncommitted option to export.
3354
            raise errors.BzrCommandError(
3355
                gettext('Unsupported export format: %s') % e.format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3356
3357
3358
class cmd_cat(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
3359
    __doc__ = """Write the contents of a file as of a given revision to standard output.
2374.1.1 by Ian Clatworthy
Help and man page fixes
3360
3361
    If no revision is nominated, the last revision is used.
3362
2374.1.2 by Ian Clatworthy
Improved after feedback from reviewers
3363
    Note: Take care to redirect standard output when using this command on a
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3364
    binary file.
2374.1.1 by Ian Clatworthy
Help and man page fixes
3365
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3366
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3367
    _see_also = ['ls']
5171.3.3 by Martin von Gagern
Add --directory option to ls, cat and annotate.
3368
    takes_options = ['directory',
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
3369
        Option('name-from-revision', help='The path name in the old tree.'),
3368.2.48 by Ian Clatworthy
apply first round of poolie's review feedback
3370
        Option('filters', help='Apply content filters to display the '
3371
                'convenience form.'),
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
3372
        'revision',
3373
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3374
    takes_args = ['filename']
2178.4.4 by Alexander Belchenko
encoding_type = 'exact' force sys.stdout to be binary stream on win32
3375
    encoding_type = 'exact'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3376
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3377
    @display_command
3368.2.31 by Ian Clatworthy
add --filters option to cat command
3378
    def run(self, filename, revision=None, name_from_revision=False,
5171.3.3 by Martin von Gagern
Add --directory option to ls, cat and annotate.
3379
            filters=False, directory=None):
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
3380
        if revision is not None and len(revision) != 1:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3381
            raise errors.BzrCommandError(gettext("bzr cat --revision takes exactly"
3382
                                         " one revision specifier"))
3063.4.1 by Lukáš Lalinský
Fix UnboundLocalError in cmd_cat.
3383
        tree, branch, relpath = \
5171.3.9 by Martin von Gagern
Rename function to _open_directory_or_containing_tree_or_branch.
3384
            _open_directory_or_containing_tree_or_branch(filename, directory)
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
3385
        self.add_cleanup(branch.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
3386
        return self._run(tree, branch, relpath, filename, revision,
3387
                         name_from_revision, filters)
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
3388
3368.2.31 by Ian Clatworthy
add --filters option to cat command
3389
    def _run(self, tree, b, relpath, filename, revision, name_from_revision,
3390
        filtered):
1907.4.5 by Matthieu Moy
Make bzr cat -r revno:N:foo consistant with bzr cat -r branch:foo.
3391
        if tree is None:
2158.1.1 by Wouter van Heyst
Fix #73500 mostly by catching a NotLocalUrl exception in cmd_cat.
3392
            tree = b.basis_tree()
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
3393
        rev_tree = _get_one_revision_tree('cat', revision, branch=b)
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
3394
        self.add_cleanup(rev_tree.lock_read().unlock)
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
3395
3396
        old_file_id = rev_tree.path2id(relpath)
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
3397
6006.3.3 by Martin Pool
add todo
3398
        # TODO: Split out this code to something that generically finds the
3399
        # best id for a path across one or more trees; it's like
3400
        # find_ids_across_trees but restricted to find just one. -- mbp
3401
        # 20110705.
2073.2.3 by wang
Change option name to --name-from-revision. Always make new tree the
3402
        if name_from_revision:
4112.1.1 by Vincent Ladeuil
Fallback to old revision id if the current one doesn't exist in
3403
            # Try in revision if requested
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
3404
            if old_file_id is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3405
                raise errors.BzrCommandError(gettext(
6138.2.4 by Jonathan Riddell
use format strings where there are multiple substitutions to allow for translations
3406
                    "{0!r} is not present in revision {1}").format(
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
3407
                        filename, rev_tree.get_revision_id()))
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
3408
            else:
6006.3.2 by Martin Pool
Change cmd_cat to use ContentFilterTree, and clean it up.
3409
                actual_file_id = old_file_id
2073.2.1 by wang
``bzr cat`` can look up contents of removed or renamed files. If the
3410
        else:
4112.1.1 by Vincent Ladeuil
Fallback to old revision id if the current one doesn't exist in
3411
            cur_file_id = tree.path2id(relpath)
6006.3.2 by Martin Pool
Change cmd_cat to use ContentFilterTree, and clean it up.
3412
            if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3413
                actual_file_id = cur_file_id
3414
            elif old_file_id is not None:
3415
                actual_file_id = old_file_id
3416
            else:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3417
                raise errors.BzrCommandError(gettext(
6138.2.4 by Jonathan Riddell
use format strings where there are multiple substitutions to allow for translations
3418
                    "{0!r} is not present in revision {1}").format(
4112.1.1 by Vincent Ladeuil
Fallback to old revision id if the current one doesn't exist in
3419
                        filename, rev_tree.get_revision_id()))
3368.2.31 by Ian Clatworthy
add --filters option to cat command
3420
        if filtered:
6006.3.2 by Martin Pool
Change cmd_cat to use ContentFilterTree, and clean it up.
3421
            from bzrlib.filter_tree import ContentFilterTree
3422
            filter_tree = ContentFilterTree(rev_tree,
3423
                rev_tree._content_filter_stack)
3424
            content = filter_tree.get_file_text(actual_file_id)
3368.2.31 by Ian Clatworthy
add --filters option to cat command
3425
        else:
6006.3.2 by Martin Pool
Change cmd_cat to use ContentFilterTree, and clean it up.
3426
            content = rev_tree.get_file_text(actual_file_id)
3427
        self.cleanup_now()
3428
        self.outf.write(content)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3429
3430
3431
class cmd_local_time_offset(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
3432
    __doc__ = """Show the offset in seconds from GMT to local time."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3433
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3434
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3435
    def run(self):
4988.8.3 by Ed Bayiates Home
More builtin command UIFactory updates
3436
        self.outf.write("%s\n" % osutils.local_time_offset())
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3437
3438
3439
3440
class cmd_commit(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
3441
    __doc__ = """Commit changes into a new revision.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3442
4351.1.1 by Ian Clatworthy
improve commit help
3443
    An explanatory message needs to be given for each commit. This is
3444
    often done by using the --message option (getting the message from the
3445
    command line) or by using the --file option (getting the message from
3446
    a file). If neither of these options is given, an editor is opened for
3447
    the user to enter the message. To see the changed files in the
3448
    boilerplate text loaded into the editor, use the --show-diff option.
3449
3450
    By default, the entire tree is committed and the person doing the
3451
    commit is assumed to be the author. These defaults can be overridden
3452
    as explained below.
3453
3454
    :Selective commits:
3455
3456
      If selected files are specified, only changes to those files are
3457
      committed.  If a directory is specified then the directory and
3458
      everything within it is committed.
3459
  
3460
      When excludes are given, they take precedence over selected files.
3461
      For example, to commit only changes within foo, but not changes
3462
      within foo/bar::
3463
  
3464
        bzr commit foo -x foo/bar
3465
  
3466
      A selective commit after a merge is not yet supported.
3467
3468
    :Custom authors:
3469
3470
      If the author of the change is not the same person as the committer,
3471
      you can specify the author's name using the --author option. The
3472
      name should be in the same format as a committer-id, e.g.
3473
      "John Doe <jdoe@example.com>". If there is more than one author of
3474
      the change you can specify the option multiple times, once for each
3475
      author.
3476
  
3477
    :Checks:
3478
3479
      A common mistake is to forget to add a new file or directory before
3480
      running the commit command. The --strict option checks for unknown
3481
      files and aborts the commit if any are found. More advanced pre-commit
3482
      checks can be implemented by defining hooks. See ``bzr help hooks``
3483
      for details.
3484
3485
    :Things to note:
3486
3487
      If you accidentially commit the wrong changes or make a spelling
3488
      mistake in the commit message say, you can use the uncommit command
3489
      to undo it. See ``bzr help uncommit`` for details.
3490
3491
      Hooks can also be configured to run after a commit. This allows you
3492
      to trigger updates to external systems like bug trackers. The --fixes
3493
      option can be used to record the association between a revision and
3494
      one or more bugs. See ``bzr help bugs`` for details.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3495
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
3496
4351.1.1 by Ian Clatworthy
improve commit help
3497
    _see_also = ['add', 'bugs', 'hooks', 'uncommit']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3498
    takes_args = ['selected*']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3499
    takes_options = [
3602.1.1 by Robert Collins
Add support for -x or --exclude to bzr commit, fixing bug 3117. (Robert Collins)
3500
            ListOption('exclude', type=str, short_name='x',
3501
                help="Do not consider changes made to a given path."),
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
3502
            Option('message', type=unicode,
3503
                   short_name='m',
3504
                   help="Description of the new revision."),
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3505
            'verbose',
3506
             Option('unchanged',
3507
                    help='Commit even if nothing has changed.'),
3508
             Option('file', type=str,
3509
                    short_name='F',
3510
                    argname='msgfile',
3511
                    help='Take commit message from this file.'),
3512
             Option('strict',
3513
                    help="Refuse to commit if there are unknown "
3514
                    "files in the working tree."),
4766.2.1 by Alexander Sack
add --commit-time Option to built-in 'commit' command (LP: #459276)
3515
             Option('commit-time', type=str,
4766.2.2 by Andrew Bennetts
Add tests, and capture timezone offset as well as timestamp.
3516
                    help="Manually set a commit time using commit date "
3517
                    "format, e.g. '2009-10-10 08:00:00 +0100'."),
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3518
             ListOption('fixes', type=str,
3535.10.7 by James Westby
Make the --fixes option conform to the style guide check once more.
3519
                    help="Mark a bug as being fixed by this revision "
3535.10.9 by James Westby
Make the improved messages show up in the UI.
3520
                         "(see \"bzr help bugs\")."),
4056.2.1 by James Westby
Allow specifying multiple authors for a revision.
3521
             ListOption('author', type=unicode,
2671.2.1 by Lukáš Lalinský
Add --author option to 'bzr commit' to record the author's name, if it's different from the committer.
3522
                    help="Set the author's name, if it's different "
3523
                         "from the committer."),
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3524
             Option('local',
3525
                    help="Perform a local commit in a bound "
3526
                         "branch.  Local commits are not pushed to "
3527
                         "the master branch until a normal commit "
3528
                         "is performed."
3529
                    ),
5193.1.1 by Parth Malwankar
added -p short option for 'commit --show-diff'
3530
             Option('show-diff', short_name='p',
4766.2.1 by Alexander Sack
add --commit-time Option to built-in 'commit' command (LP: #459276)
3531
                    help='When no message is supplied, show the diff along'
3532
                    ' with the status summary in the message editor.'),
5777.6.1 by Jelmer Vernooij
Add --lossy option to 'bzr commit'.
3533
             Option('lossy', 
3534
                    help='When committing to a foreign version control '
3535
                    'system do not push data that can not be natively '
3536
                    'represented.'),
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3537
             ]
5741.3.7 by Martin Pool
Reinstate checkin alias for commit
3538
    aliases = ['ci', 'checkin']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3539
4119.4.1 by Jonathan Lange
Extract bug fix encoding logic from commit.
3540
    def _iter_bug_fix_urls(self, fixes, branch):
6120.1.1 by Jelmer Vernooij
Support a default bug tracker.
3541
        default_bugtracker  = None
2376.4.7 by jml at canonical
- Add docstrings to tests.
3542
        # Configure the properties for bug fixing attributes.
3543
        for fixed_bug in fixes:
3544
            tokens = fixed_bug.split(':')
6120.1.1 by Jelmer Vernooij
Support a default bug tracker.
3545
            if len(tokens) == 1:
3546
                if default_bugtracker is None:
6463.1.1 by Jelmer Vernooij
Migrate 'bugtracker' setting to config stacks.
3547
                    branch_config = branch.get_config_stack()
3548
                    default_bugtracker = branch_config.get(
6120.1.2 by Jelmer Vernooij
Doc doc doc.
3549
                        "bugtracker")
6120.1.1 by Jelmer Vernooij
Support a default bug tracker.
3550
                if default_bugtracker is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3551
                    raise errors.BzrCommandError(gettext(
6120.1.1 by Jelmer Vernooij
Support a default bug tracker.
3552
                        "No tracker specified for bug %s. Use the form "
3553
                        "'tracker:id' or specify a default bug tracker "
6120.1.2 by Jelmer Vernooij
Doc doc doc.
3554
                        "using the `bugtracker` option.\nSee "
6120.1.1 by Jelmer Vernooij
Support a default bug tracker.
3555
                        "\"bzr help bugs\" for more information on this "
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3556
                        "feature. Commit refused.") % fixed_bug)
6120.1.1 by Jelmer Vernooij
Support a default bug tracker.
3557
                tag = default_bugtracker
3558
                bug_id = tokens[0]
3559
            elif len(tokens) != 2:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3560
                raise errors.BzrCommandError(gettext(
3535.10.3 by James Westby
Talk about "trackers" rather than "tags" as it may be less confusing.
3561
                    "Invalid bug %s. Must be in the form of 'tracker:id'. "
3535.10.9 by James Westby
Make the improved messages show up in the UI.
3562
                    "See \"bzr help bugs\" for more information on this "
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3563
                    "feature.\nCommit refused.") % fixed_bug)
6120.1.1 by Jelmer Vernooij
Support a default bug tracker.
3564
            else:
3565
                tag, bug_id = tokens
2376.4.7 by jml at canonical
- Add docstrings to tests.
3566
            try:
4119.4.1 by Jonathan Lange
Extract bug fix encoding logic from commit.
3567
                yield bugtracker.get_bug_url(tag, branch, bug_id)
2376.4.26 by Jonathan Lange
Tests for MalformedBugIdentifier and new error UnknownBugTrackerAbbreviation.
3568
            except errors.UnknownBugTrackerAbbreviation:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3569
                raise errors.BzrCommandError(gettext(
3570
                    'Unrecognized bug %s. Commit refused.') % fixed_bug)
3535.10.9 by James Westby
Make the improved messages show up in the UI.
3571
            except errors.MalformedBugIdentifier, e:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3572
                raise errors.BzrCommandError(gettext(
3573
                    "%s\nCommit refused.") % (str(e),))
2376.4.7 by jml at canonical
- Add docstrings to tests.
3574
2768.1.5 by Ian Clatworthy
Wrap new std verbose option with new help instead of declaring a new one
3575
    def run(self, message=None, file=None, verbose=False, selected_list=None,
2817.4.4 by Vincent Ladeuil
Redo the lost modification.
3576
            unchanged=False, strict=False, local=False, fixes=None,
5777.6.1 by Jelmer Vernooij
Add --lossy option to 'bzr commit'.
3577
            author=None, show_diff=False, exclude=None, commit_time=None,
3578
            lossy=False):
2598.6.30 by ghigo
- Updated the identation on the basis of Aaron suggestions
3579
        from bzrlib.errors import (
3580
            PointlessCommit,
3581
            ConflictsInTree,
3582
            StrictCommitFailed
3583
        )
3584
        from bzrlib.msgeditor import (
3585
            edit_commit_message_encoded,
3642.2.1 by Jelmer Vernooij
Add simple commit message template hook.
3586
            generate_commit_message_template,
5912.4.1 by Jonathan Riddell
Add commit message hook
3587
            make_commit_message_template_encoded,
5912.4.6 by Jonathan Riddell
add comma at end of list
3588
            set_commit_message,
2598.6.30 by ghigo
- Updated the identation on the basis of Aaron suggestions
3589
        )
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3590
4766.2.2 by Andrew Bennetts
Add tests, and capture timezone offset as well as timestamp.
3591
        commit_stamp = offset = None
4766.2.1 by Alexander Sack
add --commit-time Option to built-in 'commit' command (LP: #459276)
3592
        if commit_time is not None:
4766.2.2 by Andrew Bennetts
Add tests, and capture timezone offset as well as timestamp.
3593
            try:
4766.2.1 by Alexander Sack
add --commit-time Option to built-in 'commit' command (LP: #459276)
3594
                commit_stamp, offset = timestamp.parse_patch_date(commit_time)
4766.2.2 by Andrew Bennetts
Add tests, and capture timezone offset as well as timestamp.
3595
            except ValueError, e:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3596
                raise errors.BzrCommandError(gettext(
3597
                    "Could not parse --commit-time: " + str(e)))
4766.2.1 by Alexander Sack
add --commit-time Option to built-in 'commit' command (LP: #459276)
3598
2376.4.2 by jml at canonical
More sophisticated error handling for --fixes option
3599
        properties = {}
3600
5346.4.5 by Martin Pool
Deprecate and avoid internal_tree_files and tree_files.
3601
        tree, selected_list = WorkingTree.open_containing_paths(selected_list)
1704.2.11 by Martin Pool
Handle 'bzr commit DIR' when dir contains pending merges.
3602
        if selected_list == ['']:
3603
            # workaround - commit of root of tree should be exactly the same
3604
            # as just default commit in that tree, and succeed even though
3605
            # selected-file merge commit is not done yet
3606
            selected_list = []
3607
2817.4.4 by Vincent Ladeuil
Redo the lost modification.
3608
        if fixes is None:
3609
            fixes = []
4119.4.1 by Jonathan Lange
Extract bug fix encoding logic from commit.
3610
        bug_property = bugtracker.encode_fixes_bug_urls(
3611
            self._iter_bug_fix_urls(fixes, tree.branch))
2453.2.1 by Martin Pool
Don't set the bugs property unless bugs are actually set
3612
        if bug_property:
3613
            properties['bugs'] = bug_property
2376.4.7 by jml at canonical
- Add docstrings to tests.
3614
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
3615
        if local and not tree.branch.get_bound_location():
3616
            raise errors.LocalRequiresBoundBranch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3617
4795.5.1 by Gioele Barabucci
Ask for confirmation if the commit message is a file name
3618
        if message is not None:
4795.5.15 by Vincent Ladeuil
Fix PQM failures for LC_ALL=C for bug #73073 fix (commit warns for file-name-like messages).
3619
            try:
4878.1.1 by Vincent Ladeuil
Fix babune failures when LC_ALL=C for bug #73073 fix using lexists not exists
3620
                file_exists = osutils.lexists(message)
4795.5.15 by Vincent Ladeuil
Fix PQM failures for LC_ALL=C for bug #73073 fix (commit warns for file-name-like messages).
3621
            except UnicodeError:
3622
                # The commit message contains unicode characters that can't be
3623
                # represented in the filesystem encoding, so that can't be a
3624
                # file.
3625
                file_exists = False
3626
            if file_exists:
3627
                warning_msg = (
3628
                    'The commit message is a file name: "%(f)s".\n'
3629
                    '(use --file "%(f)s" to take commit message from that file)'
3630
                    % { 'f': message })
4795.5.13 by Gioele Barabucci
Do not check for interactivity
3631
                ui.ui_factory.show_warning(warning_msg)
5137.1.1 by Robert Collins
* ``bzr commit`` will prompt before using a commit message that was
3632
            if '\r' in message:
3633
                message = message.replace('\r\n', '\n')
3634
                message = message.replace('\r', '\n')
3635
            if file:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3636
                raise errors.BzrCommandError(gettext(
3637
                    "please specify either --message or --file"))
4795.5.1 by Gioele Barabucci
Ask for confirmation if the commit message is a file name
3638
2149.1.4 by Aaron Bentley
Add additional test that callback is called with a Commit instance
3639
        def get_message(commit_obj):
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
3640
            """Callback to get commit message"""
5137.1.1 by Robert Collins
* ``bzr commit`` will prompt before using a commit message that was
3641
            if file:
5340.7.1 by Martin
Rather than using codecs.open with potentially invalid flags when getting a commit message, just decode the bytes after reading
3642
                f = open(file)
4708.2.3 by Martin
Merge bzr.dev to unite with similar changes already made
3643
                try:
5340.7.1 by Martin
Rather than using codecs.open with potentially invalid flags when getting a commit message, just decode the bytes after reading
3644
                    my_message = f.read().decode(osutils.get_user_encoding())
4708.2.3 by Martin
Merge bzr.dev to unite with similar changes already made
3645
                finally:
3646
                    f.close()
5137.1.1 by Robert Collins
* ``bzr commit`` will prompt before using a commit message that was
3647
            elif message is not None:
3648
                my_message = message
3649
            else:
3650
                # No message supplied: make one up.
3651
                # text is the status of the tree
3652
                text = make_commit_message_template_encoded(tree,
2598.6.30 by ghigo
- Updated the identation on the basis of Aaron suggestions
3653
                        selected_list, diff=show_diff,
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
3654
                        output_encoding=osutils.get_user_encoding())
5086.6.1 by Robert Collins
Minor commit tidyup in preparation for hooking around revprops.
3655
                # start_message is the template generated from hooks
5137.1.1 by Robert Collins
* ``bzr commit`` will prompt before using a commit message that was
3656
                # XXX: Warning - looks like hooks return unicode,
3657
                # make_commit_message_template_encoded returns user encoding.
3658
                # We probably want to be using edit_commit_message instead to
3659
                # avoid this.
5912.4.1 by Jonathan Riddell
Add commit message hook
3660
                my_message = set_commit_message(commit_obj)
3661
                if my_message is None:
3662
                    start_message = generate_commit_message_template(commit_obj)
3663
                    my_message = edit_commit_message_encoded(text,
3664
                        start_message=start_message)
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
3665
                if my_message is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3666
                    raise errors.BzrCommandError(gettext("please specify a commit"
3667
                        " message with either --message or --file"))
6064.1.1 by Jelmer Vernooij
Allow committing with an explicit empty commit message.
3668
                if my_message == "":
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3669
                    raise errors.BzrCommandError(gettext("Empty commit message specified."
6064.1.3 by Jelmer Vernooij
Merge bzr.dev.
3670
                            " Please specify a commit message with either"
3671
                            " --message or --file or leave a blank message"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3672
                            " with --message \"\"."))
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
3673
            return my_message
2376.4.2 by jml at canonical
More sophisticated error handling for --fixes option
3674
4570.4.3 by Robert Collins
Fix a couple of small bugs in the patch - use specific files with record_iter_changs, and the CLI shouldn't generate a filter of [] for commit.
3675
        # The API permits a commit with a filter of [] to mean 'select nothing'
3676
        # but the command line should not do that.
3677
        if not selected_list:
3678
            selected_list = None
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3679
        try:
2149.1.2 by Aaron Bentley
Defer getting the commit message until the revision is almost-committed
3680
            tree.commit(message_callback=get_message,
3681
                        specific_files=selected_list,
1607.1.5 by Robert Collins
Make commit verbose mode work!.
3682
                        allow_pointless=unchanged, strict=strict, local=local,
2789.2.1 by Ian Clatworthy
Make commit less verbose by default
3683
                        reporter=None, verbose=verbose, revprops=properties,
4766.2.1 by Alexander Sack
add --commit-time Option to built-in 'commit' command (LP: #459276)
3684
                        authors=author, timestamp=commit_stamp,
4766.2.2 by Andrew Bennetts
Add tests, and capture timezone offset as well as timestamp.
3685
                        timezone=offset,
5777.6.1 by Jelmer Vernooij
Add --lossy option to 'bzr commit'.
3686
                        exclude=tree.safe_relpath_files(exclude),
3687
                        lossy=lossy)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3688
        except PointlessCommit:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3689
            raise errors.BzrCommandError(gettext("No changes to commit."
5765.1.2 by John Arbash Meinel
Rewrap the text, it was missing a space anyway.
3690
                " Please 'bzr add' the files you want to commit, or use"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3691
                " --unchanged to force an empty commit."))
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
3692
        except ConflictsInTree:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3693
            raise errors.BzrCommandError(gettext('Conflicts detected in working '
1551.9.5 by Aaron Bentley
Revert broken save-commit-message code
3694
                'tree.  Use "bzr conflicts" to list, "bzr resolve FILE" to'
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3695
                ' resolve.'))
1185.16.65 by mbp at sourcefrog
- new commit --strict option
3696
        except StrictCommitFailed:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3697
            raise errors.BzrCommandError(gettext("Commit refused because there are"
3698
                              " 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
3699
        except errors.BoundBranchOutOfDate, e:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3700
            e.extra_help = (gettext("\n"
5066.1.1 by Gary van der Merwe
Make it possible to detect a BoundBranchOutOfDate from commit.
3701
                'To commit to master branch, run update and then commit.\n'
3702
                'You can also pass --local to commit to continue working '
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3703
                'disconnected.'))
5066.1.1 by Gary van der Merwe
Make it possible to detect a BoundBranchOutOfDate from commit.
3704
            raise
2111.1.1 by Martin Pool
Fix #32054, save message if commit fails.
3705
3706
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3707
class cmd_check(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
3708
    __doc__ = """Validate working tree structure, branch consistency and repository history.
3015.3.25 by Daniel Watkins
Updated help.
3709
3710
    This command checks various invariants about branch and repository storage
3711
    to detect data corruption or bzr bugs.
3712
3713
    The working tree and branch checks will only give output if a problem is
3714
    detected. The output fields of the repository check are:
2745.6.8 by Aaron Bentley
Clean up text
3715
4070.11.7 by Martin Pool
Correction to rest syntax for cmd_check
3716
    revisions
3717
        This is just the number of revisions checked.  It doesn't
3718
        indicate a problem.
3719
3720
    versionedfiles
3721
        This is just the number of versionedfiles checked.  It
3722
        doesn't indicate a problem.
3723
3724
    unreferenced ancestors
3725
        Texts that are ancestors of other texts, but
3726
        are not properly referenced by the revision ancestry.  This is a
3727
        subtle problem that Bazaar can work around.
3728
3729
    unique file texts
3730
        This is the total number of unique file contents
3731
        seen in the checked revisions.  It does not indicate a problem.
3732
3733
    repeated file texts
3734
        This is the total number of repeated texts seen
3735
        in the checked revisions.  Texts can be repeated when their file
3736
        entries are modified, but the file contents are not.  It does not
3737
        indicate a problem.
3015.4.14 by Daniel Watkins
Updated check help to explain what happens when no options are given.
3738
3015.4.19 by Daniel Watkins
Improved check docs.
3739
    If no restrictions are specified, all Bazaar data that is found at the given
3740
    location will be checked.
3741
3742
    :Examples:
3743
3744
        Check the tree and branch at 'foo'::
3745
3746
            bzr check --tree --branch foo
3747
3748
        Check only the repository at 'bar'::
3749
3750
            bzr check --repo bar
3751
3752
        Check everything at 'baz'::
3753
3754
            bzr check baz
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3755
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3756
3757
    _see_also = ['reconcile']
3015.3.2 by Daniel Watkins
Check.check now takes a path rather than a branch.
3758
    takes_args = ['path?']
3015.4.2 by Daniel Watkins
Made UI changes to include CLI options.
3759
    takes_options = ['verbose',
3760
                     Option('branch', help="Check the branch related to the"
3761
                                           " current directory."),
3762
                     Option('repo', help="Check the repository related to the"
3763
                                         " current directory."),
3764
                     Option('tree', help="Check the working tree related to"
3765
                                         " the current directory.")]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3766
3015.4.5 by Daniel Watkins
Each option selects only the specific thing to be checked.
3767
    def run(self, path=None, verbose=False, branch=False, repo=False,
3768
            tree=False):
3015.3.22 by Daniel Watkins
Changed 'check' to 'check_dwim'.
3769
        from bzrlib.check import check_dwim
3015.3.2 by Daniel Watkins
Check.check now takes a path rather than a branch.
3770
        if path is None:
3771
            path = '.'
3015.4.7 by Daniel Watkins
Vanilla 'bzr check' checks all items.
3772
        if not branch and not repo and not tree:
3773
            branch = repo = tree = True
3015.4.2 by Daniel Watkins
Made UI changes to include CLI options.
3774
        check_dwim(path, verbose, do_branch=branch, do_repo=repo, do_tree=tree)
1534.5.16 by Robert Collins
Review feedback.
3775
3776
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3777
class cmd_upgrade(Command):
4360.10.22 by Matthew Fuller
Merge up through 2.2.0.
3778
    __doc__ = """Upgrade a repository, branch or working tree to a newer format.
4360.10.15 by Ian Clatworthy
enhance the upgrade help and add a NEWS item
3779
4360.10.19 by Ian Clatworthy
Take --pack out of the UI and improve help (feedback from lifeless and poolie)
3780
    When the default format has changed after a major new release of
3781
    Bazaar, you may be informed during certain operations that you
3782
    should upgrade. Upgrading to a newer format may improve performance
3783
    or make new features available. It may however limit interoperability
3784
    with older repositories or with older versions of Bazaar.
4360.10.15 by Ian Clatworthy
enhance the upgrade help and add a NEWS item
3785
4360.10.19 by Ian Clatworthy
Take --pack out of the UI and improve help (feedback from lifeless and poolie)
3786
    If you wish to upgrade to a particular format rather than the
3787
    current default, that can be specified using the --format option.
3788
    As a consequence, you can use the upgrade command this way to
3789
    "downgrade" to an earlier format, though some conversions are
3790
    a one way process (e.g. changing from the 1.x default to the
3791
    2.x default) so downgrading is not always possible.
4360.10.15 by Ian Clatworthy
enhance the upgrade help and add a NEWS item
3792
4360.10.42 by Matthew Fuller
Correct backup dir name.
3793
    A backup.bzr.~#~ directory is created at the start of the conversion
4360.10.43 by Matthew Fuller
Rewrap paragraph.
3794
    process (where # is a number). By default, this is left there on
3795
    completion. If the conversion fails, delete the new .bzr directory
3796
    and rename this one back in its place. Use the --clean option to ask
3797
    for the backup.bzr directory to be removed on successful conversion.
3798
    Alternatively, you can delete it by hand if everything looks good
3799
    afterwards.
4360.10.15 by Ian Clatworthy
enhance the upgrade help and add a NEWS item
3800
4360.10.19 by Ian Clatworthy
Take --pack out of the UI and improve help (feedback from lifeless and poolie)
3801
    If the location given is a shared repository, dependent branches
3802
    are also converted provided the repository converts successfully.
3803
    If the conversion of a branch fails, remaining branches are still
3804
    tried.
4360.10.15 by Ian Clatworthy
enhance the upgrade help and add a NEWS item
3805
4360.10.45 by Vincent Ladeuil
Stop mentioning 2.0 in the upgrade guide, all documented steps are valid for all bzr versions.
3806
    For more information on upgrades, see the Bazaar Upgrade Guide,
4360.10.37 by Vincent Ladeuil
Fix reference to bazaar-vcs.org.
3807
    http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3808
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3809
4360.10.19 by Ian Clatworthy
Take --pack out of the UI and improve help (feedback from lifeless and poolie)
3810
    _see_also = ['check', 'reconcile', 'formats']
4360.10.9 by Ian Clatworthy
limit ui to upgrading a single location for now
3811
    takes_args = ['url?']
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
3812
    takes_options = [
4360.10.2 by Ian Clatworthy
drop stacked vs unstacked logic; support multiple URLs
3813
        RegistryOption('format',
3814
            help='Upgrade to a specific format.  See "bzr help'
3815
                 ' formats" for details.',
6207.3.3 by jelmer at samba
Fix tests and the like.
3816
            lazy_registry=('bzrlib.controldir', 'format_registry'),
3817
            converter=lambda name: controldir.format_registry.make_bzrdir(name),
4360.10.2 by Ian Clatworthy
drop stacked vs unstacked logic; support multiple URLs
3818
            value_switches=True, title='Branch format'),
3819
        Option('clean',
3820
            help='Remove the backup.bzr directory if successful.'),
4360.10.4 by Ian Clatworthy
support multiple urls, --pack and --dry-run
3821
        Option('dry-run',
3822
            help="Show what would be done, but don't actually do anything."),
4360.10.2 by Ian Clatworthy
drop stacked vs unstacked logic; support multiple URLs
3823
    ]
1857.1.20 by Aaron Bentley
Strip out all the EnumOption stuff
3824
4360.10.19 by Ian Clatworthy
Take --pack out of the UI and improve help (feedback from lifeless and poolie)
3825
    def run(self, url='.', format=None, clean=False, dry_run=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3826
        from bzrlib.upgrade import upgrade
4360.10.19 by Ian Clatworthy
Take --pack out of the UI and improve help (feedback from lifeless and poolie)
3827
        exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
4360.10.2 by Ian Clatworthy
drop stacked vs unstacked logic; support multiple URLs
3828
        if exceptions:
3829
            if len(exceptions) == 1:
4360.10.44 by Matthew Fuller
Make comment clearer about what's being compatible.
3830
                # Compatibility with historical behavior
4360.10.2 by Ian Clatworthy
drop stacked vs unstacked logic; support multiple URLs
3831
                raise exceptions[0]
3832
            else:
3833
                return 3
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3834
3835
3836
class cmd_whoami(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
3837
    __doc__ = """Show or set bzr user id.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3838
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
3839
    :Examples:
3840
        Show the email of the current user::
3841
3842
            bzr whoami --email
3843
3844
        Set the current user::
3845
3035.1.1 by John Arbash Meinel
Address bug #59302 and fix documentation that uses single quotes.
3846
            bzr whoami "Frank Chu <fchu@example.com>"
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
3847
    """
5171.3.15 by Martin von Gagern
Add --directory option to whoami.
3848
    takes_options = [ 'directory',
3849
                      Option('email',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3850
                             help='Display email address only.'),
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
3851
                      Option('branch',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
3852
                             help='Set identity for the current branch instead of '
3853
                                  'globally.'),
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
3854
                    ]
3855
    takes_args = ['name?']
3856
    encoding_type = 'replace'
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3857
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
3858
    @display_command
5171.3.15 by Martin von Gagern
Add --directory option to whoami.
3859
    def run(self, email=False, branch=False, name=None, directory=None):
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
3860
        if name is None:
5171.3.15 by Martin von Gagern
Add --directory option to whoami.
3861
            if directory is None:
3862
                # use branch if we're inside one; otherwise global config
3863
                try:
6351.3.4 by Jelmer Vernooij
Convert whoami to config stack.
3864
                    c = Branch.open_containing(u'.')[0].get_config_stack()
5171.3.15 by Martin von Gagern
Add --directory option to whoami.
3865
                except errors.NotBranchError:
6351.3.4 by Jelmer Vernooij
Convert whoami to config stack.
3866
                    c = _mod_config.GlobalStack()
5171.3.15 by Martin von Gagern
Add --directory option to whoami.
3867
            else:
6351.3.4 by Jelmer Vernooij
Convert whoami to config stack.
3868
                c = Branch.open(directory).get_config_stack()
3869
            identity = c.get('email')
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
3870
            if email:
6351.3.4 by Jelmer Vernooij
Convert whoami to config stack.
3871
                self.outf.write(_mod_config.extract_email_address(identity)
3872
                                + '\n')
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
3873
            else:
6351.3.4 by Jelmer Vernooij
Convert whoami to config stack.
3874
                self.outf.write(identity + '\n')
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
3875
            return
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
3876
5616.3.1 by Jelmer Vernooij
Print error if both --email and a new identity were specified.
3877
        if email:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3878
            raise errors.BzrCommandError(gettext("--email can only be used to display existing "
3879
                                         "identity"))
5616.3.1 by Jelmer Vernooij
Print error if both --email and a new identity were specified.
3880
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
3881
        # display a warning if an email address isn't included in the given name.
3882
        try:
5345.5.9 by Vincent Ladeuil
Implements 'bzr lock --config <file>'.
3883
            _mod_config.extract_email_address(name)
2055.2.2 by John Arbash Meinel
Switch extract_email_address() to use a more specific exception
3884
        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
3885
            warning('"%s" does not seem to contain an email address.  '
3886
                    'This is allowed, but not recommended.', name)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3887
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
3888
        # use global config unless --branch given
3889
        if branch:
5171.3.15 by Martin von Gagern
Add --directory option to whoami.
3890
            if directory is None:
6351.3.4 by Jelmer Vernooij
Convert whoami to config stack.
3891
                c = Branch.open_containing(u'.')[0].get_config_stack()
5171.3.15 by Martin von Gagern
Add --directory option to whoami.
3892
            else:
6404.6.1 by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made.
3893
                b = Branch.open(directory)
3894
                self.add_cleanup(b.lock_write().unlock)
3895
                c = b.get_config_stack()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3896
        else:
6351.3.4 by Jelmer Vernooij
Convert whoami to config stack.
3897
            c = _mod_config.GlobalStack()
3898
        c.set('email', name)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3899
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.
3900
1185.35.14 by Aaron Bentley
Implemented nick command
3901
class cmd_nick(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
3902
    __doc__ = """Print or set the branch nickname.
3565.6.16 by Marius Kruger
update nick command description to mention how it works for bound branches,
3903
6437.32.2 by Aaron Bentley
Update docs.
3904
    If unset, the colocated branch name is used for colocated branches, and
3905
    the branch directory name is used for other branches.  To print the
3906
    current nickname, execute with no argument.
3565.6.16 by Marius Kruger
update nick command description to mention how it works for bound branches,
3907
3908
    Bound branches use the nickname of its master branch unless it is set
3909
    locally.
1185.35.14 by Aaron Bentley
Implemented nick command
3910
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
3911
3912
    _see_also = ['info']
1185.35.14 by Aaron Bentley
Implemented nick command
3913
    takes_args = ['nickname?']
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
3914
    takes_options = ['directory']
3915
    def run(self, nickname=None, directory=u'.'):
3916
        branch = Branch.open_containing(directory)[0]
1185.35.14 by Aaron Bentley
Implemented nick command
3917
        if nickname is None:
3918
            self.printme(branch)
3919
        else:
3920
            branch.nick = nickname
3921
3922
    @display_command
3923
    def printme(self, branch):
4988.8.4 by Vincent Ladeuil
Fix lines too long, fix inverted assertions.
3924
        self.outf.write('%s\n' % branch.nick)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3925
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.
3926
2900.3.2 by Tim Penhey
A working alias command.
3927
class cmd_alias(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
3928
    __doc__ = """Set/unset and display aliases.
2900.3.2 by Tim Penhey
A working alias command.
3929
3930
    :Examples:
3931
        Show the current aliases::
3932
3933
            bzr alias
3934
3935
        Show the alias specified for 'll'::
3936
3937
            bzr alias ll
3938
3939
        Set an alias for 'll'::
3940
2900.3.10 by Tim Penhey
Show examples, and change text to use double rather than single quotes.
3941
            bzr alias ll="log --line -r-10..-1"
2900.3.2 by Tim Penhey
A working alias command.
3942
2900.3.4 by Tim Penhey
Removed the unalais separate command.
3943
        To remove an alias for 'll'::
3944
3945
            bzr alias --remove ll
3946
2900.3.2 by Tim Penhey
A working alias command.
3947
    """
3948
    takes_args = ['name?']
2900.3.4 by Tim Penhey
Removed the unalais separate command.
3949
    takes_options = [
3950
        Option('remove', help='Remove the alias.'),
3951
        ]
2900.3.2 by Tim Penhey
A working alias command.
3952
2900.3.4 by Tim Penhey
Removed the unalais separate command.
3953
    def run(self, name=None, remove=False):
3954
        if remove:
3955
            self.remove_alias(name)
3956
        elif name is None:
2900.3.2 by Tim Penhey
A working alias command.
3957
            self.print_aliases()
3958
        else:
3959
            equal_pos = name.find('=')
3960
            if equal_pos == -1:
3961
                self.print_alias(name)
3962
            else:
3963
                self.set_alias(name[:equal_pos], name[equal_pos+1:])
3964
2900.3.4 by Tim Penhey
Removed the unalais separate command.
3965
    def remove_alias(self, alias_name):
3966
        if alias_name is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
3967
            raise errors.BzrCommandError(gettext(
3968
                'bzr alias --remove expects an alias to remove.'))
2900.3.4 by Tim Penhey
Removed the unalais separate command.
3969
        # If alias is not found, print something like:
3970
        # unalias: foo: not found
5345.5.9 by Vincent Ladeuil
Implements 'bzr lock --config <file>'.
3971
        c = _mod_config.GlobalConfig()
2900.3.8 by Tim Penhey
Use the exception text for unalias not found.
3972
        c.unset_alias(alias_name)
2900.3.4 by Tim Penhey
Removed the unalais separate command.
3973
3974
    @display_command
2900.3.2 by Tim Penhey
A working alias command.
3975
    def print_aliases(self):
3976
        """Print out the defined aliases in a similar format to bash."""
5345.5.9 by Vincent Ladeuil
Implements 'bzr lock --config <file>'.
3977
        aliases = _mod_config.GlobalConfig().get_aliases()
2900.3.7 by Tim Penhey
Updates from Aaron's review.
3978
        for key, value in sorted(aliases.iteritems()):
2900.3.10 by Tim Penhey
Show examples, and change text to use double rather than single quotes.
3979
            self.outf.write('bzr alias %s="%s"\n' % (key, value))
2900.3.2 by Tim Penhey
A working alias command.
3980
3981
    @display_command
3982
    def print_alias(self, alias_name):
3983
        from bzrlib.commands import get_alias
3984
        alias = get_alias(alias_name)
3985
        if alias is None:
2900.3.7 by Tim Penhey
Updates from Aaron's review.
3986
            self.outf.write("bzr alias: %s: not found\n" % alias_name)
2900.3.2 by Tim Penhey
A working alias command.
3987
        else:
2900.3.7 by Tim Penhey
Updates from Aaron's review.
3988
            self.outf.write(
2900.3.11 by Tim Penhey
Fixed the output in the tests.
3989
                'bzr alias %s="%s"\n' % (alias_name, ' '.join(alias)))
2900.3.2 by Tim Penhey
A working alias command.
3990
2900.3.12 by Tim Penhey
Final review comments.
3991
    def set_alias(self, alias_name, alias_command):
2900.3.2 by Tim Penhey
A working alias command.
3992
        """Save the alias in the global config."""
5345.5.9 by Vincent Ladeuil
Implements 'bzr lock --config <file>'.
3993
        c = _mod_config.GlobalConfig()
2900.3.12 by Tim Penhey
Final review comments.
3994
        c.set_alias(alias_name, alias_command)
2900.3.2 by Tim Penhey
A working alias command.
3995
3996
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
3997
class cmd_selftest(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
3998
    __doc__ = """Run internal test suite.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3999
2213.2.1 by Martin Pool
Add selftest --first flag
4000
    If arguments are given, they are regular expressions that say which tests
4001
    should run.  Tests matching any expression are run, and other tests are
4002
    not run.
4003
4004
    Alternatively if --first is given, matching tests are run first and then
4005
    all other tests are run.  This is useful if you have been working in a
4006
    particular area, but want to make sure nothing else was broken.
1552 by Martin Pool
Improved help text for bzr selftest
4007
2394.2.2 by Ian Clatworthy
Add --randomize and update help
4008
    If --exclude is given, tests that match that regular expression are
2394.2.9 by Ian Clatworthy
update NEWS and help to reflect removal of comma support
4009
    excluded, regardless of whether they match --first or not.
2394.2.2 by Ian Clatworthy
Add --randomize and update help
4010
4011
    To help catch accidential dependencies between tests, the --randomize
4012
    option is useful. In most cases, the argument used is the word 'now'.
4013
    Note that the seed used for the random number generator is displayed
4014
    when this option is used. The seed can be explicitly passed as the
4015
    argument to this option if required. This enables reproduction of the
4016
    actual ordering used if and when an order sensitive problem is encountered.
4017
4018
    If --list-only is given, the tests that would be run are listed. This is
4019
    useful when combined with --first, --exclude and/or --randomize to
4020
    understand their impact. The test harness reports "Listed nn tests in ..."
4021
    instead of "Ran nn tests in ..." when list mode is enabled.
4022
1552 by Martin Pool
Improved help text for bzr selftest
4023
    If the global option '--no-plugins' is given, plugins are not loaded
4024
    before running the selftests.  This has two effects: features provided or
4025
    modified by plugins will not be tested, and tests provided by plugins will
4026
    not be run.
4027
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4028
    Tests that need working space on disk use a common temporary directory,
2598.4.1 by Martin Pool
Remove obsolete --clean-output, --keep-output, --numbered-dirs selftest options (thanks Alexander)
4029
    typically inside $TMPDIR or /tmp.
4030
4685.1.2 by Robert Collins
Document BZR_TEST_PDB in cmd_selftest's help.
4031
    If you set BZR_TEST_PDB=1 when running selftest, failing tests will drop
4032
    into a pdb postmortem session.
4033
5418.2.4 by Martin Pool
Mention --coverage in selftest help
4034
    The --coverage=DIRNAME global option produces a report with covered code
4035
    indicated.
4036
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
4037
    :Examples:
4038
        Run only tests relating to 'ignore'::
4039
4040
            bzr selftest ignore
4041
4042
        Disable plugins and list tests as they're run::
4043
4044
            bzr --no-plugins selftest -v
1185.16.58 by mbp at sourcefrog
- run all selftests by default
4045
    """
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.
4046
    # NB: this is used from the class without creating an instance, which is
4047
    # why it does not have a self parameter.
4048
    def get_transport_type(typestring):
4049
        """Parse and return a transport specifier."""
4050
        if typestring == "sftp":
4797.11.2 by Vincent Ladeuil
Stop requiring testtools for sftp use.
4051
            from bzrlib.tests import stub_sftp
4052
            return stub_sftp.SFTPAbsoluteServer
5904.1.1 by Martin Pool
Pyflakes-driven cleanups
4053
        elif typestring == "memory":
5017.3.36 by Vincent Ladeuil
-s bb.test_selftest passing
4054
            from bzrlib.tests import test_server
5017.3.45 by Vincent Ladeuil
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry.
4055
            return memory.MemoryServer
5904.1.1 by Martin Pool
Pyflakes-driven cleanups
4056
        elif typestring == "fakenfs":
5017.3.36 by Vincent Ladeuil
-s bb.test_selftest passing
4057
            from bzrlib.tests import test_server
4058
            return test_server.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.
4059
        msg = "No known transport type %s. Supported types are: sftp\n" %\
4060
            (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
4061
        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.
4062
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4063
    hidden = True
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
4064
    takes_args = ['testspecs*']
1552 by Martin Pool
Improved help text for bzr selftest
4065
    takes_options = ['verbose',
2418.2.2 by Martin Pool
Add -1 option to selftest
4066
                     Option('one',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4067
                             help='Stop when one test fails.',
2418.2.2 by Martin Pool
Add -1 option to selftest
4068
                             short_name='1',
4069
                             ),
2333.1.1 by Dmitry Vasiliev
Fixed typo and removed some trailing whitespaces
4070
                     Option('transport',
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.
4071
                            help='Use a different transport by default '
4072
                                 'throughout the test suite.',
4073
                            type=get_transport_type),
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4074
                     Option('benchmark',
5050.10.1 by Martin Pool
Remove bzr selftest --benchmark
4075
                            help='Run the benchmarks rather than selftests.',
4076
                            hidden=True),
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
4077
                     Option('lsprof-timed',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4078
                            help='Generate lsprof output for benchmarked'
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
4079
                                 ' sections of code.'),
4641.3.3 by Robert Collins
Enable --lsprof-tests on bzr selftest.
4080
                     Option('lsprof-tests',
4081
                            help='Generate lsprof output for each test.'),
2213.2.1 by Martin Pool
Add selftest --first flag
4082
                     Option('first',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4083
                            help='Run all tests, but run specified tests first.',
2418.2.1 by Martin Pool
Add -f alias for selftest --first
4084
                            short_name='f',
2321.2.1 by Alexander Belchenko
`bzr selftest --numbered-dirs` use numbered dirs for TestCaseInTempDir
4085
                            ),
2394.2.1 by Ian Clatworthy
--list and --exclude first cut
4086
                     Option('list-only',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4087
                            help='List the tests instead of running them.'),
4205.3.2 by Robert Collins
Create fork and reinvoke parallel testing support.
4088
                     RegistryOption('parallel',
4205.3.5 by Robert Collins
Missing . on the parallel option.
4089
                        help="Run the test suite in parallel.",
4205.3.2 by Robert Collins
Create fork and reinvoke parallel testing support.
4090
                        lazy_registry=('bzrlib.tests', 'parallel_registry'),
4091
                        value_switches=False,
4092
                        ),
2394.2.2 by Ian Clatworthy
Add --randomize and update help
4093
                     Option('randomize', type=str, argname="SEED",
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4094
                            help='Randomize the order of tests using the given'
4095
                                 ' seed or "now" for the current time.'),
5924.1.2 by Vincent Ladeuil
Support multiple selftest --exclude options
4096
                     ListOption('exclude', type=str, argname="PATTERN",
4097
                                short_name='x',
4098
                                help='Exclude tests that match this regular'
4099
                                ' expression.'),
4165.1.1 by Robert Collins
Add builtin subunit support.
4100
                     Option('subunit',
4101
                        help='Output test progress via subunit.'),
2658.3.3 by Daniel Watkins
Added UI support for bzr selftest --strict.
4102
                     Option('strict', help='Fail on missing dependencies or '
4103
                            'known failures.'),
3193.1.8 by Vincent Ladeuil
Add '--load-list' option to selftest.
4104
                     Option('load-list', type=str, argname='TESTLISTFILE',
4105
                            help='Load a test id list from a text file.'),
3390.1.1 by Andrew Bennetts
Add --debugflags/-E option to selftest.
4106
                     ListOption('debugflag', type=str, short_name='E',
4107
                                help='Turn on a selftest debug flag.'),
3649.6.4 by Vincent Ladeuil
selftest --starting-with now accepts multiple values.
4108
                     ListOption('starting-with', type=str, argname='TESTID',
4109
                                param_name='starting_with', short_name='s',
4110
                                help=
4111
                                'Load only the tests starting with TESTID.'),
6015.31.1 by John Arbash Meinel
Bug #837293, make 'bzr selftest' disable fsync/fdatasync while running.
4112
                     Option('sync',
4113
                            help="By default we disable fsync and fdatasync"
4114
                                 " while running the test suite.")
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
4115
                     ]
2204.3.4 by Alexander Belchenko
Command 'selftest' use 'replace' encoding_type to prevent sudden traceback
4116
    encoding_type = 'replace'
1185.16.58 by mbp at sourcefrog
- run all selftests by default
4117
4000.2.3 by Robert Collins
Allow extra options to bzrlib.tests.selftest from plugins.
4118
    def __init__(self):
4119
        Command.__init__(self)
4120
        self.additional_selftest_args = {}
4121
2805.1.1 by Ian Clatworthy
Fix selftest --benchmark so verbose by default again
4122
    def run(self, testspecs_list=None, verbose=False, one=False,
2598.4.1 by Martin Pool
Remove obsolete --clean-output, --keep-output, --numbered-dirs selftest options (thanks Alexander)
4123
            transport=None, benchmark=None,
5050.10.3 by Martin Pool
Delete obsolete selftest --cache-dir option
4124
            lsprof_timed=None,
2598.4.1 by Martin Pool
Remove obsolete --clean-output, --keep-output, --numbered-dirs selftest options (thanks Alexander)
4125
            first=False, list_only=False,
3198.1.1 by Vincent Ladeuil
Add --load-list option to selftest
4126
            randomize=None, exclude=None, strict=False,
4205.3.2 by Robert Collins
Create fork and reinvoke parallel testing support.
4127
            load_list=None, debugflag=None, starting_with=None, subunit=False,
6015.31.1 by John Arbash Meinel
Bug #837293, make 'bzr selftest' disable fsync/fdatasync while running.
4128
            parallel=None, lsprof_tests=False,
4129
            sync=False):
6111.3.1 by Martin von Gagern
Make lazy imports (at least more) thread-safe.
4130
6111.3.3 by Martin von Gagern
Document the call to disallow_proxying in cmd_selftest.
4131
        # During selftest, disallow proxying, as it can cause severe
4132
        # performance penalties and is only needed for thread
4133
        # safety. The selftest command is assumed to not use threads
4134
        # too heavily. The call should be as early as possible, as
4135
        # error reporting for past duplicate imports won't have useful
4136
        # backtraces.
4137
        lazy_import.disallow_proxying()
4138
5247.1.15 by Vincent Ladeuil
Merge cleanup into first-try resolving conflicts
4139
        from bzrlib import tests
3427.5.3 by John Arbash Meinel
Update the activate_deprecation_warnings so it can be skipped if there is already an error set.
4140
2095.4.1 by Martin Pool
Better progress bars during tests
4141
        if testspecs_list is not None:
4142
            pattern = '|'.join(testspecs_list)
4143
        else:
4144
            pattern = ".*"
4165.1.1 by Robert Collins
Add builtin subunit support.
4145
        if subunit:
4165.1.2 by Robert Collins
Make a clear error when attempting to use subunit and it is not available.
4146
            try:
4147
                from bzrlib.tests import SubUnitBzrRunner
4148
            except ImportError:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4149
                raise errors.BzrCommandError(gettext("subunit not available. subunit "
4150
                    "needs to be installed to use --subunit."))
4165.1.1 by Robert Collins
Add builtin subunit support.
4151
            self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
5229.1.8 by Vincent Ladeuil
Subunit stream handling.
4152
            # On Windows, disable automatic conversion of '\n' to '\r\n' in
4153
            # stdout, which would corrupt the subunit stream. 
5229.2.2 by Vincent Ladeuil
More robust stream checking for subunit on windows
4154
            # FIXME: This has been fixed in subunit trunk (>0.0.5) so the
4155
            # following code can be deleted when it's sufficiently deployed
4156
            # -- vila/mgz 20100514
4157
            if (sys.platform == "win32"
4158
                and getattr(sys.stdout, 'fileno', None) is not None):
5229.1.8 by Vincent Ladeuil
Subunit stream handling.
4159
                import msvcrt
4160
                msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
4205.3.2 by Robert Collins
Create fork and reinvoke parallel testing support.
4161
        if parallel:
4162
            self.additional_selftest_args.setdefault(
4163
                'suite_decorators', []).append(parallel)
2095.4.1 by Martin Pool
Better progress bars during tests
4164
        if benchmark:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4165
            raise errors.BzrCommandError(gettext(
5050.10.1 by Martin Pool
Remove bzr selftest --benchmark
4166
                "--benchmark is no longer supported from bzr 2.2; "
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4167
                "use bzr-usertest instead"))
5050.10.1 by Martin Pool
Remove bzr selftest --benchmark
4168
        test_suite_factory = None
5924.1.2 by Vincent Ladeuil
Support multiple selftest --exclude options
4169
        if not exclude:
4170
            exclude_pattern = None
4171
        else:
4172
            exclude_pattern = '(' + '|'.join(exclude) + ')'
6015.31.1 by John Arbash Meinel
Bug #837293, make 'bzr selftest' disable fsync/fdatasync while running.
4173
        if not sync:
4174
            self._disable_fsync()
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4175
        selftest_kwargs = {"verbose": verbose,
4176
                          "pattern": pattern,
4177
                          "stop_on_failure": one,
4178
                          "transport": transport,
4179
                          "test_suite_factory": test_suite_factory,
4180
                          "lsprof_timed": lsprof_timed,
4181
                          "lsprof_tests": lsprof_tests,
4182
                          "matching_tests_first": first,
4183
                          "list_only": list_only,
4184
                          "random_seed": randomize,
5924.1.2 by Vincent Ladeuil
Support multiple selftest --exclude options
4185
                          "exclude_pattern": exclude_pattern,
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4186
                          "strict": strict,
4187
                          "load_list": load_list,
4188
                          "debug_flags": debugflag,
4189
                          "starting_with": starting_with
4190
                          }
4191
        selftest_kwargs.update(self.additional_selftest_args)
5393.2.1 by Vincent Ladeuil
Fix bug #625686 by removing the warning filter added by selftest.
4192
4193
        # Make deprecation warnings visible, unless -Werror is set
4194
        cleanup = symbol_versioning.activate_deprecation_warnings(
4195
            override=False)
4196
        try:
5398.1.1 by Vincent Ladeuil
Cleanup warnings.filters after running selftest
4197
            result = tests.selftest(**selftest_kwargs)
5393.2.1 by Vincent Ladeuil
Fix bug #625686 by removing the warning filter added by selftest.
4198
        finally:
4199
            cleanup()
2095.4.1 by Martin Pool
Better progress bars during tests
4200
        return int(not result)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4201
6015.31.1 by John Arbash Meinel
Bug #837293, make 'bzr selftest' disable fsync/fdatasync while running.
4202
    def _disable_fsync(self):
4203
        """Change the 'os' functionality to not synchronize."""
4204
        self._orig_fsync = getattr(os, 'fsync', None)
4205
        if self._orig_fsync is not None:
4206
            os.fsync = lambda filedes: None
4207
        self._orig_fdatasync = getattr(os, 'fdatasync', None)
4208
        if self._orig_fdatasync is not None:
4209
            os.fdatasync = lambda filedes: None
4210
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4211
4212
class cmd_version(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
4213
    __doc__ = """Show version of bzr."""
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
4214
2785.1.2 by bialix at ukr
bugfix for #131100
4215
    encoding_type = 'replace'
3346.2.1 by Martin Pool
Add version --short option
4216
    takes_options = [
4217
        Option("short", help="Print just the version number."),
4218
        ]
2785.1.2 by bialix at ukr
bugfix for #131100
4219
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
4220
    @display_command
3346.2.1 by Martin Pool
Add version --short option
4221
    def run(self, short=False):
1819.1.8 by Martin Pool
Improved reporting of bzrlib revision_id
4222
        from bzrlib.version import show_version
3346.2.1 by Martin Pool
Add version --short option
4223
        if short:
3346.2.7 by Martin Pool
Commands should use self.outf not print
4224
            self.outf.write(bzrlib.version_string + '\n')
3346.2.1 by Martin Pool
Add version --short option
4225
        else:
4226
            show_version(to_file=self.outf)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4227
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
4228
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4229
class cmd_rocks(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
4230
    __doc__ = """Statement of optimism."""
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
4231
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4232
    hidden = True
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
4233
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
4234
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4235
    def run(self):
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
4236
        self.outf.write(gettext("It sure does!\n"))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4237
4238
4239
class cmd_find_merge_base(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
4240
    __doc__ = """Find and print a base revision for merging two branches."""
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
4241
    # TODO: Options to specify revisions on either side, as if
4242
    #       merging only part of the history.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4243
    takes_args = ['branch', 'other']
4244
    hidden = True
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4245
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
4246
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4247
    def run(self, branch, other):
2872.2.1 by Andrew Bennetts
Remove unused imports in builtins.py revealed by pyflakes, and fix one undefined name.
4248
        from bzrlib.revision import ensure_null
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4249
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
4250
        branch1 = Branch.open_containing(branch)[0]
4251
        branch2 = Branch.open_containing(other)[0]
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
4252
        self.add_cleanup(branch1.lock_read().unlock)
4253
        self.add_cleanup(branch2.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4254
        last1 = ensure_null(branch1.last_revision())
4255
        last2 = ensure_null(branch2.last_revision())
4256
4257
        graph = branch1.repository.get_graph(branch2.repository)
4258
        base_rev_id = graph.find_unique_lca(last1, last2)
4259
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
4260
        self.outf.write(gettext('merge base is revision %s\n') % base_rev_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4261
4262
4263
class cmd_merge(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
4264
    __doc__ = """Perform a three-way merge.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4265
3277.1.1 by Peter Schuller
Document the relationship between bzr send and bzr merge. In
4266
    The source of the merge can be specified either in the form of a branch,
4267
    or in the form of a path to a file containing a merge directive generated
4268
    with bzr send. If neither is specified, the default is the upstream branch
5887.2.1 by Jonathan Riddell
give an error when trying to merge a non existent file
4269
    or the branch most recently merged using --remember.  The source of the
4270
    merge may also be specified in the form of a path to a file in another
4271
    branch:  in this case, only the modifications to that file are merged into
4272
    the current working tree.
3277.1.1 by Peter Schuller
Document the relationship between bzr send and bzr merge. In
4273
5537.3.1 by Eric Siegerman
Clarify the description of --revision, and an example.
4274
    When merging from a branch, by default bzr will try to merge in all new
4275
    work from the other branch, automatically determining an appropriate base
4276
    revision.  If this fails, you may need to give an explicit base.
4277
5537.3.4 by Eric Siegerman
Fix capitalization of "bzr", per review. Grammar fix: change "cherrypicking" to "a cherrypick".
4278
    To pick a different ending revision, pass "--revision OTHER".  bzr will
5537.3.1 by Eric Siegerman
Clarify the description of --revision, and an example.
4279
    try to merge in all new work up to and including revision OTHER.
4280
4281
    If you specify two values, "--revision BASE..OTHER", only revisions BASE
4282
    through OTHER, excluding BASE but including OTHER, will be merged.  If this
4283
    causes some revisions to be skipped, i.e. if the destination branch does
5537.3.3 by Eric Siegerman
Fix an off-by-one error in the description of "--revision BASE..OTHER".
4284
    not already contain revision BASE, such a merge is commonly referred to as
5877.3.1 by Matt Giuca
help merge: Added a few sentences explaining the different semantics of cherrypick merges.
4285
    a "cherrypick". Unlike a normal merge, Bazaar does not currently track
4286
    cherrypicks. The changes look like a normal commit, and the history of the
4287
    changes from the other branch is not stored in the commit.
3277.1.3 by Peter Schuller
Identify by name the "cherrypicking" mode of operation of 'bzr merge'.
4288
5537.3.2 by Eric Siegerman
Drive-by clarification.
4289
    Revision numbers are always relative to the source branch.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4290
1551.2.18 by Aaron Bentley
Updated docs to clarify conflict handling
4291
    Merge will do its best to combine the changes in two branches, but there
4292
    are some kinds of problems only a human can fix.  When it encounters those,
4293
    it will mark a conflict.  A conflict means that you need to fix something,
6437.2.2 by Vincent Ladeuil
Release 2.5b5
4294
    before you can commit.
1551.2.18 by Aaron Bentley
Updated docs to clarify conflict handling
4295
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
4296
    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
4297
5861.1.2 by Vincent Ladeuil
Use positive forms where possible, fix the command help and the user guide.
4298
    If there is no default branch set, the first merge will set it (use
6105.2.4 by Martin von Gagern
Drive-by typo correction in command docstrings.
4299
    --no-remember to avoid setting it). After that, you can omit the branch
5861.1.3 by Vincent Ladeuil
Fix the docs for push/pull/send regarding --no-remember.
4300
    to use the default.  To change the default, use --remember. The value will
4301
    only be saved if the remote location can be accessed.
1614.2.2 by Olaf Conradi
Merge command:
4302
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
4303
    The results of the merge are placed into the destination working
4304
    directory, where they can be reviewed (with bzr diff), tested, and then
4305
    committed to record the result of the merge.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4306
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4307
    merge refuses to run if there are any uncommitted changes, unless
5939.2.1 by Neil Martinsen-Burrell
better document the effect of merge --force
4308
    --force is given.  If --force is given, then the changes from the source 
5939.2.2 by Neil Martinsen-Burrell
language recommendation from Eli Zaretskii
4309
    will be merged with the current working tree, including any uncommitted
4310
    changes in the tree.  The --force option can also be used to create a
4311
    merge revision which has more than two parents.
4955.3.2 by Vincent Ladeuil
Tweak the spacing.
4312
4313
    If one would like to merge changes from the working tree of the other
4314
    branch without merging any committed revisions, the --uncommitted option
4315
    can be given.
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
4316
4526.6.15 by Aaron Bentley
Update command help
4317
    To select only some changes to merge, use "merge -i", which will prompt
4318
    you to apply each diff hunk and file change, similar to "shelve".
4319
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
4320
    :Examples:
5537.3.1 by Eric Siegerman
Clarify the description of --revision, and an example.
4321
        To merge all new revisions from bzr.dev::
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
4322
4323
            bzr merge ../bzr.dev
4324
4325
        To merge changes up to and including revision 82 from bzr.dev::
4326
4327
            bzr merge -r 82 ../bzr.dev
4328
4329
        To merge the changes introduced by 82, without previous changes::
4330
4331
            bzr merge -r 81..82 ../bzr.dev
3277.1.1 by Peter Schuller
Document the relationship between bzr send and bzr merge. In
4332
4816.1.1 by Ian Clatworthy
Trivial formatting fix to merge help
4333
        To apply a merge directive contained in /tmp/merge::
3277.1.1 by Peter Schuller
Document the relationship between bzr send and bzr merge. In
4334
4335
            bzr merge /tmp/merge
4971.3.2 by Neil Martinsen-Burrell
reformat examples with less reST
4336
4337
        To create a merge revision with three parents from two branches
4971.3.3 by Vincent Ladeuil
Tweak NEWS entry order and some cleanup.
4338
        feature1a and feature1b:
4971.3.2 by Neil Martinsen-Burrell
reformat examples with less reST
4339
4340
            bzr merge ../feature1a
4341
            bzr merge ../feature1b --force
4342
            bzr commit -m 'revision with three parents'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4343
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4344
3008.1.25 by Aaron Bentley
Set encoding exact on cmd_merge
4345
    encoding_type = 'exact'
4095.2.1 by Neil Martinsen-Burrell
Better help for bzr send
4346
    _see_also = ['update', 'remerge', 'status-flags', 'send']
3277.1.4 by Peter Schuller
As per further feedback, use LOCATION instead of MERGE_OR_MERGE_DIRECTIVE.
4347
    takes_args = ['location?']
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
4348
    takes_options = [
2839.5.1 by Alexander Belchenko
add -c option to merge command
4349
        'change',
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
4350
        'revision',
4351
        Option('force',
4352
               help='Merge even if the destination tree has uncommitted changes.'),
4353
        'merge-type',
4354
        'reprocess',
4355
        'remember',
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
4356
        Option('show-base', help="Show base revision text in "
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4357
               "conflicts."),
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
4358
        Option('uncommitted', help='Apply uncommitted changes'
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4359
               ' from a working copy, instead of branch changes.'),
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
4360
        Option('pull', help='If the destination is already'
4361
                ' completely merged into the source, pull from the'
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4362
                ' source rather than merging.  When this happens,'
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
4363
                ' you do not need to commit the result.'),
5171.3.1 by Martin von Gagern
Turn --directory and -d into a global option.
4364
        custom_help('directory',
2598.1.10 by Martin Pool
Clean up options that are registered globally and used once or not at all.
4365
               help='Branch to merge into, '
5171.3.1 by Martin von Gagern
Turn --directory and -d into a global option.
4366
                    'rather than the one containing the working directory.'),
4526.6.3 by Aaron Bentley
Implement interactive merging.
4367
        Option('preview', help='Instead of merging, show a diff of the'
4368
               ' merge.'),
4369
        Option('interactive', help='Select changes interactively.',
5321.1.74 by Gordon Tyler
Reverted some more command-related stuff that I missed earlier.
4370
            short_name='i')
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
4371
    ]
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
4372
3277.1.4 by Peter Schuller
As per further feedback, use LOCATION instead of MERGE_OR_MERGE_DIRECTIVE.
4373
    def run(self, location=None, revision=None, force=False,
5861.1.1 by Vincent Ladeuil
Don't set submit_branch if it's not yet set when merging.
4374
            merge_type=None, show_base=False, reprocess=None, remember=None,
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
4375
            uncommitted=False, pull=False,
4376
            directory=None,
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
4377
            preview=False,
4526.6.3 by Aaron Bentley
Implement interactive merging.
4378
            interactive=False,
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
4379
            ):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4380
        if merge_type is None:
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
4381
            merge_type = _mod_merge.Merge3Merger
1614.2.2 by Olaf Conradi
Merge command:
4382
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
4383
        if directory is None: directory = u'.'
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
4384
        possible_transports = []
4385
        merger = None
4386
        allow_pending = True
4387
        verified = 'inapplicable'
5863.5.1 by Jonathan Riddell
add an error message when merging into empty branch
4388
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
4389
        tree = WorkingTree.open_containing(directory)[0]
5863.5.1 by Jonathan Riddell
add an error message when merging into empty branch
4390
        if tree.branch.revno() == 0:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4391
            raise errors.BzrCommandError(gettext('Merging into empty branches not currently supported, '
4392
                                         'https://bugs.launchpad.net/bzr/+bug/308562'))
4037.2.1 by Roberto Aguilar
Check for umcommitted changes.
4393
4037.2.2 by Roberto Aguilar
Updating uncommitted changes check.
4394
        try:
4395
            basis_tree = tree.revision_tree(tree.last_revision())
4396
        except errors.NoSuchRevision:
4397
            basis_tree = tree.basis_tree()
4672.3.2 by Vincent Ladeuil
Don't allow merge on top of pending merges without --force.
4398
4399
        # die as quickly as possible if there are uncommitted changes
4104.8.1 by Robert Collins
Cherrypick the fix for merge --force onto 1.13.1
4400
        if not force:
4721.3.2 by Vincent Ladeuil
Simplify mutable_tree.has_changes() and update call sites.
4401
            if tree.has_changes():
4104.8.1 by Robert Collins
Cherrypick the fix for merge --force onto 1.13.1
4402
                raise errors.UncommittedChanges(tree)
4037.2.1 by Roberto Aguilar
Check for umcommitted changes.
4403
3586.1.31 by Ian Clatworthy
view filtering for pull, update & merge
4404
        view_info = _get_view_info_for_change_reporter(tree)
1551.10.25 by Aaron Bentley
Make ChangeReporter private
4405
        change_reporter = delta._ChangeReporter(
3586.1.31 by Ian Clatworthy
view filtering for pull, update & merge
4406
            unversioned_filter=tree.is_ignored, view_info=view_info)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4407
        pb = ui.ui_factory.nested_progress_bar()
4408
        self.add_cleanup(pb.finished)
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
4409
        self.add_cleanup(tree.lock_write().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4410
        if location is not None:
4411
            try:
4412
                mergeable = bundle.read_mergeable_from_url(location,
4413
                    possible_transports=possible_transports)
4414
            except errors.NotABundle:
4415
                mergeable = None
4416
            else:
4417
                if uncommitted:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4418
                    raise errors.BzrCommandError(gettext('Cannot use --uncommitted'
4419
                        ' with bundles or merge directives.'))
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4420
4421
                if revision is not None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4422
                    raise errors.BzrCommandError(gettext(
4423
                        'Cannot use -r with merge directives or bundles'))
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4424
                merger, verified = _mod_merge.Merger.from_mergeable(tree,
4961.2.11 by Martin Pool
Pull out pbs and ProgressPhases stored in object state; just use them in single functions
4425
                   mergeable, None)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4426
4427
        if merger is None and uncommitted:
4428
            if revision is not None and len(revision) > 0:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4429
                raise errors.BzrCommandError(gettext('Cannot use --uncommitted and'
4430
                    ' --revision at the same time.'))
4961.2.11 by Martin Pool
Pull out pbs and ProgressPhases stored in object state; just use them in single functions
4431
            merger = self.get_merger_from_uncommitted(tree, location, None)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4432
            allow_pending = False
4433
4434
        if merger is None:
4435
            merger, allow_pending = self._get_merger_from_branch(tree,
4961.2.11 by Martin Pool
Pull out pbs and ProgressPhases stored in object state; just use them in single functions
4436
                location, revision, remember, possible_transports, None)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4437
4438
        merger.merge_type = merge_type
4439
        merger.reprocess = reprocess
4440
        merger.show_base = show_base
4441
        self.sanity_check_merger(merger)
4442
        if (merger.base_rev_id == merger.other_rev_id and
4443
            merger.other_rev_id is not None):
5887.3.1 by Vincent Ladeuil
Simplify code and fix the test.
4444
            # check if location is a nonexistent file (and not a branch) to
4445
            # disambiguate the 'Nothing to do'
4446
            if merger.interesting_files:
4447
                if not merger.other_tree.has_filename(
4448
                    merger.interesting_files[0]):
6138.2.2 by Jonathan Riddell
gettext builtin.py's note() usage
4449
                    note(gettext("merger: ") + str(merger))
5887.2.3 by Jonathan Riddell
PathsDoNotExist a better error to throw
4450
                    raise errors.PathsDoNotExist([location])
6138.2.2 by Jonathan Riddell
gettext builtin.py's note() usage
4451
            note(gettext('Nothing to do.'))
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4452
            return 0
4797.86.1 by John Arbash Meinel
Fix bug #760152, 'bzr merge --pull --preview' should just be 'bzr merge --preview'
4453
        if pull and not preview:
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4454
            if merger.interesting_files is not None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4455
                raise errors.BzrCommandError(gettext('Cannot pull individual files'))
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4456
            if (merger.base_rev_id == tree.last_revision()):
4457
                result = tree.pull(merger.other_branch, False,
4458
                                   merger.other_rev_id)
4459
                result.report(self.outf)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
4460
                return 0
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4461
        if merger.this_basis is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4462
            raise errors.BzrCommandError(gettext(
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4463
                "This branch has no commits."
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4464
                " (perhaps you would prefer 'bzr pull')"))
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4465
        if preview:
5321.1.68 by Gordon Tyler
Removed mergetools command and integrations into merge and remerge commands, in preparation for splitting them off into a separate branch.
4466
            return self._do_preview(merger)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4467
        elif interactive:
5321.1.68 by Gordon Tyler
Removed mergetools command and integrations into merge and remerge commands, in preparation for splitting them off into a separate branch.
4468
            return self._do_interactive(merger)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4469
        else:
5321.1.68 by Gordon Tyler
Removed mergetools command and integrations into merge and remerge commands, in preparation for splitting them off into a separate branch.
4470
            return self._do_merge(merger, change_reporter, allow_pending,
4471
                                  verified)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
4472
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4473
    def _get_preview(self, merger):
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
4474
        tree_merger = merger.make_merger()
4475
        tt = tree_merger.make_preview_transform()
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4476
        self.add_cleanup(tt.finalize)
4526.6.3 by Aaron Bentley
Implement interactive merging.
4477
        result_tree = tt.get_preview_tree()
4526.6.8 by Aaron Bentley
Remove unused tt parameter.
4478
        return result_tree
4526.6.3 by Aaron Bentley
Implement interactive merging.
4479
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4480
    def _do_preview(self, merger):
4526.6.3 by Aaron Bentley
Implement interactive merging.
4481
        from bzrlib.diff import show_diff_trees
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4482
        result_tree = self._get_preview(merger)
4797.57.10 by Alexander Belchenko
path_encoding selection logic extracted as helper function
4483
        path_encoding = osutils.get_diff_header_encoding()
4526.6.3 by Aaron Bentley
Implement interactive merging.
4484
        show_diff_trees(merger.this_tree, result_tree, self.outf,
4797.57.7 by Alexander Belchenko
merge --preview: encode diff headers in mbcs on windows.
4485
                        old_label='', new_label='',
4486
                        path_encoding=path_encoding)
3008.1.24 by Aaron Bentley
Add merge --preview to show diff
4487
4488
    def _do_merge(self, merger, change_reporter, allow_pending, verified):
4489
        merger.change_reporter = change_reporter
4490
        conflict_count = merger.do_merge()
4491
        if allow_pending:
4492
            merger.set_pending()
4493
        if verified == 'failed':
4494
            warning('Preview patch does not match changes')
4495
        if conflict_count != 0:
4496
            return 1
4497
        else:
4498
            return 0
4499
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4500
    def _do_interactive(self, merger):
4526.6.13 by Aaron Bentley
Add docstring to do_interactive.
4501
        """Perform an interactive merge.
4502
4503
        This works by generating a preview tree of the merge, then using
4504
        Shelver to selectively remove the differences between the working tree
4505
        and the preview tree.
4506
        """
4526.6.4 by Aaron Bentley
Remove changes_destroyed message.
4507
        from bzrlib import shelf_ui
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4508
        result_tree = self._get_preview(merger)
4526.6.14 by Aaron Bentley
Use default DiffWriter.
4509
        writer = bzrlib.option.diff_writer_registry.get()
4526.6.4 by Aaron Bentley
Remove changes_destroyed message.
4510
        shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
4526.6.14 by Aaron Bentley
Use default DiffWriter.
4511
                                   reporter=shelf_ui.ApplyReporter(),
4512
                                   diff_writer=writer(sys.stdout))
4832.2.1 by Aaron Bentley
Ensure merge -i doesn't leave branch write_locked.
4513
        try:
4514
            shelver.run()
4515
        finally:
4516
            shelver.finalize()
4526.6.3 by Aaron Bentley
Implement interactive merging.
4517
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
4518
    def sanity_check_merger(self, merger):
4519
        if (merger.show_base and
4520
            not merger.merge_type is _mod_merge.Merge3Merger):
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4521
            raise errors.BzrCommandError(gettext("Show-base is not supported for this"
4522
                                         " merge type. %s") % merger.merge_type)
3744.2.1 by John Arbash Meinel
Change 'bzr merge' so that it uses --reprocess as long as --show-base is not given.
4523
        if merger.reprocess is None:
4524
            if merger.show_base:
4525
                merger.reprocess = False
4526
            else:
4527
                # Use reprocess if the merger supports it
4528
                merger.reprocess = merger.merge_type.supports_reprocess
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
4529
        if merger.reprocess and not merger.merge_type.supports_reprocess:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4530
            raise errors.BzrCommandError(gettext("Conflict reduction is not supported"
4531
                                         " for merge type %s.") %
2665.2.1 by Michael Hudson
test and fix for a NameError in merge --weave --show-base
4532
                                         merger.merge_type)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
4533
        if merger.reprocess and merger.show_base:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4534
            raise errors.BzrCommandError(gettext("Cannot do conflict reduction and"
4535
                                         " show base."))
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
4536
1551.15.75 by Aaron Bentley
_merger_from_branch -> _get_merger_from_branch
4537
    def _get_merger_from_branch(self, tree, location, revision, remember,
4538
                                possible_transports, pb):
4539
        """Produce a merger from a location, assuming it refers to a branch."""
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
4540
        from bzrlib.tag import _merge_tags_if_possible
4541
        # find the branch locations
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
4542
        other_loc, user_location = self._select_branch_location(tree, location,
1551.15.74 by Aaron Bentley
Textual updates from review
4543
            revision, -1)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
4544
        if revision is not None and len(revision) == 2:
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
4545
            base_loc, _unused = self._select_branch_location(tree,
4546
                location, revision, 0)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
4547
        else:
4548
            base_loc = other_loc
4549
        # Open the branches
4550
        other_branch, other_path = Branch.open_containing(other_loc,
4551
            possible_transports)
4552
        if base_loc == other_loc:
4553
            base_branch = other_branch
4554
        else:
4555
            base_branch, base_path = Branch.open_containing(base_loc,
1551.15.66 by Aaron Bentley
Improve behavior with revision ids
4556
                possible_transports)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
4557
        # Find the revision ids
4435.1.4 by Aaron Bentley
Fix tabs.
4558
        other_revision_id = None
4559
        base_revision_id = None
4560
        if revision is not None:
4561
            if len(revision) >= 1:
4562
                other_revision_id = revision[-1].as_revision_id(other_branch)
4563
            if len(revision) == 2:
4564
                base_revision_id = revision[0].as_revision_id(base_branch)
4435.1.1 by Aaron Bentley
Correctly fall back to basis when no second revision specified.
4565
        if other_revision_id is None:
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
4566
            other_revision_id = _mod_revision.ensure_null(
4567
                other_branch.last_revision())
5861.1.1 by Vincent Ladeuil
Don't set submit_branch if it's not yet set when merging.
4568
        # Remember where we merge from. We need to remember if:
4569
        # - user specify a location (and we don't merge from the parent
4570
        #   branch)
4571
        # - user ask to remember or there is no previous location set to merge
4572
        #   from and user didn't ask to *not* remember
4573
        if (user_location is not None
4574
            and ((remember
4575
                  or (remember is None
4576
                      and tree.branch.get_submit_branch() is None)))):
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
4577
            tree.branch.set_submit_branch(other_branch.base)
5050.53.4 by Andrew Bennetts
Don't propagate tags to the master branch during cmd_merge.
4578
        # Merge tags (but don't set them in the master branch yet, the user
4579
        # might revert this merge).  Commit will propagate them.
4580
        _merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
4581
        merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4582
            other_revision_id, base_revision_id, other_branch, base_branch)
4583
        if other_path != '':
4584
            allow_pending = False
4585
            merger.interesting_files = [other_path]
1645.1.1 by Aaron Bentley
Implement single-file merge
4586
        else:
1551.15.67 by Aaron Bentley
Stop using _merge_helper for merging
4587
            allow_pending = True
4588
        return merger, allow_pending
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4589
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4590
    def get_merger_from_uncommitted(self, tree, location, pb):
4465.1.1 by Aaron Bentley
Refactor cmd_merge to allow supplying other forms of uncommitted changes.
4591
        """Get a merger for uncommitted changes.
4592
4593
        :param tree: The tree the merger should apply to.
4594
        :param location: The location containing uncommitted changes.
4595
        :param pb: The progress bar to use for showing progress.
4596
        """
4597
        location = self._select_branch_location(tree, location)[0]
4598
        other_tree, other_path = WorkingTree.open_containing(location)
4599
        merger = _mod_merge.Merger.from_uncommitted(tree, other_tree, pb)
4600
        if other_path != '':
4601
            merger.interesting_files = [other_path]
4602
        return merger
4603
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
4604
    def _select_branch_location(self, tree, user_location, revision=None,
1551.15.74 by Aaron Bentley
Textual updates from review
4605
                                index=None):
4606
        """Select a branch location, according to possible inputs.
4607
4608
        If provided, branches from ``revision`` are preferred.  (Both
4609
        ``revision`` and ``index`` must be supplied.)
4610
4611
        Otherwise, the ``location`` parameter is used.  If it is None, then the
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
4612
        ``submit`` or ``parent`` location is used, and a note is printed.
1551.15.74 by Aaron Bentley
Textual updates from review
4613
4614
        :param tree: The working tree to select a branch for merging into
4615
        :param location: The location entered by the user
4616
        :param revision: The revision parameter to the command
4617
        :param index: The index to use for the revision parameter.  Negative
4618
            indices are permitted.
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
4619
        :return: (selected_location, user_location).  The default location
4620
            will be the user-entered location.
1551.15.74 by Aaron Bentley
Textual updates from review
4621
        """
1551.15.66 by Aaron Bentley
Improve behavior with revision ids
4622
        if (revision is not None and index is not None
4623
            and revision[index] is not None):
4624
            branch = revision[index].get_branch()
4625
            if branch is not None:
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
4626
                return branch, branch
4627
        if user_location is None:
4628
            location = self._get_remembered(tree, 'Merging from')
4629
        else:
4630
            location = user_location
4631
        return location, user_location
1551.15.66 by Aaron Bentley
Improve behavior with revision ids
4632
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
4633
    def _get_remembered(self, tree, verb_string):
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
4634
        """Use tree.branch's parent if none was supplied.
4635
4636
        Report if the remembered location was used.
4637
        """
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
4638
        stored_location = tree.branch.get_submit_branch()
3596.3.1 by James Westby
Give the user a bit more information about which saved location is being used.
4639
        stored_location_type = "submit"
1551.20.2 by Aaron Bentley
Merge prefers submit branch, but falls back to parent branch
4640
        if stored_location is None:
4641
            stored_location = tree.branch.get_parent()
3596.3.1 by James Westby
Give the user a bit more information about which saved location is being used.
4642
            stored_location_type = "parent"
1685.1.71 by Wouter van Heyst
change branch.{get,set}_parent to store a relative path but return full urls
4643
        mutter("%s", stored_location)
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
4644
        if stored_location is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4645
            raise errors.BzrCommandError(gettext("No location specified or remembered"))
3249.1.1 by Ian Clatworthy
fix merge redirection when using a remembered location
4646
        display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
6138.2.4 by Jonathan Riddell
use format strings where there are multiple substitutions to allow for translations
4647
        note(gettext("{0} remembered {1} location {2}").format(verb_string,
4648
                stored_location_type, display_url))
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
4649
        return stored_location
4650
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4651
1185.35.4 by Aaron Bentley
Implemented remerge
4652
class cmd_remerge(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
4653
    __doc__ = """Redo a merge.
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
4654
4655
    Use this if you want to try a different merge technique while resolving
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4656
    conflicts.  Some merge techniques are better than others, and remerge
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
4657
    lets you try different ones on different files.
4658
4659
    The options for remerge have the same meaning and defaults as the ones for
4660
    merge.  The difference is that remerge can (only) be run when there is a
4661
    pending merge, and it lets you specify particular files.
4662
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
4663
    :Examples:
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
4664
        Re-do the merge of all conflicted files, and show the base text in
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
4665
        conflict regions, in addition to the usual THIS and OTHER texts::
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4666
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
4667
            bzr remerge --show-base
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
4668
4669
        Re-do the merge of "foobar", using the weave merge algorithm, with
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
4670
        additional processing to reduce the size of conflict regions::
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4671
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
4672
            bzr remerge --merge-type weave --reprocess foobar
2374.1.1 by Ian Clatworthy
Help and man page fixes
4673
    """
1185.35.4 by Aaron Bentley
Implemented remerge
4674
    takes_args = ['file*']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4675
    takes_options = [
5321.1.74 by Gordon Tyler
Reverted some more command-related stuff that I missed earlier.
4676
            'merge-type',
4677
            'reprocess',
4678
            Option('show-base',
5321.1.75 by Gordon Tyler
Reverted more command-related stuff and my own idiocy.
4679
                   help="Show base revision text in conflicts."),
4680
            ]
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
4681
1185.35.4 by Aaron Bentley
Implemented remerge
4682
    def run(self, file_list=None, merge_type=None, show_base=False,
5321.1.68 by Gordon Tyler
Removed mergetools command and integrations into merge and remerge commands, in preparation for splitting them off into a separate branch.
4683
            reprocess=False):
5127.1.2 by Martin Pool
Lazy-load conflict commands
4684
        from bzrlib.conflicts import restore
1185.35.4 by Aaron Bentley
Implemented remerge
4685
        if merge_type is None:
1996.3.5 by John Arbash Meinel
Cleanup, deprecated, and get the tests passing again.
4686
            merge_type = _mod_merge.Merge3Merger
5346.4.5 by Martin Pool
Deprecate and avoid internal_tree_files and tree_files.
4687
        tree, file_list = WorkingTree.open_containing_paths(file_list)
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
4688
        self.add_cleanup(tree.lock_write().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4689
        parents = tree.get_parent_ids()
4690
        if len(parents) != 2:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4691
            raise errors.BzrCommandError(gettext("Sorry, remerge only works after normal"
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4692
                                         " merges.  Not cherrypicking or"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4693
                                         " multi-merges."))
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4694
        repository = tree.branch.repository
4695
        interesting_ids = None
4696
        new_conflicts = []
4697
        conflicts = tree.conflicts()
4698
        if file_list is not None:
4699
            interesting_ids = set()
4700
            for filename in file_list:
4701
                file_id = tree.path2id(filename)
4702
                if file_id is None:
4703
                    raise errors.NotVersionedError(filename)
4704
                interesting_ids.add(file_id)
4705
                if tree.kind(file_id) != "directory":
4706
                    continue
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4707
6405.2.10 by Jelmer Vernooij
Fix more tests.
4708
                # FIXME: Support nested trees
4709
                for name, ie in tree.root_inventory.iter_entries(file_id):
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4710
                    interesting_ids.add(ie.file_id)
4711
            new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
4712
        else:
4713
            # Remerge only supports resolving contents conflicts
4714
            allowed_conflicts = ('text conflict', 'contents conflict')
4715
            restore_files = [c.path for c in conflicts
4716
                             if c.typestring in allowed_conflicts]
4717
        _mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
4718
        tree.set_conflicts(ConflictList(new_conflicts))
4719
        if file_list is not None:
4720
            restore_files = file_list
4721
        for filename in restore_files:
1551.15.47 by Aaron Bentley
Fix remerge --weave
4722
            try:
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4723
                restore(tree.abspath(filename))
4724
            except errors.NotConflicted:
4725
                pass
4726
        # Disable pending merges, because the file texts we are remerging
4727
        # have not had those merges performed.  If we use the wrong parents
4728
        # list, we imply that the working tree text has seen and rejected
4729
        # all the changes from the other tree, when in fact those changes
4730
        # have not yet been seen.
4731
        tree.set_parent_ids(parents[:1])
4732
        try:
4961.2.13 by Martin Pool
Further progress bar string-pulling
4733
            merger = _mod_merge.Merger.from_revision_ids(None, tree, parents[1])
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4734
            merger.interesting_ids = interesting_ids
4735
            merger.merge_type = merge_type
4736
            merger.show_base = show_base
4737
            merger.reprocess = reprocess
4738
            conflicts = merger.do_merge()
1185.35.4 by Aaron Bentley
Implemented remerge
4739
        finally:
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4740
            tree.set_parent_ids(parents)
1185.35.4 by Aaron Bentley
Implemented remerge
4741
        if conflicts > 0:
4742
            return 1
4743
        else:
4744
            return 0
4745
2023.1.1 by ghigo
add topics help
4746
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4747
class cmd_revert(Command):
6511.1.1 by Jelmer Vernooij
Tweak the help text, based on discussion on the mailing list with Joseph Wakeling and Bernhard Voelker.
4748
    __doc__ = """\
6511.1.2 by Jelmer Vernooij
Some more tweaks based on feedback from poolie.
4749
    Set files in the working tree back to the contents of a previous revision.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4750
1551.8.27 by Aaron Bentley
Update docs again
4751
    Giving a list of files will revert only those files.  Otherwise, all files
4752
    will be reverted.  If the revision is not specified with '--revision', the
6511.1.2 by Jelmer Vernooij
Some more tweaks based on feedback from poolie.
4753
    working tree basis revision is used. A revert operation affects only the
4754
    working tree, not any revision history like the branch and repository or
4755
    the working tree basis revision.
1551.8.26 by Aaron Bentley
Update revert help text
4756
4757
    To remove only some changes, without reverting to a prior version, use
5561.1.2 by Andrew Bennetts
Fix double dash, highlight the significant '.' param.
4758
    merge instead.  For example, "merge . -r -2..-3" (don't forget the ".")
4759
    will remove the changes introduced by the second last commit (-2), without
4760
    affecting the changes introduced by the last commit (-1).  To remove
4761
    certain changes on a hunk-by-hunk basis, see the shelve command.
6511.1.2 by Jelmer Vernooij
Some more tweaks based on feedback from poolie.
4762
    To update the branch to a specific revision or the latest revision and
4763
    update the working tree accordingly while preserving local changes, see the
4764
    update command.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4765
6511.1.2 by Jelmer Vernooij
Some more tweaks based on feedback from poolie.
4766
    Uncommitted changes to files that are reverted will be discarded.
4767
    Howver, by default, any files that have been manually changed will be
4768
    backed up first.  (Files changed only by merge are not backed up.)  Backup
4769
    files have '.~#~' appended to their name, where # is a number.
1551.8.27 by Aaron Bentley
Update docs again
4770
4771
    When you provide files, you can use their current pathname or the pathname
4772
    from the target revision.  So you can use revert to "undelete" a file by
4773
    name.  If you name a directory, all the contents of that directory will be
4774
    reverted.
2614.1.1 by Martin Pool
Doc for revert, #87548
4775
4825.1.1 by Robert Collins
Merge documentation fixes from Neil Martinsen-Burrell.
4776
    If you have newly added files since the target revision, they will be
4798.1.1 by Neil Martinsen-Burrell
change revert documentation to be clearer about when it removes files
4777
    removed.  If the files to be removed have been changed, backups will be
4778
    created as above.  Directories containing unknown files will not be
4779
    deleted.
2911.2.1 by Martin Pool
Better help for revert
4780
4955.2.1 by Neil Martinsen-Burrell
improve revert documentations discussion of pending merges
4781
    The working tree contains a list of revisions that have been merged but
4782
    not yet committed. These revisions will be included as additional parents
4783
    of the next commit.  Normally, using revert clears that list as well as
4784
    reverting the files.  If any files are specified, revert leaves the list
4785
    of uncommitted merges alone and reverts only the files.  Use ``bzr revert
4786
    .`` in the tree root to revert all files but keep the recorded merges,
4787
    and ``bzr revert --forget-merges`` to clear the pending merge list without
2911.2.1 by Martin Pool
Better help for revert
4788
    reverting any files.
4798.6.1 by Neil Martinsen-Burrell
document the use of revert --forget-merges to condense merges to a single revision
4789
4955.2.1 by Neil Martinsen-Burrell
improve revert documentations discussion of pending merges
4790
    Using "bzr revert --forget-merges", it is possible to apply all of the
4791
    changes from a branch in a single revision.  To do this, perform the merge
4792
    as desired.  Then doing revert with the "--forget-merges" option will keep
4793
    the content of the tree as it was, but it will clear the list of pending
4794
    merges.  The next commit will then contain all of the changes that are
4795
    present in the other branch, but without any other parent revisions.
4796
    Because this technique forgets where these changes originated, it may
4797
    cause additional conflicts on later merges involving the same source and
4798.6.3 by Neil Martinsen-Burrell
Add discussion of conflicts
4798
    target branches.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4799
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4800
5561.1.1 by Andrew Bennetts
Tweak 'revert' help based on IRC feedback: make clear the meanings of -2 & -1, use '-r' rather than '--revision' in example, update text for shelve being built in, and add 'merge' and 'shelve' to the see also list.
4801
    _see_also = ['cat', 'export', 'merge', 'shelve']
2598.1.6 by Martin Pool
Add help for --no-backup
4802
    takes_options = [
2851.2.1 by Martin Pool
Add revert --forget-merges
4803
        'revision',
4804
        Option('no-backup', "Do not save backups of reverted files."),
4805
        Option('forget-merges',
4806
               'Remove pending merge marker, without changing any files.'),
4807
        ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4808
    takes_args = ['file*']
4809
2851.2.1 by Martin Pool
Add revert --forget-merges
4810
    def run(self, revision=None, no_backup=False, file_list=None,
4811
            forget_merges=None):
5346.4.5 by Martin Pool
Deprecate and avoid internal_tree_files and tree_files.
4812
        tree, file_list = WorkingTree.open_containing_paths(file_list)
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
4813
        self.add_cleanup(tree.lock_tree_write().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
4814
        if forget_merges:
4815
            tree.set_parent_ids(tree.get_parent_ids()[:1])
4816
        else:
4817
            self._revert_tree_to_revision(tree, revision, file_list, no_backup)
2851.2.1 by Martin Pool
Add revert --forget-merges
4818
4819
    @staticmethod
4820
    def _revert_tree_to_revision(tree, revision, file_list, no_backup):
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
4821
        rev_tree = _get_one_revision_tree('revert', revision, tree=tree)
4961.2.11 by Martin Pool
Pull out pbs and ProgressPhases stored in object state; just use them in single functions
4822
        tree.revert(file_list, rev_tree, not no_backup, None,
4823
            report_changes=True)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4824
4825
4826
class cmd_assert_fail(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
4827
    __doc__ = """Test reporting of assertion failures"""
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
4828
    # intended just for use in testing
4829
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4830
    hidden = True
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
4831
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4832
    def run(self):
2090.2.1 by Martin Pool
Fix some code which relies on assertions and breaks under python -O
4833
        raise AssertionError("always fails")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4834
4835
4836
class cmd_help(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
4837
    __doc__ = """Show help on a command or other topic.
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4838
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4839
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4840
    _see_also = ['topics']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4841
    takes_options = [
4842
            Option('long', 'Show help on all commands.'),
4843
            ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4844
    takes_args = ['topic?']
1616.1.15 by Martin Pool
Handle 'bzr ?', etc.
4845
    aliases = ['?', '--help', '-?', '-h']
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4846
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
4847
    @display_command
3984.4.5 by Ian Clatworthy
help xxx is full help; xxx -h is concise help
4848
    def run(self, topic=None, long=False):
2023.1.1 by ghigo
add topics help
4849
        import bzrlib.help
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4850
        if topic is None and long:
4851
            topic = "commands"
3984.4.5 by Ian Clatworthy
help xxx is full help; xxx -h is concise help
4852
        bzrlib.help.help(topic)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4853
4854
4855
class cmd_shell_complete(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
4856
    __doc__ = """Show appropriate completions for context.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4857
2023.1.1 by ghigo
add topics help
4858
    For a list of all available commands, say 'bzr shell-complete'.
4859
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4860
    takes_args = ['context?']
4861
    aliases = ['s-c']
4862
    hidden = True
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4863
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
4864
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4865
    def run(self, context=None):
6405.1.2 by Jelmer Vernooij
Fix 'bzr shell-complete' and add a really basic test for it.
4866
        from bzrlib import shellcomplete
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
4867
        shellcomplete.shellcomplete(context)
4868
4869
4870
class cmd_missing(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
4871
    __doc__ = """Show unmerged/unpulled revisions between two branches.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
4872
2023.1.1 by ghigo
add topics help
4873
    OTHER_BRANCH may be local or remote.
3921.3.12 by Marius Kruger
add missing examples and NEWS
4874
4156.1.1 by Vincent Ladeuil
Trivial spelling correction to "bzr missing" documentation
4875
    To filter on a range of revisions, you can use the command -r begin..end
3921.3.13 by Marius Kruger
update missing documentation and blackbox test to better reflect `-r 3` behaviour.
4876
    -r revision requests a specific revision, -r ..end or -r begin.. are
4877
    also valid.
4849.2.1 by Neil Martinsen-Burrell
document the return values of bzr missing
4878
            
4849.2.2 by Neil Martinsen-Burrell
better markup
4879
    :Exit values:
4849.2.1 by Neil Martinsen-Burrell
document the return values of bzr missing
4880
        1 - some missing revisions
4881
        0 - no missing revisions
3921.3.13 by Marius Kruger
update missing documentation and blackbox test to better reflect `-r 3` behaviour.
4882
3921.3.12 by Marius Kruger
add missing examples and NEWS
4883
    :Examples:
4884
4885
        Determine the missing revisions between this and the branch at the
4886
        remembered pull location::
4887
4888
            bzr missing
4889
4890
        Determine the missing revisions between this and another branch::
4891
4892
            bzr missing http://server/branch
4893
4894
        Determine the missing revisions up to a specific revision on the other
4895
        branch::
4896
4897
            bzr missing -r ..-10
4898
4899
        Determine the missing revisions up to a specific revision on this
4900
        branch::
4901
4902
            bzr missing --my-revision ..-10
2023.1.1 by ghigo
add topics help
4903
    """
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
4904
4905
    _see_also = ['merge', 'pull']
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
4906
    takes_args = ['other_branch?']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
4907
    takes_options = [
5171.3.13 by Martin von Gagern
Add --directory option to 7 more commands.
4908
        'directory',
3921.3.6 by Marius Kruger
* fix some indentation anomalies in cmd_missing
4909
        Option('reverse', 'Reverse the order of revisions.'),
4910
        Option('mine-only',
4911
               'Display changes in the local branch only.'),
4912
        Option('this' , 'Same as --mine-only.'),
4913
        Option('theirs-only',
4914
               'Display changes in the remote branch only.'),
4915
        Option('other', 'Same as --theirs-only.'),
4916
        'log-format',
4917
        'show-ids',
4918
        'verbose',
4919
        custom_help('revision',
3921.3.11 by Marius Kruger
swap options as per review:
4920
             help='Filter on other branch revisions (inclusive). '
3921.3.6 by Marius Kruger
* fix some indentation anomalies in cmd_missing
4921
                'See "help revisionspec" for details.'),
3921.3.11 by Marius Kruger
swap options as per review:
4922
        Option('my-revision',
3921.3.6 by Marius Kruger
* fix some indentation anomalies in cmd_missing
4923
            type=_parse_revision_str,
3921.3.11 by Marius Kruger
swap options as per review:
4924
            help='Filter on local branch revisions (inclusive). '
3921.3.6 by Marius Kruger
* fix some indentation anomalies in cmd_missing
4925
                'See "help revisionspec" for details.'),
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
4926
        Option('include-merged',
4221.1.1 by Vincent Ladeuil
Clarify 'missing --include-merges' help.
4927
               'Show all revisions in addition to the mainline ones.'),
6123.11.1 by Martin von Gagern
Rename --include-merges option to --include-sidelines.
4928
        Option('include-merges', hidden=True,
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
4929
               help='Historical alias for --include-merged.'),
3921.3.6 by Marius Kruger
* fix some indentation anomalies in cmd_missing
4930
        ]
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
4931
    encoding_type = 'replace'
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
4932
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
4933
    @display_command
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
4934
    def run(self, other_branch=None, reverse=False, mine_only=False,
3677.1.1 by Vincent Ladeuil
Begin fixing bug #233817.
4935
            theirs_only=False,
4936
            log_format=None, long=False, short=False, line=False,
4937
            show_ids=False, verbose=False, this=False, other=False,
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
4938
            include_merged=None, revision=None, my_revision=None,
6123.11.10 by Martin von Gagern
Print deprecation warnings for all uses of include_merges.
4939
            directory=u'.',
4940
            include_merges=symbol_versioning.DEPRECATED_PARAMETER):
2466.8.1 by Kent Gibson
Reworked LogFormatter API to simplify extending the attributes of the revision being logged. Added support for begin_log() and end_log() hooks in LogFormatters.
4941
        from bzrlib.missing import find_unmerged, iter_log_revisions
3778.5.1 by Martin Pool
missing -q is quieter (#284748)
4942
        def message(s):
4943
            if not is_quiet():
4944
                self.outf.write(s)
2528.1.1 by Martin Pool
Better option names for missing (elliot)
4945
6123.11.10 by Martin von Gagern
Print deprecation warnings for all uses of include_merges.
4946
        if symbol_versioning.deprecated_passed(include_merges):
4947
            ui.ui_factory.show_user_warning(
4948
                'deprecated_command_option',
4949
                deprecated_name='--include-merges',
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
4950
                recommended_name='--include-merged',
6123.11.10 by Martin von Gagern
Print deprecation warnings for all uses of include_merges.
4951
                deprecated_in_version='2.5',
4952
                command=self.invoked_as)
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
4953
            if include_merged is None:
4954
                include_merged = include_merges
6123.11.10 by Martin von Gagern
Print deprecation warnings for all uses of include_merges.
4955
            else:
6123.11.16 by Martin von Gagern
Use gettext for command errors about conflicting options.
4956
                raise errors.BzrCommandError(gettext(
6123.11.17 by Martin von Gagern
Use the same translation template for all mutually exclusive command line options.
4957
                    '{0} and {1} are mutually exclusive').format(
4958
                    '--include-merges', '--include-merged'))
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
4959
        if include_merged is None:
4960
            include_merged = False
2528.1.1 by Martin Pool
Better option names for missing (elliot)
4961
        if this:
3427.3.3 by John Arbash Meinel
Revert cmd_missing to use the original function, only now supply restrict
4962
            mine_only = this
2528.1.1 by Martin Pool
Better option names for missing (elliot)
4963
        if other:
3427.3.3 by John Arbash Meinel
Revert cmd_missing to use the original function, only now supply restrict
4964
            theirs_only = other
4965
        # TODO: We should probably check that we don't have mine-only and
4966
        #       theirs-only set, but it gets complicated because we also have
4967
        #       this and other which could be used.
4968
        restrict = 'all'
4969
        if mine_only:
4970
            restrict = 'local'
4971
        elif theirs_only:
4972
            restrict = 'remote'
2528.1.1 by Martin Pool
Better option names for missing (elliot)
4973
5171.3.13 by Martin von Gagern
Add --directory option to 7 more commands.
4974
        local_branch = Branch.open_containing(directory)[0]
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
4975
        self.add_cleanup(local_branch.lock_read().unlock)
5144.1.1 by Andrew Bennetts
Read-lock local_branch and remote_branch in cmd_missing as soon as they are opened. Makes 'bzr missing' clean w.r.t. -Drelock.
4976
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
4977
        parent = local_branch.get_parent()
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
4978
        if other_branch is None:
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
4979
            other_branch = parent
4980
            if other_branch is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
4981
                raise errors.BzrCommandError(gettext("No peer location known"
4982
                                             " or specified."))
2193.4.1 by Alexander Belchenko
'bzr missing' without specifying location show remembered location unescaped
4983
            display_url = urlutils.unescape_for_display(parent,
4984
                                                        self.outf.encoding)
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
4985
            message(gettext("Using saved parent location: {0}\n").format(
4986
                    display_url))
2193.4.1 by Alexander Belchenko
'bzr missing' without specifying location show remembered location unescaped
4987
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
4988
        remote_branch = Branch.open(other_branch)
1551.2.46 by abentley
Made bzr missing . work on win32
4989
        if remote_branch.base == local_branch.base:
4990
            remote_branch = local_branch
5144.1.1 by Andrew Bennetts
Read-lock local_branch and remote_branch in cmd_missing as soon as they are opened. Makes 'bzr missing' clean w.r.t. -Drelock.
4991
        else:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
4992
            self.add_cleanup(remote_branch.lock_read().unlock)
3921.3.4 by Marius Kruger
add support to filter on local and remote revisions
4993
4994
        local_revid_range = _revision_range_to_revid_range(
3921.3.11 by Marius Kruger
swap options as per review:
4995
            _get_revision_range(my_revision, local_branch,
3921.3.9 by Marius Kruger
* add some blackbox tests and another whitebox test
4996
                self.name()))
3921.3.4 by Marius Kruger
add support to filter on local and remote revisions
4997
4998
        remote_revid_range = _revision_range_to_revid_range(
3921.3.11 by Marius Kruger
swap options as per review:
4999
            _get_revision_range(revision,
3921.3.9 by Marius Kruger
* add some blackbox tests and another whitebox test
5000
                remote_branch, self.name()))
3921.3.4 by Marius Kruger
add support to filter on local and remote revisions
5001
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5002
        local_extra, remote_extra = find_unmerged(
5003
            local_branch, remote_branch, restrict,
5004
            backward=not reverse,
6123.11.13 by Martin von Gagern
Rename --include-sidelines to --include-merged.
5005
            include_merged=include_merged,
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5006
            local_revid_range=local_revid_range,
5007
            remote_revid_range=remote_revid_range)
5008
5009
        if log_format is None:
5010
            registry = log.log_formatter_registry
5011
            log_format = registry.get_default(local_branch)
5012
        lf = log_format(to_file=self.outf,
5013
                        show_ids=show_ids,
5014
                        show_timezone='original')
5015
5016
        status_code = 0
5017
        if local_extra and not theirs_only:
6143.1.1 by Jonathan Riddell
use ngettext for plurals
5018
            message(ngettext("You have %d extra revision:\n",
5019
                             "You have %d extra revisions:\n", 
5020
                             len(local_extra)) %
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5021
                len(local_extra))
6519.2.2 by Neil Martinsen-Burrell
pass in tag dictionary instead of branch
5022
            rev_tag_dict = {}
5023
            if local_branch.supports_tags():
5024
                rev_tag_dict = local_branch.tags.get_reverse_tag_dict()
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5025
            for revision in iter_log_revisions(local_extra,
5026
                                local_branch.repository,
6519.2.1 by Neil Martinsen-Burrell
Show tag names when using missing command
5027
                                verbose,
6519.2.2 by Neil Martinsen-Burrell
pass in tag dictionary instead of branch
5028
                                rev_tag_dict):
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5029
                lf.log_revision(revision)
5030
            printed_local = True
5031
            status_code = 1
5032
        else:
5033
            printed_local = False
5034
5035
        if remote_extra and not mine_only:
5036
            if printed_local is True:
5037
                message("\n\n\n")
6143.1.1 by Jonathan Riddell
use ngettext for plurals
5038
            message(ngettext("You are missing %d revision:\n",
5039
                             "You are missing %d revisions:\n",
5040
                             len(remote_extra)) %
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5041
                len(remote_extra))
6519.2.2 by Neil Martinsen-Burrell
pass in tag dictionary instead of branch
5042
            if remote_branch.supports_tags():
5043
                rev_tag_dict = remote_branch.tags.get_reverse_tag_dict()
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5044
            for revision in iter_log_revisions(remote_extra,
5045
                                remote_branch.repository,
6519.2.2 by Neil Martinsen-Burrell
pass in tag dictionary instead of branch
5046
                                verbose,
5047
                                rev_tag_dict):
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5048
                lf.log_revision(revision)
5049
            status_code = 1
5050
5051
        if mine_only and not local_extra:
5052
            # We checked local, and found nothing extra
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
5053
            message(gettext('This branch has no new revisions.\n'))
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5054
        elif theirs_only and not remote_extra:
5055
            # We checked remote, and found nothing extra
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
5056
            message(gettext('Other branch has no new revisions.\n'))
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5057
        elif not (mine_only or theirs_only or local_extra or
5058
                  remote_extra):
5059
            # We checked both branches, and neither one had extra
5060
            # revisions
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
5061
            message(gettext("Branches are up to date.\n"))
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5062
        self.cleanup_now()
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
5063
        if not status_code and parent is None and other_branch is not None:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
5064
            self.add_cleanup(local_branch.lock_write().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5065
            # handle race conditions - a parent might be set while we run.
5066
            if local_branch.get_parent() is None:
5067
                local_branch.set_parent(remote_branch.base)
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
5068
        return status_code
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
5069
5070
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
5071
class cmd_pack(Command):
5131.2.3 by Martin
Merge bzr.dev to resolve conflicts
5072
    __doc__ = """Compress the data within a repository.
5108.1.1 by Parth Malwankar
initial support for 'pack --clean-obsolete-packs'. tested only manually.
5073
5108.1.6 by Parth Malwankar
fixed typo.
5074
    This operation compresses the data within a bazaar repository. As
5108.1.1 by Parth Malwankar
initial support for 'pack --clean-obsolete-packs'. tested only manually.
5075
    bazaar supports automatic packing of repository, this operation is
5076
    normally not required to be done manually.
5077
5108.1.5 by Parth Malwankar
updated docstring for pack command with better warning.
5078
    During the pack operation, bazaar takes a backup of existing repository
5079
    data, i.e. pack files. This backup is eventually removed by bazaar
5108.1.1 by Parth Malwankar
initial support for 'pack --clean-obsolete-packs'. tested only manually.
5080
    automatically when it is safe to do so. To save disk space by removing
5081
    the backed up pack files, the --clean-obsolete-packs option may be
5082
    used.
5083
5108.1.5 by Parth Malwankar
updated docstring for pack command with better warning.
5084
    Warning: If you use --clean-obsolete-packs and your machine crashes
5085
    during or immediately after repacking, you may be left with a state
5086
    where the deletion has been written to disk but the new packs have not
5087
    been. In this case the repository may be unusable.
5108.1.1 by Parth Malwankar
initial support for 'pack --clean-obsolete-packs'. tested only manually.
5088
    """
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
5089
5090
    _see_also = ['repositories']
5091
    takes_args = ['branch_or_repo?']
5108.1.1 by Parth Malwankar
initial support for 'pack --clean-obsolete-packs'. tested only manually.
5092
    takes_options = [
5093
        Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
5094
        ]
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
5095
5108.1.1 by Parth Malwankar
initial support for 'pack --clean-obsolete-packs'. tested only manually.
5096
    def run(self, branch_or_repo='.', clean_obsolete_packs=False):
6207.3.3 by jelmer at samba
Fix tests and the like.
5097
        dir = controldir.ControlDir.open_containing(branch_or_repo)[0]
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
5098
        try:
5099
            branch = dir.open_branch()
5100
            repository = branch.repository
5101
        except errors.NotBranchError:
5102
            repository = dir.open_repository()
5108.1.1 by Parth Malwankar
initial support for 'pack --clean-obsolete-packs'. tested only manually.
5103
        repository.pack(clean_obsolete_packs=clean_obsolete_packs)
2604.2.1 by Robert Collins
(robertc) Introduce a pack command.
5104
5105
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
5106
class cmd_plugins(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
5107
    __doc__ = """List the installed plugins.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
5108
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
5109
    This command displays the list of installed plugins including
5110
    version of plugin and a short description of each.
5111
5112
    --verbose shows the path where each plugin is located.
2617.3.1 by Ian Clatworthy
Make the plugins command public with better help
5113
5114
    A plugin is an external component for Bazaar that extends the
5115
    revision control system, by adding or replacing code in Bazaar.
5116
    Plugins can do a variety of things, including overriding commands,
5117
    adding new commands, providing additional network transports and
5118
    customizing log output.
5119
4988.4.2 by Martin Pool
Change url to canonical.com or wiki, plus some doc improvements in passing
5120
    See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>
5121
    for further information on plugins including where to find them and how to
5122
    install them. Instructions are also provided there on how to write new
5123
    plugins using the Python programming language.
2617.3.1 by Ian Clatworthy
Make the plugins command public with better help
5124
    """
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
5125
    takes_options = ['verbose']
2629.1.1 by Ian Clatworthy
(Ian Clatworthy) Tweak the 'make plugins public' change following feedback from lifeless
5126
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
5127
    @display_command
3193.2.3 by Alexander Belchenko
another formatting variant suggested by John Meinel.
5128
    def run(self, verbose=False):
5616.7.5 by Martin Pool
Factor out describe_loaded_plugins
5129
        from bzrlib import plugin
5863.3.4 by Martin
Add comment suggested by poolie in review
5130
        # Don't give writelines a generator as some codecs don't like that
5863.3.3 by Martin
Use list() instead as suggested by jam in review
5131
        self.outf.writelines(
5132
            list(plugin.describe_plugins(show_paths=verbose)))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
5133
5134
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
5135
class cmd_testament(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
5136
    __doc__ = """Show testament (signing-form) of a revision."""
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
5137
    takes_options = [
5138
            'revision',
5139
            Option('long', help='Produce long-format testament.'),
5140
            Option('strict',
5141
                   help='Produce a strict-format testament.')]
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
5142
    takes_args = ['branch?']
6015.58.1 by John Arbash Meinel
Fix bug #1010339.
5143
    encoding_type = 'exact'
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
5144
    @display_command
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
5145
    def run(self, branch=u'.', revision=None, long=False, strict=False):
5146
        from bzrlib.testament import Testament, StrictTestament
5147
        if strict is True:
5148
            testament_class = StrictTestament
5149
        else:
5150
            testament_class = Testament
3530.2.1 by John Arbash Meinel
'bzr testament' should just open the branch
5151
        if branch == '.':
5152
            b = Branch.open_containing(branch)[0]
5153
        else:
5154
            b = Branch.open(branch)
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
5155
        self.add_cleanup(b.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5156
        if revision is None:
5157
            rev_id = b.last_revision()
5158
        else:
5159
            rev_id = revision[0].as_revision_id(b)
5160
        t = testament_class.from_revision(b.repository, rev_id)
5161
        if long:
6015.58.1 by John Arbash Meinel
Fix bug #1010339.
5162
            self.outf.writelines(t.as_text_lines())
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5163
        else:
6015.58.1 by John Arbash Meinel
Fix bug #1010339.
5164
            self.outf.write(t.as_short_text())
1185.16.32 by Martin Pool
- add a basic annotate built-in command
5165
5166
5167
class cmd_annotate(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
5168
    __doc__ = """Show the origin of each line in a file.
1185.16.32 by Martin Pool
- add a basic annotate built-in command
5169
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
5170
    This prints out the given file with an annotation on the left side
5171
    indicating which revision, author and date introduced the change.
5172
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
5173
    If the origin is the same for a run of consecutive lines, it is
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
5174
    shown only at the top, unless the --all option is given.
1185.16.32 by Martin Pool
- add a basic annotate built-in command
5175
    """
5176
    # TODO: annotate directories; showing when each file was last changed
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
5177
    # TODO: if the working copy is modified, show annotations on that
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
5178
    #       with new uncommitted lines marked
1733.2.8 by Michael Ellerman
Add CVS compatible aliases for checkout and annotate, from fullermd.
5179
    aliases = ['ann', 'blame', 'praise']
1185.16.32 by Martin Pool
- add a basic annotate built-in command
5180
    takes_args = ['filename']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
5181
    takes_options = [Option('all', help='Show annotations on all lines.'),
5182
                     Option('long', help='Show commit date in annotations.'),
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
5183
                     'revision',
5184
                     'show-ids',
5171.3.3 by Martin von Gagern
Add --directory option to ls, cat and annotate.
5185
                     'directory',
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
5186
                     ]
2593.1.1 by Adeodato Simó
Improve annotate to prevent unicode exceptions in certain situations.
5187
    encoding_type = 'exact'
1185.16.32 by Martin Pool
- add a basic annotate built-in command
5188
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
5189
    @display_command
2182.3.1 by John Arbash Meinel
Annotate now shows dotted revnos instead of plain revnos.
5190
    def run(self, filename, all=False, long=False, revision=None,
5171.3.3 by Martin von Gagern
Add --directory option to ls, cat and annotate.
5191
            show_ids=False, directory=None):
5815.3.1 by Jelmer Vernooij
Add annotate_file_revision_tree.
5192
        from bzrlib.annotate import (
5193
            annotate_file_tree,
5194
            )
3146.2.1 by Lukáš Lalinský
Don't require a working tree in cmd_annotate.
5195
        wt, branch, relpath = \
5171.3.9 by Martin von Gagern
Rename function to _open_directory_or_containing_tree_or_branch.
5196
            _open_directory_or_containing_tree_or_branch(filename, directory)
3146.2.1 by Lukáš Lalinský
Don't require a working tree in cmd_annotate.
5197
        if wt is not None:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
5198
            self.add_cleanup(wt.lock_read().unlock)
3146.2.1 by Lukáš Lalinský
Don't require a working tree in cmd_annotate.
5199
        else:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
5200
            self.add_cleanup(branch.lock_read().unlock)
4900.1.2 by Andrew Bennetts
Use Command.add_cleanup to fix ObjectNotLocked bug in cmd_annotate.
5201
        tree = _get_one_revision_tree('annotate', revision, branch=branch)
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
5202
        self.add_cleanup(tree.lock_read().unlock)
5638.2.1 by Andrew King
Fix 537442 - cannot annotate deleted file
5203
        if wt is not None and revision is None:
4900.1.2 by Andrew Bennetts
Use Command.add_cleanup to fix ObjectNotLocked bug in cmd_annotate.
5204
            file_id = wt.path2id(relpath)
5205
        else:
5206
            file_id = tree.path2id(relpath)
5207
        if file_id is None:
5208
            raise errors.NotVersionedError(filename)
5209
        if wt is not None and revision is None:
5210
            # If there is a tree and we're not annotating historical
5211
            # versions, annotate the working tree's content.
5212
            annotate_file_tree(wt, file_id, self.outf, long, all,
5213
                show_ids=show_ids)
5214
        else:
5815.3.14 by Jelmer Vernooij
Kill annotate_file_revision_tree() in favor annotate_file_tree().
5215
            annotate_file_tree(tree, file_id, self.outf, long, all,
5815.3.1 by Jelmer Vernooij
Add annotate_file_revision_tree.
5216
                show_ids=show_ids, branch=branch)
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
5217
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
5218
5219
class cmd_re_sign(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
5220
    __doc__ = """Create a digital signature for an existing revision."""
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
5221
    # TODO be able to replace existing ones.
5222
5223
    hidden = True # is this right ?
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
5224
    takes_args = ['revision_id*']
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
5225
    takes_options = ['directory', 'revision']
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
5226
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
5227
    def run(self, revision_id_list=None, revision=None, directory=u'.'):
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
5228
        if revision_id_list is not None and revision is not None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
5229
            raise errors.BzrCommandError(gettext('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
5230
        if revision_id_list is None and revision is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
5231
            raise errors.BzrCommandError(gettext('You must supply either --revision or a revision_id'))
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
5232
        b = WorkingTree.open_containing(directory)[0].branch
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
5233
        self.add_cleanup(b.lock_write().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5234
        return self._run(b, revision_id_list, revision)
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
5235
5236
    def _run(self, b, revision_id_list, revision):
5237
        import bzrlib.gpg as gpg
6351.3.2 by Jelmer Vernooij
Convert some gpg options to config stacks.
5238
        gpg_strategy = gpg.GPGStrategy(b.get_config_stack())
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
5239
        if revision_id_list is not None:
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
5240
            b.repository.start_write_group()
5241
            try:
5242
                for revision_id in revision_id_list:
5243
                    b.repository.sign_revision(revision_id, gpg_strategy)
5244
            except:
5245
                b.repository.abort_write_group()
5246
                raise
5247
            else:
5248
                b.repository.commit_write_group()
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
5249
        elif revision is not None:
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
5250
            if len(revision) == 1:
5251
                revno, rev_id = revision[0].in_history(b)
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
5252
                b.repository.start_write_group()
5253
                try:
5254
                    b.repository.sign_revision(rev_id, gpg_strategy)
5255
                except:
5256
                    b.repository.abort_write_group()
5257
                    raise
5258
                else:
5259
                    b.repository.commit_write_group()
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
5260
            elif len(revision) == 2:
5261
                # are they both on rh- if so we can walk between them
5262
                # might be nice to have a range helper for arbitrary
5263
                # revision paths. hmm.
5264
                from_revno, from_revid = revision[0].in_history(b)
5265
                to_revno, to_revid = revision[1].in_history(b)
5266
                if to_revid is None:
5267
                    to_revno = b.revno()
5268
                if from_revno is None or to_revno is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
5269
                    raise errors.BzrCommandError(gettext('Cannot sign a range of non-revision-history revisions'))
3010.1.17 by Robert Collins
Lock correctness and commit_group management for re-sign, in builtins.
5270
                b.repository.start_write_group()
5271
                try:
5272
                    for revno in range(from_revno, to_revno + 1):
5273
                        b.repository.sign_revision(b.get_rev_id(revno),
5274
                                                   gpg_strategy)
5275
                except:
5276
                    b.repository.abort_write_group()
5277
                    raise
5278
                else:
5279
                    b.repository.commit_write_group()
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
5280
            else:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
5281
                raise errors.BzrCommandError(gettext('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.
5282
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
5283
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
5284
class cmd_bind(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
5285
    __doc__ = """Convert the current branch into a checkout of the supplied branch.
5185.1.1 by John C Barstow
Document what happens when no location is supplied to bzr bind
5286
    If no branch is supplied, rebind to the last bound location.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
5287
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
5288
    Once converted into a checkout, commits must succeed on the master branch
5289
    before they will be applied to the local branch.
3565.6.15 by Marius Kruger
update bind and switch command descriptions to state what will happen to nicknames.
5290
3565.6.16 by Marius Kruger
update nick command description to mention how it works for bound branches,
5291
    Bound branches use the nickname of its master branch unless it is set
4775.1.1 by Martin Pool
Remove several 'the the' typos
5292
    locally, in which case binding will update the local nickname to be
3565.6.15 by Marius Kruger
update bind and switch command descriptions to state what will happen to nicknames.
5293
    that of the master.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
5294
    """
5295
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
5296
    _see_also = ['checkouts', 'unbind']
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
5297
    takes_args = ['location?']
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
5298
    takes_options = ['directory']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
5299
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
5300
    def run(self, location=None, directory=u'.'):
5301
        b, relpath = Branch.open_containing(directory)
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
5302
        if location is None:
5303
            try:
5304
                location = b.get_old_bound_location()
5305
            except errors.UpgradeRequired:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
5306
                raise errors.BzrCommandError(gettext('No location supplied.  '
5307
                    'This format does not remember old locations.'))
2230.3.31 by Aaron Bentley
Implement re-binding previously-bound branches
5308
            else:
5309
                if location is None:
4988.7.1 by Neil Martinsen-Burrell
better error message for bzr bind on and already bound branch
5310
                    if b.get_bound_location() is not None:
6404.6.1 by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made.
5311
                        raise errors.BzrCommandError(
5312
                            gettext('Branch is already bound'))
4988.7.1 by Neil Martinsen-Burrell
better error message for bzr bind on and already bound branch
5313
                    else:
6404.6.1 by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made.
5314
                        raise errors.BzrCommandError(
5315
                            gettext('No location supplied'
5316
                                    ' and no previous location known'))
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
5317
        b_other = Branch.open(location)
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
5318
        try:
5319
            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
5320
        except errors.DivergedBranches:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
5321
            raise errors.BzrCommandError(gettext('These branches have diverged.'
5322
                                         ' Try merging, and then bind again.'))
3565.6.11 by Marius Kruger
Bind now updates explicit nicks
5323
        if b.get_config().has_explicit_nickname():
5324
            b.nick = b_other.nick
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
5325
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
5326
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
5327
class cmd_unbind(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
5328
    __doc__ = """Convert the current checkout into a regular branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
5329
2270.1.2 by John Arbash Meinel
Tweak the help text for bind/unbind according to Robert's suggestions.
5330
    After unbinding, the local branch is considered independent and subsequent
5331
    commits will be local only.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
5332
    """
5333
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
5334
    _see_also = ['checkouts', 'bind']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
5335
    takes_args = []
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
5336
    takes_options = ['directory']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
5337
5171.3.2 by Martin von Gagern
Add --directory option to 13 more commands.
5338
    def run(self, directory=u'.'):
5339
        b, relpath = Branch.open_containing(directory)
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
5340
        if not b.unbind():
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
5341
            raise errors.BzrCommandError(gettext('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
5342
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
5343
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
5344
class cmd_uncommit(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
5345
    __doc__ = """Remove the last committed revision.
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
5346
5347
    --verbose will print out what is being removed.
5348
    --dry-run will go through all the motions, but not actually
5349
    remove anything.
2747.2.1 by Daniel Watkins
Modified the help message of 'uncommit'.
5350
5351
    If --revision is specified, uncommit revisions to leave the branch at the
5352
    specified revision.  For example, "bzr uncommit -r 15" will leave the
5353
    branch at revision 15.
5354
1551.19.39 by Aaron Bentley
Update 'uncommit' docs
5355
    Uncommit leaves the working tree ready for a new commit.  The only change
5356
    it may make is to restore any pending merges that were present before
5357
    the commit.
1553.5.34 by Martin Pool
Stub lock-breaking command
5358
    """
1185.62.11 by John Arbash Meinel
Added TODO for bzr uncommit to remove unreferenced information.
5359
1553.5.34 by Martin Pool
Stub lock-breaking command
5360
    # TODO: jam 20060108 Add an option to allow uncommit to remove
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
5361
    # unreferenced information in 'branch-as-repository' branches.
1553.5.34 by Martin Pool
Stub lock-breaking command
5362
    # TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
5363
    # information in shared branches as well.
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
5364
    _see_also = ['commit']
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
5365
    takes_options = ['verbose', 'revision',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
5366
                    Option('dry-run', help='Don\'t actually make changes.'),
3280.4.1 by John Arbash Meinel
Add uncommit --local.
5367
                    Option('force', help='Say yes to all questions.'),
6091.1.2 by Jelmer Vernooij
Add --keep-tags option to 'bzr uncommit'.
5368
                    Option('keep-tags',
5369
                           help='Keep tags that point to removed revisions.'),
3280.4.1 by John Arbash Meinel
Add uncommit --local.
5370
                    Option('local',
5371
                           help="Only remove the commits from the local branch"
5372
                                " when in a checkout."
5373
                           ),
5374
                    ]
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
5375
    takes_args = ['location?']
5376
    aliases = []
3101.1.1 by Aaron Bentley
Uncommit doesn't throw when it encounters un-encodable characters
5377
    encoding_type = 'replace'
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
5378
6091.1.6 by Jelmer Vernooij
Add keywords at the end.
5379
    def run(self, location=None, dry_run=False, verbose=False,
5380
            revision=None, force=False, local=False, keep_tags=False):
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
5381
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
5382
            location = u'.'
6207.3.3 by jelmer at samba
Fix tests and the like.
5383
        control, relpath = controldir.ControlDir.open_containing(location)
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
5384
        try:
5385
            tree = control.open_workingtree()
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
5386
            b = tree.branch
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
5387
        except (errors.NoWorkingTree, errors.NotLocalUrl):
5388
            tree = None
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
5389
            b = control.open_branch()
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
5390
3065.2.2 by John Arbash Meinel
During bzr uncommit, lock the working tree if it is available.
5391
        if tree is not None:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
5392
            self.add_cleanup(tree.lock_write().unlock)
3065.2.2 by John Arbash Meinel
During bzr uncommit, lock the working tree if it is available.
5393
        else:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
5394
            self.add_cleanup(b.lock_write().unlock)
6091.1.2 by Jelmer Vernooij
Add --keep-tags option to 'bzr uncommit'.
5395
        return self._run(b, tree, dry_run, verbose, revision, force,
6091.1.6 by Jelmer Vernooij
Add keywords at the end.
5396
                         local, keep_tags)
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
5397
6091.1.6 by Jelmer Vernooij
Add keywords at the end.
5398
    def _run(self, b, tree, dry_run, verbose, revision, force, local,
5399
             keep_tags):
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
5400
        from bzrlib.log import log_formatter, show_log
5401
        from bzrlib.uncommit import uncommit
5402
5403
        last_revno, last_rev_id = b.last_revision_info()
5404
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
5405
        rev_id = None
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
5406
        if revision is None:
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
5407
            revno = last_revno
5408
            rev_id = last_rev_id
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
5409
        else:
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
5410
            # 'bzr uncommit -r 10' actually means uncommit
5411
            # so that the final tree is at revno 10.
5412
            # but bzrlib.uncommit.uncommit() actually uncommits
5413
            # the revisions that are supplied.
5414
            # So we need to offset it by one
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
5415
            revno = revision[0].in_history(b).revno + 1
5416
            if revno <= last_revno:
5417
                rev_id = b.get_rev_id(revno)
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
5418
2948.2.2 by John Arbash Meinel
Re-introduce the None check in case someone asks to uncommit *to* the last revision
5419
        if rev_id is None or _mod_revision.is_null(rev_id):
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
5420
            self.outf.write(gettext('No revisions to uncommit.\n'))
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
5421
            return 1
5422
5423
        lf = log_formatter('short',
4988.8.3 by Ed Bayiates Home
More builtin command UIFactory updates
5424
                           to_file=self.outf,
3629.1.2 by John Arbash Meinel
Change to just display the command to restore the tip,
5425
                           show_timezone='original')
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
5426
5427
        show_log(b,
5428
                 lf,
5429
                 verbose=False,
5430
                 direction='forward',
5431
                 start_revision=revno,
3065.2.1 by Lukáš Lalinský
Add a global branch write lock to cmd_uncommit and avoid unnecessary Branch.revno calls.
5432
                 end_revision=last_revno)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
5433
5434
        if dry_run:
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
5435
            self.outf.write(gettext('Dry-run, pretending to remove'
5436
                            ' the above revisions.\n'))
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
5437
        else:
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
5438
            self.outf.write(gettext('The above revision(s) will be removed.\n'))
4988.8.1 by Ed Bayiates
Updated builtins.py cmd_uncommit to use UIFactory
5439
5440
        if not force:
5416.1.6 by Martin Pool
Change 'uncommit' command to use confirm_action not get_boolean
5441
            if not ui.ui_factory.confirm_action(
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
5442
                    gettext(u'Uncommit these revisions'),
5416.1.6 by Martin Pool
Change 'uncommit' command to use confirm_action not get_boolean
5443
                    'bzrlib.builtins.uncommit',
5444
                    {}):
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
5445
                self.outf.write(gettext('Canceled\n'))
4988.8.1 by Ed Bayiates
Updated builtins.py cmd_uncommit to use UIFactory
5446
                return 0
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
5447
3629.1.1 by John Arbash Meinel
Change 'bzr uncommit' to display the revision ids and log them.
5448
        mutter('Uncommitting from {%s} to {%s}',
5449
               last_rev_id, rev_id)
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
5450
        uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
6091.1.2 by Jelmer Vernooij
Add --keep-tags option to 'bzr uncommit'.
5451
                 revno=revno, local=local, keep_tags=keep_tags)
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
5452
        self.outf.write(gettext('You can restore the old tip by running:\n'
5453
             '  bzr pull . -r revid:%s\n') % last_rev_id)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
5454
5455
1553.5.34 by Martin Pool
Stub lock-breaking command
5456
class cmd_break_lock(Command):
5345.5.9 by Vincent Ladeuil
Implements 'bzr lock --config <file>'.
5457
    __doc__ = """Break a dead lock.
5458
5459
    This command breaks a lock on a repository, branch, working directory or
5460
    config file.
1553.5.34 by Martin Pool
Stub lock-breaking command
5461
1553.5.35 by Martin Pool
Start break-lock --show
5462
    CAUTION: Locks should only be broken when you are sure that the process
1553.5.34 by Martin Pool
Stub lock-breaking command
5463
    holding the lock has been stopped.
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
5464
4960.2.3 by Martin Pool
Better break-lock help
5465
    You can get information on what locks are open via the 'bzr info
5466
    [location]' command.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
5467
2666.1.1 by Ian Clatworthy
Bazaar User Reference generated from online help
5468
    :Examples:
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
5469
        bzr break-lock
4960.2.3 by Martin Pool
Better break-lock help
5470
        bzr break-lock bzr+ssh://example.com/bzr/foo
5345.5.9 by Vincent Ladeuil
Implements 'bzr lock --config <file>'.
5471
        bzr break-lock --conf ~/.bazaar
1553.5.34 by Martin Pool
Stub lock-breaking command
5472
    """
5345.5.9 by Vincent Ladeuil
Implements 'bzr lock --config <file>'.
5473
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
5474
    takes_args = ['location?']
5345.5.9 by Vincent Ladeuil
Implements 'bzr lock --config <file>'.
5475
    takes_options = [
5476
        Option('config',
5477
               help='LOCATION is the directory where the config lock is.'),
5416.2.1 by Martin Pool
Add 'break-lock --force'
5478
        Option('force',
5479
            help='Do not ask for confirmation before breaking the lock.'),
5345.5.9 by Vincent Ladeuil
Implements 'bzr lock --config <file>'.
5480
        ]
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
5481
5416.2.1 by Martin Pool
Add 'break-lock --force'
5482
    def run(self, location=None, config=False, force=False):
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
5483
        if location is None:
5484
            location = u'.'
5416.2.1 by Martin Pool
Add 'break-lock --force'
5485
        if force:
5486
            ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5487
                None,
5488
                {'bzrlib.lockdir.break': True})
5345.5.9 by Vincent Ladeuil
Implements 'bzr lock --config <file>'.
5489
        if config:
5490
            conf = _mod_config.LockableConfig(file_name=location)
5491
            conf.break_lock()
5492
        else:
6207.3.3 by jelmer at samba
Fix tests and the like.
5493
            control, relpath = controldir.ControlDir.open_containing(location)
5345.5.9 by Vincent Ladeuil
Implements 'bzr lock --config <file>'.
5494
            try:
5495
                control.break_lock()
5496
            except NotImplementedError:
5497
                pass
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
5498
1553.5.35 by Martin Pool
Start break-lock --show
5499
1910.17.2 by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue
5500
class cmd_wait_until_signalled(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
5501
    __doc__ = """Test helper for test_start_and_stop_bzr_subprocess_send_signal.
1910.17.2 by Andrew Bennetts
Add start_bzr_subprocess and stop_bzr_subprocess to allow test code to continue
5502
5503
    This just prints a line to signal when it is ready, then blocks on stdin.
5504
    """
5505
5506
    hidden = True
5507
5508
    def run(self):
1910.17.6 by Andrew Bennetts
Use sys.stdout consistently, rather than mixed with print.
5509
        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
5510
        sys.stdout.flush()
5511
        sys.stdin.readline()
5512
1553.5.35 by Martin Pool
Start break-lock --show
5513
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
5514
class cmd_serve(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
5515
    __doc__ = """Run the bzr server."""
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
5516
5517
    aliases = ['server']
5518
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
5519
    takes_options = [
5520
        Option('inet',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
5521
               help='Serve on stdin/out for use from inetd or sshd.'),
4822.1.1 by Robert Collins
Be more clean in the help for bzr serve about the --allow-writes option.
5522
        RegistryOption('protocol',
5523
               help="Protocol to serve.",
4370.4.6 by Jelmer Vernooij
Move server protocol registry to bzrlib.transport.
5524
               lazy_registry=('bzrlib.transport', 'transport_server_registry'),
4370.4.1 by Jelmer Vernooij
Add registry for 'bzr serve' protocols.
5525
               value_switches=True),
6475.2.1 by Ross Lagerwall
Split the --port option to bzr serve into --listen and --port.
5526
        Option('listen',
5527
               help='Listen for connections on nominated address.', type=str),
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
5528
        Option('port',
6475.2.1 by Ross Lagerwall
Split the --port option to bzr serve into --listen and --port.
5529
               help='Listen for connections on nominated port.  Passing 0 as '
5530
                    'the port number will result in a dynamically allocated '
5531
                    'port.  The default port depends on the protocol.',
5532
               type=int),
5171.3.1 by Martin von Gagern
Turn --directory and -d into a global option.
5533
        custom_help('directory',
5534
               help='Serve contents of this directory.'),
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
5535
        Option('allow-writes',
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
5536
               help='By default the server is a readonly server.  Supplying '
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
5537
                    '--allow-writes enables write access to the contents of '
4822.1.1 by Robert Collins
Be more clean in the help for bzr serve about the --allow-writes option.
5538
                    'the served directory and below.  Note that ``bzr serve`` '
5539
                    'does not perform authentication, so unless some form of '
5540
                    'external authentication is arranged supplying this '
5541
                    'option leads to global uncontrolled write access to your '
5542
                    'file system.'
2020.1.1 by Robert Collins
Add readonly support to the smart server, enabled by default via `bzr server`.
5543
                ),
6133.4.29 by John Arbash Meinel
Expose --client-timeout to the command line, pass it through the layers.
5544
        Option('client-timeout', type=float,
5545
               help='Override the default idle client timeout (5min).'),
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
5546
        ]
5547
6475.2.1 by Ross Lagerwall
Split the --port option to bzr serve into --listen and --port.
5548
    def run(self, listen=None, port=None, inet=False, directory=None,
5549
            allow_writes=False, protocol=None, client_timeout=None):
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
5550
        from bzrlib import transport
4370.4.1 by Jelmer Vernooij
Add registry for 'bzr serve' protocols.
5551
        if directory is None:
5552
            directory = os.getcwd()
5553
        if protocol is None:
5273.1.7 by Vincent Ladeuil
No more use of the get_transport imported *symbol*, all uses are through
5554
            protocol = transport.transport_server_registry.get()
6236.1.1 by Jelmer Vernooij
bzr serve can now serve remote URLs and things behind directory services.
5555
        url = transport.location_to_url(directory)
4370.4.4 by Jelmer Vernooij
Move more bzr smart server-specific stuff into a single function.
5556
        if not allow_writes:
5557
            url = 'readonly+' + url
6236.1.1 by Jelmer Vernooij
bzr serve can now serve remote URLs and things behind directory services.
5558
        t = transport.get_transport_from_url(url)
6489.2.1 by Jelmer Vernooij
Remove code deprecated in bzr 2.5.
5559
        protocol(t, listen, port, inet, client_timeout)
4370.4.1 by Jelmer Vernooij
Add registry for 'bzr serve' protocols.
5560
3955.1.2 by Jonathan Lange
Extract the port-getting logic. Use note() rather than print()
5561
1731.2.7 by Aaron Bentley
Add join command
5562
class cmd_join(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
5563
    __doc__ = """Combine a tree into its containing tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
5564
4251.1.2 by Aaron Bentley
Hide the --reference option.
5565
    This command requires the target tree to be in a rich-root format.
2338.3.1 by Aaron Bentley
Hide nested-tree commands and improve their docs
5566
5567
    The TREE argument should be an independent tree, inside another tree, but
5568
    not part of it.  (Such trees can be produced by "bzr split", but also by
5569
    running "bzr branch" with the target inside a tree.)
5570
5432.1.1 by John C Barstow
Correct spelling of 'independent'
5571
    The result is a combined tree, with the subtree no longer an independent
2338.3.1 by Aaron Bentley
Hide nested-tree commands and improve their docs
5572
    part.  This is marked as a merge of the subtree into the containing tree,
5573
    and all history is preserved.
1731.2.7 by Aaron Bentley
Add join command
5574
    """
5575
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
5576
    _see_also = ['split']
1731.2.7 by Aaron Bentley
Add join command
5577
    takes_args = ['tree']
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
5578
    takes_options = [
4251.1.2 by Aaron Bentley
Hide the --reference option.
5579
            Option('reference', help='Join by reference.', hidden=True),
2598.1.1 by Martin Pool
Add test for and documentation of option style, fix up existing options to comply
5580
            ]
1731.2.7 by Aaron Bentley
Add join command
5581
2100.3.11 by Aaron Bentley
Add join --reference support
5582
    def run(self, tree, reference=False):
1731.2.7 by Aaron Bentley
Add join command
5583
        sub_tree = WorkingTree.open(tree)
5584
        parent_dir = osutils.dirname(sub_tree.basedir)
5585
        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
5586
        repo = containing_tree.branch.repository
5587
        if not repo.supports_rich_root():
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
5588
            raise errors.BzrCommandError(gettext(
2255.2.235 by Martin Pool
Add blackbox test that join gives clean error when the repository doesn't support rich roots
5589
                "Can't join trees because %s doesn't support rich root data.\n"
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
5590
                "You can use bzr upgrade on the repository.")
2255.2.235 by Martin Pool
Add blackbox test that join gives clean error when the repository doesn't support rich roots
5591
                % (repo,))
2100.3.11 by Aaron Bentley
Add join --reference support
5592
        if reference:
2255.2.219 by Martin Pool
fix unbound local error in cmd_join
5593
            try:
2100.3.11 by Aaron Bentley
Add join --reference support
5594
                containing_tree.add_reference(sub_tree)
2255.2.219 by Martin Pool
fix unbound local error in cmd_join
5595
            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
5596
                # XXX: Would be better to just raise a nicely printable
5597
                # exception from the real origin.  Also below.  mbp 20070306
6138.2.4 by Jonathan Riddell
use format strings where there are multiple substitutions to allow for translations
5598
                raise errors.BzrCommandError(
5599
                       gettext("Cannot join {0}.  {1}").format(tree, e.reason))
2100.3.11 by Aaron Bentley
Add join --reference support
5600
        else:
5601
            try:
5602
                containing_tree.subsume(sub_tree)
5603
            except errors.BadSubsumeSource, e:
6138.2.4 by Jonathan Riddell
use format strings where there are multiple substitutions to allow for translations
5604
                raise errors.BzrCommandError(
5605
                       gettext("Cannot join {0}.  {1}").format(tree, e.reason))
1553.5.35 by Martin Pool
Start break-lock --show
5606
1731.2.22 by Aaron Bentley
Initial work on split command
5607
5608
class cmd_split(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
5609
    __doc__ = """Split a subdirectory of a tree into a separate tree.
2338.3.1 by Aaron Bentley
Hide nested-tree commands and improve their docs
5610
3113.6.2 by Aaron Bentley
Un-hide split command, add NEWS
5611
    This command will produce a target tree in a format that supports
5612
    rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be
5613
    converted into earlier formats like 'dirstate-tags'.
2338.3.1 by Aaron Bentley
Hide nested-tree commands and improve their docs
5614
5615
    The TREE argument should be a subdirectory of a working tree.  That
5616
    subdirectory will be converted into an independent tree, with its own
5617
    branch.  Commits in the top-level tree will not apply to the new subtree.
1731.2.22 by Aaron Bentley
Initial work on split command
5618
    """
5619
4251.1.4 by Aaron Bentley
Uncomment split's 'See also:join'
5620
    _see_also = ['join']
1731.2.22 by Aaron Bentley
Initial work on split command
5621
    takes_args = ['tree']
5622
5623
    def run(self, tree):
5624
        containing_tree, subdir = WorkingTree.open_containing(tree)
5625
        sub_id = containing_tree.path2id(subdir)
5626
        if sub_id is None:
5627
            raise errors.NotVersionedError(subdir)
1731.2.23 by Aaron Bentley
Throw user-friendly error splitting in shared repo with wrong format
5628
        try:
5629
            containing_tree.extract(sub_id)
5630
        except errors.RootNotRich:
4416.6.1 by Neil Martinsen-Burrell
Fix #220067 adding more specificity to the error message when split fails
5631
            raise errors.RichRootUpgradeRequired(containing_tree.branch.base)
1731.2.22 by Aaron Bentley
Initial work on split command
5632
5633
1551.12.8 by Aaron Bentley
Add merge-directive command
5634
class cmd_merge_directive(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
5635
    __doc__ = """Generate a merge directive for auto-merge tools.
1551.12.32 by Aaron Bentley
Improve merge directive help
5636
5637
    A directive requests a merge to be performed, and also provides all the
5638
    information necessary to do so.  This means it must either include a
5639
    revision bundle, or the location of a branch containing the desired
5640
    revision.
5641
5642
    A submit branch (the location to merge into) must be supplied the first
5643
    time the command is issued.  After it has been supplied once, it will
5644
    be remembered as the default.
5645
5646
    A public branch is optional if a revision bundle is supplied, but required
5647
    if --diff or --plain is specified.  It will be remembered as the default
5648
    after the first use.
5649
    """
1551.12.20 by Aaron Bentley
Pull directive registry into command class
5650
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
5651
    takes_args = ['submit_branch?', 'public_branch?']
5652
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
5653
    hidden = True
5654
2681.1.4 by Aaron Bentley
Fix reference to told submit command
5655
    _see_also = ['send']
2520.4.121 by Aaron Bentley
Polish up submit command
5656
1551.12.43 by Aaron Bentley
Misc changes from review
5657
    takes_options = [
5171.3.13 by Martin von Gagern
Add --directory option to 7 more commands.
5658
        'directory',
1551.12.43 by Aaron Bentley
Misc changes from review
5659
        RegistryOption.from_kwargs('patch-type',
2681.1.7 by Aaron Bentley
Fix option grammar
5660
            'The type of patch to include in the directive.',
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
5661
            title='Patch type',
5662
            value_switches=True,
5663
            enum_switch=False,
5664
            bundle='Bazaar revision bundle (default).',
5665
            diff='Normal unified diff.',
5666
            plain='No patch, just directive.'),
5667
        Option('sign', help='GPG-sign the directive.'), 'revision',
1551.12.26 by Aaron Bentley
Get email working, with optional message
5668
        Option('mail-to', type=str,
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
5669
            help='Instead of printing the directive, email to this address.'),
1551.12.27 by Aaron Bentley
support custom message everywhere
5670
        Option('message', type=str, short_name='m',
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
5671
            help='Message to use when committing this merge.')
1551.12.27 by Aaron Bentley
support custom message everywhere
5672
        ]
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
5673
2530.2.1 by Adeodato Simó
Add encoding_type = 'exact' to cmd_merge_directive. (LP #120591)
5674
    encoding_type = 'exact'
5675
1551.12.16 by Aaron Bentley
Enable signing merge directives
5676
    def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5171.3.13 by Martin von Gagern
Add --directory option to 7 more commands.
5677
            sign=False, revision=None, mail_to=None, message=None,
5678
            directory=u'.'):
2490.2.28 by Aaron Bentley
Fix handling of null revision
5679
        from bzrlib.revision import ensure_null, NULL_REVISION
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
5680
        include_patch, include_bundle = {
5681
            'plain': (False, False),
5682
            'diff': (True, False),
5683
            'bundle': (True, True),
5684
            }[patch_type]
5171.3.13 by Martin von Gagern
Add --directory option to 7 more commands.
5685
        branch = Branch.open(directory)
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
5686
        stored_submit_branch = branch.get_submit_branch()
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
5687
        if submit_branch is None:
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
5688
            submit_branch = stored_submit_branch
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
5689
        else:
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
5690
            if stored_submit_branch is None:
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
5691
                branch.set_submit_branch(submit_branch)
5692
        if submit_branch is None:
5693
            submit_branch = branch.get_parent()
5694
        if submit_branch is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
5695
            raise errors.BzrCommandError(gettext('No submit branch specified or known'))
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
5696
5697
        stored_public_branch = branch.get_public_branch()
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
5698
        if public_branch is None:
1551.12.44 by Aaron Bentley
Add (set|get)_public_branch
5699
            public_branch = stored_public_branch
5700
        elif stored_public_branch is None:
6404.6.1 by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made.
5701
            # FIXME: Should be done only if we succeed ? -- vila 2012-01-03
6404.6.7 by Vincent Ladeuil
Change set/remove to require a lock for the branch config files.
5702
            branch.set_public_branch(public_branch)
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
5703
        if not include_bundle and public_branch is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
5704
            raise errors.BzrCommandError(gettext('No public branch specified or'
5705
                                         ' known'))
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
5706
        base_revision_id = None
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
5707
        if revision is not None:
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
5708
            if len(revision) > 2:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
5709
                raise errors.BzrCommandError(gettext('bzr merge-directive takes '
5710
                    'at most two one revision identifiers'))
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
5711
            revision_id = revision[-1].as_revision_id(branch)
2520.4.112 by Aaron Bentley
Make cherry-pick merge directives possible
5712
            if len(revision) == 2:
3298.2.8 by John Arbash Meinel
Get rid of .in_branch(need_revno=False) in favor of simpler .as_revision_id()
5713
                base_revision_id = revision[0].as_revision_id(branch)
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
5714
        else:
5715
            revision_id = branch.last_revision()
2490.2.28 by Aaron Bentley
Fix handling of null revision
5716
        revision_id = ensure_null(revision_id)
5717
        if revision_id == NULL_REVISION:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
5718
            raise errors.BzrCommandError(gettext('No revisions to bundle.'))
2520.4.73 by Aaron Bentley
Implement new merge directive format
5719
        directive = merge_directive.MergeDirective2.from_objects(
1551.12.17 by Aaron Bentley
add revision selection to mergedirective
5720
            branch.repository, revision_id, time.time(),
1551.12.8 by Aaron Bentley
Add merge-directive command
5721
            osutils.local_time_offset(), submit_branch,
2520.5.4 by Aaron Bentley
Replace 'bundle-revisions' with 'submit' command
5722
            public_branch=public_branch, include_patch=include_patch,
5723
            include_bundle=include_bundle, message=message,
5724
            base_revision_id=base_revision_id)
1551.12.26 by Aaron Bentley
Get email working, with optional message
5725
        if mail_to is None:
5726
            if sign:
5727
                self.outf.write(directive.to_signed(branch))
5728
            else:
5729
                self.outf.writelines(directive.to_lines())
1551.12.16 by Aaron Bentley
Enable signing merge directives
5730
        else:
1551.12.26 by Aaron Bentley
Get email working, with optional message
5731
            message = directive.to_email(mail_to, branch, sign)
6379.8.3 by Jelmer Vernooij
Fix remaining tests.
5732
            s = SMTPConnection(branch.get_config_stack())
2535.2.1 by Adeodato Simó
New SMTPConnection class, a reduced version of that in bzr-email.
5733
            s.send_email(message)
1551.12.8 by Aaron Bentley
Add merge-directive command
5734
1551.12.14 by Aaron Bentley
Get merge-directive command basically working
5735
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
5736
class cmd_send(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
5737
    __doc__ = """Mail or create a merge-directive for submitting changes.
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
5738
5739
    A merge directive provides many things needed for requesting merges:
5740
5741
    * A machine-readable description of the merge to perform
5742
5743
    * An optional patch that is a preview of the changes requested
5744
5745
    * An optional bundle of revision data, so that the changes can be applied
5746
      directly from the merge directive, without retrieving data from a
5747
      branch.
5748
4949.2.1 by Martin Pool
Better help for cmd_send
5749
    `bzr send` creates a compact data set that, when applied using bzr
5750
    merge, has the same effect as merging from the source branch.  
5751
    
5752
    By default the merge directive is self-contained and can be applied to any
5753
    branch containing submit_branch in its ancestory without needing access to
5754
    the source branch.
5755
    
5756
    If --no-bundle is specified, then Bazaar doesn't send the contents of the
5757
    revisions, but only a structured request to merge from the
5758
    public_location.  In that case the public_branch is needed and it must be
5759
    up-to-date and accessible to the recipient.  The public_branch is always
5760
    included if known, so that people can check it later.
5761
5762
    The submit branch defaults to the parent of the source branch, but can be
5763
    overridden.  Both submit branch and public branch will be remembered in
5764
    branch.conf the first time they are used for a particular branch.  The
5765
    source branch defaults to that containing the working directory, but can
5766
    be changed using --from.
5767
5861.1.3 by Vincent Ladeuil
Fix the docs for push/pull/send regarding --no-remember.
5768
    Both the submit branch and the public branch follow the usual behavior with
5769
    respect to --remember: If there is no default location set, the first send
6105.2.4 by Martin von Gagern
Drive-by typo correction in command docstrings.
5770
    will set it (use --no-remember to avoid setting it). After that, you can
5861.1.3 by Vincent Ladeuil
Fix the docs for push/pull/send regarding --no-remember.
5771
    omit the location to use the default.  To change the default, use
5772
    --remember. The value will only be saved if the location can be accessed.
5773
4949.2.1 by Martin Pool
Better help for cmd_send
5774
    In order to calculate those changes, bzr must analyse the submit branch.
5775
    Therefore it is most efficient for the submit branch to be a local mirror.
5776
    If a public location is known for the submit_branch, that location is used
5777
    in the merge directive.
5778
5779
    The default behaviour is to send the merge directive by mail, unless -o is
5780
    given, in which case it is sent to a file.
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
5781
5782
    Mail is sent using your preferred mail program.  This should be transparent
5278.1.2 by Martin Pool
Don't say 'Linux' except when specifically talking about the kernel
5783
    on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
5784
    If the preferred client can't be found (or used), your editor will be used.
5785
5786
    To use a specific mail program, set the mail_client configuration option.
5787
    (For Thunderbird 1.5, this works around some bugs.)  Supported values for
4715.3.1 by Brian de Alwis
Introduce new mailer to support MacOS X's Mail.app
5788
    specific clients are "claws", "evolution", "kmail", "mail.app" (MacOS X's
5789
    Mail.app), "mutt", and "thunderbird"; generic options are "default",
5790
    "editor", "emacsclient", "mapi", and "xdg-email".  Plugins may also add
5791
    supported clients.
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
5792
5793
    If mail is being sent, a to address is required.  This can be supplied
5794
    either on the commandline, by setting the submit_to configuration
5795
    option in the branch itself or the child_submit_to configuration option
5796
    in the submit branch.
5797
5798
    Two formats are currently supported: "4" uses revision bundle format 4 and
5799
    merge directive format 2.  It is significantly faster and smaller than
5800
    older formats.  It is compatible with Bazaar 0.19 and later.  It is the
5801
    default.  "0.9" uses revision bundle format 0.9 and merge directive
5802
    format 1.  It is compatible with Bazaar 0.12 - 0.18.
5803
5804
    The merge directives created by bzr send may be applied using bzr merge or
5805
    bzr pull by specifying a file containing a merge directive as the location.
4949.2.1 by Martin Pool
Better help for cmd_send
5806
5807
    bzr send makes extensive use of public locations to map local locations into
5808
    URLs that can be used by other people.  See `bzr help configuration` to
5809
    set them, and use `bzr info` to display them.
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
5810
    """
5811
5812
    encoding_type = 'exact'
5813
5814
    _see_also = ['merge', 'pull']
5815
5816
    takes_args = ['submit_branch?', 'public_branch?']
5817
5818
    takes_options = [
5819
        Option('no-bundle',
5820
               help='Do not include a bundle in the merge directive.'),
5821
        Option('no-patch', help='Do not include a preview patch in the merge'
5822
               ' directive.'),
5823
        Option('remember',
5824
               help='Remember submit and public branch.'),
5825
        Option('from',
5826
               help='Branch to generate the submission from, '
5827
               'rather than the one containing the working directory.',
5828
               short_name='f',
5829
               type=unicode),
5830
        Option('output', short_name='o',
5086.3.3 by Jelmer Vernooij
Allow merge directives to output multiple patch files.
5831
               help='Write merge directive to this file or directory; '
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
5832
                    'use - for stdout.',
5833
               type=unicode),
4464.3.4 by Vincent Ladeuil
Fix bug #206577 by adding a --strict option to send.
5834
        Option('strict',
5835
               help='Refuse to send if there are uncommitted changes in'
4464.3.11 by Vincent Ladeuil
Add a check for tree/branch sync and tweak help.
5836
               ' the working tree, --no-strict disables the check.'),
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
5837
        Option('mail-to', help='Mail the request to this address.',
5838
               type=unicode),
5839
        'revision',
5840
        'message',
5841
        Option('body', help='Body for the email.', type=unicode),
5842
        RegistryOption('format',
4464.3.4 by Vincent Ladeuil
Fix bug #206577 by adding a --strict option to send.
5843
                       help='Use the specified output format.',
5844
                       lazy_registry=('bzrlib.send', 'format_registry')),
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
5845
        ]
5846
5847
    def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5861.1.4 by Vincent Ladeuil
Fix send --no-remember when no location is set.
5848
            no_patch=False, revision=None, remember=None, output=None,
4464.3.4 by Vincent Ladeuil
Fix bug #206577 by adding a --strict option to send.
5849
            format=None, mail_to=None, message=None, body=None,
5850
            strict=None, **kwargs):
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
5851
        from bzrlib.send import send
5852
        return send(submit_branch, revision, public_branch, remember,
4464.3.4 by Vincent Ladeuil
Fix bug #206577 by adding a --strict option to send.
5853
                    format, no_bundle, no_patch, output,
5854
                    kwargs.get('from', '.'), mail_to, message, body,
5855
                    self.outf,
5856
                    strict=strict)
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
5857
5858
4367.1.6 by Jelmer Vernooij
Fix bundle revisions.
5859
class cmd_bundle_revisions(cmd_send):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
5860
    __doc__ = """Create a merge-directive for submitting changes.
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
5861
5862
    A merge directive provides many things needed for requesting merges:
5863
5864
    * A machine-readable description of the merge to perform
5865
5866
    * An optional patch that is a preview of the changes requested
5867
5868
    * An optional bundle of revision data, so that the changes can be applied
5869
      directly from the merge directive, without retrieving data from a
5870
      branch.
5871
5872
    If --no-bundle is specified, then public_branch is needed (and must be
5873
    up-to-date), so that the receiver can perform the merge using the
5874
    public_branch.  The public_branch is always included if known, so that
5875
    people can check it later.
5876
5877
    The submit branch defaults to the parent, but can be overridden.  Both
5878
    submit branch and public branch will be remembered if supplied.
5879
5880
    If a public_branch is known for the submit_branch, that public submit
5881
    branch is used in the merge instructions.  This means that a local mirror
5882
    can be used as your actual submit branch, once you have set public_branch
5883
    for that mirror.
5884
5885
    Two formats are currently supported: "4" uses revision bundle format 4 and
5886
    merge directive format 2.  It is significantly faster and smaller than
5887
    older formats.  It is compatible with Bazaar 0.19 and later.  It is the
5888
    default.  "0.9" uses revision bundle format 0.9 and merge directive
5889
    format 1.  It is compatible with Bazaar 0.12 - 0.18.
5890
    """
5891
5892
    takes_options = [
5893
        Option('no-bundle',
5894
               help='Do not include a bundle in the merge directive.'),
5895
        Option('no-patch', help='Do not include a preview patch in the merge'
5896
               ' directive.'),
5897
        Option('remember',
5898
               help='Remember submit and public branch.'),
5899
        Option('from',
5900
               help='Branch to generate the submission from, '
5901
               'rather than the one containing the working directory.',
5902
               short_name='f',
5903
               type=unicode),
5904
        Option('output', short_name='o', help='Write directive to this file.',
5905
               type=unicode),
4464.3.6 by Vincent Ladeuil
bundle-revisions should support --strict too.
5906
        Option('strict',
4464.3.11 by Vincent Ladeuil
Add a check for tree/branch sync and tweak help.
5907
               help='Refuse to bundle revisions if there are uncommitted'
5908
               ' changes in the working tree, --no-strict disables the check.'),
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
5909
        'revision',
5910
        RegistryOption('format',
5911
                       help='Use the specified output format.',
5912
                       lazy_registry=('bzrlib.send', 'format_registry')),
5913
        ]
5914
    aliases = ['bundle']
5915
5916
    _see_also = ['send', 'merge']
5917
5918
    hidden = True
5919
5920
    def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5921
            no_patch=False, revision=None, remember=False, output=None,
4464.3.6 by Vincent Ladeuil
bundle-revisions should support --strict too.
5922
            format=None, strict=None, **kwargs):
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
5923
        if output is None:
5924
            output = '-'
5925
        from bzrlib.send import send
5926
        return send(submit_branch, revision, public_branch, remember,
5927
                         format, no_bundle, no_patch, output,
5928
                         kwargs.get('from', '.'), None, None, None,
4464.3.6 by Vincent Ladeuil
bundle-revisions should support --strict too.
5929
                         self.outf, strict=strict)
4367.1.3 by Jelmer Vernooij
Move cmd_{send,bundle_revisions} back to bzrlib.builtins per Ians request.
5930
5931
2220.2.2 by Martin Pool
Add tag command and basic implementation
5932
class cmd_tag(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
5933
    __doc__ = """Create, remove or modify a tag naming a revision.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
5934
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
5935
    Tags give human-meaningful names to revisions.  Commands that take a -r
5936
    (--revision) option can be given -rtag:X, where X is any previously
5937
    created tag.
5938
2220.2.41 by Martin Pool
Fix tag help (fullermd)
5939
    Tags are stored in the branch.  Tags are copied from one branch to another
5940
    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.
5941
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
5942
    It is an error to give a tag name that already exists unless you pass
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
5943
    --force, in which case the tag is moved to point to the new revision.
3566.2.1 by Benjamin Peterson
document how the rename tags
5944
3566.2.2 by Benjamin Peterson
fix markup
5945
    To rename a tag (change the name but keep it on the same revsion), run ``bzr
5946
    tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``.
5086.4.9 by Jelmer Vernooij
Update documentation.
5947
5948
    If no tag name is specified it will be determined through the 
5949
    'automatic_tag_name' hook. This can e.g. be used to automatically tag
5950
    upstream releases by reading configure.ac. See ``bzr help hooks`` for
5951
    details.
2220.2.8 by Martin Pool
Add -d option to push, pull, merge commands.
5952
    """
2220.2.2 by Martin Pool
Add tag command and basic implementation
5953
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
5954
    _see_also = ['commit', 'tags']
5086.4.2 by Jelmer Vernooij
Tag names can now be determined automatically by hooks if they are
5955
    takes_args = ['tag_name?']
2220.2.2 by Martin Pool
Add tag command and basic implementation
5956
    takes_options = [
2220.2.21 by Martin Pool
Add tag --delete command and implementation
5957
        Option('delete',
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
5958
            help='Delete this tag rather than placing it.',
5959
            ),
5171.3.1 by Martin von Gagern
Turn --directory and -d into a global option.
5960
        custom_help('directory',
5961
            help='Branch in which to place the tag.'),
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
5962
        Option('force',
2598.1.2 by Martin Pool
Also check that option help ends in a period, and fix those that don't
5963
            help='Replace existing tags.',
2220.2.21 by Martin Pool
Add tag --delete command and implementation
5964
            ),
2220.2.6 by Martin Pool
Add tag -r option
5965
        'revision',
2220.2.2 by Martin Pool
Add tag command and basic implementation
5966
        ]
5967
5086.4.2 by Jelmer Vernooij
Tag names can now be determined automatically by hooks if they are
5968
    def run(self, tag_name=None,
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
5969
            delete=None,
5970
            directory='.',
5971
            force=None,
2220.2.21 by Martin Pool
Add tag --delete command and implementation
5972
            revision=None,
2220.2.42 by Martin Pool
Tag command refuses to replace existing tags unless you force it.
5973
            ):
2220.2.2 by Martin Pool
Add tag command and basic implementation
5974
        branch, relpath = Branch.open_containing(directory)
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
5975
        self.add_cleanup(branch.lock_write().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5976
        if delete:
5086.4.2 by Jelmer Vernooij
Tag names can now be determined automatically by hooks if they are
5977
            if tag_name is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
5978
                raise errors.BzrCommandError(gettext("No tag specified to delete."))
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5979
            branch.tags.delete_tag(tag_name)
6138.2.2 by Jonathan Riddell
gettext builtin.py's note() usage
5980
            note(gettext('Deleted tag %s.') % tag_name)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5981
        else:
5982
            if revision:
5983
                if len(revision) != 1:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
5984
                    raise errors.BzrCommandError(gettext(
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5985
                        "Tags can only be placed on a single revision, "
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
5986
                        "not on a range"))
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5987
                revision_id = revision[0].as_revision_id(branch)
2220.2.21 by Martin Pool
Add tag --delete command and implementation
5988
            else:
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
5989
                revision_id = branch.last_revision()
5086.4.2 by Jelmer Vernooij
Tag names can now be determined automatically by hooks if they are
5990
            if tag_name is None:
5086.4.7 by Jelmer Vernooij
Put automatic_tag_name on Branch.
5991
                tag_name = branch.automatic_tag_name(revision_id)
5086.4.2 by Jelmer Vernooij
Tag names can now be determined automatically by hooks if they are
5992
                if tag_name is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
5993
                    raise errors.BzrCommandError(gettext(
5994
                        "Please specify a tag name."))
6111.2.1 by Jelmer Vernooij
``bzr tag`` no longer errors if a tag already exists but refers to the
5995
            try:
5996
                existing_target = branch.tags.lookup_tag(tag_name)
5997
            except errors.NoSuchTag:
5998
                existing_target = None
5999
            if not force and existing_target not in (None, revision_id):
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
6000
                raise errors.TagAlreadyExists(tag_name)
6111.2.1 by Jelmer Vernooij
``bzr tag`` no longer errors if a tag already exists but refers to the
6001
            if existing_target == revision_id:
6138.2.2 by Jonathan Riddell
gettext builtin.py's note() usage
6002
                note(gettext('Tag %s already exists for that revision.') % tag_name)
6111.2.1 by Jelmer Vernooij
``bzr tag`` no longer errors if a tag already exists but refers to the
6003
            else:
6123.4.7 by Jelmer Vernooij
Remove unnecessary handling of GhostTagsNotSupported.
6004
                branch.tags.set_tag(tag_name, revision_id)
6123.5.1 by Jelmer Vernooij
Mention when a tag has been updated vs created.
6005
                if existing_target is None:
6138.2.2 by Jonathan Riddell
gettext builtin.py's note() usage
6006
                    note(gettext('Created tag %s.') % tag_name)
6123.5.1 by Jelmer Vernooij
Mention when a tag has been updated vs created.
6007
                else:
6138.2.2 by Jonathan Riddell
gettext builtin.py's note() usage
6008
                    note(gettext('Updated tag %s.') % tag_name)
2220.2.2 by Martin Pool
Add tag command and basic implementation
6009
6010
2220.2.24 by Martin Pool
Add tags command
6011
class cmd_tags(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
6012
    __doc__ = """List tags.
2220.2.24 by Martin Pool
Add tags command
6013
3007.1.1 by Adeodato Simó
Small fix to tags' help.
6014
    This command shows a table of tag names and the revisions they reference.
2220.2.24 by Martin Pool
Add tags command
6015
    """
6016
2425.2.3 by Robert Collins
Update existing builtin commands help text to use _see_also. (Robert Collins)
6017
    _see_also = ['tag']
2220.2.24 by Martin Pool
Add tags command
6018
    takes_options = [
5171.3.1 by Martin von Gagern
Turn --directory and -d into a global option.
6019
        custom_help('directory',
6020
            help='Branch whose tags should be displayed.'),
5582.2.1 by Jelmer Vernooij
support extending --sort argument to 'bzr tags'.
6021
        RegistryOption('sort',
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
6022
            'Sort tags by different criteria.', title='Sorting',
5582.2.1 by Jelmer Vernooij
support extending --sort argument to 'bzr tags'.
6023
            lazy_registry=('bzrlib.tag', 'tag_sort_methods')
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
6024
            ),
2805.8.3 by Adeodato Simó
Show dotted revnos, and revids only with --show-ids.
6025
        'show-ids',
3904.2.1 by Marius Kruger
* factor out _get2Revisions from cmd_log to be able to reuse how revesions is determined by log.
6026
        'revision',
2220.2.24 by Martin Pool
Add tags command
6027
    ]
6028
6029
    @display_command
5582.2.1 by Jelmer Vernooij
support extending --sort argument to 'bzr tags'.
6030
    def run(self, directory='.', sort=None, show_ids=False, revision=None):
6031
        from bzrlib.tag import tag_sort_methods
2220.2.24 by Martin Pool
Add tags command
6032
        branch, relpath = Branch.open_containing(directory)
3904.2.1 by Marius Kruger
* factor out _get2Revisions from cmd_log to be able to reuse how revesions is determined by log.
6033
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
6034
        tags = branch.tags.get_tag_dict().items()
3553.1.1 by Robert Collins
Do not scan history for tags when none are present.
6035
        if not tags:
6036
            return
3904.2.1 by Marius Kruger
* factor out _get2Revisions from cmd_log to be able to reuse how revesions is determined by log.
6037
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
6038
        self.add_cleanup(branch.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
6039
        if revision:
6162.1.3 by Vincent Ladeuil
Add a separate method to determines the tags for the reivision range.
6040
            # Restrict to the specified range
6041
            tags = self._tags_for_range(branch, revision)
5582.2.1 by Jelmer Vernooij
support extending --sort argument to 'bzr tags'.
6042
        if sort is None:
6043
            sort = tag_sort_methods.get()
6044
        sort(branch, tags)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
6045
        if not show_ids:
6046
            # [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
6047
            for index, (tag, revid) in enumerate(tags):
6048
                try:
6049
                    revno = branch.revision_id_to_dotted_revno(revid)
6050
                    if isinstance(revno, tuple):
6051
                        revno = '.'.join(map(str, revno))
6162.1.1 by Vincent Ladeuil
Stop reloading all ancestry for each tag when searching tags in a revision range (still breaks if X>Y in -rX..Y)
6052
                except (errors.NoSuchRevision,
6165.3.1 by Jelmer Vernooij
Support running 'bzr tags' against remote repositories without revision graph access.
6053
                        errors.GhostRevisionsHaveNoRevno,
6054
                        errors.UnsupportedOperation):
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
6055
                    # Bad tag data/merges can lead to tagged revisions
6056
                    # which are not in this branch. Fail gracefully ...
6057
                    revno = '?'
6058
                tags[index] = (tag, revno)
6059
        self.cleanup_now()
2805.8.6 by Adeodato Simó
Don't sort by revno; only by time if --sort=time is passed.
6060
        for tag, revspec in tags:
6061
            self.outf.write('%-20s %s\n' % (tag, revspec))
2220.2.24 by Martin Pool
Add tags command
6062
6162.1.3 by Vincent Ladeuil
Add a separate method to determines the tags for the reivision range.
6063
    def _tags_for_range(self, branch, revision):
6064
        range_valid = True
6065
        rev1, rev2 = _get_revision_range(revision, branch, self.name())
6066
        revid1, revid2 = rev1.rev_id, rev2.rev_id
6067
        # _get_revision_range will always set revid2 if it's not specified.
6068
        # If revid1 is None, it means we want to start from the branch
6069
        # origin which is always a valid ancestor. If revid1 == revid2, the
6070
        # ancestry check is useless.
6071
        if revid1 and revid1 != revid2:
6072
            # FIXME: We really want to use the same graph than
6073
            # branch.iter_merge_sorted_revisions below, but this is not
6074
            # easily available -- vila 2011-09-23
6075
            if branch.repository.get_graph().is_ancestor(revid2, revid1):
6076
                # We don't want to output anything in this case...
6077
                return []
6078
        # only show revisions between revid1 and revid2 (inclusive)
6079
        tagged_revids = branch.tags.get_reverse_tag_dict()
6080
        found = []
6081
        for r in branch.iter_merge_sorted_revisions(
6082
            start_revision_id=revid2, stop_revision_id=revid1,
6083
            stop_rule='include'):
6084
            revid_tags = tagged_revids.get(r[0], None)
6085
            if revid_tags:
6086
                found.extend([(tag, r[0]) for tag in revid_tags])
6087
        return found
6088
2220.2.24 by Martin Pool
Add tags command
6089
2796.2.5 by Aaron Bentley
Implement reconfigure command
6090
class cmd_reconfigure(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
6091
    __doc__ = """Reconfigure the type of a bzr directory.
2796.2.15 by Aaron Bentley
More updates from review
6092
6093
    A target configuration must be specified.
6094
6095
    For checkouts, the bind-to location will be auto-detected if not specified.
6096
    The order of preference is
6097
    1. For a lightweight checkout, the current bound location.
6098
    2. For branches that used to be checkouts, the previously-bound location.
6099
    3. The push location.
6100
    4. The parent location.
6101
    If none of these is available, --bind-to must be specified.
6102
    """
2796.2.5 by Aaron Bentley
Implement reconfigure command
6103
3535.4.1 by Marius Kruger
Update reconfigure help to say exactly what it wil do.
6104
    _see_also = ['branches', 'checkouts', 'standalone-trees', 'working-trees']
2796.2.5 by Aaron Bentley
Implement reconfigure command
6105
    takes_args = ['location?']
3983.3.11 by Vincent Ladeuil
Fix indentation as per Aaron's review and then some.
6106
    takes_options = [
6107
        RegistryOption.from_kwargs(
6123.8.2 by Martin von Gagern
Make the various aspects of reconfigure independent from one another.
6108
            'tree_type',
6109
            title='Tree type',
6110
            help='The relation between branch and tree.',
3983.3.11 by Vincent Ladeuil
Fix indentation as per Aaron's review and then some.
6111
            value_switches=True, enum_switch=False,
6112
            branch='Reconfigure to be an unbound branch with no working tree.',
6113
            tree='Reconfigure to be an unbound branch with a working tree.',
6114
            checkout='Reconfigure to be a bound branch with a working tree.',
6115
            lightweight_checkout='Reconfigure to be a lightweight'
6116
                ' checkout (with no local history).',
6123.8.2 by Martin von Gagern
Make the various aspects of reconfigure independent from one another.
6117
            ),
6118
        RegistryOption.from_kwargs(
6119
            'repository_type',
6120
            title='Repository type',
6121
            help='Location fo the repository.',
6122
            value_switches=True, enum_switch=False,
3983.3.11 by Vincent Ladeuil
Fix indentation as per Aaron's review and then some.
6123
            standalone='Reconfigure to be a standalone branch '
6124
                '(i.e. stop using shared repository).',
6125
            use_shared='Reconfigure to use a shared repository.',
6123.8.2 by Martin von Gagern
Make the various aspects of reconfigure independent from one another.
6126
            ),
6127
        RegistryOption.from_kwargs(
6128
            'repository_trees',
6129
            title='Trees in Repository',
6130
            help='Whether new branches in the repository have trees.',
6131
            value_switches=True, enum_switch=False,
3983.3.11 by Vincent Ladeuil
Fix indentation as per Aaron's review and then some.
6132
            with_trees='Reconfigure repository to create '
6133
                'working trees on branches by default.',
6134
            with_no_trees='Reconfigure repository to not create '
6135
                'working trees on branches by default.'
6136
            ),
6137
        Option('bind-to', help='Branch to bind checkout to.', type=str),
6138
        Option('force',
4509.3.1 by Martin Pool
Initial failing test for 'reconfigure --stacked-on'
6139
            help='Perform reconfiguration even if local changes'
6140
            ' will be lost.'),
6141
        Option('stacked-on',
4509.3.3 by Martin Pool
Add reconfigure --unstacked command
6142
            help='Reconfigure a branch to be stacked on another branch.',
4509.3.1 by Martin Pool
Initial failing test for 'reconfigure --stacked-on'
6143
            type=unicode,
6144
            ),
4509.3.3 by Martin Pool
Add reconfigure --unstacked command
6145
        Option('unstacked',
6146
            help='Reconfigure a branch to be unstacked.  This '
4509.3.34 by Martin Pool
Fix typo
6147
                'may require copying substantial data into it.',
4509.3.3 by Martin Pool
Add reconfigure --unstacked command
6148
            ),
3983.3.11 by Vincent Ladeuil
Fix indentation as per Aaron's review and then some.
6149
        ]
2796.2.5 by Aaron Bentley
Implement reconfigure command
6150
6123.8.2 by Martin von Gagern
Make the various aspects of reconfigure independent from one another.
6151
    def run(self, location=None, bind_to=None, force=False,
6152
            tree_type=None, repository_type=None, repository_trees=None,
6153
            stacked_on=None, unstacked=None):
6207.3.3 by jelmer at samba
Fix tests and the like.
6154
        directory = controldir.ControlDir.open(location)
4509.3.35 by Martin Pool
Ban reconfigure --stacked-on foo --unstacked
6155
        if stacked_on and unstacked:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
6156
            raise errors.BzrCommandError(gettext("Can't use both --stacked-on and --unstacked"))
4509.3.35 by Martin Pool
Ban reconfigure --stacked-on foo --unstacked
6157
        elif stacked_on is not None:
4509.3.38 by Martin Pool
Move reconfigure --stacked-on core code into reconfigure.py
6158
            reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
4509.3.3 by Martin Pool
Add reconfigure --unstacked command
6159
        elif unstacked:
4509.3.39 by Martin Pool
Move reconfigure --unstacked to reconfigure.py
6160
            reconfigure.ReconfigureUnstacked().apply(directory)
4509.3.1 by Martin Pool
Initial failing test for 'reconfigure --stacked-on'
6161
        # At the moment you can use --stacked-on and a different
6162
        # reconfiguration shape at the same time; there seems no good reason
6163
        # to ban it.
6123.8.2 by Martin von Gagern
Make the various aspects of reconfigure independent from one another.
6164
        if (tree_type is None and
6165
            repository_type is None and
6166
            repository_trees is None):
4509.3.3 by Martin Pool
Add reconfigure --unstacked command
6167
            if stacked_on or unstacked:
4509.3.1 by Martin Pool
Initial failing test for 'reconfigure --stacked-on'
6168
                return
6169
            else:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
6170
                raise errors.BzrCommandError(gettext('No target configuration '
6171
                    'specified'))
6123.8.2 by Martin von Gagern
Make the various aspects of reconfigure independent from one another.
6172
        reconfiguration = None
6173
        if tree_type == 'branch':
2796.2.5 by Aaron Bentley
Implement reconfigure command
6174
            reconfiguration = reconfigure.Reconfigure.to_branch(directory)
6123.8.2 by Martin von Gagern
Make the various aspects of reconfigure independent from one another.
6175
        elif tree_type == 'tree':
2796.2.5 by Aaron Bentley
Implement reconfigure command
6176
            reconfiguration = reconfigure.Reconfigure.to_tree(directory)
6123.8.2 by Martin von Gagern
Make the various aspects of reconfigure independent from one another.
6177
        elif tree_type == 'checkout':
3983.3.11 by Vincent Ladeuil
Fix indentation as per Aaron's review and then some.
6178
            reconfiguration = reconfigure.Reconfigure.to_checkout(
6179
                directory, bind_to)
6123.8.2 by Martin von Gagern
Make the various aspects of reconfigure independent from one another.
6180
        elif tree_type == 'lightweight-checkout':
2796.2.19 by Aaron Bentley
Support reconfigure --lightweight-checkout
6181
            reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
6182
                directory, bind_to)
6123.8.2 by Martin von Gagern
Make the various aspects of reconfigure independent from one another.
6183
        if reconfiguration:
6184
            reconfiguration.apply(force)
6185
            reconfiguration = None
6186
        if repository_type == 'use-shared':
3311.2.6 by Aaron Bentley
rename 'sharing' to 'use-shared'
6187
            reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
6123.8.2 by Martin von Gagern
Make the various aspects of reconfigure independent from one another.
6188
        elif repository_type == 'standalone':
3311.2.5 by Aaron Bentley
Implement reconfigure --standalone and --sharing
6189
            reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
6123.8.2 by Martin von Gagern
Make the various aspects of reconfigure independent from one another.
6190
        if reconfiguration:
6191
            reconfiguration.apply(force)
6192
            reconfiguration = None
6193
        if repository_trees == 'with-trees':
3921.4.3 by Matthew Fuller
Add --with-trees and --with-no-trees to the 'reconfigure' command.
6194
            reconfiguration = reconfigure.Reconfigure.set_repository_trees(
6195
                directory, True)
6123.8.2 by Martin von Gagern
Make the various aspects of reconfigure independent from one another.
6196
        elif repository_trees == 'with-no-trees':
3921.4.3 by Matthew Fuller
Add --with-trees and --with-no-trees to the 'reconfigure' command.
6197
            reconfiguration = reconfigure.Reconfigure.set_repository_trees(
6198
                directory, False)
6123.8.2 by Martin von Gagern
Make the various aspects of reconfigure independent from one another.
6199
        if reconfiguration:
6200
            reconfiguration.apply(force)
6201
            reconfiguration = None
2796.2.5 by Aaron Bentley
Implement reconfigure command
6202
6203
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
6204
class cmd_switch(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
6205
    __doc__ = """Set the branch of a checkout and update.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
6206
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
6207
    For lightweight checkouts, this changes the branch being referenced.
6208
    For heavyweight checkouts, this checks that there are no local commits
6209
    versus the current bound branch, then it makes the local branch a mirror
6210
    of the new location and binds to it.
3565.6.15 by Marius Kruger
update bind and switch command descriptions to state what will happen to nicknames.
6211
6538.1.30 by Aaron Bentley
Make *not* storing on switch the default.
6212
    In both cases, the working tree is updated and uncommitted changes
6213
    are merged. The user can commit or revert these as they desire.
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
6214
6215
    Pending merges need to be committed or reverted before using switch.
3246.5.1 by Robert Collins
* ``bzr switch`` will attempt to find branches to switch to relative to the
6216
6217
    The path to the branch to switch to can be specified relative to the parent
6218
    directory of the current branch. For example, if you are currently in a
6219
    checkout of /path/to/branch, specifying 'newbranch' will find a branch at
6220
    /path/to/newbranch.
3565.6.15 by Marius Kruger
update bind and switch command descriptions to state what will happen to nicknames.
6221
3565.6.16 by Marius Kruger
update nick command description to mention how it works for bound branches,
6222
    Bound branches use the nickname of its master branch unless it is set
4775.1.1 by Martin Pool
Remove several 'the the' typos
6223
    locally, in which case switching will update the local nickname to be
3565.6.15 by Marius Kruger
update bind and switch command descriptions to state what will happen to nicknames.
6224
    that of the master.
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
6225
    """
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
6226
3984.5.11 by Daniel Watkins
Allow only a revision to be passed to switch.
6227
    takes_args = ['to_location?']
5171.3.13 by Martin von Gagern
Add --directory option to 7 more commands.
6228
    takes_options = ['directory',
6229
                     Option('force',
3984.5.5 by Daniel Watkins
bzr switch now takes a revision option.
6230
                        help='Switch even if local commits will be lost.'),
3984.5.19 by Andrew Bennetts
Merge lp:bzr, resolving conflicts.
6231
                     'revision',
4520.1.1 by John Arbash Meinel
'bzr switch -b' can now be used to create the branch while you switch to it.
6232
                     Option('create-branch', short_name='b',
6233
                        help='Create the target branch from this one before'
6234
                             ' switching to it.'),
6538.1.30 by Aaron Bentley
Make *not* storing on switch the default.
6235
                     Option('store',
6236
                        help='Store and restore uncommitted changes in the'
6237
                             ' branch.'),
3984.5.19 by Andrew Bennetts
Merge lp:bzr, resolving conflicts.
6238
                    ]
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
6239
3984.5.19 by Andrew Bennetts
Merge lp:bzr, resolving conflicts.
6240
    def run(self, to_location=None, force=False, create_branch=False,
6538.1.30 by Aaron Bentley
Make *not* storing on switch the default.
6241
            revision=None, directory=u'.', store=False):
2999.1.2 by Ian Clatworthy
incorporate review feedback including basic blackbox tests
6242
        from bzrlib import switch
5171.3.13 by Martin von Gagern
Add --directory option to 7 more commands.
6243
        tree_location = directory
3984.5.18 by Daniel Watkins
cmd_switch now uses _get_one_revision.
6244
        revision = _get_one_revision('switch', revision)
6437.21.6 by Jelmer Vernooij
Fix remaining switch tests.
6245
        possible_transports = []
6246
        control_dir = controldir.ControlDir.open_containing(tree_location,
6247
            possible_transports=possible_transports)[0]
3984.5.11 by Daniel Watkins
Allow only a revision to be passed to switch.
6248
        if to_location is None:
6249
            if revision is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
6250
                raise errors.BzrCommandError(gettext('You must supply either a'
6251
                                             ' revision or a location'))
5171.3.13 by Martin von Gagern
Add --directory option to 7 more commands.
6252
            to_location = tree_location
4354.2.1 by Aaron Bentley
Improve switch --force with lightweight checkouts.
6253
        try:
6437.21.6 by Jelmer Vernooij
Fix remaining switch tests.
6254
            branch = control_dir.open_branch(
6255
                possible_transports=possible_transports)
4354.2.1 by Aaron Bentley
Improve switch --force with lightweight checkouts.
6256
            had_explicit_nick = branch.get_config().has_explicit_nickname()
6257
        except errors.NotBranchError:
4520.1.1 by John Arbash Meinel
'bzr switch -b' can now be used to create the branch while you switch to it.
6258
            branch = None
4354.2.1 by Aaron Bentley
Improve switch --force with lightweight checkouts.
6259
            had_explicit_nick = False
4520.1.1 by John Arbash Meinel
'bzr switch -b' can now be used to create the branch while you switch to it.
6260
        if create_branch:
6261
            if branch is None:
6436.2.1 by Jelmer Vernooij
Add methods for looking up sibling branches.
6262
                raise errors.BzrCommandError(
6263
                    gettext('cannot create branch without source branch'))
6437.21.6 by Jelmer Vernooij
Fix remaining switch tests.
6264
            to_location = lookup_new_sibling_branch(control_dir, to_location,
6265
                 possible_transports=possible_transports)
4520.1.1 by John Arbash Meinel
'bzr switch -b' can now be used to create the branch while you switch to it.
6266
            to_branch = branch.bzrdir.sprout(to_location,
6437.21.6 by Jelmer Vernooij
Fix remaining switch tests.
6267
                 possible_transports=possible_transports,
6436.2.1 by Jelmer Vernooij
Add methods for looking up sibling branches.
6268
                 source_branch=branch).open_branch()
4520.1.1 by John Arbash Meinel
'bzr switch -b' can now be used to create the branch while you switch to it.
6269
        else:
6437.40.1 by Jelmer Vernooij
Support colocated branches in 'bzr rmbranch'.
6270
            try:
6271
                to_branch = Branch.open(to_location,
6272
                    possible_transports=possible_transports)
6273
            except errors.NotBranchError:
6274
                to_branch = open_sibling_branch(control_dir, to_location,
6275
                    possible_transports=possible_transports)
3984.5.13 by Daniel Watkins
Changed switch and cmd_switch to reflect change back.
6276
        if revision is not None:
3984.5.18 by Daniel Watkins
cmd_switch now uses _get_one_revision.
6277
            revision = revision.as_revision_id(to_branch)
6538.1.17 by Aaron Bentley
Switch command stores/restores uncommitted changes.
6278
        switch.switch(control_dir, to_branch, force, revision_id=revision,
6538.1.30 by Aaron Bentley
Make *not* storing on switch the default.
6279
                      store_uncommitted=store)
4354.2.1 by Aaron Bentley
Improve switch --force with lightweight checkouts.
6280
        if had_explicit_nick:
3565.6.7 by Marius Kruger
* checkouts now use master nick when no explicit nick is set.
6281
            branch = control_dir.open_branch() #get the new branch!
6282
            branch.nick = to_branch.nick
6138.2.2 by Jonathan Riddell
gettext builtin.py's note() usage
6283
        note(gettext('Switched to branch: %s'),
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
6284
            urlutils.unescape_for_display(to_branch.base, 'utf-8'))
6285
4354.2.1 by Aaron Bentley
Improve switch --force with lightweight checkouts.
6286
2999.1.1 by Ian Clatworthy
migrate switch command into the core - was in BzrTools
6287
3586.1.9 by Ian Clatworthy
first cut at view command
6288
class cmd_view(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
6289
    __doc__ = """Manage filtered views.
3586.1.33 by Ian Clatworthy
cleanup trailing whitespace
6290
3586.1.9 by Ian Clatworthy
first cut at view command
6291
    Views provide a mask over the tree so that users can focus on
6292
    a subset of a tree when doing their work. After creating a view,
6293
    commands that support a list of files - status, diff, commit, etc -
6294
    effectively have that list of files implicitly given each time.
6295
    An explicit list of files can still be given but those files
6296
    must be within the current view.
6297
6298
    In most cases, a view has a short life-span: it is created to make
6299
    a selected change and is deleted once that change is committed.
6300
    At other times, you may wish to create one or more named views
3586.1.14 by Ian Clatworthy
added --all option to the view command
6301
    and switch between them.
3586.1.33 by Ian Clatworthy
cleanup trailing whitespace
6302
3586.1.9 by Ian Clatworthy
first cut at view command
6303
    To disable the current view without deleting it, you can switch to
6304
    the pseudo view called ``off``. This can be useful when you need
6305
    to see the whole tree for an operation or two (e.g. merge) but
6306
    want to switch back to your view after that.
6307
6308
    :Examples:
3586.1.14 by Ian Clatworthy
added --all option to the view command
6309
      To define the current view::
3586.1.9 by Ian Clatworthy
first cut at view command
6310
6311
        bzr view file1 dir1 ...
6312
6313
      To list the current view::
6314
6315
        bzr view
6316
6317
      To delete the current view::
6318
6319
        bzr view --delete
6320
6321
      To disable the current view without deleting it::
6322
6323
        bzr view --switch off
6324
3586.1.14 by Ian Clatworthy
added --all option to the view command
6325
      To define a named view and switch to it::
3586.1.9 by Ian Clatworthy
first cut at view command
6326
6327
        bzr view --name view-name file1 dir1 ...
6328
6329
      To list a named view::
6330
6331
        bzr view --name view-name
6332
6333
      To delete a named view::
6334
6335
        bzr view --name view-name --delete
6336
6337
      To switch to a named view::
6338
6339
        bzr view --switch view-name
3586.1.14 by Ian Clatworthy
added --all option to the view command
6340
6341
      To list all views defined::
6342
6343
        bzr view --all
6344
6345
      To delete all views::
6346
6347
        bzr view --delete --all
3586.1.9 by Ian Clatworthy
first cut at view command
6348
    """
6349
3586.1.14 by Ian Clatworthy
added --all option to the view command
6350
    _see_also = []
3586.1.9 by Ian Clatworthy
first cut at view command
6351
    takes_args = ['file*']
6352
    takes_options = [
3586.1.14 by Ian Clatworthy
added --all option to the view command
6353
        Option('all',
6354
            help='Apply list or delete action to all views.',
6355
            ),
3586.1.9 by Ian Clatworthy
first cut at view command
6356
        Option('delete',
6357
            help='Delete the view.',
6358
            ),
6359
        Option('name',
3586.1.14 by Ian Clatworthy
added --all option to the view command
6360
            help='Name of the view to define, list or delete.',
3586.1.9 by Ian Clatworthy
first cut at view command
6361
            type=unicode,
6362
            ),
6363
        Option('switch',
6364
            help='Name of the view to switch to.',
6365
            type=unicode,
6366
            ),
6367
        ]
6368
6369
    def run(self, file_list,
3586.1.14 by Ian Clatworthy
added --all option to the view command
6370
            all=False,
3586.1.9 by Ian Clatworthy
first cut at view command
6371
            delete=False,
6372
            name=None,
6373
            switch=None,
6374
            ):
5346.4.5 by Martin Pool
Deprecate and avoid internal_tree_files and tree_files.
6375
        tree, file_list = WorkingTree.open_containing_paths(file_list,
6376
            apply_view=False)
3586.1.9 by Ian Clatworthy
first cut at view command
6377
        current_view, view_dict = tree.views.get_view_info()
6378
        if name is None:
6379
            name = current_view
6380
        if delete:
6381
            if file_list:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
6382
                raise errors.BzrCommandError(gettext(
6383
                    "Both --delete and a file list specified"))
3586.1.9 by Ian Clatworthy
first cut at view command
6384
            elif switch:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
6385
                raise errors.BzrCommandError(gettext(
6386
                    "Both --delete and --switch specified"))
3586.1.14 by Ian Clatworthy
added --all option to the view command
6387
            elif all:
6388
                tree.views.set_view_info(None, {})
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
6389
                self.outf.write(gettext("Deleted all views.\n"))
3586.1.9 by Ian Clatworthy
first cut at view command
6390
            elif name is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
6391
                raise errors.BzrCommandError(gettext("No current view to delete"))
3586.1.9 by Ian Clatworthy
first cut at view command
6392
            else:
6393
                tree.views.delete_view(name)
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
6394
                self.outf.write(gettext("Deleted '%s' view.\n") % name)
3586.1.9 by Ian Clatworthy
first cut at view command
6395
        elif switch:
6396
            if file_list:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
6397
                raise errors.BzrCommandError(gettext(
6398
                    "Both --switch and a file list specified"))
3586.1.14 by Ian Clatworthy
added --all option to the view command
6399
            elif all:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
6400
                raise errors.BzrCommandError(gettext(
6401
                    "Both --switch and --all specified"))
3586.1.9 by Ian Clatworthy
first cut at view command
6402
            elif switch == 'off':
6403
                if current_view is None:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
6404
                    raise errors.BzrCommandError(gettext("No current view to disable"))
3586.1.9 by Ian Clatworthy
first cut at view command
6405
                tree.views.set_view_info(None, view_dict)
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
6406
                self.outf.write(gettext("Disabled '%s' view.\n") % (current_view))
3586.1.9 by Ian Clatworthy
first cut at view command
6407
            else:
6408
                tree.views.set_view_info(switch, view_dict)
3586.1.20 by Ian Clatworthy
centralise formatting of view file lists
6409
                view_str = views.view_display_str(tree.views.lookup_view())
6138.2.4 by Jonathan Riddell
use format strings where there are multiple substitutions to allow for translations
6410
                self.outf.write(gettext("Using '{0}' view: {1}\n").format(switch, view_str))
3586.1.14 by Ian Clatworthy
added --all option to the view command
6411
        elif all:
6412
            if view_dict:
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
6413
                self.outf.write(gettext('Views defined:\n'))
3586.1.14 by Ian Clatworthy
added --all option to the view command
6414
                for view in sorted(view_dict):
6415
                    if view == current_view:
6416
                        active = "=>"
6417
                    else:
6418
                        active = "  "
3586.1.20 by Ian Clatworthy
centralise formatting of view file lists
6419
                    view_str = views.view_display_str(view_dict[view])
6420
                    self.outf.write('%s %-20s %s\n' % (active, view, view_str))
3586.1.14 by Ian Clatworthy
added --all option to the view command
6421
            else:
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
6422
                self.outf.write(gettext('No views defined.\n'))
3586.1.9 by Ian Clatworthy
first cut at view command
6423
        elif file_list:
6424
            if name is None:
6425
                # No name given and no current view set
6426
                name = 'my'
6427
            elif name == 'off':
6138.2.3 by Jonathan Riddell
gettext() on builtin.py's error messages
6428
                raise errors.BzrCommandError(gettext(
6429
                    "Cannot change the 'off' pseudo view"))
3586.1.9 by Ian Clatworthy
first cut at view command
6430
            tree.views.set_view(name, sorted(file_list))
3586.1.20 by Ian Clatworthy
centralise formatting of view file lists
6431
            view_str = views.view_display_str(tree.views.lookup_view())
6138.2.4 by Jonathan Riddell
use format strings where there are multiple substitutions to allow for translations
6432
            self.outf.write(gettext("Using '{0}' view: {1}\n").format(name, view_str))
3586.1.9 by Ian Clatworthy
first cut at view command
6433
        else:
6434
            # list the files
3586.1.13 by Ian Clatworthy
fix list of a known view when no current view set
6435
            if name is None:
6436
                # No name given and no current view set
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
6437
                self.outf.write(gettext('No current view.\n'))
3586.1.9 by Ian Clatworthy
first cut at view command
6438
            else:
3586.1.20 by Ian Clatworthy
centralise formatting of view file lists
6439
                view_str = views.view_display_str(tree.views.lookup_view(name))
6138.2.4 by Jonathan Riddell
use format strings where there are multiple substitutions to allow for translations
6440
                self.outf.write(gettext("'{0}' view is: {1}\n").format(name, view_str))
3586.1.9 by Ian Clatworthy
first cut at view command
6441
6442
3254.2.1 by Daniel Watkins
Added cmd_hooks.
6443
class cmd_hooks(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
6444
    __doc__ = """Show hooks."""
3254.2.1 by Daniel Watkins
Added cmd_hooks.
6445
3254.2.9 by Daniel Watkins
Made cmd_hooks hidden.
6446
    hidden = True
3254.2.1 by Daniel Watkins
Added cmd_hooks.
6447
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
6448
    def run(self):
6449
        for hook_key in sorted(hooks.known_hooks.keys()):
6450
            some_hooks = hooks.known_hooks_key_to_object(hook_key)
6451
            self.outf.write("%s:\n" % type(some_hooks).__name__)
6452
            for hook_name, hook_point in sorted(some_hooks.items()):
6453
                self.outf.write("  %s:\n" % (hook_name,))
6454
                found_hooks = list(hook_point)
6455
                if found_hooks:
6456
                    for hook in found_hooks:
6457
                        self.outf.write("    %s\n" %
6458
                                        (some_hooks.get_hook_name(hook),))
6459
                else:
6138.2.1 by Jonathan Riddell
add gettext to all the builtin commands outf usage
6460
                    self.outf.write(gettext("    <no hooks installed>\n"))
3254.2.1 by Daniel Watkins
Added cmd_hooks.
6461
6462
4991.1.3 by Jelmer Vernooij
Name command remove-branch, rmbranch as alias.
6463
class cmd_remove_branch(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
6464
    __doc__ = """Remove a branch.
4991.1.1 by Jelmer Vernooij
Add rmbranch command.
6465
4991.1.5 by Jelmer Vernooij
Add example for rmbranch, explain a bit better what the command does.
6466
    This will remove the branch from the specified location but 
4991.1.6 by Jelmer Vernooij
Docstring tweaks from Ians review.
6467
    will keep any working tree or repository in place.
4991.1.5 by Jelmer Vernooij
Add example for rmbranch, explain a bit better what the command does.
6468
6469
    :Examples:
6470
4991.1.6 by Jelmer Vernooij
Docstring tweaks from Ians review.
6471
      Remove the branch at repo/trunk::
4991.1.5 by Jelmer Vernooij
Add example for rmbranch, explain a bit better what the command does.
6472
6473
        bzr remove-branch repo/trunk
6474
4991.1.1 by Jelmer Vernooij
Add rmbranch command.
6475
    """
6476
6477
    takes_args = ["location?"]
6478
6437.41.2 by Jelmer Vernooij
rmbranch now refuses removing active branches.
6479
    takes_options = ['directory',
6480
        Option('force', help='Remove branch even if it is the active branch.')]
6437.40.1 by Jelmer Vernooij
Support colocated branches in 'bzr rmbranch'.
6481
4991.1.3 by Jelmer Vernooij
Name command remove-branch, rmbranch as alias.
6482
    aliases = ["rmbranch"]
6483
6437.41.2 by Jelmer Vernooij
rmbranch now refuses removing active branches.
6484
    def run(self, directory=None, location=None, force=False):
6437.40.1 by Jelmer Vernooij
Support colocated branches in 'bzr rmbranch'.
6485
        br = open_nearby_branch(near=directory, location=location)
6437.41.2 by Jelmer Vernooij
rmbranch now refuses removing active branches.
6486
        if not force and br.bzrdir.has_workingtree():
6487
            try:
6488
                active_branch = br.bzrdir.open_branch(name="")
6489
            except errors.NotBranchError:
6490
                active_branch = None
6491
            if (active_branch is not None and
6492
                br.control_url == active_branch.control_url):
6493
                raise errors.BzrCommandError(
6437.41.4 by Jelmer Vernooij
Clarify error message.
6494
                    gettext("Branch is active. Use --force to remove it."))
6437.40.1 by Jelmer Vernooij
Support colocated branches in 'bzr rmbranch'.
6495
        br.bzrdir.destroy_branch(br.name)
5521.1.1 by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore.
6496
4991.1.1 by Jelmer Vernooij
Add rmbranch command.
6497
0.16.80 by Aaron Bentley
Rename shelve2/unshelve2 to shelve/unshelve
6498
class cmd_shelve(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
6499
    __doc__ = """Temporarily set aside some changes from the current tree.
0.16.74 by Aaron Bentley
Merge with shelf-manager
6500
6501
    Shelve allows you to temporarily put changes you've made "on the shelf",
6502
    ie. out of the way, until a later time when you can bring them back from
3990.2.6 by Daniel Watkins
Improved shelve documentation, as per #327421.
6503
    the shelf with the 'unshelve' command.  The changes are stored alongside
6504
    your working tree, and so they aren't propagated along with your branch nor
6505
    will they survive its deletion.
0.16.74 by Aaron Bentley
Merge with shelf-manager
6506
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
6507
    If shelve --list is specified, previously-shelved changes are listed.
6508
0.16.74 by Aaron Bentley
Merge with shelf-manager
6509
    Shelve is intended to help separate several sets of changes that have
6510
    been inappropriately mingled.  If you just want to get rid of all changes
6511
    and you don't need to restore them later, use revert.  If you want to
6512
    shelve all text changes at once, use shelve --all.
6513
6514
    If filenames are specified, only the changes to those files will be
6515
    shelved. Other files will be left untouched.
6516
6517
    If a revision is specified, changes since that revision will be shelved.
6518
6519
    You can put multiple items on the shelf, and by default, 'unshelve' will
6520
    restore the most recently shelved changes.
5504.2.1 by Neil Martinsen-Burrell
add documentation of the ability to edit changes when shelving
6521
6522
    For complicated changes, it is possible to edit the changes in a separate
6523
    editor program to decide what the file remaining in the working copy
6524
    should look like.  To do this, add the configuration option
6525
6526
        change_editor = PROGRAM @new_path @old_path
6527
6528
    where @new_path is replaced with the path of the new version of the 
6529
    file and @old_path is replaced with the path of the old version of 
6530
    the file.  The PROGRAM should save the new file with the desired 
6531
    contents of the file in the working tree.
6532
        
0.16.74 by Aaron Bentley
Merge with shelf-manager
6533
    """
6534
6535
    takes_args = ['file*']
6536
6537
    takes_options = [
5171.3.13 by Martin von Gagern
Add --directory option to 7 more commands.
6538
        'directory',
0.16.74 by Aaron Bentley
Merge with shelf-manager
6539
        'revision',
6540
        Option('all', help='Shelve all changes.'),
6541
        'message',
0.16.108 by Aaron Bentley
Shelf supports multiple diff writers.
6542
        RegistryOption('writer', 'Method to use for writing diffs.',
6543
                       bzrlib.option.diff_writer_registry,
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
6544
                       value_switches=True, enum_switch=False),
6545
0.16.119 by Aaron Bentley
Fix option help style.
6546
        Option('list', help='List shelved changes.'),
4100.3.1 by Aaron Bentley
Implement shelve --destroy
6547
        Option('destroy',
6548
               help='Destroy removed changes instead of shelving them.'),
0.16.74 by Aaron Bentley
Merge with shelf-manager
6549
    ]
5504.2.1 by Neil Martinsen-Burrell
add documentation of the ability to edit changes when shelving
6550
    _see_also = ['unshelve', 'configuration']
0.16.74 by Aaron Bentley
Merge with shelf-manager
6551
0.16.108 by Aaron Bentley
Shelf supports multiple diff writers.
6552
    def run(self, revision=None, all=False, file_list=None, message=None,
5521.1.1 by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore.
6553
            writer=None, list=False, destroy=False, directory=None):
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
6554
        if list:
5521.1.1 by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore.
6555
            return self.run_for_list(directory=directory)
0.16.74 by Aaron Bentley
Merge with shelf-manager
6556
        from bzrlib.shelf_ui import Shelver
0.16.108 by Aaron Bentley
Shelf supports multiple diff writers.
6557
        if writer is None:
6558
            writer = bzrlib.option.diff_writer_registry.get()
0.16.103 by Aaron Bentley
raise UserAbort instead of doing sys.exit
6559
        try:
4603.1.7 by Aaron Bentley
Allow configuring change editor.
6560
            shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5171.3.13 by Martin von Gagern
Add --directory option to 7 more commands.
6561
                file_list, message, destroy=destroy, directory=directory)
4603.1.7 by Aaron Bentley
Allow configuring change editor.
6562
            try:
6563
                shelver.run()
6564
            finally:
4603.1.11 by Aaron Bentley
Implement shelver.finalize
6565
                shelver.finalize()
0.16.103 by Aaron Bentley
raise UserAbort instead of doing sys.exit
6566
        except errors.UserAbort:
6567
            return 0
0.16.74 by Aaron Bentley
Merge with shelf-manager
6568
5521.1.1 by Vincent Ladeuil
Handle --directory when paths are also provided to shelve and restore.
6569
    def run_for_list(self, directory=None):
6570
        if directory is None:
6571
            directory = u'.'
6572
        tree = WorkingTree.open_containing(directory)[0]
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
6573
        self.add_cleanup(tree.lock_read().unlock)
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
6574
        manager = tree.get_shelf_manager()
5418.4.6 by Parth Malwankar
used active_shelves instead of creating a new function for listing shelves
6575
        shelves = manager.active_shelves()
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
6576
        if len(shelves) == 0:
6138.2.2 by Jonathan Riddell
gettext builtin.py's note() usage
6577
            note(gettext('No shelved changes.'))
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
6578
            return 0
5418.4.6 by Parth Malwankar
used active_shelves instead of creating a new function for listing shelves
6579
        for shelf_id in reversed(shelves):
6580
            message = manager.get_metadata(shelf_id).get('message')
6581
            if message is None:
6582
                message = '<no message>'
4900.1.3 by Andrew Bennetts
Replace lots of try/finally blocks in builtins.py with add_cleanup. Reduces line count by 80, and removes lots of indentation levels too.
6583
            self.outf.write('%3d: %s\n' % (shelf_id, message))
6584
        return 1
0.16.113 by Aaron Bentley
Change ls-shelf to shelve --list
6585
0.16.74 by Aaron Bentley
Merge with shelf-manager
6586
0.16.80 by Aaron Bentley
Rename shelve2/unshelve2 to shelve/unshelve
6587
class cmd_unshelve(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
6588
    __doc__ = """Restore shelved changes.
0.16.74 by Aaron Bentley
Merge with shelf-manager
6589
6590
    By default, the most recently shelved changes are restored. However if you
3990.2.5 by Daniel Watkins
Improve unshelve documentation, as per #327425.
6591
    specify a shelf by id those changes will be restored instead.  This works
6592
    best when the changes don't depend on each other.
0.16.74 by Aaron Bentley
Merge with shelf-manager
6593
    """
6594
6595
    takes_args = ['shelf_id?']
6596
    takes_options = [
5171.3.13 by Martin von Gagern
Add --directory option to 7 more commands.
6597
        'directory',
0.16.74 by Aaron Bentley
Merge with shelf-manager
6598
        RegistryOption.from_kwargs(
6599
            'action', help="The action to perform.",
6600
            enum_switch=False, value_switches=True,
6601
            apply="Apply changes and remove from the shelf.",
4902.1.2 by Guilherme Salgado
First round of the new approach, using a new action (--preview) on the unshelve command
6602
            dry_run="Show changes, but do not apply or remove them.",
6603
            preview="Instead of unshelving the changes, show the diff that "
6604
                    "would result from unshelving.",
4889.1.3 by Martin Pool
New option unshelve --keep
6605
            delete_only="Delete changes without applying them.",
6606
            keep="Apply changes but don't delete them.",
0.16.74 by Aaron Bentley
Merge with shelf-manager
6607
        )
6608
    ]
0.16.117 by Aaron Bentley
Remove references to ls-shelf
6609
    _see_also = ['shelve']
0.16.74 by Aaron Bentley
Merge with shelf-manager
6610
5171.3.13 by Martin von Gagern
Add --directory option to 7 more commands.
6611
    def run(self, shelf_id=None, action='apply', directory=u'.'):
0.16.74 by Aaron Bentley
Merge with shelf-manager
6612
        from bzrlib.shelf_ui import Unshelver
5171.3.13 by Martin von Gagern
Add --directory option to 7 more commands.
6613
        unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
4595.13.2 by Alexander Belchenko
[cherrypick revno 4650 from bzr.dev] Fix shelve on windows. (Robert Collins, #305006)
6614
        try:
6615
            unshelver.run()
6616
        finally:
6617
            unshelver.tree.unlock()
0.16.74 by Aaron Bentley
Merge with shelf-manager
6618
6619
4020.1.1 by Jelmer Vernooij
Import clean-tree from bzrtools.
6620
class cmd_clean_tree(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
6621
    __doc__ = """Remove unwanted files from working tree.
4020.1.1 by Jelmer Vernooij
Import clean-tree from bzrtools.
6622
6623
    By default, only unknown files, not ignored files, are deleted.  Versioned
6624
    files are never deleted.
6625
6626
    Another class is 'detritus', which includes files emitted by bzr during
6627
    normal operations and selftests.  (The value of these files decreases with
6628
    time.)
6629
6630
    If no options are specified, unknown files are deleted.  Otherwise, option
6631
    flags are respected, and may be combined.
6632
6633
    To check what clean-tree will do, use --dry-run.
6634
    """
5171.3.4 by Martin von Gagern
Add --directory option to clean-tree.
6635
    takes_options = ['directory',
6636
                     Option('ignored', help='Delete all ignored files.'),
5666.1.1 by Jelmer Vernooij
Clarify that 'bzr clean-tree --detritus' cleans up revert backups too.
6637
                     Option('detritus', help='Delete conflict files, merge and revert'
4020.1.1 by Jelmer Vernooij
Import clean-tree from bzrtools.
6638
                            ' backups, and failed selftest dirs.'),
6639
                     Option('unknown',
6640
                            help='Delete files unknown to bzr (default).'),
6641
                     Option('dry-run', help='Show files to delete instead of'
6642
                            ' deleting them.'),
6643
                     Option('force', help='Do not prompt before deleting.')]
6644
    def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5171.3.4 by Martin von Gagern
Add --directory option to clean-tree.
6645
            force=False, directory=u'.'):
4020.1.1 by Jelmer Vernooij
Import clean-tree from bzrtools.
6646
        from bzrlib.clean_tree import clean_tree
6647
        if not (unknown or ignored or detritus):
6648
            unknown = True
6649
        if dry_run:
6650
            force = True
5171.3.4 by Martin von Gagern
Add --directory option to clean-tree.
6651
        clean_tree(directory, unknown=unknown, ignored=ignored,
6652
                   detritus=detritus, dry_run=dry_run, no_prompt=force)
4020.1.1 by Jelmer Vernooij
Import clean-tree from bzrtools.
6653
6654
4273.1.19 by Aaron Bentley
Implement reference command
6655
class cmd_reference(Command):
5131.2.1 by Martin
Permit bzrlib to run under python -OO by explictly assigning to __doc__ for user-visible docstrings
6656
    __doc__ = """list, view and set branch locations for nested trees.
4273.1.19 by Aaron Bentley
Implement reference command
6657
6658
    If no arguments are provided, lists the branch locations for nested trees.
6659
    If one argument is provided, display the branch location for that tree.
6660
    If two arguments are provided, set the branch location for that tree.
6661
    """
6662
6663
    hidden = True
6664
6665
    takes_args = ['path?', 'location?']
6666
6667
    def run(self, path=None, location=None):
6668
        branchdir = '.'
6669
        if path is not None:
6670
            branchdir = path
6671
        tree, branch, relpath =(
6207.3.3 by jelmer at samba
Fix tests and the like.
6672
            controldir.ControlDir.open_containing_tree_or_branch(branchdir))
4273.1.19 by Aaron Bentley
Implement reference command
6673
        if path is not None:
6674
            path = relpath
6675
        if tree is None:
6676
            tree = branch.basis_tree()
6677
        if path is None:
6678
            info = branch._get_all_reference_info().iteritems()
6679
            self._display_reference_info(tree, branch, info)
6680
        else:
6681
            file_id = tree.path2id(path)
6682
            if file_id is None:
6683
                raise errors.NotVersionedError(path)
6684
            if location is None:
6685
                info = [(file_id, branch.get_reference_info(file_id))]
6686
                self._display_reference_info(tree, branch, info)
6687
            else:
6688
                branch.set_reference_info(file_id, path, location)
6689
6690
    def _display_reference_info(self, tree, branch, info):
6691
        ref_list = []
6692
        for file_id, (path, location) in info:
6693
            try:
6694
                path = tree.id2path(file_id)
6695
            except errors.NoSuchId:
6696
                pass
6697
            ref_list.append((path, location))
6698
        for path, location in sorted(ref_list):
6699
            self.outf.write('%s %s\n' % (path, location))
6700
6701
5830.2.12 by INADA Naoki
Make "export-pot" hidden command.
6702
class cmd_export_pot(Command):
6703
    __doc__ = """Export command helps and error messages in po format."""
6704
6705
    hidden = True
6162.4.5 by Jonathan Riddell
change export-pot --plugins option to --plugin which takes a plugin name rather than command name
6706
    takes_options = [Option('plugin', 
6707
                            help='Export help text from named command '\
6708
                                 '(defaults to all built in commands).',
6351.2.1 by Martin Packman
Add export-pot --include-duplicates option for permitting multiple entries with the same msgid
6709
                            type=str),
6710
                     Option('include-duplicates',
6711
                            help='Output multiple copies of the same msgid '
6712
                                 'string if it appears more than once.'),
6713
                            ]
5830.2.12 by INADA Naoki
Make "export-pot" hidden command.
6714
6351.2.1 by Martin Packman
Add export-pot --include-duplicates option for permitting multiple entries with the same msgid
6715
    def run(self, plugin=None, include_duplicates=False):
5830.2.12 by INADA Naoki
Make "export-pot" hidden command.
6716
        from bzrlib.export_pot import export_pot
6351.2.1 by Martin Packman
Add export-pot --include-duplicates option for permitting multiple entries with the same msgid
6717
        export_pot(self.outf, plugin, include_duplicates)
5830.2.12 by INADA Naoki
Make "export-pot" hidden command.
6718
6719
5127.1.1 by Martin Pool
version-info is lazily loaded
6720
def _register_lazy_builtins():
6721
    # register lazy builtins from other modules; called at startup and should
6722
    # be only called once.
6723
    for (name, aliases, module_name) in [
6724
        ('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
5447.4.16 by Vincent Ladeuil
Use config_id instead of id as suggested by poolie.
6725
        ('cmd_config', [], 'bzrlib.config'),
5127.1.3 by Martin Pool
lazy-load dpush
6726
        ('cmd_dpush', [], 'bzrlib.foreign'),
5321.1.74 by Gordon Tyler
Reverted some more command-related stuff that I missed earlier.
6727
        ('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5127.1.2 by Martin Pool
Lazy-load conflict commands
6728
        ('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5321.1.74 by Gordon Tyler
Reverted some more command-related stuff that I missed earlier.
6729
        ('cmd_conflicts', [], 'bzrlib.conflicts'),
6556.2.2 by Jelmer Vernooij
Move ping plugin to bzrlib.
6730
        ('cmd_ping', [], 'bzrlib.smart.ping'),
5971.1.37 by Jonathan Riddell
renamed file 'bzrlib/sign_my_commits.py' => 'bzrlib/commit_signature_commands.py'
6731
        ('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6491.1.2 by Jelmer Vernooij
Translate another string.
6732
        ('cmd_verify_signatures', [], 'bzrlib.commit_signature_commands'),
5510.1.2 by Martin von Gagern
Avoid test-script command depending on testtools.
6733
        ('cmd_test_script', [], 'bzrlib.cmd_test_script'),
5127.1.1 by Martin Pool
version-info is lazily loaded
6734
        ]:
6735
        builtin_command_registry.register_lazy(name, aliases, module_name)