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