/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
1508.1.20 by Robert Collins
Create a checkout command.
23
from shutil import rmtree
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
24
import sys
25
26
import bzrlib
1508.1.25 by Robert Collins
Update per review comments.
27
import bzrlib.branch
28
from bzrlib.branch import Branch
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.
29
import bzrlib.bzrdir as bzrdir
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
30
from bzrlib.bundle import read_bundle_from_url
31
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
32
from bzrlib.commands import Command, display_command
1505.1.10 by John Arbash Meinel
Brought back 'optimized' version, for better errors, cleaned up exception handling.
33
import bzrlib.errors as errors
1185.35.4 by Aaron Bentley
Implemented remerge
34
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError, 
1185.35.13 by Aaron Bentley
Merged Martin
35
                           NotBranchError, DivergedBranches, NotConflicted,
1558.2.1 by Aaron Bentley
Ensure remerge errors when file-id is None
36
                           NoSuchFile, NoWorkingTree, FileInWrongBranch,
1185.82.140 by Aaron Bentley
Check for NotABundle, not BadBundle, so we get errors for malformed bundles
37
                           NotVersionedError, NotABundle)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
38
from bzrlib.log import show_one_log
1534.7.140 by Aaron Bentley
Moved the merge stuff into merge.py
39
from bzrlib.merge import Merge3Merger
1185.16.43 by Martin Pool
- clean up handling of option objects
40
from bzrlib.option import Option
1685.1.37 by John Arbash Meinel
builtins now use urlfordisplay to display nicer paths to the user.
41
import bzrlib.osutils
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
42
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
43
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.
44
from bzrlib.revisionspec import RevisionSpec
1460 by Robert Collins
merge from martin.
45
import bzrlib.trace
1185.33.42 by Martin Pool
[patch] make --quiet a global option (robey)
46
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
47
from bzrlib.transport.local import LocalTransport
1534.9.10 by Aaron Bentley
Fixed use of ui_factory (which can't be imported directly)
48
import bzrlib.ui
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
49
import bzrlib.urlutils as urlutils
1457.1.4 by Robert Collins
Branch.relpath has been moved to WorkingTree.relpath.
50
from bzrlib.workingtree import WorkingTree
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
51
52
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
53
def tree_files(file_list, default_branch=u'.'):
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
54
    try:
1508.1.15 by Robert Collins
Merge from mpool.
55
        return internal_tree_files(file_list, default_branch)
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
56
    except FileInWrongBranch, e:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
57
        raise BzrCommandError("%s is not in the same branch as %s" %
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
58
                             (e.path, file_list[0]))
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
59
1185.85.12 by John Arbash Meinel
Refactoring AddAction to allow redirecting to an encoding file.
60
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
61
# XXX: Bad function name; should possibly also be a class method of
62
# WorkingTree rather than a function.
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
63
def internal_tree_files(file_list, default_branch=u'.'):
1658.1.8 by Martin Pool
(internal_tree_files) Better docstring
64
    """Convert command-line paths to a WorkingTree and relative paths.
65
66
    This is typically used for command-line processors that take one or
67
    more filenames, and infer the workingtree that contains them.
68
69
    The filenames given are not required to exist.
70
71
    :param file_list: Filenames to convert.  
72
73
    :param default_branch: Fallback tree path to use if file_list is empty or None.
74
75
    :return: workingtree, [relative_paths]
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
76
    """
77
    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
78
        return WorkingTree.open_containing(default_branch)[0], file_list
79
    tree = WorkingTree.open_containing(file_list[0])[0]
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
80
    new_list = []
81
    for filename in file_list:
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
82
        try:
83
            new_list.append(tree.relpath(filename))
1185.31.45 by John Arbash Meinel
Refactoring Exceptions found some places where the wrong exception was caught.
84
        except errors.PathNotChild:
1508.1.15 by Robert Collins
Merge from mpool.
85
            raise FileInWrongBranch(tree.branch, filename)
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
86
    return tree, new_list
1185.12.101 by Aaron Bentley
Made commit take branch from first argument, if supplied.
87
88
1553.5.78 by Martin Pool
New bzr init --format option and test
89
def get_format_type(typestring):
90
    """Parse and return a format specifier."""
1666.1.3 by Robert Collins
Fix and test upgrades from bzrdir 6 over SFTP.
91
    if typestring == "weave":
92
        return bzrdir.BzrDirFormat6()
1694.2.6 by Martin Pool
[merge] bzr.dev
93
    if typestring == "default":
1553.5.78 by Martin Pool
New bzr init --format option and test
94
        return bzrdir.BzrDirMetaFormat1()
1694.2.6 by Martin Pool
[merge] bzr.dev
95
    if typestring == "metaweave":
96
        format = bzrdir.BzrDirMetaFormat1()
97
        format.repository_format = bzrlib.repository.RepositoryFormat7()
98
        return format
1553.5.78 by Martin Pool
New bzr init --format option and test
99
    if typestring == "knit":
100
        format = bzrdir.BzrDirMetaFormat1()
101
        format.repository_format = bzrlib.repository.RepositoryFormatKnit1()
102
        return format
1694.2.6 by Martin Pool
[merge] bzr.dev
103
    msg = "Unknown bzr format %s. Current formats are: default, knit,\n" \
104
          "metaweave and weave" % typestring
1553.5.78 by Martin Pool
New bzr init --format option and test
105
    raise BzrCommandError(msg)
106
107
1185.16.112 by mbp at sourcefrog
todo
108
# TODO: Make sure no commands unconditionally use the working directory as a
109
# branch.  If a filename argument is used, the first of them should be used to
110
# specify the branch.  (Perhaps this can be factored out into some kind of
111
# Argument class, representing a file in a branch, where the first occurrence
112
# opens the branch?)
113
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
114
class cmd_status(Command):
115
    """Display status summary.
116
117
    This reports on versioned and unknown files, reporting them
118
    grouped by state.  Possible states are:
119
120
    added
121
        Versioned in the working copy but not in the previous revision.
122
123
    removed
124
        Versioned in the previous revision but removed or deleted
125
        in the working copy.
126
127
    renamed
128
        Path of this file changed from the previous revision;
129
        the text may also have changed.  This includes files whose
130
        parent directory was renamed.
131
132
    modified
133
        Text has changed since the previous revision.
134
135
    unknown
136
        Not versioned and not matching an ignore pattern.
137
138
    To see ignored files use 'bzr ignored'.  For details in the
139
    changes to file texts, use 'bzr diff'.
140
141
    If no arguments are specified, the status of the entire working
142
    directory is shown.  Otherwise, only the status of the specified
143
    files or directories is reported.  If a directory is given, status
144
    is reported for everything inside that directory.
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
145
146
    If a revision argument is given, the status is calculated against
147
    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
148
    """
1185.16.76 by Martin Pool
doc
149
    
150
    # TODO: --no-recurse, --recurse options
151
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
152
    takes_args = ['file*']
1773.1.2 by Robert Collins
Remove --all option from status.
153
    takes_options = ['show-ids', 'revision']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
154
    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()
155
156
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
157
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
158
    @display_command
1773.1.2 by Robert Collins
Remove --all option from status.
159
    def run(self, show_ids=False, file_list=None, revision=None):
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
160
        from bzrlib.status import show_tree_status
1185.85.15 by John Arbash Meinel
Updated bzr status, adding test_cat
161
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
162
        tree, file_list = tree_files(file_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
163
            
1773.1.2 by Robert Collins
Remove --all option from status.
164
        show_tree_status(tree, show_ids=show_ids,
1185.85.84 by John Arbash Meinel
[merge] bzr.dev 1573, lots of updates
165
                         specific_files=file_list, revision=revision,
166
                         to_file=self.outf)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
167
168
169
class cmd_cat_revision(Command):
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
170
    """Write out metadata for a revision.
171
    
172
    The revision to print can either be specified by a specific
173
    revision identifier, or you can use --revision.
174
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
175
176
    hidden = True
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
177
    takes_args = ['revision_id?']
178
    takes_options = ['revision']
1685.1.76 by Wouter van Heyst
codecleanup
179
    # cat-revision is more for frontends so should be exact
180
    encoding = 'strict'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
181
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
182
    @display_command
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
183
    def run(self, revision_id=None, revision=None):
184
185
        if revision_id is not None and revision is not None:
186
            raise BzrCommandError('You can only supply one of revision_id or --revision')
187
        if revision_id is None and revision is None:
188
            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)
189
        b = WorkingTree.open_containing(u'.')[0].branch
1185.85.72 by John Arbash Meinel
Fix some of the tests.
190
191
        # TODO: jam 20060112 should cat-revision always output utf-8?
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
192
        if revision_id is not None:
1185.85.78 by John Arbash Meinel
[merge] jam-integration 1512, includes Storage changes.
193
            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.
194
        elif revision is not None:
195
            for rev in revision:
196
                if rev is None:
197
                    raise BzrCommandError('You cannot specify a NULL revision.')
198
                revno, rev_id = rev.in_history(b)
1185.85.78 by John Arbash Meinel
[merge] jam-integration 1512, includes Storage changes.
199
                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
200
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
201
202
class cmd_revno(Command):
203
    """Show current revision number.
204
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
205
    This is equal to the number of revisions on this branch.
206
    """
207
1185.50.16 by John Arbash Meinel
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location'
208
    takes_args = ['location?']
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
209
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
210
    @display_command
1185.50.16 by John Arbash Meinel
[patch] Michael Ellerman: 'Trivial patch to allow revno to take a location'
211
    def run(self, location=u'.'):
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
212
        self.outf.write(str(Branch.open_containing(location)[0].revno()))
213
        self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
214
1182 by Martin Pool
- more disentangling of xml storage format from objects
215
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
216
class cmd_revision_info(Command):
217
    """Show revision number and revision id for a given revision identifier.
218
    """
219
    hidden = True
220
    takes_args = ['revision_info*']
221
    takes_options = ['revision']
1185.85.24 by John Arbash Meinel
Moved run_bzr_decode into TestCase
222
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
223
    @display_command
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
224
    def run(self, revision=None, revision_info_list=[]):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
225
226
        revs = []
227
        if revision is not None:
228
            revs.extend(revision)
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
229
        if revision_info_list is not None:
230
            for rev in revision_info_list:
231
                revs.append(RevisionSpec(rev))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
232
        if len(revs) == 0:
233
            raise BzrCommandError('You must supply a revision identifier')
234
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
235
        b = WorkingTree.open_containing(u'.')[0].branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
236
237
        for rev in revs:
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
238
            revinfo = rev.in_history(b)
239
            if revinfo.revno is None:
240
                print '     %s' % revinfo.rev_id
241
            else:
242
                print '%4d %s' % (revinfo.revno, revinfo.rev_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
243
244
    
245
class cmd_add(Command):
246
    """Add specified files or directories.
247
248
    In non-recursive mode, all the named items are added, regardless
249
    of whether they were previously ignored.  A warning is given if
250
    any of the named files are already versioned.
251
252
    In recursive mode (the default), files are treated the same way
253
    but the behaviour for directories is different.  Directories that
254
    are already versioned do not give a warning.  All directories,
255
    whether already versioned or not, are searched for files or
256
    subdirectories that are neither versioned or ignored, and these
257
    are added.  This search proceeds recursively into versioned
258
    directories.  If no names are given '.' is assumed.
259
260
    Therefore simply saying 'bzr add' will version all files that
261
    are currently unknown.
262
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
263
    Adding a file whose parent directory is not versioned will
264
    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).
265
    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
266
    get added when you add a file in the directory.
1185.33.90 by Martin Pool
[merge] add --dry-run option (mpe)
267
268
    --dry-run will show which files would be added, but not actually 
269
    add them.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
270
    """
271
    takes_args = ['file*']
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
272
    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()
273
    encoding_type = 'replace'
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
274
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
275
    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
276
        import bzrlib.add
277
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()
278
        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.
279
            should_print=(not is_quiet()))
1185.53.1 by Michael Ellerman
Add support for bzr add --dry-run
280
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
281
        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.
282
                                              action=action, save=not dry_run)
1185.46.8 by Aaron Bentley
bzr add reports ignored patterns.
283
        if len(ignored) > 0:
1711.1.2 by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were
284
            if verbose:
285
                for glob in sorted(ignored.keys()):
1185.46.9 by Aaron Bentley
Added verbose option to bzr add, to list all ignored files.
286
                    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()
287
                        self.outf.write("ignored %s matching \"%s\"\n" 
288
                                        % (path, glob))
1711.1.2 by Robert Collins
'bzr add' is now less verbose in telling you what ignore globs were
289
            else:
290
                match_len = 0
291
                for glob, paths in ignored.items():
292
                    match_len += len(paths)
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
293
                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()
294
            self.outf.write("If you wish to add some of these files,"
295
                            " please add them by name.\n")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
296
297
298
class cmd_mkdir(Command):
299
    """Create a new versioned directory.
300
301
    This is equivalent to creating the directory and then adding it.
302
    """
1685.1.80 by Wouter van Heyst
more code cleanup
303
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
304
    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()
305
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
306
307
    def run(self, dir_list):
308
        for d in dir_list:
309
            os.mkdir(d)
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
310
            wt, dd = WorkingTree.open_containing(d)
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
311
            wt.add([dd])
1685.1.80 by Wouter van Heyst
more code cleanup
312
            self.outf.write('added %s\n' % d)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
313
314
315
class cmd_relpath(Command):
316
    """Show path of a file relative to root"""
1685.1.80 by Wouter van Heyst
more code cleanup
317
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
318
    takes_args = ['filename']
319
    hidden = True
320
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
321
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
322
    def run(self, filename):
1185.85.19 by John Arbash Meinel
Updated bzr relpath
323
        # TODO: jam 20050106 Can relpath return a munged path if
324
        #       sys.stdout encoding cannot represent it?
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
325
        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()
326
        self.outf.write(relpath)
327
        self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
328
329
330
class cmd_inventory(Command):
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
331
    """Show inventory of the current working copy or a revision.
332
333
    It is possible to limit the output to a particular entry
334
    type using the --kind option.  For example; --kind file.
335
    """
1685.1.80 by Wouter van Heyst
more code cleanup
336
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
337
    takes_options = ['revision', 'show-ids', 'kind']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
338
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
339
    @display_command
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
340
    def run(self, revision=None, show_ids=False, kind=None):
341
        if kind and kind not in ['file', 'directory', 'symlink']:
342
            raise BzrCommandError('invalid kind specified')
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
343
        tree = WorkingTree.open_containing(u'.')[0]
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
344
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
345
            inv = tree.read_working_inventory()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
346
        else:
347
            if len(revision) > 1:
348
                raise BzrCommandError('bzr inventory --revision takes'
349
                    ' exactly one revision identifier')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
350
            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
351
                revision[0].in_history(tree.branch).rev_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
352
353
        for path, entry in inv.entries():
1185.33.33 by Martin Pool
[patch] add 'bzr inventory --kind directory'; remove 'bzr directories'
354
            if kind and kind != entry.kind:
355
                continue
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
356
            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()
357
                self.outf.write('%-50s %s\n' % (path, entry.file_id))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
358
            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()
359
                self.outf.write(path)
360
                self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
361
362
363
class cmd_mv(Command):
364
    """Move or rename a file.
365
366
    usage:
367
        bzr mv OLDNAME NEWNAME
368
        bzr mv SOURCE... DESTINATION
369
370
    If the last argument is a versioned directory, all the other names
371
    are moved into it.  Otherwise, there must be exactly two arguments
372
    and the file is changed to a new name, which must not already exist.
373
374
    Files cannot be moved between branches.
375
    """
1685.1.80 by Wouter van Heyst
more code cleanup
376
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
377
    takes_args = ['names*']
1616.1.8 by Martin Pool
Unify 'mv', 'move', 'rename'. (#5379, Matthew Fuller)
378
    aliases = ['move', 'rename']
1185.85.26 by John Arbash Meinel
bzr mv should succeed even if it can't display the paths.
379
    encoding_type = 'replace'
380
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
381
    def run(self, names_list):
382
        if len(names_list) < 2:
383
            raise BzrCommandError("missing file argument")
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
384
        tree, rel_names = tree_files(names_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
385
        
386
        if os.path.isdir(names_list[-1]):
387
            # move into existing directory
1508.1.8 by Robert Collins
move move() from Branch to WorkingTree.
388
            for pair in tree.move(rel_names[:-1], rel_names[-1]):
1185.85.25 by John Arbash Meinel
updated 'bzr mv'
389
                self.outf.write("%s => %s\n" % pair)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
390
        else:
391
            if len(names_list) != 2:
392
                raise BzrCommandError('to mv multiple files the destination '
393
                                      'must be a versioned directory')
1508.1.7 by Robert Collins
Move rename_one from Branch to WorkingTree. (Robert Collins).
394
            tree.rename_one(rel_names[0], rel_names[1])
1185.85.25 by John Arbash Meinel
updated 'bzr mv'
395
            self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
396
            
397
    
398
class cmd_pull(Command):
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
399
    """Turn this branch into a mirror of another branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
400
401
    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
402
    considered diverged if the destination branch's most recent commit is one
403
    that has not been merged (directly or indirectly) into the parent.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
404
1661.1.1 by Martin Pool
[merge] olaf's --remember changes
405
    If branches have diverged, you can use 'bzr merge' to integrate the changes
406
    from one into the other.  Once one branch has merged, the other should
407
    be able to pull it again.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
408
409
    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
410
    from one into the other.  Once one branch has merged, the other should
411
    be able to pull it again.
412
413
    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
414
    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
415
416
    If there is no default location set, the first pull will set it.  After
417
    that, you can omit the location to use the default.  To change the
418
    default, use --remember.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
419
    """
1685.1.80 by Wouter van Heyst
more code cleanup
420
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
421
    takes_options = ['remember', 'overwrite', 'revision', 'verbose']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
422
    takes_args = ['location?']
1185.85.27 by John Arbash Meinel
Updated bzr branch and bzr pull
423
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
424
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
425
    def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
426
        # FIXME: too much stuff is in the command class
427
        try:
428
            tree_to = WorkingTree.open_containing(u'.')[0]
429
            branch_to = tree_to.branch
430
        except NoWorkingTree:
431
            tree_to = None
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
432
            branch_to = Branch.open_containing(u'.')[0]
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
433
434
        reader = None
435
        if location is not None:
436
            try:
437
                reader = read_bundle_from_url(location)
438
            except NotABundle:
439
                pass # Continue on considering this url a Branch
440
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
441
        stored_loc = branch_to.get_parent()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
442
        if location is None:
443
            if stored_loc is None:
444
                raise BzrCommandError("No pull location known or specified.")
445
            else:
1685.1.58 by Martin Pool
urlutils.unescape_for_display should return Unicode
446
                display_url = urlutils.unescape_for_display(stored_loc,
447
                        self.outf.encoding)
448
                self.outf.write("Using saved location: %s\n" % display_url)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
449
                location = stored_loc
1185.56.1 by Michael Ellerman
Simplify handling of DivergedBranches in cmd_pull()
450
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
451
452
        if reader is not None:
453
            install_bundle(branch_to.repository, reader)
454
            branch_from = branch_to
455
        else:
456
            branch_from = Branch.open(location)
457
458
            if branch_to.get_parent() is None or remember:
459
                branch_to.set_parent(branch_from.base)
460
461
        rev_id = None
1185.76.4 by Erik BÃ¥gfors
expanded tabs
462
        if revision is None:
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
463
            if reader is not None:
1793.2.2 by Aaron Bentley
Move BundleReader into v07 serializer
464
                rev_id = reader.target
1185.76.3 by Erik BÃ¥gfors
changes for pull --revision based on input from John
465
        elif len(revision) == 1:
1614.2.12 by Olaf Conradi
Merge bzr.dev
466
            rev_id = revision[0].in_history(branch_from).rev_id
1185.76.4 by Erik BÃ¥gfors
expanded tabs
467
        else:
468
            raise BzrCommandError('bzr pull --revision takes one value.')
1185.76.1 by Erik BÃ¥gfors
Support for --revision in pull
469
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
470
        old_rh = branch_to.revision_history()
471
        if tree_to is not None:
1614.2.12 by Olaf Conradi
Merge bzr.dev
472
            count = tree_to.pull(branch_from, overwrite, rev_id)
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
473
        else:
1614.2.12 by Olaf Conradi
Merge bzr.dev
474
            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
475
        note('%d revision(s) pulled.' % (count,))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
476
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
477
        if verbose:
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
478
            new_rh = branch_to.revision_history()
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
479
            if old_rh != new_rh:
480
                # Something changed
481
                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
482
                show_changed_revisions(branch_to, old_rh, new_rh,
1185.85.27 by John Arbash Meinel
Updated bzr branch and bzr pull
483
                                       to_file=self.outf)
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
484
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
485
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
486
class cmd_push(Command):
1649.1.1 by Robert Collins
* 'pull' and 'push' now normalise the revision history, so that any two
487
    """Update a mirror of this branch.
488
    
489
    The target branch will not have its working tree populated because this
490
    is both expensive, and is not supported on remote file systems.
491
    
492
    Some smart servers or protocols *may* put the working tree in place in
493
    the future.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
494
495
    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
496
    considered diverged if the destination branch's most recent commit is one
497
    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.
498
499
    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
500
    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.
501
    
502
    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
503
    do a merge (see bzr help merge) from the other branch, and commit that.
504
    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
505
506
    If there is no default push location set, the first push will set it.
507
    After that, you can omit the location to use the default.  To change the
508
    default, use --remember.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
509
    """
1685.1.80 by Wouter van Heyst
more code cleanup
510
1185.85.31 by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag.
511
    takes_options = ['remember', 'overwrite', 'verbose',
1495 by Robert Collins
Add a --create-prefix to the new push command.
512
                     Option('create-prefix', 
513
                            help='Create the path leading up to the branch '
514
                                 'if it does not already exist')]
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
515
    takes_args = ['location?']
1185.85.31 by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag.
516
    encoding_type = 'replace'
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
517
1495 by Robert Collins
Add a --create-prefix to the new push command.
518
    def run(self, location=None, remember=False, overwrite=False,
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
519
            create_prefix=False, verbose=False):
1185.33.45 by Martin Pool
[merge] refactoring of branch vs working tree, etc (robertc)
520
        # FIXME: Way too big!  Put this into a function called from the
521
        # command.
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
522
        from bzrlib.transport import get_transport
523
        
1692.3.1 by Robert Collins
Fix push to work with just a branch, no need for a working tree.
524
        br_from = Branch.open_containing('.')[0]
525
        stored_loc = br_from.get_push_location()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
526
        if location is None:
527
            if stored_loc is None:
528
                raise BzrCommandError("No push location known or specified.")
529
            else:
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
530
                display_url = urlutils.unescape_for_display(stored_loc,
531
                        self.outf.encoding)
532
                self.outf.write("Using saved location: %s" % display_url)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
533
                location = stored_loc
1685.1.22 by John Arbash Meinel
cmd_push was passing the location directly to relpath, rather than a URL
534
535
        transport = get_transport(location)
536
        location_url = transport.base
1614.2.9 by Olaf Conradi
Added testcases for using push with --remember. Moved remember code to
537
        if br_from.get_push_location() is None or remember:
1685.1.24 by John Arbash Meinel
cmd_push should use URLs throughout.
538
            br_from.set_push_location(location_url)
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
539
540
        old_rh = []
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
541
        try:
1685.1.24 by John Arbash Meinel
cmd_push should use URLs throughout.
542
            dir_to = bzrlib.bzrdir.BzrDir.open(location_url)
1563.2.38 by Robert Collins
make push preserve tree formats.
543
            br_to = dir_to.open_branch()
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
544
        except NotBranchError:
545
            # create a branch.
1685.1.22 by John Arbash Meinel
cmd_push was passing the location directly to relpath, rather than a URL
546
            transport = transport.clone('..')
1495 by Robert Collins
Add a --create-prefix to the new push command.
547
            if not create_prefix:
548
                try:
1685.1.24 by John Arbash Meinel
cmd_push should use URLs throughout.
549
                    relurl = transport.relpath(location_url)
550
                    mutter('creating directory %s => %s', location_url, relurl)
551
                    transport.mkdir(relurl)
1495 by Robert Collins
Add a --create-prefix to the new push command.
552
                except NoSuchFile:
553
                    raise BzrCommandError("Parent directory of %s "
554
                                          "does not exist." % location)
555
            else:
556
                current = transport.base
1685.1.22 by John Arbash Meinel
cmd_push was passing the location directly to relpath, rather than a URL
557
                needed = [(transport, transport.relpath(location_url))]
1495 by Robert Collins
Add a --create-prefix to the new push command.
558
                while needed:
559
                    try:
560
                        transport, relpath = needed[-1]
561
                        transport.mkdir(relpath)
562
                        needed.pop()
563
                    except NoSuchFile:
564
                        new_transport = transport.clone('..')
565
                        needed.append((new_transport,
566
                                       new_transport.relpath(transport.base)))
567
                        if new_transport.base == transport.base:
1616.1.16 by Martin Pool
typo
568
                            raise BzrCommandError("Could not create "
1495 by Robert Collins
Add a --create-prefix to the new push command.
569
                                                  "path prefix.")
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
570
            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???)
571
                revision_id=br_from.last_revision())
1563.2.38 by Robert Collins
make push preserve tree formats.
572
            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).
573
            count = len(br_to.revision_history())
574
        else:
575
            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.
576
            try:
1692.3.6 by Robert Collins
Show the correct number of revisions pushed when pushing a new branch (Robert Collins).
577
                try:
578
                    tree_to = dir_to.open_workingtree()
579
                except errors.NotLocalUrl:
580
                    warning('This transport does not update the working '
581
                            'tree of: %s' % (br_to.base,))
582
                    count = br_to.pull(br_from, overwrite)
583
                except NoWorkingTree:
584
                    count = br_to.pull(br_from, overwrite)
585
                else:
586
                    count = tree_to.pull(br_from, overwrite)
587
            except DivergedBranches:
588
                raise BzrCommandError("These branches have diverged."
589
                                      "  Try a merge then push with overwrite.")
1185.33.44 by Martin Pool
[patch] show number of revisions pushed/pulled/merged (Robey Pointer)
590
        note('%d revision(s) pushed.' % (count,))
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
591
1185.31.5 by John Arbash Meinel
Merged pull --verbose changes
592
        if verbose:
593
            new_rh = br_to.revision_history()
594
            if old_rh != new_rh:
595
                # Something changed
596
                from bzrlib.log import show_changed_revisions
1185.85.31 by John Arbash Meinel
Updated bzr push, including bringing in the unused --verbose flag.
597
                show_changed_revisions(br_to, old_rh, new_rh,
598
                                       to_file=self.outf)
1490 by Robert Collins
Implement a 'bzr push' command, with saved locations; update diff to return 1.
599
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
600
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
601
class cmd_branch(Command):
602
    """Create a new copy of a branch.
603
604
    If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
605
    be used.  In other words, "branch ../foo/bar" will attempt to create ./bar.
606
607
    To retrieve the branch as of a particular revision, supply the --revision
608
    parameter, as in "branch foo/bar -r 5".
1185.10.2 by Aaron Bentley
Updated help message
609
610
    --basis is to speed up branching from remote branches.  When specified, it
611
    copies all the file-contents, inventory and revision data from the basis
612
    branch before copying anything from the remote branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
613
    """
614
    takes_args = ['from_location', 'to_location?']
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
615
    takes_options = ['revision', 'basis']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
616
    aliases = ['get', 'clone']
617
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
618
    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
619
        from bzrlib.transport import get_transport
1692.7.6 by Martin Pool
[patch] force deletion of trees containing readonly files (alexander)
620
        from bzrlib.osutils import rmtree
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('.')
656
            except bzrlib.errors.FileExists:
657
                raise BzrCommandError('Target directory "%s" already'
658
                                      ' exists.' % to_location)
659
            except bzrlib.errors.NoSuchFile:
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()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
667
            except bzrlib.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)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
671
            except bzrlib.errors.UnlistableBranch:
1442.1.71 by Robert Collins
'bzr branch' sets the branch-name,
672
                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:
721
            branch_location = bzrlib.osutils.getcwd()
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
733
        if (bzrlib.osutils.abspath(to_location) == 
734
            bzrlib.osutils.abspath(branch_location)):
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
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
751
        old_format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
752
        bzrlib.bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
753
        try:
754
            if lightweight:
755
                checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
756
                bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
757
            else:
758
                checkout_branch =  bzrlib.bzrdir.BzrDir.create_branch_convenience(
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:
767
            bzrlib.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'.'):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
780
        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()
781
        old_inv = tree.basis_tree().inventory
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
782
        new_inv = tree.read_working_inventory()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
783
784
        renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
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?']
801
802
    def run(self, dir='.'):
803
        tree = WorkingTree.open_containing(dir)[0]
804
        tree.lock_write()
805
        try:
806
            if tree.last_revision() == tree.branch.last_revision():
1587.1.11 by Robert Collins
Local commits appear to be working properly.
807
                # may be up to date, check master too.
808
                master = tree.branch.get_master_branch()
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
809
                if master is None or master.last_revision == tree.last_revision():
1587.1.11 by Robert Collins
Local commits appear to be working properly.
810
                    note("Tree is up to date.")
811
                    return
1508.1.24 by Robert Collins
Add update command for use with checkouts.
812
            conflicts = tree.update()
813
            note('Updated to revision %d.' %
814
                 (tree.branch.revision_id_to_revno(tree.last_revision()),))
815
            if conflicts != 0:
816
                return 1
817
            else:
818
                return 0
819
        finally:
820
            tree.unlock()
821
822
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
823
class cmd_info(Command):
1694.2.6 by Martin Pool
[merge] bzr.dev
824
    """Show information about a working tree, branch or repository.
825
826
    This command will show all known locations and formats associated to the
827
    tree, branch or repository.  Statistical information is included with
828
    each report.
829
830
    Branches and working trees will also report any missing revisions.
831
    """
832
    takes_args = ['location?']
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
833
    takes_options = ['verbose']
1694.2.6 by Martin Pool
[merge] bzr.dev
834
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
835
    @display_command
1694.2.6 by Martin Pool
[merge] bzr.dev
836
    def run(self, location=None, verbose=False):
837
        from bzrlib.info import show_bzrdir_info
838
        show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
839
                         verbose=verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
840
841
842
class cmd_remove(Command):
843
    """Make a file unversioned.
844
845
    This makes bzr stop tracking changes to a versioned file.  It does
846
    not delete the working copy.
1551.6.26 by Aaron Bentley
Add support for remove --new
847
848
    You can specify one or more files, and/or --new.  If you specify --new,
849
    only 'added' files will be removed.  If you specify both, then new files
850
    in the specified directories will be removed.  If the directories are
851
    also new, they will also be removed.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
852
    """
1551.6.26 by Aaron Bentley
Add support for remove --new
853
    takes_args = ['file*']
854
    takes_options = ['verbose', Option('new', help='remove newly-added files')]
1424 by Robert Collins
add rm alias to remove
855
    aliases = ['rm']
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
856
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
857
    
1551.6.26 by Aaron Bentley
Add support for remove --new
858
    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
859
        tree, file_list = tree_files(file_list)
1551.6.26 by Aaron Bentley
Add support for remove --new
860
        if new is False:
861
            if file_list is None:
862
                raise BzrCommandError('Specify one or more files to remove, or'
863
                                      ' use --new.')
864
        else:
865
            from bzrlib.delta import compare_trees
866
            added = [compare_trees(tree.basis_tree(), tree,
867
                                   specific_files=file_list).added]
868
            file_list = sorted([f[0] for f in added[0]], reverse=True)
869
            if len(file_list) == 0:
870
                raise BzrCommandError('No matching files.')
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
871
        tree.remove(file_list, verbose=verbose, to_file=self.outf)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
872
873
874
class cmd_file_id(Command):
875
    """Print file_id of a particular file or directory.
876
877
    The file_id is assigned when the file is first added and remains the
878
    same through all revisions where the file exists, even when it is
879
    moved or renamed.
880
    """
1685.1.80 by Wouter van Heyst
more code cleanup
881
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
882
    hidden = True
883
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
884
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
885
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
886
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
887
        tree, relpath = WorkingTree.open_containing(filename)
888
        i = tree.inventory.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
889
        if i == None:
890
            raise BzrError("%r is not a versioned file" % filename)
891
        else:
1685.1.80 by Wouter van Heyst
more code cleanup
892
            self.outf.write(i + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
893
894
895
class cmd_file_path(Command):
896
    """Print path of file_ids to a file or directory.
897
898
    This prints one line for each directory down to the target,
1185.85.35 by John Arbash Meinel
Updated file-path
899
    starting at the branch root.
900
    """
1685.1.80 by Wouter van Heyst
more code cleanup
901
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
902
    hidden = True
903
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
904
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
905
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
906
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
907
        tree, relpath = WorkingTree.open_containing(filename)
908
        inv = tree.inventory
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
909
        fid = inv.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
910
        if fid == None:
911
            raise BzrError("%r is not a versioned file" % filename)
912
        for fip in inv.get_idpath(fid):
1685.1.80 by Wouter van Heyst
more code cleanup
913
            self.outf.write(fip + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
914
915
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
916
class cmd_reconcile(Command):
917
    """Reconcile bzr metadata in a branch.
918
919
    This can correct data mismatches that may have been caused by
920
    previous ghost operations or bzr upgrades. You should only
921
    need to run this command if 'bzr check' or a bzr developer 
922
    advises you to run it.
923
924
    If a second branch is provided, cross-branch reconciliation is
925
    also attempted, which will check that data like the tree root
926
    id which was not present in very early bzr versions is represented
927
    correctly in both branches.
928
929
    At the same time it is run it may recompress data resulting in 
930
    a potential saving in disk space or performance gain.
931
932
    The branch *MUST* be on a listable system such as local disk or sftp.
933
    """
934
    takes_args = ['branch?']
935
936
    def run(self, branch="."):
937
        from bzrlib.reconcile import reconcile
938
        dir = bzrlib.bzrdir.BzrDir.open(branch)
939
        reconcile(dir)
940
941
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
942
class cmd_revision_history(Command):
1733.2.1 by Michael Ellerman
Add an optional location parameter to the 'revision-history' command.
943
    """Display the list of revision ids on a branch."""
944
    takes_args = ['location?']
945
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
946
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
947
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
948
    @display_command
1733.2.1 by Michael Ellerman
Add an optional location parameter to the 'revision-history' command.
949
    def run(self, location="."):
950
        branch = Branch.open_containing(location)[0]
951
        for revid in branch.revision_history():
1733.2.4 by Michael Ellerman
Merge bzr.dev, fix minor conflict in cmd_revision_history().
952
            self.outf.write(revid)
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
953
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
954
955
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
956
class cmd_ancestry(Command):
957
    """List all revisions merged into this branch."""
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
958
    takes_args = ['location?']
959
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
960
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
961
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
962
    @display_command
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
963
    def run(self, location="."):
964
        try:
965
            wt = WorkingTree.open_containing(location)[0]
966
        except errors.NoWorkingTree:
967
            b = Branch.open(location)
968
            last_revision = b.last_revision()
969
        else:
970
            b = wt.branch
971
            last_revision = wt.last_revision()
972
973
        revision_ids = b.repository.get_ancestry(last_revision)
1668.1.14 by Martin Pool
merge olaf - InvalidRevisionId fixes
974
        assert revision_ids[0] == None
975
        revision_ids.pop(0)
976
        for revision_id in revision_ids:
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
977
            self.outf.write(revision_id + '\n')
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
978
979
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
980
class cmd_init(Command):
981
    """Make a directory into a versioned branch.
982
983
    Use this to create an empty branch, or before importing an
984
    existing project.
985
1662.1.19 by Martin Pool
Better error message when initting existing tree
986
    If there is a repository in a parent directory of the location, then 
987
    the history of the branch will be stored in the repository.  Otherwise
988
    init creates a standalone branch which carries its own history in 
989
    .bzr.
990
991
    If there is already a branch at the location but it has no working tree,
992
    the tree can be populated with 'bzr checkout'.
993
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
994
    Recipe for importing a tree of files:
995
        cd ~/project
996
        bzr init
1185.12.93 by Aaron Bentley
Fixed obsolete help
997
        bzr add .
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
998
        bzr status
999
        bzr commit -m 'imported project'
1000
    """
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
1001
    takes_args = ['location?']
1553.5.78 by Martin Pool
New bzr init --format option and test
1002
    takes_options = [
1003
                     Option('format', 
1694.2.6 by Martin Pool
[merge] bzr.dev
1004
                            help='Specify a format for this branch. Current'
1005
                                 ' formats are: default, knit, metaweave and'
1006
                                 ' weave. Default is knit; metaweave and'
1007
                                 ' weave are deprecated',
1553.5.78 by Martin Pool
New bzr init --format option and test
1008
                            type=get_format_type),
1009
                     ]
1010
    def run(self, location=None, format=None):
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
1011
        from bzrlib.branch import Branch
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)
1548 by Martin Pool
Fix 'bzr added' typo, and tests for that command.
1216
            if not os.access(bzrlib.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):
1553.2.9 by Erik BÃ¥gfors
log_formatter => log_format for "named" formatters
1331
            default = bzrlib.config.BranchConfig(b).log_format()
1553.2.4 by Erik BÃ¥gfors
Support for setting the default log format at a configuration option
1332
            log_format = get_log_format(long=long, short=short, line=line, default=default)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1333
        lf = log_formatter(log_format,
1334
                           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()
1335
                           to_file=self.outf,
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1336
                           show_timezone=timezone)
1337
1338
        show_log(b,
1339
                 lf,
1340
                 file_id,
1341
                 verbose=verbose,
1342
                 direction=direction,
1343
                 start_revision=rev1,
1344
                 end_revision=rev2,
1345
                 search=message)
1346
1185.85.4 by John Arbash Meinel
currently broken, trying to fix things up.
1347
1553.2.4 by Erik BÃ¥gfors
Support for setting the default log format at a configuration option
1348
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
1349
    log_format = default
1350
    if long:
1351
        log_format = 'long'
1352
    if short:
1353
        log_format = 'short'
1354
    if line:
1355
        log_format = 'line'
1356
    return log_format
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1357
1358
1359
class cmd_touching_revisions(Command):
1360
    """Return revision-ids which affected a particular file.
1361
1685.1.80 by Wouter van Heyst
more code cleanup
1362
    A more user-friendly interface is "bzr log FILE".
1363
    """
1364
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1365
    hidden = True
1366
    takes_args = ["filename"]
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1367
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1368
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1369
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1370
        tree, relpath = WorkingTree.open_containing(filename)
1371
        b = tree.branch
1372
        inv = tree.read_working_inventory()
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1373
        file_id = inv.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1374
        for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1375
            self.outf.write("%6d %s\n" % (revno, what))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1376
1377
1378
class cmd_ls(Command):
1379
    """List files in a tree.
1380
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1381
    # TODO: Take a revision or remote path and list that tree instead.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1382
    hidden = True
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1383
    takes_options = ['verbose', 'revision',
1384
                     Option('non-recursive',
1385
                            help='don\'t recurse into sub-directories'),
1386
                     Option('from-root',
1387
                            help='Print all paths from the root of the branch.'),
1388
                     Option('unknown', help='Print unknown files'),
1389
                     Option('versioned', help='Print versioned files'),
1390
                     Option('ignored', help='Print ignored files'),
1391
1392
                     Option('null', help='Null separate the files'),
1393
                    ]
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1394
    @display_command
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1395
    def run(self, revision=None, verbose=False, 
1396
            non_recursive=False, from_root=False,
1397
            unknown=False, versioned=False, ignored=False,
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1398
            null=False):
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1399
1400
        if verbose and null:
1401
            raise BzrCommandError('Cannot set both --verbose and --null')
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1402
        all = not (unknown or versioned or ignored)
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1403
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1404
        selection = {'I':ignored, '?':unknown, 'V':versioned}
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1405
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1406
        tree, relpath = WorkingTree.open_containing(u'.')
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1407
        if from_root:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1408
            relpath = u''
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1409
        elif relpath:
1410
            relpath += '/'
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1411
        if revision is not None:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1412
            tree = tree.branch.repository.revision_tree(
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1413
                revision[0].in_history(tree.branch).rev_id)
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1414
1415
        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.
1416
            if fp.startswith(relpath):
1417
                fp = fp[len(relpath):]
1418
                if non_recursive and '/' in fp:
1419
                    continue
1420
                if not all and not selection[fc]:
1421
                    continue
1422
                if verbose:
1423
                    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()
1424
                    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.
1425
                elif null:
1685.1.80 by Wouter van Heyst
more code cleanup
1426
                    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()
1427
                    self.outf.flush()
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1428
                else:
1685.1.80 by Wouter van Heyst
more code cleanup
1429
                    self.outf.write(fp + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1430
1431
1432
class cmd_unknowns(Command):
1433
    """List unknown files."""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1434
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1435
    def run(self):
1436
        from bzrlib.osutils import quotefn
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():
1685.1.80 by Wouter van Heyst
more code cleanup
1438
            self.outf.write(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):
1608
        print bzrlib.osutils.local_time_offset()
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:
1689
            message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1690
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1691
        if message == "":
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
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:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1790
            b = WorkingTree.open_containing(u'.')[0].branch
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1791
            config = bzrlib.config.BranchConfig(b)
1371 by Martin Pool
- raise NotBranchError if format file can't be read
1792
        except NotBranchError:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1793
            config = bzrlib.config.GlobalConfig()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1794
        
1795
        if email:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1796
            print config.user_email()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1797
        else:
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
1798
            print config.username()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1799
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.
1800
1185.35.14 by Aaron Bentley
Implemented nick command
1801
class cmd_nick(Command):
1551.3.11 by Aaron Bentley
Merge from Robert
1802
    """Print or set the branch nickname.  
1803
1185.35.14 by Aaron Bentley
Implemented nick command
1804
    If unset, the tree root directory name is used as the nickname
1805
    To print the current nickname, execute with no argument.  
1806
    """
1807
    takes_args = ['nickname?']
1808
    def run(self, nickname=None):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1809
        branch = Branch.open_containing(u'.')[0]
1185.35.14 by Aaron Bentley
Implemented nick command
1810
        if nickname is None:
1811
            self.printme(branch)
1812
        else:
1813
            branch.nick = nickname
1814
1815
    @display_command
1816
    def printme(self, branch):
1817
        print branch.nick 
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1818
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.
1819
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1820
class cmd_selftest(Command):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1821
    """Run internal test suite.
1822
    
1823
    This creates temporary test directories in the working directory,
1824
    but not existing data is affected.  These directories are deleted
1825
    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
1826
    fail and --keep-output is specified.
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1827
    
1828
    If arguments are given, they are regular expressions that say
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1829
    which tests should run.
1552 by Martin Pool
Improved help text for bzr selftest
1830
1831
    If the global option '--no-plugins' is given, plugins are not loaded
1832
    before running the selftests.  This has two effects: features provided or
1833
    modified by plugins will not be tested, and tests provided by plugins will
1834
    not be run.
1835
1836
    examples:
1837
        bzr selftest ignore
1838
        bzr --no-plugins selftest -v
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1839
    """
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1840
    # 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.
1841
1842
    # NB: this is used from the class without creating an instance, which is
1843
    # why it does not have a self parameter.
1844
    def get_transport_type(typestring):
1845
        """Parse and return a transport specifier."""
1846
        if typestring == "sftp":
1847
            from bzrlib.transport.sftp import SFTPAbsoluteServer
1848
            return SFTPAbsoluteServer
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1849
        if typestring == "memory":
1850
            from bzrlib.transport.memory import MemoryServer
1851
            return MemoryServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
1852
        if typestring == "fakenfs":
1558.10.2 by Robert Collins
Refactor the FakeNFS support into a TransportDecorator.
1853
            from bzrlib.transport.fakenfs import FakeNFSServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
1854
            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.
1855
        msg = "No known transport type %s. Supported types are: sftp\n" %\
1856
            (typestring)
1857
        raise BzrCommandError(msg)
1858
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1859
    hidden = True
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1860
    takes_args = ['testspecs*']
1552 by Martin Pool
Improved help text for bzr selftest
1861
    takes_options = ['verbose',
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1862
                     Option('one', help='stop when one test fails'),
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1863
                     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.
1864
                            help='keep output directories when tests fail'),
1865
                     Option('transport', 
1866
                            help='Use a different transport by default '
1867
                                 'throughout the test suite.',
1868
                            type=get_transport_type),
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1869
                     Option('benchmark', help='run the bzr bencharks.'),
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1870
                     Option('lsprof-timed',
1871
                            help='generate lsprof output for benchmarked'
1872
                                 ' sections of code.'),
1873
                     ]
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1874
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1875
    def run(self, testspecs_list=None, verbose=None, one=False,
1876
            keep_output=False, transport=None, benchmark=None,
1877
            lsprof_timed=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1878
        import bzrlib.ui
1707.2.2 by Robert Collins
Start on bench_add, an add benchtest.
1879
        from bzrlib.tests import selftest
1880
        import bzrlib.benchmarks as benchmarks
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1881
        # we don't want progress meters from the tests to go to the
1882
        # real output; and we don't want log messages cluttering up
1883
        # the real logs.
1884
        save_ui = bzrlib.ui.ui_factory
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1885
        print '%10s: %s' % ('bzr', bzrlib.osutils.realpath(sys.argv[0]))
1886
        print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
1887
        print
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1888
        bzrlib.trace.info('running tests...')
1889
        try:
1890
            bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1891
            if testspecs_list is not None:
1892
                pattern = '|'.join(testspecs_list)
1893
            else:
1894
                pattern = ".*"
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1895
            if benchmark:
1707.2.2 by Robert Collins
Start on bench_add, an add benchtest.
1896
                test_suite_factory = benchmarks.test_suite
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1897
                if verbose is None:
1898
                    verbose = True
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1899
            else:
1900
                test_suite_factory = None
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1901
                if verbose is None:
1902
                    verbose = False
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1903
            result = selftest(verbose=verbose, 
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1904
                              pattern=pattern,
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1905
                              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.
1906
                              keep_output=keep_output,
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1907
                              transport=transport,
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1908
                              test_suite_factory=test_suite_factory,
1909
                              lsprof_timed=lsprof_timed)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1910
            if result:
1911
                bzrlib.trace.info('tests passed')
1912
            else:
1913
                bzrlib.trace.info('tests failed')
1914
            return int(not result)
1915
        finally:
1916
            bzrlib.ui.ui_factory = save_ui
1917
1918
1185.62.8 by John Arbash Meinel
Deprecating bzrlib.get_bzr_revision, in favor of bzrlib.builtins._get_bzr_branch
1919
def _get_bzr_branch():
1920
    """If bzr is run from a branch, return Branch or None"""
1921
    import bzrlib.errors
1922
    from bzrlib.branch import Branch
1923
    from bzrlib.osutils import abspath
1924
    from os.path import dirname
1925
    
1926
    try:
1927
        branch = Branch.open(dirname(abspath(dirname(__file__))))
1928
        return branch
1929
    except bzrlib.errors.BzrError:
1930
        return None
1931
    
1932
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1933
def show_version():
1934
    print "bzr (bazaar-ng) %s" % bzrlib.__version__
1935
    # 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
1936
    branch = _get_bzr_branch()
1937
    if branch:
1938
        rh = branch.revision_history()
1939
        revno = len(rh)
1185.62.1 by John Arbash Meinel
bzr --version prints branch nickname.
1940
        print "  bzr checkout, revision %d" % (revno,)
1941
        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
1942
        if rh:
1943
            print "  revid: %s" % (rh[-1],)
1711.2.29 by John Arbash Meinel
[patch] Lalo Martins: add python path information to bzr --version
1944
    print "Using python interpreter:", sys.executable
1945
    import site
1946
    print "Using python standard library:", os.path.dirname(site.__file__)
1947
    print "Using bzrlib:",
1948
    if len(bzrlib.__path__) > 1:
1949
        # print repr, which is a good enough way of making it clear it's
1950
        # more than one element (eg ['/foo/bar', '/foo/bzr'])
1951
        print repr(bzrlib.__path__)
1952
    else:
1953
        print bzrlib.__path__[0]
1954
1955
    print
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1956
    print bzrlib.__copyright__
1185.50.94 by John Arbash Meinel
Updated web page url to http://bazaar-vcs.org
1957
    print "http://bazaar-vcs.org/"
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1958
    print
1959
    print "bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and"
1960
    print "you may use, modify and redistribute it under the terms of the GNU"
1961
    print "General Public License version 2 or later."
1962
1963
1964
class cmd_version(Command):
1965
    """Show version of bzr."""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1966
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1967
    def run(self):
1968
        show_version()
1969
1970
class cmd_rocks(Command):
1971
    """Statement of optimism."""
1972
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1973
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1974
    def run(self):
1975
        print "it sure does!"
1976
1977
1978
class cmd_find_merge_base(Command):
1979
    """Find and print a base revision for merging two branches.
1980
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1981
    # TODO: Options to specify revisions on either side, as if
1982
    #       merging only part of the history.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1983
    takes_args = ['branch', 'other']
1984
    hidden = True
1985
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1986
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1987
    def run(self, branch, other):
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1988
        from bzrlib.revision import common_ancestor, MultipleRevisionSources
1989
        
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1990
        branch1 = Branch.open_containing(branch)[0]
1991
        branch2 = Branch.open_containing(other)[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1992
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1993
        history_1 = branch1.revision_history()
1994
        history_2 = branch2.revision_history()
1995
1241 by Martin Pool
- rename last_patch to last_revision
1996
        last1 = branch1.last_revision()
1997
        last2 = branch2.last_revision()
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1998
1551.2.2 by Aaron Bentley
Fix find-merge-base for new API [recommit]
1999
        source = MultipleRevisionSources(branch1.repository, 
2000
                                         branch2.repository)
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2001
        
2002
        base_rev_id = common_ancestor(last1, last2, source)
2003
2004
        print 'merge base is revision %s' % base_rev_id
2005
        
2006
        return
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2007
2008
        if base_revno is None:
2009
            raise bzrlib.errors.UnrelatedBranches()
2010
2011
        print ' r%-6d in %s' % (base_revno, branch)
2012
2013
        other_revno = branch2.revision_id_to_revno(base_revid)
2014
        
2015
        print ' r%-6d in %s' % (other_revno, other)
2016
2017
2018
2019
class cmd_merge(Command):
2020
    """Perform a three-way merge.
2021
    
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2022
    The branch is the branch you will merge from.  By default, it will
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2023
    merge the latest revision.  If you specify a revision, that
2024
    revision will be merged.  If you specify two revisions, the first
2025
    will be used as a BASE, and the second one as OTHER.  Revision
2026
    numbers are always relative to the specified branch.
2027
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
2028
    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
2029
    branch, automatically determining an appropriate base.  If this
2030
    fails, you may need to give an explicit base.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2031
    
1551.2.18 by Aaron Bentley
Updated docs to clarify conflict handling
2032
    Merge will do its best to combine the changes in two branches, but there
2033
    are some kinds of problems only a human can fix.  When it encounters those,
2034
    it will mark a conflict.  A conflict means that you need to fix something,
2035
    before you should commit.
2036
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
2037
    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
2038
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2039
    If there is no default branch set, the first merge will set it. After
2040
    that, you can omit the branch to use the default.  To change the
1614.2.2 by Olaf Conradi
Merge command:
2041
    default, use --remember.
2042
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2043
    Examples:
2044
2045
    To merge the latest revision from bzr.dev
2046
    bzr merge ../bzr.dev
2047
2048
    To merge changes up to and including revision 82 from bzr.dev
2049
    bzr merge -r 82 ../bzr.dev
2050
2051
    To merge the changes introduced by 82, without previous changes:
2052
    bzr merge -r 81..82 ../bzr.dev
2053
    
2054
    merge refuses to run if there are any uncommitted changes, unless
2055
    --force is given.
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2056
2057
    The following merge types are available:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2058
    """
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2059
    takes_args = ['branch?']
1614.2.2 by Olaf Conradi
Merge command:
2060
    takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
1185.18.1 by Aaron Bentley
Added --show-base to merge
2061
                     Option('show-base', help="Show base revision text in "
2062
                            "conflicts")]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2063
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2064
    def help(self):
2065
        from merge import merge_type_help
2066
        from inspect import getdoc
2067
        return getdoc(self) + '\n' + merge_type_help() 
2068
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2069
    def run(self, branch=None, revision=None, force=False, merge_type=None,
1614.2.2 by Olaf Conradi
Merge command:
2070
            show_base=False, reprocess=False, remember=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2071
        if merge_type is None:
1534.7.139 by Aaron Bentley
ApplyMerge3 -> Merge3Merger
2072
            merge_type = Merge3Merger
1614.2.2 by Olaf Conradi
Merge command:
2073
2074
        tree = WorkingTree.open_containing(u'.')[0]
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
2075
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2076
        if branch is not None:
2077
            try:
2078
                reader = read_bundle_from_url(branch)
2079
            except NotABundle:
2080
                pass # Continue on considering this url a Branch
1185.82.25 by Aaron Bentley
Added changeset-merging functionality
2081
            else:
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2082
                conflicts = merge_bundle(reader, tree, not force, merge_type,
2083
                                            reprocess, show_base)
2084
                if conflicts == 0:
2085
                    return 0
2086
                else:
2087
                    return 1
1185.82.25 by Aaron Bentley
Added changeset-merging functionality
2088
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2089
        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
2090
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2091
        if revision is None or len(revision) < 1:
2092
            base = [None, None]
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2093
            other = [branch, -1]
1645.1.1 by Aaron Bentley
Implement single-file merge
2094
            other_branch, path = Branch.open_containing(branch)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2095
        else:
2096
            if len(revision) == 1:
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
2097
                base = [None, None]
1645.1.1 by Aaron Bentley
Implement single-file merge
2098
                other_branch, path = Branch.open_containing(branch)
1185.12.46 by Aaron Bentley
Fixed -r brokenness in merge
2099
                revno = revision[0].in_history(other_branch).revno
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2100
                other = [branch, revno]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2101
            else:
2102
                assert len(revision) == 2
2103
                if None in revision:
2104
                    raise BzrCommandError(
2105
                        "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
2106
                other_branch, path = Branch.open_containing(branch)
2107
2108
                base = [branch, revision[0].in_history(other_branch).revno]
2109
                other = [branch, revision[1].in_history(other_branch).revno]
2110
2111
        if tree.branch.get_parent() is None or remember:
2112
            tree.branch.set_parent(other_branch.base)
2113
1645.1.1 by Aaron Bentley
Implement single-file merge
2114
        if path != "":
2115
            interesting_files = [path]
2116
        else:
2117
            interesting_files = None
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2118
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2119
        try:
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2120
            try:
2121
                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
2122
                                       merge_type=merge_type,
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2123
                                       reprocess=reprocess,
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2124
                                       show_base=show_base,
1645.1.1 by Aaron Bentley
Implement single-file merge
2125
                                       pb=pb, file_list=interesting_files)
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2126
            finally:
2127
                pb.finished()
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
2128
            if conflict_count != 0:
2129
                return 1
2130
            else:
2131
                return 0
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2132
        except bzrlib.errors.AmbiguousBase, e:
1173 by Martin Pool
- message typo
2133
            m = ("sorry, bzr can't determine the right merge base yet\n"
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2134
                 "candidates are:\n  "
2135
                 + "\n  ".join(e.bases)
2136
                 + "\n"
2137
                 "please specify an explicit base with -r,\n"
2138
                 "and (if you want) report this to the bzr developers\n")
2139
            log_error(m)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2140
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2141
    # TODO: move up to common parent; this isn't merge-specific anymore. 
2142
    def _get_remembered_parent(self, tree, supplied_location, verb_string):
2143
        """Use tree.branch's parent if none was supplied.
2144
2145
        Report if the remembered location was used.
2146
        """
2147
        if supplied_location is not None:
2148
            return supplied_location
2149
        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
2150
        mutter("%s", stored_location)
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2151
        if stored_location is None:
2152
            raise BzrCommandError("No location specified or remembered")
2153
        display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2154
        self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2155
        return stored_location
2156
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2157
1185.35.4 by Aaron Bentley
Implemented remerge
2158
class cmd_remerge(Command):
2159
    """Redo a merge.
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2160
2161
    Use this if you want to try a different merge technique while resolving
2162
    conflicts.  Some merge techniques are better than others, and remerge 
2163
    lets you try different ones on different files.
2164
2165
    The options for remerge have the same meaning and defaults as the ones for
2166
    merge.  The difference is that remerge can (only) be run when there is a
2167
    pending merge, and it lets you specify particular files.
2168
2169
    Examples:
2170
    $ bzr remerge --show-base
2171
        Re-do the merge of all conflicted files, and show the base text in
2172
        conflict regions, in addition to the usual THIS and OTHER texts.
2173
2174
    $ bzr remerge --merge-type weave --reprocess foobar
2175
        Re-do the merge of "foobar", using the weave merge algorithm, with
2176
        additional processing to reduce the size of conflict regions.
2177
    
2178
    The following merge types are available:"""
1185.35.4 by Aaron Bentley
Implemented remerge
2179
    takes_args = ['file*']
2180
    takes_options = ['merge-type', 'reprocess',
2181
                     Option('show-base', help="Show base revision text in "
2182
                            "conflicts")]
2183
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2184
    def help(self):
2185
        from merge import merge_type_help
2186
        from inspect import getdoc
2187
        return getdoc(self) + '\n' + merge_type_help() 
2188
1185.35.4 by Aaron Bentley
Implemented remerge
2189
    def run(self, file_list=None, merge_type=None, show_base=False,
2190
            reprocess=False):
2191
        from bzrlib.merge import merge_inner, transform_tree
2192
        if merge_type is None:
1534.7.139 by Aaron Bentley
ApplyMerge3 -> Merge3Merger
2193
            merge_type = Merge3Merger
1508.1.15 by Robert Collins
Merge from mpool.
2194
        tree, file_list = tree_files(file_list)
2195
        tree.lock_write()
1185.35.4 by Aaron Bentley
Implemented remerge
2196
        try:
1508.1.15 by Robert Collins
Merge from mpool.
2197
            pending_merges = tree.pending_merges() 
1185.35.4 by Aaron Bentley
Implemented remerge
2198
            if len(pending_merges) != 1:
2199
                raise BzrCommandError("Sorry, remerge only works after normal"
2200
                                      + " merges.  Not cherrypicking or"
2201
                                      + "multi-merges.")
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2202
            repository = tree.branch.repository
1508.1.15 by Robert Collins
Merge from mpool.
2203
            base_revision = common_ancestor(tree.branch.last_revision(), 
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2204
                                            pending_merges[0], repository)
2205
            base_tree = repository.revision_tree(base_revision)
2206
            other_tree = repository.revision_tree(pending_merges[0])
1185.35.4 by Aaron Bentley
Implemented remerge
2207
            interesting_ids = None
2208
            if file_list is not None:
2209
                interesting_ids = set()
2210
                for filename in file_list:
1508.1.15 by Robert Collins
Merge from mpool.
2211
                    file_id = tree.path2id(filename)
1558.2.1 by Aaron Bentley
Ensure remerge errors when file-id is None
2212
                    if file_id is None:
2213
                        raise NotVersionedError(filename)
1185.35.4 by Aaron Bentley
Implemented remerge
2214
                    interesting_ids.add(file_id)
1508.1.15 by Robert Collins
Merge from mpool.
2215
                    if tree.kind(file_id) != "directory":
1185.35.4 by Aaron Bentley
Implemented remerge
2216
                        continue
1185.35.13 by Aaron Bentley
Merged Martin
2217
                    
1508.1.15 by Robert Collins
Merge from mpool.
2218
                    for name, ie in tree.inventory.iter_entries(file_id):
1185.35.4 by Aaron Bentley
Implemented remerge
2219
                        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()
2220
            transform_tree(tree, tree.basis_tree(), interesting_ids)
1185.35.4 by Aaron Bentley
Implemented remerge
2221
            if file_list is None:
1508.1.15 by Robert Collins
Merge from mpool.
2222
                restore_files = list(tree.iter_conflicts())
1185.35.4 by Aaron Bentley
Implemented remerge
2223
            else:
2224
                restore_files = file_list
2225
            for filename in restore_files:
2226
                try:
1508.1.15 by Robert Collins
Merge from mpool.
2227
                    restore(tree.abspath(filename))
1185.35.4 by Aaron Bentley
Implemented remerge
2228
                except NotConflicted:
2229
                    pass
1551.5.1 by Aaron Bentley
Stop using deprecated api in remerge
2230
            conflicts =  merge_inner(tree.branch, other_tree, base_tree,
2231
                                     this_tree=tree,
1185.35.4 by Aaron Bentley
Implemented remerge
2232
                                     interesting_ids = interesting_ids, 
2233
                                     other_rev_id=pending_merges[0], 
2234
                                     merge_type=merge_type, 
2235
                                     show_base=show_base,
2236
                                     reprocess=reprocess)
2237
        finally:
1508.1.15 by Robert Collins
Merge from mpool.
2238
            tree.unlock()
1185.35.4 by Aaron Bentley
Implemented remerge
2239
        if conflicts > 0:
2240
            return 1
2241
        else:
2242
            return 0
2243
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2244
class cmd_revert(Command):
2245
    """Reverse all changes since the last commit.
2246
2247
    Only versioned files are affected.  Specify filenames to revert only 
2248
    those files.  By default, any files that are changed will be backed up
2249
    first.  Backup files have a '~' appended to their name.
2250
    """
2251
    takes_options = ['revision', 'no-backup']
2252
    takes_args = ['file*']
2253
    aliases = ['merge-revert']
2254
2255
    def run(self, revision=None, no_backup=False, file_list=None):
2256
        from bzrlib.commands import parse_spec
2257
        if file_list is not None:
2258
            if len(file_list) == 0:
2259
                raise BzrCommandError("No files specified")
1457.1.9 by Robert Collins
Change cmd_revert implementation to call workingtree.Revert.
2260
        else:
2261
            file_list = []
1185.50.53 by John Arbash Meinel
[patch] Aaron Bentley: make revert work in a subdirectory.
2262
        
2263
        tree, file_list = tree_files(file_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2264
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2265
            # FIXME should be tree.last_revision
1558.4.2 by Aaron Bentley
Revert in checkout works properly
2266
            rev_id = tree.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2267
        elif len(revision) != 1:
2268
            raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
2269
        else:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2270
            rev_id = revision[0].in_history(tree.branch).rev_id
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2271
        pb = bzrlib.ui.ui_factory.nested_progress_bar()
2272
        try:
2273
            tree.revert(file_list, 
2274
                        tree.branch.repository.revision_tree(rev_id),
2275
                        not no_backup, pb)
2276
        finally:
2277
            pb.finished()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2278
2279
2280
class cmd_assert_fail(Command):
2281
    """Test reporting of assertion failures"""
2282
    hidden = True
2283
    def run(self):
2284
        assert False, "always fails"
2285
2286
2287
class cmd_help(Command):
2288
    """Show help on a command or other topic.
2289
2290
    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.
2291
    takes_options = [Option('long', 'show help on all commands')]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2292
    takes_args = ['topic?']
1616.1.15 by Martin Pool
Handle 'bzr ?', etc.
2293
    aliases = ['?', '--help', '-?', '-h']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2294
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2295
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2296
    def run(self, topic=None, long=False):
2297
        import help
2298
        if topic is None and long:
2299
            topic = "commands"
2300
        help.help(topic)
2301
2302
2303
class cmd_shell_complete(Command):
2304
    """Show appropriate completions for context.
2305
2306
    For a list of all available commands, say 'bzr shell-complete'."""
2307
    takes_args = ['context?']
2308
    aliases = ['s-c']
2309
    hidden = True
2310
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2311
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2312
    def run(self, context=None):
2313
        import shellcomplete
2314
        shellcomplete.shellcomplete(context)
2315
2316
1228 by Martin Pool
- add fetch command as builtin
2317
class cmd_fetch(Command):
2318
    """Copy in history from another branch but don't merge it.
2319
2320
    This is an internal method used for pull and merge."""
2321
    hidden = True
2322
    takes_args = ['from_branch', 'to_branch']
2323
    def run(self, from_branch, to_branch):
2324
        from bzrlib.fetch import Fetcher
2325
        from bzrlib.branch import Branch
1185.16.100 by mbp at sourcefrog
Update fetch command for new Branch constructors.
2326
        from_b = Branch.open(from_branch)
2327
        to_b = Branch.open(to_branch)
1185.65.27 by Robert Collins
Tweak storage towards mergability.
2328
        Fetcher(to_b, from_b)
1228 by Martin Pool
- add fetch command as builtin
2329
2330
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2331
class cmd_missing(Command):
1185.54.3 by Aaron Bentley
Factored out find_unmerged
2332
    """Show unmerged/unpulled revisions between two branches.
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2333
1185.54.3 by Aaron Bentley
Factored out find_unmerged
2334
    OTHER_BRANCH may be local or remote."""
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2335
    takes_args = ['other_branch?']
2336
    takes_options = [Option('reverse', 'Reverse the order of revisions'),
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2337
                     Option('mine-only', 
2338
                            'Display changes in the local branch only'),
2339
                     Option('theirs-only', 
2340
                            'Display changes in the remote branch only'), 
1553.2.3 by Erik BÃ¥gfors
cover the missing command with formatters as well
2341
                     'log-format',
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2342
                     'line',
2343
                     'long', 
2344
                     'short',
2345
                     'show-ids',
1185.54.19 by Aaron Bentley
All tests pass
2346
                     'verbose'
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2347
                     ]
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2348
2349
    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
2350
            theirs_only=False, log_format=None, long=False, short=False, line=False, 
1185.54.19 by Aaron Bentley
All tests pass
2351
            show_ids=False, verbose=False):
2352
        from bzrlib.missing import find_unmerged, iter_log_data
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2353
        from bzrlib.log import log_formatter
1185.46.5 by Aaron Bentley
Use unicode pathname in cmd_missing
2354
        local_branch = bzrlib.branch.Branch.open_containing(u".")[0]
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
2355
        parent = local_branch.get_parent()
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2356
        if other_branch is None:
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
2357
            other_branch = parent
2358
            if other_branch is None:
2359
                raise BzrCommandError("No missing location known or specified.")
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2360
            print "Using last location: " + local_branch.get_parent()
2361
        remote_branch = bzrlib.branch.Branch.open(other_branch)
1551.2.46 by abentley
Made bzr missing . work on win32
2362
        if remote_branch.base == local_branch.base:
2363
            remote_branch = local_branch
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2364
        local_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2365
        try:
1551.2.46 by abentley
Made bzr missing . work on win32
2366
            remote_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2367
            try:
2368
                local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2369
                if (log_format == None):
2370
                    default = bzrlib.config.BranchConfig(local_branch).log_format()
2371
                    log_format = get_log_format(long=long, short=short, line=line, default=default)
2372
                lf = log_formatter(log_format, sys.stdout,
2373
                                   show_ids=show_ids,
2374
                                   show_timezone='original')
2375
                if reverse is False:
2376
                    local_extra.reverse()
2377
                    remote_extra.reverse()
2378
                if local_extra and not theirs_only:
2379
                    print "You have %d extra revision(s):" % len(local_extra)
2380
                    for data in iter_log_data(local_extra, local_branch.repository,
2381
                                              verbose):
2382
                        lf.show(*data)
2383
                    printed_local = True
2384
                else:
2385
                    printed_local = False
2386
                if remote_extra and not mine_only:
2387
                    if printed_local is True:
2388
                        print "\n\n"
2389
                    print "You are missing %d revision(s):" % len(remote_extra)
2390
                    for data in iter_log_data(remote_extra, remote_branch.repository, 
2391
                                              verbose):
2392
                        lf.show(*data)
2393
                if not remote_extra and not local_extra:
2394
                    status_code = 0
2395
                    print "Branches are up to date."
2396
                else:
2397
                    status_code = 1
2398
            finally:
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2399
                remote_branch.unlock()
2400
        finally:
2401
            local_branch.unlock()
2402
        if not status_code and parent is None and other_branch is not None:
2403
            local_branch.lock_write()
2404
            try:
2405
                # handle race conditions - a parent might be set while we run.
2406
                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
2407
                    local_branch.set_parent(remote_branch.base)
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2408
            finally:
2409
                local_branch.unlock()
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2410
        return status_code
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2411
2412
2413
class cmd_plugins(Command):
2414
    """List plugins"""
2415
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2416
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2417
    def run(self):
2418
        import bzrlib.plugin
2419
        from inspect import getdoc
1516 by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a
2420
        for name, plugin in bzrlib.plugin.all_plugins().items():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2421
            if hasattr(plugin, '__path__'):
2422
                print plugin.__path__[0]
2423
            elif hasattr(plugin, '__file__'):
2424
                print plugin.__file__
2425
            else:
2426
                print `plugin`
2427
                
2428
            d = getdoc(plugin)
2429
            if d:
2430
                print '\t', d.split('\n')[0]
2431
2432
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2433
class cmd_testament(Command):
2434
    """Show testament (signing-form) of a revision."""
2435
    takes_options = ['revision', 'long']
2436
    takes_args = ['branch?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2437
    @display_command
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2438
    def run(self, branch=u'.', revision=None, long=False):
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2439
        from bzrlib.testament import Testament
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2440
        b = WorkingTree.open_containing(branch)[0].branch
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2441
        b.lock_read()
2442
        try:
2443
            if revision is None:
2444
                rev_id = b.last_revision()
2445
            else:
2446
                rev_id = revision[0].in_history(b).rev_id
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2447
            t = Testament.from_revision(b.repository, rev_id)
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2448
            if long:
2449
                sys.stdout.writelines(t.as_text_lines())
2450
            else:
2451
                sys.stdout.write(t.as_short_text())
2452
        finally:
2453
            b.unlock()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2454
2455
2456
class cmd_annotate(Command):
2457
    """Show the origin of each line in a file.
2458
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2459
    This prints out the given file with an annotation on the left side
2460
    indicating which revision, author and date introduced the change.
2461
2462
    If the origin is the same for a run of consecutive lines, it is 
2463
    shown only at the top, unless the --all option is given.
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2464
    """
2465
    # 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
2466
    # TODO: if the working copy is modified, show annotations on that 
2467
    #       with new uncommitted lines marked
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2468
    aliases = ['blame', 'praise']
2469
    takes_args = ['filename']
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2470
    takes_options = [Option('all', help='show annotations on all lines'),
2471
                     Option('long', help='show date in annotations'),
1694.2.6 by Martin Pool
[merge] bzr.dev
2472
                     'revision'
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2473
                     ]
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2474
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2475
    @display_command
1694.2.6 by Martin Pool
[merge] bzr.dev
2476
    def run(self, filename, all=False, long=False, revision=None):
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2477
        from bzrlib.annotate import annotate_file
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2478
        tree, relpath = WorkingTree.open_containing(filename)
2479
        branch = tree.branch
2480
        branch.lock_read()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2481
        try:
1694.2.6 by Martin Pool
[merge] bzr.dev
2482
            if revision is None:
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2483
                revision_id = branch.last_revision()
1694.2.6 by Martin Pool
[merge] bzr.dev
2484
            elif len(revision) != 1:
2485
                raise BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2486
            else:
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2487
                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).
2488
            file_id = tree.inventory.path2id(relpath)
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2489
            tree = branch.repository.revision_tree(revision_id)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2490
            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
2491
            annotate_file(branch, file_version, file_id, long, all, sys.stdout)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2492
        finally:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2493
            branch.unlock()
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
2494
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2495
2496
class cmd_re_sign(Command):
2497
    """Create a digital signature for an existing revision."""
2498
    # TODO be able to replace existing ones.
2499
2500
    hidden = True # is this right ?
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2501
    takes_args = ['revision_id*']
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2502
    takes_options = ['revision']
2503
    
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2504
    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.
2505
        import bzrlib.config as config
2506
        import bzrlib.gpg as gpg
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2507
        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.
2508
            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
2509
        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.
2510
            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)
2511
        b = WorkingTree.open_containing(u'.')[0].branch
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2512
        gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2513
        if revision_id_list is not None:
2514
            for revision_id in revision_id_list:
2515
                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.
2516
        elif revision is not None:
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2517
            if len(revision) == 1:
2518
                revno, rev_id = revision[0].in_history(b)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2519
                b.repository.sign_revision(rev_id, gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2520
            elif len(revision) == 2:
2521
                # are they both on rh- if so we can walk between them
2522
                # might be nice to have a range helper for arbitrary
2523
                # revision paths. hmm.
2524
                from_revno, from_revid = revision[0].in_history(b)
2525
                to_revno, to_revid = revision[1].in_history(b)
2526
                if to_revid is None:
2527
                    to_revno = b.revno()
2528
                if from_revno is None or to_revno is None:
2529
                    raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2530
                for revno in range(from_revno, to_revno + 1):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2531
                    b.repository.sign_revision(b.get_rev_id(revno), 
2532
                                               gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2533
            else:
2534
                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.
2535
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2536
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2537
class cmd_bind(Command):
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2538
    """Bind the current branch to a master branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2539
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2540
    After binding, commits must succeed on the master branch
2541
    before they are executed on the local one.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2542
    """
2543
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2544
    takes_args = ['location']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2545
    takes_options = []
2546
2547
    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
2548
        b, relpath = Branch.open_containing(u'.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2549
        b_other = Branch.open(location)
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2550
        try:
2551
            b.bind(b_other)
2552
        except DivergedBranches:
2553
            raise BzrCommandError('These branches have diverged.'
1505.1.12 by John Arbash Meinel
Fixing up the error message for a failed bind.
2554
                                  ' Try merging, and then bind again.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2555
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2556
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2557
class cmd_unbind(Command):
1702.1.1 by Martin Pool
(patch) Fix for unbind help text (olaf)
2558
    """Unbind the current branch from its master branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2559
2560
    After unbinding, the local branch is considered independent.
1702.1.1 by Martin Pool
(patch) Fix for unbind help text (olaf)
2561
    All subsequent commits will be local.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2562
    """
2563
2564
    takes_args = []
2565
    takes_options = []
2566
2567
    def run(self):
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2568
        b, relpath = Branch.open_containing(u'.')
2569
        if not b.unbind():
2570
            raise BzrCommandError('Local branch is not bound')
2571
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2572
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2573
class cmd_uncommit(bzrlib.commands.Command):
2574
    """Remove the last committed revision.
2575
2576
    --verbose will print out what is being removed.
2577
    --dry-run will go through all the motions, but not actually
2578
    remove anything.
2579
    
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
2580
    In the future, uncommit will create a revision bundle, which can then
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2581
    be re-applied.
1553.5.34 by Martin Pool
Stub lock-breaking command
2582
    """
1185.62.11 by John Arbash Meinel
Added TODO for bzr uncommit to remove unreferenced information.
2583
1553.5.34 by Martin Pool
Stub lock-breaking command
2584
    # TODO: jam 20060108 Add an option to allow uncommit to remove
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
2585
    # unreferenced information in 'branch-as-repository' branches.
1553.5.34 by Martin Pool
Stub lock-breaking command
2586
    # TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2587
    # information in shared branches as well.
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
2588
    takes_options = ['verbose', 'revision',
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2589
                    Option('dry-run', help='Don\'t actually make changes'),
2590
                    Option('force', help='Say yes to all questions.')]
2591
    takes_args = ['location?']
2592
    aliases = []
2593
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
2594
    def run(self, location=None, 
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2595
            dry_run=False, verbose=False,
2596
            revision=None, force=False):
2597
        from bzrlib.branch import Branch
2598
        from bzrlib.log import log_formatter
2599
        import sys
2600
        from bzrlib.uncommit import uncommit
2601
2602
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2603
            location = u'.'
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2604
        control, relpath = bzrdir.BzrDir.open_containing(location)
2605
        try:
2606
            tree = control.open_workingtree()
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
2607
            b = tree.branch
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2608
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2609
            tree = None
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
2610
            b = control.open_branch()
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2611
2612
        if revision is None:
2613
            revno = b.revno()
2614
            rev_id = b.last_revision()
2615
        else:
2616
            revno, rev_id = revision[0].in_history(b)
2617
        if rev_id is None:
2618
            print 'No revisions to uncommit.'
2619
2620
        for r in range(revno, b.revno()+1):
2621
            rev_id = b.get_rev_id(r)
2622
            lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2623
            lf.show(r, b.repository.get_revision(rev_id), None)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2624
2625
        if dry_run:
2626
            print 'Dry-run, pretending to remove the above revisions.'
2627
            if not force:
2628
                val = raw_input('Press <enter> to continue')
2629
        else:
2630
            print 'The above revision(s) will be removed.'
2631
            if not force:
2632
                val = raw_input('Are you sure [y/N]? ')
2633
                if val.lower() not in ('y', 'yes'):
2634
                    print 'Canceled'
2635
                    return 0
2636
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2637
        uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2638
                revno=revno)
2639
2640
1553.5.34 by Martin Pool
Stub lock-breaking command
2641
class cmd_break_lock(Command):
2642
    """Break a dead lock on a repository, branch or working directory.
2643
1553.5.35 by Martin Pool
Start break-lock --show
2644
    CAUTION: Locks should only be broken when you are sure that the process
1553.5.34 by Martin Pool
Stub lock-breaking command
2645
    holding the lock has been stopped.
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2646
2647
    You can get information on what locks are open via the 'bzr info' command.
1553.5.35 by Martin Pool
Start break-lock --show
2648
    
2649
    example:
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2650
        bzr break-lock
1553.5.34 by Martin Pool
Stub lock-breaking command
2651
    """
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2652
    takes_args = ['location?']
2653
2654
    def run(self, location=None, show=False):
2655
        if location is None:
2656
            location = u'.'
2657
        control, relpath = bzrdir.BzrDir.open_containing(location)
1687.1.17 by Robert Collins
Test break lock on old format branches.
2658
        try:
2659
            control.break_lock()
2660
        except NotImplementedError:
2661
            pass
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2662
        
1553.5.35 by Martin Pool
Start break-lock --show
2663
2664
2665
# command-line interpretation helper for merge-related commands
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2666
def merge(other_revision, base_revision,
2667
          check_clean=True, ignore_zero=False,
1534.7.118 by Aaron Bentley
Dirty merge of the mainline
2668
          this_dir=None, backup_files=False, merge_type=Merge3Merger,
1553.5.35 by Martin Pool
Start break-lock --show
2669
          file_list=None, show_base=False, reprocess=False,
1534.9.6 by Aaron Bentley
Disable merge progress bars, except from the merge command
2670
          pb=DummyProgress()):
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2671
    """Merge changes into a tree.
2672
2673
    base_revision
2674
        list(path, revno) Base for three-way merge.  
2675
        If [None, None] then a base will be automatically determined.
2676
    other_revision
2677
        list(path, revno) Other revision for three-way merge.
2678
    this_dir
2679
        Directory to merge changes into; '.' by default.
2680
    check_clean
2681
        If true, this_dir must have no uncommitted changes before the
2682
        merge begins.
2683
    ignore_zero - If true, suppress the "zero conflicts" message when 
2684
        there are no conflicts; should be set when doing something we expect
2685
        to complete perfectly.
2686
    file_list - If supplied, merge only changes to selected files.
2687
2688
    All available ancestors of other_revision and base_revision are
2689
    automatically pulled into the branch.
2690
2691
    The revno may be -1 to indicate the last revision on the branch, which is
2692
    the typical case.
2693
2694
    This function is intended for use from the command line; programmatic
2695
    clients might prefer to call merge.merge_inner(), which has less magic 
2696
    behavior.
2697
    """
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
2698
    from bzrlib.merge import Merger
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2699
    if this_dir is None:
2700
        this_dir = u'.'
1534.4.28 by Robert Collins
first cut at merge from integration.
2701
    this_tree = WorkingTree.open_containing(this_dir)[0]
1534.7.118 by Aaron Bentley
Dirty merge of the mainline
2702
    if show_base and not merge_type is Merge3Merger:
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2703
        raise BzrCommandError("Show-base is not supported for this merge"
2704
                              " type. %s" % merge_type)
1551.6.8 by Aaron Bentley
Implemented reprocess for weave
2705
    if reprocess and not merge_type.supports_reprocess:
1551.6.14 by Aaron Bentley
Tweaks from merge review
2706
        raise BzrCommandError("Conflict reduction is not supported for merge"
2707
                              " type %s." % merge_type)
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2708
    if reprocess and show_base:
1551.6.14 by Aaron Bentley
Tweaks from merge review
2709
        raise BzrCommandError("Cannot do conflict reduction and show base.")
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
2710
    try:
2711
        merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2712
        merger.pp = ProgressPhase("Merge phase", 5, pb)
2713
        merger.pp.next_phase()
2714
        merger.check_basis(check_clean)
2715
        merger.set_other(other_revision)
2716
        merger.pp.next_phase()
2717
        merger.set_base(base_revision)
2718
        if merger.base_rev_id == merger.other_rev_id:
2719
            note('Nothing to do.')
2720
            return 0
2721
        merger.backup_files = backup_files
2722
        merger.merge_type = merge_type 
2723
        merger.set_interesting_files(file_list)
2724
        merger.show_base = show_base 
2725
        merger.reprocess = reprocess
2726
        conflicts = merger.do_merge()
1645.1.1 by Aaron Bentley
Implement single-file merge
2727
        if file_list is None:
2728
            merger.set_pending()
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
2729
    finally:
2730
        pb.clear()
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2731
    return conflicts
2732
2733
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
2734
# these get imported and then picked up by the scan for cmd_*
2735
# TODO: Some more consistent way to split command definitions across files;
2736
# 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'.
2737
# aliases.  ideally we would avoid loading the implementation until the
2738
# details were needed.
1185.35.4 by Aaron Bentley
Implemented remerge
2739
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
2740
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.
2741
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
2742
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
2743
        cmd_weave_plan_merge, cmd_weave_merge_text