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