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