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