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