/brz/remove-bazaar

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