/brz/remove-bazaar

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