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