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