/brz/remove-bazaar

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