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