/brz/remove-bazaar

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