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