/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
1185.16.43 by Martin Pool
- clean up handling of option objects
51
from bzrlib.option import Option
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
52
from bzrlib.progress import DummyProgress, ProgressPhase
1711.1.2 by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were
53
from bzrlib.revision import common_ancestor
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:
1731.1.13 by Aaron Bentley
Refactored checkout creation
765
            bzrdir.BzrDir.create_checkout_convenience(to_location, source,
766
                                                      revision_id, lightweight)
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
767
        finally:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
768
            bzrdir.BzrDirFormat.set_default_format(old_format)
1508.1.20 by Robert Collins
Create a checkout command.
769
770
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
771
class cmd_renames(Command):
772
    """Show list of renamed files.
773
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
774
    # TODO: Option to show renames between two historical versions.
775
776
    # TODO: Only show renames under dir, rather than in the whole branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
777
    takes_args = ['dir?']
778
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
779
    @display_command
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
780
    def run(self, dir=u'.'):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
781
        from bzrlib.tree import find_renames
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
782
        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()
783
        old_inv = tree.basis_tree().inventory
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
784
        new_inv = tree.read_working_inventory()
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
785
        renames = list(find_renames(old_inv, new_inv))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
786
        renames.sort()
787
        for old_name, new_name in renames:
1185.85.32 by John Arbash Meinel
Updated bzr renames
788
            self.outf.write("%s => %s\n" % (old_name, new_name))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
789
790
1508.1.24 by Robert Collins
Add update command for use with checkouts.
791
class cmd_update(Command):
792
    """Update a tree to have the latest code committed to its branch.
793
    
794
    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.
795
    conflicts. If you have any local changes, you will still 
796
    need to commit them after the update for the update to be complete.
797
    
798
    If you want to discard your local changes, you can just do a 
799
    'bzr revert' instead of 'bzr commit' after the update.
1508.1.24 by Robert Collins
Add update command for use with checkouts.
800
    """
801
    takes_args = ['dir?']
1815.3.1 by Stefan (metze) Metzmacher
add 'up' as alias for 'update'
802
    aliases = ['up']
1508.1.24 by Robert Collins
Add update command for use with checkouts.
803
804
    def run(self, dir='.'):
805
        tree = WorkingTree.open_containing(dir)[0]
806
        tree.lock_write()
1878.3.2 by Adeodato Simó
Update with suggestions from John Arbash Meinel.
807
        existing_pending_merges = tree.pending_merges()
1508.1.24 by Robert Collins
Add update command for use with checkouts.
808
        try:
1830.1.1 by John Arbash Meinel
Print up to date even if bound, also always print out current revno.
809
            last_rev = tree.last_revision() 
810
            if last_rev == tree.branch.last_revision():
1587.1.11 by Robert Collins
Local commits appear to be working properly.
811
                # may be up to date, check master too.
812
                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.
813
                if master is None or last_rev == master.last_revision():
814
                    revno = tree.branch.revision_id_to_revno(last_rev)
815
                    note("Tree is up to date at revision %d." % (revno,))
816
                    return 0
1508.1.24 by Robert Collins
Add update command for use with checkouts.
817
            conflicts = tree.update()
1830.1.1 by John Arbash Meinel
Print up to date even if bound, also always print out current revno.
818
            revno = tree.branch.revision_id_to_revno(tree.last_revision())
819
            note('Updated to revision %d.' % (revno,))
1878.3.2 by Adeodato Simó
Update with suggestions from John Arbash Meinel.
820
            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.
821
                note('Your local commits will now show as pending merges with '
1878.3.2 by Adeodato Simó
Update with suggestions from John Arbash Meinel.
822
                     "'bzr status', and can be committed with 'bzr commit'.")
1508.1.24 by Robert Collins
Add update command for use with checkouts.
823
            if conflicts != 0:
824
                return 1
825
            else:
826
                return 0
827
        finally:
828
            tree.unlock()
829
830
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
831
class cmd_info(Command):
1694.2.6 by Martin Pool
[merge] bzr.dev
832
    """Show information about a working tree, branch or repository.
833
834
    This command will show all known locations and formats associated to the
835
    tree, branch or repository.  Statistical information is included with
836
    each report.
837
838
    Branches and working trees will also report any missing revisions.
839
    """
840
    takes_args = ['location?']
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
841
    takes_options = ['verbose']
1694.2.6 by Martin Pool
[merge] bzr.dev
842
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
843
    @display_command
1694.2.6 by Martin Pool
[merge] bzr.dev
844
    def run(self, location=None, verbose=False):
845
        from bzrlib.info import show_bzrdir_info
846
        show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
847
                         verbose=verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
848
849
850
class cmd_remove(Command):
851
    """Make a file unversioned.
852
853
    This makes bzr stop tracking changes to a versioned file.  It does
854
    not delete the working copy.
1551.6.26 by Aaron Bentley
Add support for remove --new
855
856
    You can specify one or more files, and/or --new.  If you specify --new,
857
    only 'added' files will be removed.  If you specify both, then new files
858
    in the specified directories will be removed.  If the directories are
859
    also new, they will also be removed.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
860
    """
1551.6.26 by Aaron Bentley
Add support for remove --new
861
    takes_args = ['file*']
862
    takes_options = ['verbose', Option('new', help='remove newly-added files')]
1424 by Robert Collins
add rm alias to remove
863
    aliases = ['rm']
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
864
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
865
    
1551.6.26 by Aaron Bentley
Add support for remove --new
866
    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
867
        tree, file_list = tree_files(file_list)
1551.6.26 by Aaron Bentley
Add support for remove --new
868
        if new is False:
869
            if file_list is None:
870
                raise BzrCommandError('Specify one or more files to remove, or'
871
                                      ' use --new.')
872
        else:
1852.10.3 by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.
873
            added = tree.changes_from(tree.basis_tree(),
874
                specific_files=file_list).added
875
            file_list = sorted([f[0] for f in added], reverse=True)
1551.6.26 by Aaron Bentley
Add support for remove --new
876
            if len(file_list) == 0:
877
                raise BzrCommandError('No matching files.')
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
878
        tree.remove(file_list, verbose=verbose, to_file=self.outf)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
879
880
881
class cmd_file_id(Command):
882
    """Print file_id of a particular file or directory.
883
884
    The file_id is assigned when the file is first added and remains the
885
    same through all revisions where the file exists, even when it is
886
    moved or renamed.
887
    """
1685.1.80 by Wouter van Heyst
more code cleanup
888
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
889
    hidden = True
890
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
891
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
892
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
893
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
894
        tree, relpath = WorkingTree.open_containing(filename)
895
        i = tree.inventory.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
896
        if i == None:
897
            raise BzrError("%r is not a versioned file" % filename)
898
        else:
1685.1.80 by Wouter van Heyst
more code cleanup
899
            self.outf.write(i + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
900
901
902
class cmd_file_path(Command):
903
    """Print path of file_ids to a file or directory.
904
905
    This prints one line for each directory down to the target,
1185.85.35 by John Arbash Meinel
Updated file-path
906
    starting at the branch root.
907
    """
1685.1.80 by Wouter van Heyst
more code cleanup
908
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
909
    hidden = True
910
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
911
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
912
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
913
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
914
        tree, relpath = WorkingTree.open_containing(filename)
915
        inv = tree.inventory
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
916
        fid = inv.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
917
        if fid == None:
918
            raise BzrError("%r is not a versioned file" % filename)
919
        for fip in inv.get_idpath(fid):
1685.1.80 by Wouter van Heyst
more code cleanup
920
            self.outf.write(fip + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
921
922
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
923
class cmd_reconcile(Command):
924
    """Reconcile bzr metadata in a branch.
925
926
    This can correct data mismatches that may have been caused by
927
    previous ghost operations or bzr upgrades. You should only
928
    need to run this command if 'bzr check' or a bzr developer 
929
    advises you to run it.
930
931
    If a second branch is provided, cross-branch reconciliation is
932
    also attempted, which will check that data like the tree root
933
    id which was not present in very early bzr versions is represented
934
    correctly in both branches.
935
936
    At the same time it is run it may recompress data resulting in 
937
    a potential saving in disk space or performance gain.
938
939
    The branch *MUST* be on a listable system such as local disk or sftp.
940
    """
941
    takes_args = ['branch?']
942
943
    def run(self, branch="."):
944
        from bzrlib.reconcile import reconcile
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
945
        dir = bzrdir.BzrDir.open(branch)
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
946
        reconcile(dir)
947
948
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
949
class cmd_revision_history(Command):
1733.2.1 by Michael Ellerman
Add an optional location parameter to the 'revision-history' command.
950
    """Display the list of revision ids on a branch."""
951
    takes_args = ['location?']
952
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
953
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
954
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
955
    @display_command
1733.2.1 by Michael Ellerman
Add an optional location parameter to the 'revision-history' command.
956
    def run(self, location="."):
957
        branch = Branch.open_containing(location)[0]
958
        for revid in branch.revision_history():
1733.2.4 by Michael Ellerman
Merge bzr.dev, fix minor conflict in cmd_revision_history().
959
            self.outf.write(revid)
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
960
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
961
962
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
963
class cmd_ancestry(Command):
964
    """List all revisions merged into this branch."""
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
965
    takes_args = ['location?']
966
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
967
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
968
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
969
    @display_command
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
970
    def run(self, location="."):
971
        try:
972
            wt = WorkingTree.open_containing(location)[0]
973
        except errors.NoWorkingTree:
974
            b = Branch.open(location)
975
            last_revision = b.last_revision()
976
        else:
977
            b = wt.branch
978
            last_revision = wt.last_revision()
979
980
        revision_ids = b.repository.get_ancestry(last_revision)
1668.1.14 by Martin Pool
merge olaf - InvalidRevisionId fixes
981
        assert revision_ids[0] == None
982
        revision_ids.pop(0)
983
        for revision_id in revision_ids:
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
984
            self.outf.write(revision_id + '\n')
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
985
986
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
987
class cmd_init(Command):
988
    """Make a directory into a versioned branch.
989
990
    Use this to create an empty branch, or before importing an
991
    existing project.
992
1662.1.19 by Martin Pool
Better error message when initting existing tree
993
    If there is a repository in a parent directory of the location, then 
994
    the history of the branch will be stored in the repository.  Otherwise
995
    init creates a standalone branch which carries its own history in 
996
    .bzr.
997
998
    If there is already a branch at the location but it has no working tree,
999
    the tree can be populated with 'bzr checkout'.
1000
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1001
    Recipe for importing a tree of files:
1002
        cd ~/project
1003
        bzr init
1185.12.93 by Aaron Bentley
Fixed obsolete help
1004
        bzr add .
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1005
        bzr status
1006
        bzr commit -m 'imported project'
1007
    """
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
1008
    takes_args = ['location?']
1553.5.78 by Martin Pool
New bzr init --format option and test
1009
    takes_options = [
1010
                     Option('format', 
1694.2.6 by Martin Pool
[merge] bzr.dev
1011
                            help='Specify a format for this branch. Current'
1012
                                 ' formats are: default, knit, metaweave and'
1013
                                 ' weave. Default is knit; metaweave and'
1014
                                 ' weave are deprecated',
1553.5.78 by Martin Pool
New bzr init --format option and test
1015
                            type=get_format_type),
1016
                     ]
1017
    def run(self, location=None, format=None):
1694.2.6 by Martin Pool
[merge] bzr.dev
1018
        if format is None:
1019
            format = get_format_type('default')
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
1020
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1021
            location = u'.'
1830.4.5 by Wouter van Heyst
cleanup
1022
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1023
        to_transport = transport.get_transport(location)
1830.4.5 by Wouter van Heyst
cleanup
1024
1025
        # The path has to exist to initialize a
1026
        # branch inside of it.
1027
        # Just using os.mkdir, since I don't
1028
        # believe that we want to create a bunch of
1029
        # locations if the user supplies an extended path
1030
        # TODO: create-prefix
1031
        try:
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1032
            to_transport.mkdir('.')
1830.4.8 by Wouter van Heyst
clean up imports (and get if collapsing right)
1033
        except errors.FileExists:
1830.4.5 by Wouter van Heyst
cleanup
1034
            pass
1830.4.1 by Wouter van Heyst
Allow bzr init to create remote branches
1035
                    
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1036
        try:
1662.1.19 by Martin Pool
Better error message when initting existing tree
1037
            existing_bzrdir = bzrdir.BzrDir.open(location)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1038
        except NotBranchError:
1662.1.19 by Martin Pool
Better error message when initting existing tree
1039
            # really a NotBzrDir error...
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1040
            bzrdir.BzrDir.create_branch_convenience(location, format=format)
1041
        else:
1662.1.19 by Martin Pool
Better error message when initting existing tree
1042
            if existing_bzrdir.has_branch():
1830.4.8 by Wouter van Heyst
clean up imports (and get if collapsing right)
1043
                if (isinstance(to_transport, LocalTransport)
1044
                    and not existing_bzrdir.has_workingtree()):
1830.4.1 by Wouter van Heyst
Allow bzr init to create remote branches
1045
                        raise errors.BranchExistsWithoutWorkingTree(location)
1046
                raise errors.AlreadyBranchError(location)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1047
            else:
1662.1.19 by Martin Pool
Better error message when initting existing tree
1048
                existing_bzrdir.create_branch()
1049
                existing_bzrdir.create_workingtree()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1050
1051
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1052
class cmd_init_repository(Command):
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1053
    """Create a shared repository to hold branches.
1054
1055
    New branches created under the repository directory will store their revisions
1056
    in the repository, not in the branch directory, if the branch format supports
1057
    shared storage.
1058
1662.1.11 by Martin Pool
Better help for init-repo (Erik)
1059
    example:
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1060
        bzr init-repo repo
1662.1.11 by Martin Pool
Better help for init-repo (Erik)
1061
        bzr init repo/trunk
1062
        bzr checkout --lightweight repo/trunk trunk-checkout
1063
        cd trunk-checkout
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1064
        (add files here)
1065
    """
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1066
    takes_args = ["location"] 
1067
    takes_options = [Option('format', 
1694.2.6 by Martin Pool
[merge] bzr.dev
1068
                            help='Specify a format for this repository.'
1069
                                 ' Current formats are: default, knit,'
1070
                                 ' metaweave and weave. Default is knit;'
1071
                                 ' metaweave and weave are deprecated',
1624.2.1 by Erik Bågfors
support for --tree in bzr init-repo
1072
                            type=get_format_type),
1624.2.4 by Erik Bågfors
rename --tree to --trees
1073
                     Option('trees',
1624.2.1 by Erik Bågfors
support for --tree in bzr init-repo
1074
                             help='Allows branches in repository to have'
1075
                             ' a working tree')]
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1076
    aliases = ["init-repo"]
1624.2.4 by Erik Bågfors
rename --tree to --trees
1077
    def run(self, location, format=None, trees=False):
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1078
        if format is None:
1694.2.6 by Martin Pool
[merge] bzr.dev
1079
            format = get_format_type('default')
1830.4.5 by Wouter van Heyst
cleanup
1080
1081
        if location is None:
1082
            location = '.'
1083
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1084
        to_transport = transport.get_transport(location)
1830.4.5 by Wouter van Heyst
cleanup
1085
        try:
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1086
            to_transport.mkdir('.')
1830.4.8 by Wouter van Heyst
clean up imports (and get if collapsing right)
1087
        except errors.FileExists:
1830.4.5 by Wouter van Heyst
cleanup
1088
            pass
1089
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1090
        newdir = format.initialize_on_transport(to_transport)
1558.5.2 by Aaron Bentley
Created *shared* repositories...
1091
        repo = newdir.create_repository(shared=True)
1624.2.4 by Erik Bågfors
rename --tree to --trees
1092
        repo.set_make_working_trees(trees)
1558.5.1 by Aaron Bentley
Added make-repository command
1093
1094
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1095
class cmd_diff(Command):
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1096
    """Show differences in the working tree or between revisions.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1097
    
1098
    If files are listed, only the changes in those files are listed.
1099
    Otherwise, all changes for the tree are listed.
1100
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1101
    "bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1102
    produces patches suitable for "patch -p1".
1103
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1104
    examples:
1105
        bzr diff
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1106
            Shows the difference in the working tree versus the last commit
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1107
        bzr diff -r1
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1108
            Difference between the working tree and revision 1
1185.1.2 by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd
1109
        bzr diff -r1..2
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1110
            Difference between revision 2 and revision 1
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1111
        bzr diff --diff-prefix old/:new/
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1112
            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.
1113
        bzr diff bzr.mine bzr.dev
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1114
            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.
1115
        bzr diff foo.c
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1116
            Show just the differences for 'foo.c'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1117
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1118
    # TODO: Option to use external diff command; could be GNU diff, wdiff,
1119
    #       or a graphical diff.
1120
1121
    # TODO: Python difflib is not exactly the same as unidiff; should
1122
    #       either fix it up or prefer to use an external diff.
1123
1124
    # TODO: Selected-file diff is inefficient and doesn't show you
1125
    #       deleted files.
1126
1127
    # TODO: This probably handles non-Unix newlines poorly.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1128
    
1129
    takes_args = ['file*']
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1130
    takes_options = ['revision', 'diff-options', 'prefix']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1131
    aliases = ['di', 'dif']
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1132
    encoding_type = 'exact'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1133
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1134
    @display_command
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1135
    def run(self, revision=None, file_list=None, diff_options=None,
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1136
            prefix=None):
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1137
        from bzrlib.diff import diff_cmd_helper, show_diff_trees
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1138
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1139
        if (prefix is None) or (prefix == '0'):
1140
            # diff -p0 format
1694.2.1 by Martin Pool
Remove 'a/', 'b/' default prefixes on diff output.
1141
            old_label = ''
1142
            new_label = ''
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1143
        elif prefix == '1':
1144
            old_label = 'old/'
1145
            new_label = 'new/'
1146
        else:
1147
            if not ':' in prefix:
1148
                 raise BzrError("--diff-prefix expects two values separated by a colon")
1149
            old_label, new_label = prefix.split(":")
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1150
        
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1151
        try:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1152
            tree1, file_list = internal_tree_files(file_list)
1153
            tree2 = None
1508.1.15 by Robert Collins
Merge from mpool.
1154
            b = None
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1155
            b2 = None
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
1156
        except FileInWrongBranch:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1157
            if len(file_list) != 2:
1158
                raise BzrCommandError("Files are in different branches")
1159
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1160
            tree1, file1 = WorkingTree.open_containing(file_list[0])
1161
            tree2, file2 = WorkingTree.open_containing(file_list[1])
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1162
            if file1 != "" or file2 != "":
1508.1.15 by Robert Collins
Merge from mpool.
1163
                # FIXME diff those two files. rbc 20051123
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1164
                raise BzrCommandError("Files are in different branches")
1165
            file_list = None
1732.3.1 by Matthieu Moy
Implementation of -r revno:N:/path/to/branch
1166
        except NotBranchError:
1881.1.2 by Matthieu Moy
Formatting and style for the last patch.
1167
            if (revision is not None and len(revision) == 2
1881.1.4 by Matthieu Moy
needs_tree -> needs_branch
1168
                and not revision[0].needs_branch()
1169
                and not revision[1].needs_branch()):
1711.2.100 by John Arbash Meinel
clean up comment.
1170
                # If both revision specs include a branch, we can
1171
                # diff them without needing a local working tree
1881.1.2 by Matthieu Moy
Formatting and style for the last patch.
1172
                tree1, tree2 = None, None
1881.1.1 by Matthieu Moy
Fixed and tested "bzr diff" outside a working tree.
1173
            else:
1174
                raise
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1175
        if revision is not None:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1176
            if tree2 is not None:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1177
                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.
1178
            if (len(revision) == 1) or (revision[1].spec is None):
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1179
                return diff_cmd_helper(tree1, file_list, diff_options,
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1180
                                       revision[0], 
1181
                                       old_label=old_label, new_label=new_label)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1182
            elif len(revision) == 2:
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1183
                return diff_cmd_helper(tree1, file_list, diff_options,
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1184
                                       revision[0], revision[1],
1185
                                       old_label=old_label, new_label=new_label)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1186
            else:
1187
                raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
1188
        else:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1189
            if tree2 is not None:
1190
                return show_diff_trees(tree1, tree2, sys.stdout, 
1191
                                       specific_files=file_list,
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1192
                                       external_diff_options=diff_options,
1193
                                       old_label=old_label, new_label=new_label)
1508.1.15 by Robert Collins
Merge from mpool.
1194
            else:
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1195
                return diff_cmd_helper(tree1, file_list, diff_options,
1196
                                       old_label=old_label, new_label=new_label)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1197
1198
1199
class cmd_deleted(Command):
1200
    """List files deleted in the working tree.
1201
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1202
    # TODO: Show files deleted since a previous revision, or
1203
    # between two revisions.
1204
    # TODO: Much more efficient way to do this: read in new
1205
    # directories with readdir, rather than stating each one.  Same
1206
    # level of effort but possibly much less IO.  (Or possibly not,
1207
    # if the directories are very large...)
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1208
    takes_options = ['show-ids']
1209
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1210
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1211
    def run(self, show_ids=False):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1212
        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()
1213
        old = tree.basis_tree()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1214
        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
1215
            if not tree.has_id(ie.file_id):
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1216
                self.outf.write(path)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1217
                if show_ids:
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1218
                    self.outf.write(' ')
1219
                    self.outf.write(ie.file_id)
1220
                self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1221
1222
1223
class cmd_modified(Command):
1224
    """List files modified in working tree."""
1225
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1226
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1227
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1228
        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.
1229
        td = tree.changes_from(tree.basis_tree())
1398 by Robert Collins
integrate in Gustavos x-bit patch
1230
        for path, id, kind, text_modified, meta_modified in td.modified:
1685.1.80 by Wouter van Heyst
more code cleanup
1231
            self.outf.write(path + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1232
1233
1234
class cmd_added(Command):
1235
    """List files added in working tree."""
1236
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1237
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1238
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1239
        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()
1240
        basis_inv = wt.basis_tree().inventory
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1241
        inv = wt.inventory
1242
        for file_id in inv:
1243
            if file_id in basis_inv:
1244
                continue
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
1245
            if inv.is_root(file_id) and len(basis_inv) == 0:
1246
                continue
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1247
            path = inv.id2path(file_id)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1248
            if not os.access(osutils.abspath(path), os.F_OK):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1249
                continue
1685.1.80 by Wouter van Heyst
more code cleanup
1250
            self.outf.write(path + '\n')
1185.85.53 by John Arbash Meinel
Updated cmd_root
1251
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1252
1253
class cmd_root(Command):
1254
    """Show the tree root directory.
1255
1256
    The root is the nearest enclosing directory with a .bzr control
1257
    directory."""
1258
    takes_args = ['filename?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1259
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1260
    def run(self, filename=None):
1261
        """Print the branch root."""
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1262
        tree = WorkingTree.open_containing(filename)[0]
1685.1.80 by Wouter van Heyst
more code cleanup
1263
        self.outf.write(tree.basedir + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1264
1265
1266
class cmd_log(Command):
1626.1.2 by Martin Pool
Better help message for log command.
1267
    """Show log of a branch, file, or directory.
1268
1269
    By default show the log of the branch containing the working directory.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1270
1185.16.153 by Martin Pool
[patch] fix help for bzr log (Matthieu)
1271
    To request a range of logs, you can use the command -r begin..end
1272
    -r revision requests a specific revision, -r ..end or -r begin.. are
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1273
    also valid.
1626.1.2 by Martin Pool
Better help message for log command.
1274
1275
    examples:
1276
        bzr log
1277
        bzr log foo.c
1278
        bzr log -r -10.. http://server/branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1279
    """
1280
1393.1.55 by Martin Pool
doc
1281
    # TODO: Make --revision support uuid: and hash: [future tag:] notation.
1282
1626.1.2 by Martin Pool
Better help message for log command.
1283
    takes_args = ['location?']
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1284
    takes_options = [Option('forward', 
1285
                            help='show from oldest to newest'),
1626.1.2 by Martin Pool
Better help message for log command.
1286
                     'timezone', 
1287
                     Option('verbose', 
1288
                             help='show files changed in each revision'),
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1289
                     'show-ids', 'revision',
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1290
                     'log-format',
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
1291
                     'line', 'long', 
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1292
                     Option('message',
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1293
                            help='show revisions whose message matches this regexp',
1294
                            type=str),
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
1295
                     'short',
1185.16.57 by Martin Pool
[merge] from aaron
1296
                     ]
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()
1297
    encoding_type = 'replace'
1298
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1299
    @display_command
1626.1.2 by Martin Pool
Better help message for log command.
1300
    def run(self, location=None, timezone='original',
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1301
            verbose=False,
1302
            show_ids=False,
1303
            forward=False,
1304
            revision=None,
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1305
            log_format=None,
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1306
            message=None,
1307
            long=False,
1185.12.25 by Aaron Bentley
Added one-line log format
1308
            short=False,
1309
            line=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1310
        from bzrlib.log import log_formatter, show_log
1185.16.49 by mbp at sourcefrog
- more refactoring and tests of commandline
1311
        assert message is None or isinstance(message, basestring), \
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1312
            "invalid message argument %r" % message
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1313
        direction = (forward and 'forward') or 'reverse'
1314
        
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1315
        # log everything
1316
        file_id = None
1626.1.2 by Martin Pool
Better help message for log command.
1317
        if location:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1318
            # find the file id to log:
1319
1626.1.2 by Martin Pool
Better help message for log command.
1320
            dir, fp = bzrdir.BzrDir.open_containing(location)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1321
            b = dir.open_branch()
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1322
            if fp != '':
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1323
                try:
1324
                    # might be a tree:
1325
                    inv = dir.open_workingtree().inventory
1326
                except (errors.NotBranchError, errors.NotLocalUrl):
1327
                    # either no tree, or is remote.
1328
                    inv = b.basis_tree().inventory
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1329
                file_id = inv.path2id(fp)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1330
        else:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1331
            # local dir only
1332
            # 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.
1333
            dir, relpath = bzrdir.BzrDir.open_containing('.')
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1334
            b = dir.open_branch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1335
1336
        if revision is None:
1337
            rev1 = None
1338
            rev2 = None
1339
        elif len(revision) == 1:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1340
            rev1 = rev2 = revision[0].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1341
        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
1342
            if revision[0].spec is None:
1343
                # missing begin-range means first revision
1344
                rev1 = 1
1345
            else:
1346
                rev1 = revision[0].in_history(b).revno
1347
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
1348
            if revision[1].spec is None:
1349
                # missing end-range means last known revision
1350
                rev2 = b.revno()
1351
            else:
1352
                rev2 = revision[1].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1353
        else:
1354
            raise BzrCommandError('bzr log --revision takes one or two values.')
1355
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
1356
        # By this point, the revision numbers are converted to the +ve
1357
        # form if they were supplied in the -ve form, so we can do
1358
        # this comparison in relative safety
1359
        if rev1 > rev2:
1360
            (rev2, rev1) = (rev1, rev2)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1361
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1362
        if (log_format == None):
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
1363
            default = b.get_config().log_format()
1364
            log_format = get_log_format(long=long, short=short, line=line, 
1365
                                        default=default)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1366
        lf = log_formatter(log_format,
1367
                           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()
1368
                           to_file=self.outf,
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1369
                           show_timezone=timezone)
1370
1371
        show_log(b,
1372
                 lf,
1373
                 file_id,
1374
                 verbose=verbose,
1375
                 direction=direction,
1376
                 start_revision=rev1,
1377
                 end_revision=rev2,
1378
                 search=message)
1379
1185.85.4 by John Arbash Meinel
currently broken, trying to fix things up.
1380
1553.2.4 by Erik Bågfors
Support for setting the default log format at a configuration option
1381
def get_log_format(long=False, short=False, line=False, default='long'):
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
1382
    log_format = default
1383
    if long:
1384
        log_format = 'long'
1385
    if short:
1386
        log_format = 'short'
1387
    if line:
1388
        log_format = 'line'
1389
    return log_format
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1390
1391
1392
class cmd_touching_revisions(Command):
1393
    """Return revision-ids which affected a particular file.
1394
1685.1.80 by Wouter van Heyst
more code cleanup
1395
    A more user-friendly interface is "bzr log FILE".
1396
    """
1397
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1398
    hidden = True
1399
    takes_args = ["filename"]
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1400
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1401
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1402
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1403
        tree, relpath = WorkingTree.open_containing(filename)
1404
        b = tree.branch
1405
        inv = tree.read_working_inventory()
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1406
        file_id = inv.path2id(relpath)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1407
        for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1408
            self.outf.write("%6d %s\n" % (revno, what))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1409
1410
1411
class cmd_ls(Command):
1412
    """List files in a tree.
1413
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1414
    # TODO: Take a revision or remote path and list that tree instead.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1415
    hidden = True
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1416
    takes_options = ['verbose', 'revision',
1417
                     Option('non-recursive',
1418
                            help='don\'t recurse into sub-directories'),
1419
                     Option('from-root',
1420
                            help='Print all paths from the root of the branch.'),
1421
                     Option('unknown', help='Print unknown files'),
1422
                     Option('versioned', help='Print versioned files'),
1423
                     Option('ignored', help='Print ignored files'),
1424
1425
                     Option('null', help='Null separate the files'),
1426
                    ]
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1427
    @display_command
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1428
    def run(self, revision=None, verbose=False, 
1429
            non_recursive=False, from_root=False,
1430
            unknown=False, versioned=False, ignored=False,
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1431
            null=False):
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1432
1433
        if verbose and null:
1434
            raise BzrCommandError('Cannot set both --verbose and --null')
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1435
        all = not (unknown or versioned or ignored)
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1436
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1437
        selection = {'I':ignored, '?':unknown, 'V':versioned}
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1438
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1439
        tree, relpath = WorkingTree.open_containing(u'.')
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1440
        if from_root:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1441
            relpath = u''
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1442
        elif relpath:
1443
            relpath += '/'
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1444
        if revision is not None:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1445
            tree = tree.branch.repository.revision_tree(
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1446
                revision[0].in_history(tree.branch).rev_id)
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1447
1448
        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.
1449
            if fp.startswith(relpath):
1450
                fp = fp[len(relpath):]
1451
                if non_recursive and '/' in fp:
1452
                    continue
1453
                if not all and not selection[fc]:
1454
                    continue
1455
                if verbose:
1456
                    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()
1457
                    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.
1458
                elif null:
1685.1.80 by Wouter van Heyst
more code cleanup
1459
                    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()
1460
                    self.outf.flush()
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1461
                else:
1685.1.80 by Wouter van Heyst
more code cleanup
1462
                    self.outf.write(fp + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1463
1464
1465
class cmd_unknowns(Command):
1466
    """List unknown files."""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1467
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1468
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1469
        for f in WorkingTree.open_containing(u'.')[0].unknowns():
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
1470
            self.outf.write(osutils.quotefn(f) + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1471
1472
1473
class cmd_ignore(Command):
1474
    """Ignore a command or pattern.
1475
1476
    To remove patterns from the ignore list, edit the .bzrignore file.
1477
1478
    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
1479
    from the branch root.  Otherwise, it is compared to only the last
1480
    component of the path.  To match a file only in the root directory,
1481
    prepend './'.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1482
1483
    Ignore patterns are case-insensitive on case-insensitive systems.
1484
1485
    Note: wildcards must be quoted from the shell on Unix.
1486
1487
    examples:
1488
        bzr ignore ./Makefile
1489
        bzr ignore '*.class'
1490
    """
1185.16.4 by Martin Pool
- doc and todo for ignore command
1491
    # 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.
1492
    takes_args = ['name_pattern?']
1493
    takes_options = [
1494
                     Option('old-default-rules',
1495
                            help='Out the ignore rules bzr < 0.9 always used.')
1496
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1497
    
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
1498
    def run(self, name_pattern=None, old_default_rules=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1499
        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.
1500
        if old_default_rules is not None:
1501
            # 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.
1502
            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.
1503
                print pattern
1504
            return
1505
        if name_pattern is None:
1506
            raise BzrCommandError("ignore requires a NAME_PATTERN")
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1507
        tree, relpath = WorkingTree.open_containing(u'.')
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1508
        ifn = tree.abspath('.bzrignore')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1509
        if os.path.exists(ifn):
1510
            f = open(ifn, 'rt')
1511
            try:
1512
                igns = f.read().decode('utf-8')
1513
            finally:
1514
                f.close()
1515
        else:
1516
            igns = ''
1517
1518
        # TODO: If the file already uses crlf-style termination, maybe
1519
        # we should use that for the newly added lines?
1520
1521
        if igns and igns[-1] != '\n':
1522
            igns += '\n'
1523
        igns += name_pattern + '\n'
1524
1704.2.22 by Martin Pool
Fix misplaced try/finally (Debian #352791, madduck)
1525
        f = AtomicFile(ifn, 'wt')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1526
        try:
1527
            f.write(igns.encode('utf-8'))
1528
            f.commit()
1529
        finally:
1530
            f.close()
1531
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1532
        inv = tree.inventory
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1533
        if inv.path2id('.bzrignore'):
1534
            mutter('.bzrignore is already versioned')
1535
        else:
1536
            mutter('need to make new .bzrignore file versioned')
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
1537
            tree.add(['.bzrignore'])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1538
1539
1540
class cmd_ignored(Command):
1541
    """List ignored files and the patterns that matched them.
1542
1543
    See also: bzr ignore"""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1544
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1545
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1546
        tree = WorkingTree.open_containing(u'.')[0]
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
1547
        for path, file_class, kind, file_id, entry in tree.list_files():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1548
            if file_class != 'I':
1549
                continue
1550
            ## XXX: Slightly inefficient since this was already calculated
1551
            pat = tree.is_ignored(path)
1552
            print '%-50s %s' % (path, pat)
1553
1554
1555
class cmd_lookup_revision(Command):
1556
    """Lookup the revision-id from a revision-number
1557
1558
    example:
1559
        bzr lookup-revision 33
1560
    """
1561
    hidden = True
1562
    takes_args = ['revno']
1563
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1564
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1565
    def run(self, revno):
1566
        try:
1567
            revno = int(revno)
1568
        except ValueError:
1569
            raise BzrCommandError("not a valid revision-number: %r" % revno)
1570
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1571
        print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1572
1573
1574
class cmd_export(Command):
1575
    """Export past revision to destination directory.
1576
1577
    If no revision is specified this exports the last committed revision.
1578
1579
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
1580
    given, try to find the format with the extension. If no extension
1581
    is found exports to a directory (equivalent to --format=dir).
1582
1583
    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
1584
    is given, the top directory will be the root name of the file.
1585
1586
    Note: export of tree with non-ascii filenames to zip is not supported.
1587
1551.3.11 by Aaron Bentley
Merge from Robert
1588
     Supported formats       Autodetected by extension
1589
     -----------------       -------------------------
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
1590
         dir                            -
1591
         tar                          .tar
1592
         tbz2                    .tar.bz2, .tbz2
1593
         tgz                      .tar.gz, .tgz
1594
         zip                          .zip
1595
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1596
    takes_args = ['dest']
1597
    takes_options = ['revision', 'format', 'root']
1598
    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.
1599
        from bzrlib.export import export
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1600
        tree = WorkingTree.open_containing(u'.')[0]
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1601
        b = tree.branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1602
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1603
            # should be tree.last_revision  FIXME
1241 by Martin Pool
- rename last_patch to last_revision
1604
            rev_id = b.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1605
        else:
1606
            if len(revision) != 1:
1607
                raise BzrError('bzr export --revision takes exactly 1 argument')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1608
            rev_id = revision[0].in_history(b).rev_id
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1609
        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.
1610
        try:
1611
            export(t, dest, format, root)
1612
        except errors.NoSuchExportFormat, e:
1613
            raise BzrCommandError('Unsupported export format: %s' % e.format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1614
1615
1616
class cmd_cat(Command):
1617
    """Write a file's text from a previous revision."""
1618
1619
    takes_options = ['revision']
1620
    takes_args = ['filename']
1621
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1622
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1623
    def run(self, filename, revision=None):
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1624
        if revision is not None and len(revision) != 1:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1625
            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
1626
        tree = None
1627
        try:
1628
            tree, relpath = WorkingTree.open_containing(filename)
1629
            b = tree.branch
1630
        except NotBranchError:
1631
            pass
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1632
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1633
        if tree is None:
1634
            b, relpath = Branch.open_containing(filename)
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1635
        if revision is None:
1636
            revision_id = b.last_revision()
1637
        else:
1638
            revision_id = revision[0].in_history(b).rev_id
1639
        b.print_file(relpath, revision_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1640
1641
1642
class cmd_local_time_offset(Command):
1643
    """Show the offset in seconds from GMT to local time."""
1644
    hidden = True    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1645
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1646
    def run(self):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1647
        print osutils.local_time_offset()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1648
1649
1650
1651
class cmd_commit(Command):
1652
    """Commit changes into a new revision.
1653
    
1654
    If no arguments are given, the entire tree is committed.
1655
1656
    If selected files are specified, only changes to those files are
1657
    committed.  If a directory is specified then the directory and everything 
1658
    within it is committed.
1659
1660
    A selected-file commit may fail in some cases where the committed
1661
    tree would be invalid, such as trying to commit a file in a
1662
    newly-added directory that is not itself committed.
1663
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1664
    # TODO: Run hooks on tree to-be-committed, and after commit.
1665
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1666
    # TODO: Strict commit that fails if there are deleted files.
1667
    #       (what does "deleted files" mean ??)
1668
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1669
    # TODO: Give better message for -s, --summary, used by tla people
1670
1671
    # XXX: verbose currently does nothing
1672
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1673
    takes_args = ['selected*']
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1674
    takes_options = ['message', 'verbose', 
1675
                     Option('unchanged',
1676
                            help='commit even if nothing has changed'),
1677
                     Option('file', type=str, 
1678
                            argname='msgfile',
1679
                            help='file containing commit message'),
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1680
                     Option('strict',
1681
                            help="refuse to commit if there are unknown "
1682
                            "files in the working tree."),
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1683
                     Option('local',
1684
                            help="perform a local only commit in a bound "
1685
                                 "branch. Such commits are not pushed to "
1686
                                 "the master branch until a normal commit "
1687
                                 "is performed."
1688
                            ),
1185.16.43 by Martin Pool
- clean up handling of option objects
1689
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1690
    aliases = ['ci', 'checkin']
1691
1692
    def run(self, message=None, file=None, verbose=True, selected_list=None,
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1693
            unchanged=False, strict=False, local=False):
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1694
        from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1695
        from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1696
                StrictCommitFailed)
1185.33.76 by Martin Pool
Fix import error.
1697
        from bzrlib.msgeditor import edit_commit_message, \
1698
                make_commit_message_template
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
1699
        from tempfile import TemporaryFile
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1700
1185.33.77 by Martin Pool
doc
1701
        # TODO: Need a blackbox test for invoking the external editor; may be
1702
        # slightly problematic to run this cross-platform.
1703
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
1704
        # TODO: do more checks that the commit will succeed before 
1705
        # spending the user's valuable time typing a commit message.
1706
        #
1707
        # TODO: if the commit *does* happen to fail, then save the commit 
1708
        # 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
1709
        tree, selected_list = tree_files(selected_list)
1704.2.11 by Martin Pool
Handle 'bzr commit DIR' when dir contains pending merges.
1710
        if selected_list == ['']:
1711
            # workaround - commit of root of tree should be exactly the same
1712
            # as just default commit in that tree, and succeed even though
1713
            # selected-file merge commit is not done yet
1714
            selected_list = []
1715
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1716
        if local and not tree.branch.get_bound_location():
1717
            raise errors.LocalRequiresBoundBranch()
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1718
        if message is None and not file:
1185.33.76 by Martin Pool
Fix import error.
1719
            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
1720
            message = edit_commit_message(template)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1721
            if message is None:
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1722
                raise BzrCommandError("please specify a commit message"
1723
                                      " with either --message or --file")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1724
        elif message and file:
1725
            raise BzrCommandError("please specify either --message or --file")
1726
        
1727
        if file:
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
1728
            message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1729
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1730
        if message == "":
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1731
            raise BzrCommandError("empty commit message specified")
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1732
        
1733
        if verbose:
1734
            reporter = ReportCommitToLog()
1735
        else:
1736
            reporter = NullCommitReporter()
1737
        
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1738
        try:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1739
            tree.commit(message, specific_files=selected_list,
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1740
                        allow_pointless=unchanged, strict=strict, local=local,
1741
                        reporter=reporter)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1742
        except PointlessCommit:
1743
            # FIXME: This should really happen before the file is read in;
1744
            # 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.
1745
            raise BzrCommandError("no changes to commit."
1746
                                  " use --unchanged to commit anyhow")
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
1747
        except ConflictsInTree:
1748
            raise BzrCommandError("Conflicts detected in working tree.  "
1749
                'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1750
        except StrictCommitFailed:
1751
            raise BzrCommandError("Commit refused because there are unknown "
1752
                                  "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
1753
        except errors.BoundBranchOutOfDate, e:
1878.3.1 by Adeodato Simó
cmd_commit.run:
1754
            raise BzrCommandError(str(e) + "\n"
1878.3.2 by Adeodato Simó
Update with suggestions from John Arbash Meinel.
1755
                'To commit to master branch, run update and then commit.\n'
1756
                'You can also pass --local to commit to continue working '
1757
                'disconnected.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1758
1759
class cmd_check(Command):
1760
    """Validate consistency of branch history.
1761
1762
    This command checks various invariants about the branch storage to
1763
    detect data corruption or bzr bugs.
1764
    """
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1765
    takes_args = ['branch?']
1449 by Robert Collins
teach check about ghosts
1766
    takes_options = ['verbose']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1767
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1768
    def run(self, branch=None, verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1769
        from bzrlib.check import check
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1770
        if branch is None:
1771
            tree = WorkingTree.open_containing()[0]
1772
            branch = tree.branch
1773
        else:
1774
            branch = Branch.open(branch)
1775
        check(branch, verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1776
1777
1778
class cmd_scan_cache(Command):
1779
    hidden = True
1780
    def run(self):
1781
        from bzrlib.hashcache import HashCache
1782
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1783
        c = HashCache(u'.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1784
        c.read()
1785
        c.scan()
1786
            
1787
        print '%6d stats' % c.stat_count
1788
        print '%6d in hashcache' % len(c._cache)
1789
        print '%6d files removed from cache' % c.removed_count
1790
        print '%6d hashes updated' % c.update_count
1791
        print '%6d files changed too recently to cache' % c.danger_count
1792
1793
        if c.needs_write:
1794
            c.write()
1534.5.16 by Robert Collins
Review feedback.
1795
1796
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1797
class cmd_upgrade(Command):
1798
    """Upgrade branch storage to current format.
1799
1800
    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.
1801
    this command. When the default format has changed you may also be warned
1802
    during other operations to upgrade.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1803
    """
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
1804
    takes_args = ['url?']
1534.5.13 by Robert Collins
Correct buggy test.
1805
    takes_options = [
1806
                     Option('format', 
1694.2.6 by Martin Pool
[merge] bzr.dev
1807
                            help='Upgrade to a specific format. Current formats'
1808
                                 ' are: default, knit, metaweave and weave.'
1809
                                 ' Default is knit; metaweave and weave are'
1810
                                 ' deprecated',
1534.5.13 by Robert Collins
Correct buggy test.
1811
                            type=get_format_type),
1812
                    ]
1813
1814
1815
    def run(self, url='.', format=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1816
        from bzrlib.upgrade import upgrade
1694.2.6 by Martin Pool
[merge] bzr.dev
1817
        if format is None:
1818
            format = get_format_type('default')
1534.5.13 by Robert Collins
Correct buggy test.
1819
        upgrade(url, format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1820
1821
1822
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
1823
    """Show or set bzr user id.
1824
    
1825
    examples:
1826
        bzr whoami --email
1827
        bzr whoami 'Frank Chu <fchu@example.com>'
1828
    """
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
1829
    takes_options = [ Option('email',
1830
                             help='display email address only'),
1831
                      Option('branch',
1832
                             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
1833
                                  'globally'),
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
1834
                    ]
1835
    takes_args = ['name?']
1836
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1837
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1838
    @display_command
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
1839
    def run(self, email=False, branch=False, name=None):
1840
        if name is None:
1841
            # use branch if we're inside one; otherwise global config
1842
            try:
1816.2.10 by Robey Pointer
code style changes
1843
                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
1844
            except NotBranchError:
1845
                c = config.GlobalConfig()
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
1846
            if email:
1816.2.10 by Robey Pointer
code style changes
1847
                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
1848
            else:
1816.2.10 by Robey Pointer
code style changes
1849
                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
1850
            return
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
1851
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
1852
        # display a warning if an email address isn't included in the given name.
1853
        try:
1854
            config.extract_email_address(name)
1855
        except BzrError, e:
1840.1.5 by Robey Pointer
change the warning message for a 'whoami' with no email address, on jam's recommendation
1856
            warning('"%s" does not seem to contain an email address.  '
1857
                    '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
1858
        
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
1859
        # use global config unless --branch given
1860
        if branch:
1816.2.10 by Robey Pointer
code style changes
1861
            c = Branch.open_containing('.')[0].get_config()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1862
        else:
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
1863
            c = config.GlobalConfig()
1864
        c.set_user_option('email', name)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1865
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.
1866
1185.35.14 by Aaron Bentley
Implemented nick command
1867
class cmd_nick(Command):
1551.3.11 by Aaron Bentley
Merge from Robert
1868
    """Print or set the branch nickname.  
1869
1185.35.14 by Aaron Bentley
Implemented nick command
1870
    If unset, the tree root directory name is used as the nickname
1871
    To print the current nickname, execute with no argument.  
1872
    """
1873
    takes_args = ['nickname?']
1874
    def run(self, nickname=None):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1875
        branch = Branch.open_containing(u'.')[0]
1185.35.14 by Aaron Bentley
Implemented nick command
1876
        if nickname is None:
1877
            self.printme(branch)
1878
        else:
1879
            branch.nick = nickname
1880
1881
    @display_command
1882
    def printme(self, branch):
1883
        print branch.nick 
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1884
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.
1885
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1886
class cmd_selftest(Command):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1887
    """Run internal test suite.
1888
    
1889
    This creates temporary test directories in the working directory,
1890
    but not existing data is affected.  These directories are deleted
1891
    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
1892
    fail and --keep-output is specified.
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1893
    
1894
    If arguments are given, they are regular expressions that say
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1895
    which tests should run.
1552 by Martin Pool
Improved help text for bzr selftest
1896
1897
    If the global option '--no-plugins' is given, plugins are not loaded
1898
    before running the selftests.  This has two effects: features provided or
1899
    modified by plugins will not be tested, and tests provided by plugins will
1900
    not be run.
1901
1902
    examples:
1903
        bzr selftest ignore
1904
        bzr --no-plugins selftest -v
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1905
    """
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1906
    # 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.
1907
1908
    # NB: this is used from the class without creating an instance, which is
1909
    # why it does not have a self parameter.
1910
    def get_transport_type(typestring):
1911
        """Parse and return a transport specifier."""
1912
        if typestring == "sftp":
1913
            from bzrlib.transport.sftp import SFTPAbsoluteServer
1914
            return SFTPAbsoluteServer
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1915
        if typestring == "memory":
1916
            from bzrlib.transport.memory import MemoryServer
1917
            return MemoryServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
1918
        if typestring == "fakenfs":
1558.10.2 by Robert Collins
Refactor the FakeNFS support into a TransportDecorator.
1919
            from bzrlib.transport.fakenfs import FakeNFSServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
1920
            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.
1921
        msg = "No known transport type %s. Supported types are: sftp\n" %\
1922
            (typestring)
1923
        raise BzrCommandError(msg)
1924
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1925
    hidden = True
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1926
    takes_args = ['testspecs*']
1552 by Martin Pool
Improved help text for bzr selftest
1927
    takes_options = ['verbose',
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1928
                     Option('one', help='stop when one test fails'),
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1929
                     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.
1930
                            help='keep output directories when tests fail'),
1931
                     Option('transport', 
1932
                            help='Use a different transport by default '
1933
                                 'throughout the test suite.',
1934
                            type=get_transport_type),
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1935
                     Option('benchmark', help='run the bzr bencharks.'),
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1936
                     Option('lsprof-timed',
1937
                            help='generate lsprof output for benchmarked'
1938
                                 ' sections of code.'),
1939
                     ]
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1940
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1941
    def run(self, testspecs_list=None, verbose=None, one=False,
1942
            keep_output=False, transport=None, benchmark=None,
1943
            lsprof_timed=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1944
        import bzrlib.ui
1707.2.2 by Robert Collins
Start on bench_add, an add benchtest.
1945
        from bzrlib.tests import selftest
1946
        import bzrlib.benchmarks as benchmarks
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1947
        # we don't want progress meters from the tests to go to the
1948
        # real output; and we don't want log messages cluttering up
1949
        # the real logs.
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1950
        save_ui = ui.ui_factory
1951
        print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1952
        print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
1953
        print
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1954
        info('running tests...')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1955
        try:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1956
            ui.ui_factory = ui.SilentUIFactory()
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1957
            if testspecs_list is not None:
1958
                pattern = '|'.join(testspecs_list)
1959
            else:
1960
                pattern = ".*"
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1961
            if benchmark:
1707.2.2 by Robert Collins
Start on bench_add, an add benchtest.
1962
                test_suite_factory = benchmarks.test_suite
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1963
                if verbose is None:
1964
                    verbose = True
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1965
            else:
1966
                test_suite_factory = None
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1967
                if verbose is None:
1968
                    verbose = False
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1969
            result = selftest(verbose=verbose, 
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1970
                              pattern=pattern,
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1971
                              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.
1972
                              keep_output=keep_output,
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1973
                              transport=transport,
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1974
                              test_suite_factory=test_suite_factory,
1975
                              lsprof_timed=lsprof_timed)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1976
            if result:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1977
                info('tests passed')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1978
            else:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1979
                info('tests failed')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1980
            return int(not result)
1981
        finally:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1982
            ui.ui_factory = save_ui
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1983
1984
1185.62.8 by John Arbash Meinel
Deprecating bzrlib.get_bzr_revision, in favor of bzrlib.builtins._get_bzr_branch
1985
def _get_bzr_branch():
1986
    """If bzr is run from a branch, return Branch or None"""
1987
    from os.path import dirname
1988
    
1989
    try:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1990
        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
1991
        return branch
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1992
    except errors.BzrError:
1185.62.8 by John Arbash Meinel
Deprecating bzrlib.get_bzr_revision, in favor of bzrlib.builtins._get_bzr_branch
1993
        return None
1994
    
1995
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1996
def show_version():
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1997
    import bzrlib
1861.2.8 by Alexander Belchenko
More branding: bazaar-ng -> Bazaar; bazaar-ng.org -> bazaar-vcs.org
1998
    print "Bazaar (bzr) %s" % bzrlib.__version__
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1999
    # 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
2000
    branch = _get_bzr_branch()
2001
    if branch:
2002
        rh = branch.revision_history()
2003
        revno = len(rh)
1185.62.1 by John Arbash Meinel
bzr --version prints branch nickname.
2004
        print "  bzr checkout, revision %d" % (revno,)
2005
        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
2006
        if rh:
2007
            print "  revid: %s" % (rh[-1],)
1711.2.29 by John Arbash Meinel
[patch] Lalo Martins: add python path information to bzr --version
2008
    print "Using python interpreter:", sys.executable
2009
    import site
2010
    print "Using python standard library:", os.path.dirname(site.__file__)
2011
    print "Using bzrlib:",
2012
    if len(bzrlib.__path__) > 1:
2013
        # print repr, which is a good enough way of making it clear it's
2014
        # more than one element (eg ['/foo/bar', '/foo/bzr'])
2015
        print repr(bzrlib.__path__)
2016
    else:
2017
        print bzrlib.__path__[0]
2018
2019
    print
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2020
    print bzrlib.__copyright__
1185.50.94 by John Arbash Meinel
Updated web page url to http://bazaar-vcs.org
2021
    print "http://bazaar-vcs.org/"
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2022
    print
2023
    print "bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and"
2024
    print "you may use, modify and redistribute it under the terms of the GNU"
2025
    print "General Public License version 2 or later."
2026
2027
2028
class cmd_version(Command):
2029
    """Show version of bzr."""
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2030
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2031
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2032
    def run(self):
2033
        show_version()
2034
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2035
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2036
class cmd_rocks(Command):
2037
    """Statement of optimism."""
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2038
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2039
    hidden = True
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2040
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2041
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2042
    def run(self):
2043
        print "it sure does!"
2044
2045
2046
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.
2047
    """Find and print a base revision for merging two branches."""
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
2048
    # TODO: Options to specify revisions on either side, as if
2049
    #       merging only part of the history.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2050
    takes_args = ['branch', 'other']
2051
    hidden = True
2052
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2053
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2054
    def run(self, branch, other):
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2055
        from bzrlib.revision import common_ancestor, MultipleRevisionSources
2056
        
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
2057
        branch1 = Branch.open_containing(branch)[0]
2058
        branch2 = Branch.open_containing(other)[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2059
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2060
        history_1 = branch1.revision_history()
2061
        history_2 = branch2.revision_history()
2062
1241 by Martin Pool
- rename last_patch to last_revision
2063
        last1 = branch1.last_revision()
2064
        last2 = branch2.last_revision()
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2065
1551.2.2 by Aaron Bentley
Fix find-merge-base for new API [recommit]
2066
        source = MultipleRevisionSources(branch1.repository, 
2067
                                         branch2.repository)
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2068
        
2069
        base_rev_id = common_ancestor(last1, last2, source)
2070
2071
        print 'merge base is revision %s' % base_rev_id
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2072
2073
2074
class cmd_merge(Command):
2075
    """Perform a three-way merge.
2076
    
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2077
    The branch is the branch you will merge from.  By default, it will merge
2078
    the latest revision.  If you specify a revision, that revision will be
2079
    merged.  If you specify two revisions, the first will be used as a BASE,
2080
    and the second one as OTHER.  Revision numbers are always relative to the
2081
    specified branch.
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2082
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
2083
    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
2084
    branch, automatically determining an appropriate base.  If this
2085
    fails, you may need to give an explicit base.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2086
    
1551.2.18 by Aaron Bentley
Updated docs to clarify conflict handling
2087
    Merge will do its best to combine the changes in two branches, but there
2088
    are some kinds of problems only a human can fix.  When it encounters those,
2089
    it will mark a conflict.  A conflict means that you need to fix something,
2090
    before you should commit.
2091
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
2092
    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
2093
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2094
    If there is no default branch set, the first merge will set it. After
2095
    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.
2096
    default, use --remember. The value will only be saved if the remote
2097
    location can be accessed.
1614.2.2 by Olaf Conradi
Merge command:
2098
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2099
    Examples:
2100
2101
    To merge the latest revision from bzr.dev
2102
    bzr merge ../bzr.dev
2103
2104
    To merge changes up to and including revision 82 from bzr.dev
2105
    bzr merge -r 82 ../bzr.dev
2106
2107
    To merge the changes introduced by 82, without previous changes:
2108
    bzr merge -r 81..82 ../bzr.dev
2109
    
2110
    merge refuses to run if there are any uncommitted changes, unless
2111
    --force is given.
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2112
2113
    The following merge types are available:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2114
    """
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2115
    takes_args = ['branch?']
1614.2.2 by Olaf Conradi
Merge command:
2116
    takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
1185.18.1 by Aaron Bentley
Added --show-base to merge
2117
                     Option('show-base', help="Show base revision text in "
2118
                            "conflicts")]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2119
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2120
    def help(self):
2121
        from merge import merge_type_help
2122
        from inspect import getdoc
2123
        return getdoc(self) + '\n' + merge_type_help() 
2124
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2125
    def run(self, branch=None, revision=None, force=False, merge_type=None,
1614.2.2 by Olaf Conradi
Merge command:
2126
            show_base=False, reprocess=False, remember=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2127
        if merge_type is None:
1534.7.139 by Aaron Bentley
ApplyMerge3 -> Merge3Merger
2128
            merge_type = Merge3Merger
1614.2.2 by Olaf Conradi
Merge command:
2129
2130
        tree = WorkingTree.open_containing(u'.')[0]
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
2131
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2132
        if branch is not None:
2133
            try:
1773.4.3 by Martin Pool
[merge] bzr.dev
2134
                reader = bundle.read_bundle_from_url(branch)
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2135
            except NotABundle:
2136
                pass # Continue on considering this url a Branch
1185.82.25 by Aaron Bentley
Added changeset-merging functionality
2137
            else:
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2138
                conflicts = merge_bundle(reader, tree, not force, merge_type,
2139
                                            reprocess, show_base)
2140
                if conflicts == 0:
2141
                    return 0
2142
                else:
2143
                    return 1
1185.82.25 by Aaron Bentley
Added changeset-merging functionality
2144
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2145
        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
2146
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2147
        if revision is None or len(revision) < 1:
2148
            base = [None, None]
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2149
            other = [branch, -1]
1645.1.1 by Aaron Bentley
Implement single-file merge
2150
            other_branch, path = Branch.open_containing(branch)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2151
        else:
2152
            if len(revision) == 1:
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
2153
                base = [None, None]
1645.1.1 by Aaron Bentley
Implement single-file merge
2154
                other_branch, path = Branch.open_containing(branch)
1185.12.46 by Aaron Bentley
Fixed -r brokenness in merge
2155
                revno = revision[0].in_history(other_branch).revno
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2156
                other = [branch, revno]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2157
            else:
2158
                assert len(revision) == 2
2159
                if None in revision:
2160
                    raise BzrCommandError(
2161
                        "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
2162
                other_branch, path = Branch.open_containing(branch)
2163
2164
                base = [branch, revision[0].in_history(other_branch).revno]
2165
                other = [branch, revision[1].in_history(other_branch).revno]
2166
2167
        if tree.branch.get_parent() is None or remember:
2168
            tree.branch.set_parent(other_branch.base)
2169
1645.1.1 by Aaron Bentley
Implement single-file merge
2170
        if path != "":
2171
            interesting_files = [path]
2172
        else:
2173
            interesting_files = None
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2174
        pb = ui.ui_factory.nested_progress_bar()
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2175
        try:
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2176
            try:
2177
                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
2178
                                       merge_type=merge_type,
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2179
                                       reprocess=reprocess,
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2180
                                       show_base=show_base,
1645.1.1 by Aaron Bentley
Implement single-file merge
2181
                                       pb=pb, file_list=interesting_files)
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2182
            finally:
2183
                pb.finished()
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
2184
            if conflict_count != 0:
2185
                return 1
2186
            else:
2187
                return 0
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2188
        except errors.AmbiguousBase, e:
1173 by Martin Pool
- message typo
2189
            m = ("sorry, bzr can't determine the right merge base yet\n"
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2190
                 "candidates are:\n  "
2191
                 + "\n  ".join(e.bases)
2192
                 + "\n"
2193
                 "please specify an explicit base with -r,\n"
2194
                 "and (if you want) report this to the bzr developers\n")
2195
            log_error(m)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2196
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2197
    # TODO: move up to common parent; this isn't merge-specific anymore. 
2198
    def _get_remembered_parent(self, tree, supplied_location, verb_string):
2199
        """Use tree.branch's parent if none was supplied.
2200
2201
        Report if the remembered location was used.
2202
        """
2203
        if supplied_location is not None:
2204
            return supplied_location
2205
        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
2206
        mutter("%s", stored_location)
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2207
        if stored_location is None:
2208
            raise BzrCommandError("No location specified or remembered")
2209
        display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2210
        self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2211
        return stored_location
2212
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2213
1185.35.4 by Aaron Bentley
Implemented remerge
2214
class cmd_remerge(Command):
2215
    """Redo a merge.
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2216
2217
    Use this if you want to try a different merge technique while resolving
2218
    conflicts.  Some merge techniques are better than others, and remerge 
2219
    lets you try different ones on different files.
2220
2221
    The options for remerge have the same meaning and defaults as the ones for
2222
    merge.  The difference is that remerge can (only) be run when there is a
2223
    pending merge, and it lets you specify particular files.
2224
2225
    Examples:
2226
    $ bzr remerge --show-base
2227
        Re-do the merge of all conflicted files, and show the base text in
2228
        conflict regions, in addition to the usual THIS and OTHER texts.
2229
2230
    $ bzr remerge --merge-type weave --reprocess foobar
2231
        Re-do the merge of "foobar", using the weave merge algorithm, with
2232
        additional processing to reduce the size of conflict regions.
2233
    
2234
    The following merge types are available:"""
1185.35.4 by Aaron Bentley
Implemented remerge
2235
    takes_args = ['file*']
2236
    takes_options = ['merge-type', 'reprocess',
2237
                     Option('show-base', help="Show base revision text in "
2238
                            "conflicts")]
2239
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2240
    def help(self):
2241
        from merge import merge_type_help
2242
        from inspect import getdoc
2243
        return getdoc(self) + '\n' + merge_type_help() 
2244
1185.35.4 by Aaron Bentley
Implemented remerge
2245
    def run(self, file_list=None, merge_type=None, show_base=False,
2246
            reprocess=False):
2247
        from bzrlib.merge import merge_inner, transform_tree
2248
        if merge_type is None:
1534.7.139 by Aaron Bentley
ApplyMerge3 -> Merge3Merger
2249
            merge_type = Merge3Merger
1508.1.15 by Robert Collins
Merge from mpool.
2250
        tree, file_list = tree_files(file_list)
2251
        tree.lock_write()
1185.35.4 by Aaron Bentley
Implemented remerge
2252
        try:
1508.1.15 by Robert Collins
Merge from mpool.
2253
            pending_merges = tree.pending_merges() 
1185.35.4 by Aaron Bentley
Implemented remerge
2254
            if len(pending_merges) != 1:
2255
                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.
2256
                                      " merges.  Not cherrypicking or"
2257
                                      " multi-merges.")
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2258
            repository = tree.branch.repository
1508.1.15 by Robert Collins
Merge from mpool.
2259
            base_revision = common_ancestor(tree.branch.last_revision(), 
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2260
                                            pending_merges[0], repository)
2261
            base_tree = repository.revision_tree(base_revision)
2262
            other_tree = repository.revision_tree(pending_merges[0])
1185.35.4 by Aaron Bentley
Implemented remerge
2263
            interesting_ids = None
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2264
            new_conflicts = []
2265
            conflicts = tree.conflicts()
1185.35.4 by Aaron Bentley
Implemented remerge
2266
            if file_list is not None:
2267
                interesting_ids = set()
2268
                for filename in file_list:
1508.1.15 by Robert Collins
Merge from mpool.
2269
                    file_id = tree.path2id(filename)
1558.2.1 by Aaron Bentley
Ensure remerge errors when file-id is None
2270
                    if file_id is None:
2271
                        raise NotVersionedError(filename)
1185.35.4 by Aaron Bentley
Implemented remerge
2272
                    interesting_ids.add(file_id)
1508.1.15 by Robert Collins
Merge from mpool.
2273
                    if tree.kind(file_id) != "directory":
1185.35.4 by Aaron Bentley
Implemented remerge
2274
                        continue
1185.35.13 by Aaron Bentley
Merged Martin
2275
                    
1508.1.15 by Robert Collins
Merge from mpool.
2276
                    for name, ie in tree.inventory.iter_entries(file_id):
1185.35.4 by Aaron Bentley
Implemented remerge
2277
                        interesting_ids.add(ie.file_id)
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2278
                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()
2279
            transform_tree(tree, tree.basis_tree(), interesting_ids)
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2280
            tree.set_conflicts(ConflictList(new_conflicts))
1185.35.4 by Aaron Bentley
Implemented remerge
2281
            if file_list is None:
1508.1.15 by Robert Collins
Merge from mpool.
2282
                restore_files = list(tree.iter_conflicts())
1185.35.4 by Aaron Bentley
Implemented remerge
2283
            else:
2284
                restore_files = file_list
2285
            for filename in restore_files:
2286
                try:
1508.1.15 by Robert Collins
Merge from mpool.
2287
                    restore(tree.abspath(filename))
1185.35.4 by Aaron Bentley
Implemented remerge
2288
                except NotConflicted:
2289
                    pass
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2290
            conflicts = merge_inner(tree.branch, other_tree, base_tree,
2291
                                    this_tree=tree,
1551.7.12 by Aaron Bentley
Fix spacing
2292
                                    interesting_ids=interesting_ids, 
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2293
                                    other_rev_id=pending_merges[0], 
2294
                                    merge_type=merge_type, 
2295
                                    show_base=show_base,
2296
                                    reprocess=reprocess)
1185.35.4 by Aaron Bentley
Implemented remerge
2297
        finally:
1508.1.15 by Robert Collins
Merge from mpool.
2298
            tree.unlock()
1185.35.4 by Aaron Bentley
Implemented remerge
2299
        if conflicts > 0:
2300
            return 1
2301
        else:
2302
            return 0
2303
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2304
class cmd_revert(Command):
2305
    """Reverse all changes since the last commit.
2306
2307
    Only versioned files are affected.  Specify filenames to revert only 
2308
    those files.  By default, any files that are changed will be backed up
2309
    first.  Backup files have a '~' appended to their name.
2310
    """
2311
    takes_options = ['revision', 'no-backup']
2312
    takes_args = ['file*']
2313
    aliases = ['merge-revert']
2314
2315
    def run(self, revision=None, no_backup=False, file_list=None):
2316
        from bzrlib.commands import parse_spec
2317
        if file_list is not None:
2318
            if len(file_list) == 0:
2319
                raise BzrCommandError("No files specified")
1457.1.9 by Robert Collins
Change cmd_revert implementation to call workingtree.Revert.
2320
        else:
2321
            file_list = []
1185.50.53 by John Arbash Meinel
[patch] Aaron Bentley: make revert work in a subdirectory.
2322
        
2323
        tree, file_list = tree_files(file_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2324
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2325
            # FIXME should be tree.last_revision
1558.4.2 by Aaron Bentley
Revert in checkout works properly
2326
            rev_id = tree.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2327
        elif len(revision) != 1:
2328
            raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
2329
        else:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2330
            rev_id = revision[0].in_history(tree.branch).rev_id
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2331
        pb = ui.ui_factory.nested_progress_bar()
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2332
        try:
2333
            tree.revert(file_list, 
2334
                        tree.branch.repository.revision_tree(rev_id),
2335
                        not no_backup, pb)
2336
        finally:
2337
            pb.finished()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2338
2339
2340
class cmd_assert_fail(Command):
2341
    """Test reporting of assertion failures"""
2342
    hidden = True
2343
    def run(self):
2344
        assert False, "always fails"
2345
2346
2347
class cmd_help(Command):
2348
    """Show help on a command or other topic.
2349
2350
    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.
2351
    takes_options = [Option('long', 'show help on all commands')]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2352
    takes_args = ['topic?']
1616.1.15 by Martin Pool
Handle 'bzr ?', etc.
2353
    aliases = ['?', '--help', '-?', '-h']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2354
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2355
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2356
    def run(self, topic=None, long=False):
2357
        import help
2358
        if topic is None and long:
2359
            topic = "commands"
2360
        help.help(topic)
2361
2362
2363
class cmd_shell_complete(Command):
2364
    """Show appropriate completions for context.
2365
2366
    For a list of all available commands, say 'bzr shell-complete'."""
2367
    takes_args = ['context?']
2368
    aliases = ['s-c']
2369
    hidden = True
2370
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2371
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2372
    def run(self, context=None):
2373
        import shellcomplete
2374
        shellcomplete.shellcomplete(context)
2375
2376
1228 by Martin Pool
- add fetch command as builtin
2377
class cmd_fetch(Command):
2378
    """Copy in history from another branch but don't merge it.
2379
2380
    This is an internal method used for pull and merge."""
2381
    hidden = True
2382
    takes_args = ['from_branch', 'to_branch']
2383
    def run(self, from_branch, to_branch):
2384
        from bzrlib.fetch import Fetcher
1185.16.100 by mbp at sourcefrog
Update fetch command for new Branch constructors.
2385
        from_b = Branch.open(from_branch)
2386
        to_b = Branch.open(to_branch)
1185.65.27 by Robert Collins
Tweak storage towards mergability.
2387
        Fetcher(to_b, from_b)
1228 by Martin Pool
- add fetch command as builtin
2388
2389
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2390
class cmd_missing(Command):
1185.54.3 by Aaron Bentley
Factored out find_unmerged
2391
    """Show unmerged/unpulled revisions between two branches.
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2392
1185.54.3 by Aaron Bentley
Factored out find_unmerged
2393
    OTHER_BRANCH may be local or remote."""
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2394
    takes_args = ['other_branch?']
2395
    takes_options = [Option('reverse', 'Reverse the order of revisions'),
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2396
                     Option('mine-only', 
2397
                            'Display changes in the local branch only'),
2398
                     Option('theirs-only', 
2399
                            'Display changes in the remote branch only'), 
1553.2.3 by Erik Bågfors
cover the missing command with formatters as well
2400
                     'log-format',
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2401
                     'line',
2402
                     'long', 
2403
                     'short',
2404
                     'show-ids',
1185.54.19 by Aaron Bentley
All tests pass
2405
                     'verbose'
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2406
                     ]
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
2407
    encoding_type = 'replace'
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2408
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
2409
    @display_command
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2410
    def run(self, other_branch=None, reverse=False, mine_only=False,
1553.2.6 by Erik Bågfors
Make default formatter work for the missing command
2411
            theirs_only=False, log_format=None, long=False, short=False, line=False, 
1185.54.19 by Aaron Bentley
All tests pass
2412
            show_ids=False, verbose=False):
2413
        from bzrlib.missing import find_unmerged, iter_log_data
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2414
        from bzrlib.log import log_formatter
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2415
        local_branch = Branch.open_containing(u".")[0]
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
2416
        parent = local_branch.get_parent()
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2417
        if other_branch is None:
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
2418
            other_branch = parent
2419
            if other_branch is None:
1624.4.8 by Jamie Wilkinson
doc: make error message make more sense
2420
                raise BzrCommandError("No peer location known or specified.")
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2421
            print "Using last location: " + local_branch.get_parent()
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2422
        remote_branch = Branch.open(other_branch)
1551.2.46 by abentley
Made bzr missing . work on win32
2423
        if remote_branch.base == local_branch.base:
2424
            remote_branch = local_branch
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2425
        local_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2426
        try:
1551.2.46 by abentley
Made bzr missing . work on win32
2427
            remote_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2428
            try:
2429
                local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2430
                if (log_format == None):
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
2431
                    default = local_branch.get_config().log_format()
2432
                    log_format = get_log_format(long=long, short=short, 
2433
                                                line=line, default=default)
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
2434
                lf = log_formatter(log_format,
2435
                                   to_file=self.outf,
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2436
                                   show_ids=show_ids,
2437
                                   show_timezone='original')
2438
                if reverse is False:
2439
                    local_extra.reverse()
2440
                    remote_extra.reverse()
2441
                if local_extra and not theirs_only:
2442
                    print "You have %d extra revision(s):" % len(local_extra)
2443
                    for data in iter_log_data(local_extra, local_branch.repository,
2444
                                              verbose):
2445
                        lf.show(*data)
2446
                    printed_local = True
2447
                else:
2448
                    printed_local = False
2449
                if remote_extra and not mine_only:
2450
                    if printed_local is True:
2451
                        print "\n\n"
2452
                    print "You are missing %d revision(s):" % len(remote_extra)
2453
                    for data in iter_log_data(remote_extra, remote_branch.repository, 
2454
                                              verbose):
2455
                        lf.show(*data)
2456
                if not remote_extra and not local_extra:
2457
                    status_code = 0
2458
                    print "Branches are up to date."
2459
                else:
2460
                    status_code = 1
2461
            finally:
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2462
                remote_branch.unlock()
2463
        finally:
2464
            local_branch.unlock()
2465
        if not status_code and parent is None and other_branch is not None:
2466
            local_branch.lock_write()
2467
            try:
2468
                # handle race conditions - a parent might be set while we run.
2469
                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
2470
                    local_branch.set_parent(remote_branch.base)
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2471
            finally:
2472
                local_branch.unlock()
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2473
        return status_code
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2474
2475
2476
class cmd_plugins(Command):
2477
    """List plugins"""
2478
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2479
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2480
    def run(self):
2481
        import bzrlib.plugin
2482
        from inspect import getdoc
1516 by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a
2483
        for name, plugin in bzrlib.plugin.all_plugins().items():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2484
            if hasattr(plugin, '__path__'):
2485
                print plugin.__path__[0]
2486
            elif hasattr(plugin, '__file__'):
2487
                print plugin.__file__
2488
            else:
2489
                print `plugin`
2490
                
2491
            d = getdoc(plugin)
2492
            if d:
2493
                print '\t', d.split('\n')[0]
2494
2495
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2496
class cmd_testament(Command):
2497
    """Show testament (signing-form) of a revision."""
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
2498
    takes_options = ['revision', 'long', 
2499
                     Option('strict', help='Produce a strict-format'
2500
                            ' testament')]
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2501
    takes_args = ['branch?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2502
    @display_command
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
2503
    def run(self, branch=u'.', revision=None, long=False, strict=False):
2504
        from bzrlib.testament import Testament, StrictTestament
2505
        if strict is True:
2506
            testament_class = StrictTestament
2507
        else:
2508
            testament_class = Testament
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2509
        b = WorkingTree.open_containing(branch)[0].branch
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2510
        b.lock_read()
2511
        try:
2512
            if revision is None:
2513
                rev_id = b.last_revision()
2514
            else:
2515
                rev_id = revision[0].in_history(b).rev_id
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
2516
            t = testament_class.from_revision(b.repository, rev_id)
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2517
            if long:
2518
                sys.stdout.writelines(t.as_text_lines())
2519
            else:
2520
                sys.stdout.write(t.as_short_text())
2521
        finally:
2522
            b.unlock()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2523
2524
2525
class cmd_annotate(Command):
2526
    """Show the origin of each line in a file.
2527
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2528
    This prints out the given file with an annotation on the left side
2529
    indicating which revision, author and date introduced the change.
2530
2531
    If the origin is the same for a run of consecutive lines, it is 
2532
    shown only at the top, unless the --all option is given.
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2533
    """
2534
    # 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
2535
    # TODO: if the working copy is modified, show annotations on that 
2536
    #       with new uncommitted lines marked
1733.2.8 by Michael Ellerman
Add CVS compatible aliases for checkout and annotate, from fullermd.
2537
    aliases = ['ann', 'blame', 'praise']
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2538
    takes_args = ['filename']
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2539
    takes_options = [Option('all', help='show annotations on all lines'),
2540
                     Option('long', help='show date in annotations'),
1694.2.6 by Martin Pool
[merge] bzr.dev
2541
                     'revision'
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2542
                     ]
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2543
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2544
    @display_command
1694.2.6 by Martin Pool
[merge] bzr.dev
2545
    def run(self, filename, all=False, long=False, revision=None):
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2546
        from bzrlib.annotate import annotate_file
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2547
        tree, relpath = WorkingTree.open_containing(filename)
2548
        branch = tree.branch
2549
        branch.lock_read()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2550
        try:
1694.2.6 by Martin Pool
[merge] bzr.dev
2551
            if revision is None:
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2552
                revision_id = branch.last_revision()
1694.2.6 by Martin Pool
[merge] bzr.dev
2553
            elif len(revision) != 1:
2554
                raise BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2555
            else:
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2556
                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).
2557
            file_id = tree.inventory.path2id(relpath)
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2558
            tree = branch.repository.revision_tree(revision_id)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2559
            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
2560
            annotate_file(branch, file_version, file_id, long, all, sys.stdout)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2561
        finally:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2562
            branch.unlock()
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
2563
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2564
2565
class cmd_re_sign(Command):
2566
    """Create a digital signature for an existing revision."""
2567
    # TODO be able to replace existing ones.
2568
2569
    hidden = True # is this right ?
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2570
    takes_args = ['revision_id*']
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2571
    takes_options = ['revision']
2572
    
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2573
    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.
2574
        import bzrlib.gpg as gpg
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2575
        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.
2576
            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
2577
        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.
2578
            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)
2579
        b = WorkingTree.open_containing(u'.')[0].branch
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
2580
        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
2581
        if revision_id_list is not None:
2582
            for revision_id in revision_id_list:
2583
                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.
2584
        elif revision is not None:
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2585
            if len(revision) == 1:
2586
                revno, rev_id = revision[0].in_history(b)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2587
                b.repository.sign_revision(rev_id, gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2588
            elif len(revision) == 2:
2589
                # are they both on rh- if so we can walk between them
2590
                # might be nice to have a range helper for arbitrary
2591
                # revision paths. hmm.
2592
                from_revno, from_revid = revision[0].in_history(b)
2593
                to_revno, to_revid = revision[1].in_history(b)
2594
                if to_revid is None:
2595
                    to_revno = b.revno()
2596
                if from_revno is None or to_revno is None:
2597
                    raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2598
                for revno in range(from_revno, to_revno + 1):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2599
                    b.repository.sign_revision(b.get_rev_id(revno), 
2600
                                               gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2601
            else:
2602
                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.
2603
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2604
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2605
class cmd_bind(Command):
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2606
    """Bind the current branch to a master branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2607
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2608
    After binding, commits must succeed on the master branch
2609
    before they are executed on the local one.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2610
    """
2611
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2612
    takes_args = ['location']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2613
    takes_options = []
2614
2615
    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
2616
        b, relpath = Branch.open_containing(u'.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2617
        b_other = Branch.open(location)
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2618
        try:
2619
            b.bind(b_other)
2620
        except DivergedBranches:
2621
            raise BzrCommandError('These branches have diverged.'
1505.1.12 by John Arbash Meinel
Fixing up the error message for a failed bind.
2622
                                  ' Try merging, and then bind again.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2623
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2624
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2625
class cmd_unbind(Command):
1702.1.1 by Martin Pool
(patch) Fix for unbind help text (olaf)
2626
    """Unbind the current branch from its master branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2627
2628
    After unbinding, the local branch is considered independent.
1702.1.1 by Martin Pool
(patch) Fix for unbind help text (olaf)
2629
    All subsequent commits will be local.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2630
    """
2631
2632
    takes_args = []
2633
    takes_options = []
2634
2635
    def run(self):
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2636
        b, relpath = Branch.open_containing(u'.')
2637
        if not b.unbind():
2638
            raise BzrCommandError('Local branch is not bound')
2639
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2640
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2641
class cmd_uncommit(Command):
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2642
    """Remove the last committed revision.
2643
2644
    --verbose will print out what is being removed.
2645
    --dry-run will go through all the motions, but not actually
2646
    remove anything.
2647
    
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
2648
    In the future, uncommit will create a revision bundle, which can then
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2649
    be re-applied.
1553.5.34 by Martin Pool
Stub lock-breaking command
2650
    """
1185.62.11 by John Arbash Meinel
Added TODO for bzr uncommit to remove unreferenced information.
2651
1553.5.34 by Martin Pool
Stub lock-breaking command
2652
    # TODO: jam 20060108 Add an option to allow uncommit to remove
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
2653
    # unreferenced information in 'branch-as-repository' branches.
1553.5.34 by Martin Pool
Stub lock-breaking command
2654
    # TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2655
    # information in shared branches as well.
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
2656
    takes_options = ['verbose', 'revision',
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2657
                    Option('dry-run', help='Don\'t actually make changes'),
2658
                    Option('force', help='Say yes to all questions.')]
2659
    takes_args = ['location?']
2660
    aliases = []
2661
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
2662
    def run(self, location=None,
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2663
            dry_run=False, verbose=False,
2664
            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
2665
        from bzrlib.log import log_formatter, show_log
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2666
        import sys
2667
        from bzrlib.uncommit import uncommit
2668
2669
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2670
            location = u'.'
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2671
        control, relpath = bzrdir.BzrDir.open_containing(location)
2672
        try:
2673
            tree = control.open_workingtree()
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
2674
            b = tree.branch
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2675
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2676
            tree = None
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
2677
            b = control.open_branch()
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2678
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
2679
        rev_id = None
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2680
        if revision is None:
2681
            revno = b.revno()
2682
        else:
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
2683
            # 'bzr uncommit -r 10' actually means uncommit
2684
            # so that the final tree is at revno 10.
2685
            # but bzrlib.uncommit.uncommit() actually uncommits
2686
            # the revisions that are supplied.
2687
            # So we need to offset it by one
2688
            revno = revision[0].in_history(b).revno+1
2689
2690
        if revno <= b.revno():
2691
            rev_id = b.get_rev_id(revno)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2692
        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
2693
            self.outf.write('No revisions to uncommit.\n')
2694
            return 1
2695
2696
        lf = log_formatter('short',
2697
                           to_file=self.outf,
2698
                           show_timezone='original')
2699
2700
        show_log(b,
2701
                 lf,
2702
                 verbose=False,
2703
                 direction='forward',
2704
                 start_revision=revno,
2705
                 end_revision=b.revno())
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2706
2707
        if dry_run:
2708
            print 'Dry-run, pretending to remove the above revisions.'
2709
            if not force:
2710
                val = raw_input('Press <enter> to continue')
2711
        else:
2712
            print 'The above revision(s) will be removed.'
2713
            if not force:
2714
                val = raw_input('Are you sure [y/N]? ')
2715
                if val.lower() not in ('y', 'yes'):
2716
                    print 'Canceled'
2717
                    return 0
2718
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2719
        uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2720
                revno=revno)
2721
2722
1553.5.34 by Martin Pool
Stub lock-breaking command
2723
class cmd_break_lock(Command):
2724
    """Break a dead lock on a repository, branch or working directory.
2725
1553.5.35 by Martin Pool
Start break-lock --show
2726
    CAUTION: Locks should only be broken when you are sure that the process
1553.5.34 by Martin Pool
Stub lock-breaking command
2727
    holding the lock has been stopped.
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2728
2729
    You can get information on what locks are open via the 'bzr info' command.
1553.5.35 by Martin Pool
Start break-lock --show
2730
    
2731
    example:
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2732
        bzr break-lock
1553.5.34 by Martin Pool
Stub lock-breaking command
2733
    """
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2734
    takes_args = ['location?']
2735
2736
    def run(self, location=None, show=False):
2737
        if location is None:
2738
            location = u'.'
2739
        control, relpath = bzrdir.BzrDir.open_containing(location)
1687.1.17 by Robert Collins
Test break lock on old format branches.
2740
        try:
2741
            control.break_lock()
2742
        except NotImplementedError:
2743
            pass
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2744
        
1553.5.35 by Martin Pool
Start break-lock --show
2745
2746
2747
# command-line interpretation helper for merge-related commands
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2748
def merge(other_revision, base_revision,
2749
          check_clean=True, ignore_zero=False,
1534.7.118 by Aaron Bentley
Dirty merge of the mainline
2750
          this_dir=None, backup_files=False, merge_type=Merge3Merger,
1553.5.35 by Martin Pool
Start break-lock --show
2751
          file_list=None, show_base=False, reprocess=False,
1534.9.6 by Aaron Bentley
Disable merge progress bars, except from the merge command
2752
          pb=DummyProgress()):
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2753
    """Merge changes into a tree.
2754
2755
    base_revision
2756
        list(path, revno) Base for three-way merge.  
2757
        If [None, None] then a base will be automatically determined.
2758
    other_revision
2759
        list(path, revno) Other revision for three-way merge.
2760
    this_dir
2761
        Directory to merge changes into; '.' by default.
2762
    check_clean
2763
        If true, this_dir must have no uncommitted changes before the
2764
        merge begins.
2765
    ignore_zero - If true, suppress the "zero conflicts" message when 
2766
        there are no conflicts; should be set when doing something we expect
2767
        to complete perfectly.
2768
    file_list - If supplied, merge only changes to selected files.
2769
2770
    All available ancestors of other_revision and base_revision are
2771
    automatically pulled into the branch.
2772
2773
    The revno may be -1 to indicate the last revision on the branch, which is
2774
    the typical case.
2775
2776
    This function is intended for use from the command line; programmatic
2777
    clients might prefer to call merge.merge_inner(), which has less magic 
2778
    behavior.
2779
    """
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
2780
    from bzrlib.merge import Merger
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2781
    if this_dir is None:
2782
        this_dir = u'.'
1534.4.28 by Robert Collins
first cut at merge from integration.
2783
    this_tree = WorkingTree.open_containing(this_dir)[0]
1534.7.118 by Aaron Bentley
Dirty merge of the mainline
2784
    if show_base and not merge_type is Merge3Merger:
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2785
        raise BzrCommandError("Show-base is not supported for this merge"
2786
                              " type. %s" % merge_type)
1551.6.8 by Aaron Bentley
Implemented reprocess for weave
2787
    if reprocess and not merge_type.supports_reprocess:
1551.6.14 by Aaron Bentley
Tweaks from merge review
2788
        raise BzrCommandError("Conflict reduction is not supported for merge"
2789
                              " type %s." % merge_type)
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2790
    if reprocess and show_base:
1551.6.14 by Aaron Bentley
Tweaks from merge review
2791
        raise BzrCommandError("Cannot do conflict reduction and show base.")
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
2792
    try:
2793
        merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2794
        merger.pp = ProgressPhase("Merge phase", 5, pb)
2795
        merger.pp.next_phase()
2796
        merger.check_basis(check_clean)
2797
        merger.set_other(other_revision)
2798
        merger.pp.next_phase()
2799
        merger.set_base(base_revision)
2800
        if merger.base_rev_id == merger.other_rev_id:
2801
            note('Nothing to do.')
2802
            return 0
2803
        merger.backup_files = backup_files
2804
        merger.merge_type = merge_type 
2805
        merger.set_interesting_files(file_list)
2806
        merger.show_base = show_base 
2807
        merger.reprocess = reprocess
2808
        conflicts = merger.do_merge()
1645.1.1 by Aaron Bentley
Implement single-file merge
2809
        if file_list is None:
2810
            merger.set_pending()
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
2811
    finally:
2812
        pb.clear()
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2813
    return conflicts
2814
2815
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
2816
# these get imported and then picked up by the scan for cmd_*
2817
# TODO: Some more consistent way to split command definitions across files;
2818
# 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'.
2819
# aliases.  ideally we would avoid loading the implementation until the
2820
# details were needed.
1185.35.4 by Aaron Bentley
Implemented remerge
2821
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
2822
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.
2823
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
2824
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
2825
        cmd_weave_plan_merge, cmd_weave_merge_text