/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
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
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:
1551.8.5 by Aaron Bentley
Change name to create_checkout
765
            source.create_checkout(to_location, revision_id, lightweight)
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
766
        finally:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
767
            bzrdir.BzrDirFormat.set_default_format(old_format)
1508.1.20 by Robert Collins
Create a checkout command.
768
769
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
770
class cmd_renames(Command):
771
    """Show list of renamed files.
772
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
773
    # TODO: Option to show renames between two historical versions.
774
775
    # TODO: Only show renames under dir, rather than in the whole branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
776
    takes_args = ['dir?']
777
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
778
    @display_command
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
779
    def run(self, dir=u'.'):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
780
        from bzrlib.tree import find_renames
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
781
        tree = WorkingTree.open_containing(dir)[0]
1534.4.35 by Robert Collins
Give branch its own basis tree and last_revision methods; deprecated branch.working_tree()
782
        old_inv = tree.basis_tree().inventory
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
783
        new_inv = tree.read_working_inventory()
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
784
        renames = list(find_renames(old_inv, new_inv))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
785
        renames.sort()
786
        for old_name, new_name in renames:
1185.85.32 by John Arbash Meinel
Updated bzr renames
787
            self.outf.write("%s => %s\n" % (old_name, new_name))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
788
789
1508.1.24 by Robert Collins
Add update command for use with checkouts.
790
class cmd_update(Command):
791
    """Update a tree to have the latest code committed to its branch.
792
    
793
    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.
794
    conflicts. If you have any local changes, you will still 
795
    need to commit them after the update for the update to be complete.
796
    
797
    If you want to discard your local changes, you can just do a 
798
    'bzr revert' instead of 'bzr commit' after the update.
1508.1.24 by Robert Collins
Add update command for use with checkouts.
799
    """
800
    takes_args = ['dir?']
1815.3.1 by Stefan (metze) Metzmacher
add 'up' as alias for 'update'
801
    aliases = ['up']
1508.1.24 by Robert Collins
Add update command for use with checkouts.
802
803
    def run(self, dir='.'):
804
        tree = WorkingTree.open_containing(dir)[0]
805
        tree.lock_write()
1878.3.2 by Adeodato Simó
Update with suggestions from John Arbash Meinel.
806
        existing_pending_merges = tree.pending_merges()
1508.1.24 by Robert Collins
Add update command for use with checkouts.
807
        try:
1830.1.1 by John Arbash Meinel
Print up to date even if bound, also always print out current revno.
808
            last_rev = tree.last_revision() 
809
            if last_rev == tree.branch.last_revision():
1587.1.11 by Robert Collins
Local commits appear to be working properly.
810
                # may be up to date, check master too.
811
                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.
812
                if master is None or last_rev == master.last_revision():
813
                    revno = tree.branch.revision_id_to_revno(last_rev)
814
                    note("Tree is up to date at revision %d." % (revno,))
815
                    return 0
1508.1.24 by Robert Collins
Add update command for use with checkouts.
816
            conflicts = tree.update()
1830.1.1 by John Arbash Meinel
Print up to date even if bound, also always print out current revno.
817
            revno = tree.branch.revision_id_to_revno(tree.last_revision())
818
            note('Updated to revision %d.' % (revno,))
1878.3.2 by Adeodato Simó
Update with suggestions from John Arbash Meinel.
819
            if tree.pending_merges() != existing_pending_merges:
1711.2.108 by John Arbash Meinel
Assert that update informs the user about where their local commits went.
820
                note('Your local commits will now show as pending merges with '
1878.3.2 by Adeodato Simó
Update with suggestions from John Arbash Meinel.
821
                     "'bzr status', and can be committed with 'bzr commit'.")
1508.1.24 by Robert Collins
Add update command for use with checkouts.
822
            if conflicts != 0:
823
                return 1
824
            else:
825
                return 0
826
        finally:
827
            tree.unlock()
828
829
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
830
class cmd_info(Command):
1694.2.6 by Martin Pool
[merge] bzr.dev
831
    """Show information about a working tree, branch or repository.
832
833
    This command will show all known locations and formats associated to the
834
    tree, branch or repository.  Statistical information is included with
835
    each report.
836
837
    Branches and working trees will also report any missing revisions.
838
    """
839
    takes_args = ['location?']
1624.3.21 by Olaf Conradi
Make bzr info command work on both local and remote locations. Support
840
    takes_options = ['verbose']
1694.2.6 by Martin Pool
[merge] bzr.dev
841
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
842
    @display_command
1694.2.6 by Martin Pool
[merge] bzr.dev
843
    def run(self, location=None, verbose=False):
844
        from bzrlib.info import show_bzrdir_info
845
        show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
846
                         verbose=verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
847
848
849
class cmd_remove(Command):
850
    """Make a file unversioned.
851
852
    This makes bzr stop tracking changes to a versioned file.  It does
853
    not delete the working copy.
1551.6.26 by Aaron Bentley
Add support for remove --new
854
855
    You can specify one or more files, and/or --new.  If you specify --new,
856
    only 'added' files will be removed.  If you specify both, then new files
857
    in the specified directories will be removed.  If the directories are
858
    also new, they will also be removed.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
859
    """
1551.6.26 by Aaron Bentley
Add support for remove --new
860
    takes_args = ['file*']
861
    takes_options = ['verbose', Option('new', help='remove newly-added files')]
1424 by Robert Collins
add rm alias to remove
862
    aliases = ['rm']
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
863
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
864
    
1551.6.26 by Aaron Bentley
Add support for remove --new
865
    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
866
        tree, file_list = tree_files(file_list)
1551.6.26 by Aaron Bentley
Add support for remove --new
867
        if new is False:
868
            if file_list is None:
869
                raise BzrCommandError('Specify one or more files to remove, or'
870
                                      ' use --new.')
871
        else:
1852.10.3 by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.
872
            added = tree.changes_from(tree.basis_tree(),
873
                specific_files=file_list).added
874
            file_list = sorted([f[0] for f in added], reverse=True)
1551.6.26 by Aaron Bentley
Add support for remove --new
875
            if len(file_list) == 0:
876
                raise BzrCommandError('No matching files.')
1685.1.77 by Wouter van Heyst
WorkingTree.remove takes an optional output file
877
        tree.remove(file_list, verbose=verbose, to_file=self.outf)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
878
879
880
class cmd_file_id(Command):
881
    """Print file_id of a particular file or directory.
882
883
    The file_id is assigned when the file is first added and remains the
884
    same through all revisions where the file exists, even when it is
885
    moved or renamed.
886
    """
1685.1.80 by Wouter van Heyst
more code cleanup
887
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
888
    hidden = True
889
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
890
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
891
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
892
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
893
        tree, relpath = WorkingTree.open_containing(filename)
894
        i = tree.inventory.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
895
        if i == None:
896
            raise BzrError("%r is not a versioned file" % filename)
897
        else:
1685.1.80 by Wouter van Heyst
more code cleanup
898
            self.outf.write(i + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
899
900
901
class cmd_file_path(Command):
902
    """Print path of file_ids to a file or directory.
903
904
    This prints one line for each directory down to the target,
1185.85.35 by John Arbash Meinel
Updated file-path
905
    starting at the branch root.
906
    """
1685.1.80 by Wouter van Heyst
more code cleanup
907
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
908
    hidden = True
909
    takes_args = ['filename']
1185.85.35 by John Arbash Meinel
Updated file-path
910
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
911
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
912
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
913
        tree, relpath = WorkingTree.open_containing(filename)
914
        inv = tree.inventory
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
915
        fid = inv.path2id(relpath)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
916
        if fid == None:
917
            raise BzrError("%r is not a versioned file" % filename)
918
        for fip in inv.get_idpath(fid):
1685.1.80 by Wouter van Heyst
more code cleanup
919
            self.outf.write(fip + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
920
921
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
922
class cmd_reconcile(Command):
923
    """Reconcile bzr metadata in a branch.
924
925
    This can correct data mismatches that may have been caused by
926
    previous ghost operations or bzr upgrades. You should only
927
    need to run this command if 'bzr check' or a bzr developer 
928
    advises you to run it.
929
930
    If a second branch is provided, cross-branch reconciliation is
931
    also attempted, which will check that data like the tree root
932
    id which was not present in very early bzr versions is represented
933
    correctly in both branches.
934
935
    At the same time it is run it may recompress data resulting in 
936
    a potential saving in disk space or performance gain.
937
938
    The branch *MUST* be on a listable system such as local disk or sftp.
939
    """
940
    takes_args = ['branch?']
941
942
    def run(self, branch="."):
943
        from bzrlib.reconcile import reconcile
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
944
        dir = bzrdir.BzrDir.open(branch)
1570.1.2 by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.'
945
        reconcile(dir)
946
947
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
948
class cmd_revision_history(Command):
1733.2.1 by Michael Ellerman
Add an optional location parameter to the 'revision-history' command.
949
    """Display the list of revision ids on a branch."""
950
    takes_args = ['location?']
951
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
952
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
953
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
954
    @display_command
1733.2.1 by Michael Ellerman
Add an optional location parameter to the 'revision-history' command.
955
    def run(self, location="."):
956
        branch = Branch.open_containing(location)[0]
957
        for revid in branch.revision_history():
1733.2.4 by Michael Ellerman
Merge bzr.dev, fix minor conflict in cmd_revision_history().
958
            self.outf.write(revid)
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
959
            self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
960
961
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
962
class cmd_ancestry(Command):
963
    """List all revisions merged into this branch."""
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
964
    takes_args = ['location?']
965
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
966
    hidden = True
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
967
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
968
    @display_command
1733.2.2 by Michael Ellerman
Add optional location to ancestry and fix behaviour for checkouts.
969
    def run(self, location="."):
970
        try:
971
            wt = WorkingTree.open_containing(location)[0]
972
        except errors.NoWorkingTree:
973
            b = Branch.open(location)
974
            last_revision = b.last_revision()
975
        else:
976
            b = wt.branch
977
            last_revision = wt.last_revision()
978
979
        revision_ids = b.repository.get_ancestry(last_revision)
1668.1.14 by Martin Pool
merge olaf - InvalidRevisionId fixes
980
        assert revision_ids[0] == None
981
        revision_ids.pop(0)
982
        for revision_id in revision_ids:
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
983
            self.outf.write(revision_id + '\n')
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
984
985
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
986
class cmd_init(Command):
987
    """Make a directory into a versioned branch.
988
989
    Use this to create an empty branch, or before importing an
990
    existing project.
991
1662.1.19 by Martin Pool
Better error message when initting existing tree
992
    If there is a repository in a parent directory of the location, then 
993
    the history of the branch will be stored in the repository.  Otherwise
994
    init creates a standalone branch which carries its own history in 
995
    .bzr.
996
997
    If there is already a branch at the location but it has no working tree,
998
    the tree can be populated with 'bzr checkout'.
999
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1000
    Recipe for importing a tree of files:
1001
        cd ~/project
1002
        bzr init
1185.12.93 by Aaron Bentley
Fixed obsolete help
1003
        bzr add .
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1004
        bzr status
1005
        bzr commit -m 'imported project'
1006
    """
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
1007
    takes_args = ['location?']
1553.5.78 by Martin Pool
New bzr init --format option and test
1008
    takes_options = [
1009
                     Option('format', 
1694.2.6 by Martin Pool
[merge] bzr.dev
1010
                            help='Specify a format for this branch. Current'
1011
                                 ' formats are: default, knit, metaweave and'
1012
                                 ' weave. Default is knit; metaweave and'
1013
                                 ' weave are deprecated',
1553.5.78 by Martin Pool
New bzr init --format option and test
1014
                            type=get_format_type),
1015
                     ]
1016
    def run(self, location=None, format=None):
1694.2.6 by Martin Pool
[merge] bzr.dev
1017
        if format is None:
1018
            format = get_format_type('default')
1185.16.138 by Martin Pool
[patch] 'bzr init DIR' (John)
1019
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1020
            location = u'.'
1830.4.5 by Wouter van Heyst
cleanup
1021
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1022
        to_transport = transport.get_transport(location)
1830.4.5 by Wouter van Heyst
cleanup
1023
1024
        # The path has to exist to initialize a
1025
        # branch inside of it.
1026
        # Just using os.mkdir, since I don't
1027
        # believe that we want to create a bunch of
1028
        # locations if the user supplies an extended path
1029
        # TODO: create-prefix
1030
        try:
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1031
            to_transport.mkdir('.')
1830.4.8 by Wouter van Heyst
clean up imports (and get if collapsing right)
1032
        except errors.FileExists:
1830.4.5 by Wouter van Heyst
cleanup
1033
            pass
1830.4.1 by Wouter van Heyst
Allow bzr init to create remote branches
1034
                    
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1035
        try:
1662.1.19 by Martin Pool
Better error message when initting existing tree
1036
            existing_bzrdir = bzrdir.BzrDir.open(location)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1037
        except NotBranchError:
1662.1.19 by Martin Pool
Better error message when initting existing tree
1038
            # really a NotBzrDir error...
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1039
            bzrdir.BzrDir.create_branch_convenience(location, format=format)
1040
        else:
1662.1.19 by Martin Pool
Better error message when initting existing tree
1041
            if existing_bzrdir.has_branch():
1830.4.8 by Wouter van Heyst
clean up imports (and get if collapsing right)
1042
                if (isinstance(to_transport, LocalTransport)
1043
                    and not existing_bzrdir.has_workingtree()):
1830.4.1 by Wouter van Heyst
Allow bzr init to create remote branches
1044
                        raise errors.BranchExistsWithoutWorkingTree(location)
1045
                raise errors.AlreadyBranchError(location)
1654.1.4 by Robert Collins
Teach `bzr init` how to init at the root of a repository.
1046
            else:
1662.1.19 by Martin Pool
Better error message when initting existing tree
1047
                existing_bzrdir.create_branch()
1048
                existing_bzrdir.create_workingtree()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1049
1050
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1051
class cmd_init_repository(Command):
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1052
    """Create a shared repository to hold branches.
1053
1054
    New branches created under the repository directory will store their revisions
1055
    in the repository, not in the branch directory, if the branch format supports
1056
    shared storage.
1057
1662.1.11 by Martin Pool
Better help for init-repo (Erik)
1058
    example:
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1059
        bzr init-repo repo
1662.1.11 by Martin Pool
Better help for init-repo (Erik)
1060
        bzr init repo/trunk
1061
        bzr checkout --lightweight repo/trunk trunk-checkout
1062
        cd trunk-checkout
1658.1.6 by Martin Pool
init-repo shouldn't insist on creating a new directory (Malone #38331)
1063
        (add files here)
1064
    """
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1065
    takes_args = ["location"] 
1066
    takes_options = [Option('format', 
1694.2.6 by Martin Pool
[merge] bzr.dev
1067
                            help='Specify a format for this repository.'
1068
                                 ' Current formats are: default, knit,'
1069
                                 ' metaweave and weave. Default is knit;'
1070
                                 ' metaweave and weave are deprecated',
1624.2.1 by Erik Bågfors
support for --tree in bzr init-repo
1071
                            type=get_format_type),
1624.2.4 by Erik Bågfors
rename --tree to --trees
1072
                     Option('trees',
1624.2.1 by Erik Bågfors
support for --tree in bzr init-repo
1073
                             help='Allows branches in repository to have'
1074
                             ' a working tree')]
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1075
    aliases = ["init-repo"]
1624.2.4 by Erik Bågfors
rename --tree to --trees
1076
    def run(self, location, format=None, trees=False):
1558.5.6 by Aaron Bentley
Renamed make-repo init-repo
1077
        if format is None:
1694.2.6 by Martin Pool
[merge] bzr.dev
1078
            format = get_format_type('default')
1830.4.5 by Wouter van Heyst
cleanup
1079
1080
        if location is None:
1081
            location = '.'
1082
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1083
        to_transport = transport.get_transport(location)
1830.4.5 by Wouter van Heyst
cleanup
1084
        try:
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1085
            to_transport.mkdir('.')
1830.4.8 by Wouter van Heyst
clean up imports (and get if collapsing right)
1086
        except errors.FileExists:
1830.4.5 by Wouter van Heyst
cleanup
1087
            pass
1088
1830.4.7 by Wouter van Heyst
review fixes, rename transport variable to to_transport
1089
        newdir = format.initialize_on_transport(to_transport)
1558.5.2 by Aaron Bentley
Created *shared* repositories...
1090
        repo = newdir.create_repository(shared=True)
1624.2.4 by Erik Bågfors
rename --tree to --trees
1091
        repo.set_make_working_trees(trees)
1558.5.1 by Aaron Bentley
Added make-repository command
1092
1093
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1094
class cmd_diff(Command):
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1095
    """Show differences in the working tree or between revisions.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1096
    
1097
    If files are listed, only the changes in those files are listed.
1098
    Otherwise, all changes for the tree are listed.
1099
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1100
    "bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1101
    produces patches suitable for "patch -p1".
1102
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1103
    examples:
1104
        bzr diff
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1105
            Shows the difference in the working tree versus the last commit
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1106
        bzr diff -r1
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1107
            Difference between the working tree and revision 1
1185.1.2 by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd
1108
        bzr diff -r1..2
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1109
            Difference between revision 2 and revision 1
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1110
        bzr diff --diff-prefix old/:new/
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1111
            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.
1112
        bzr diff bzr.mine bzr.dev
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1113
            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.
1114
        bzr diff foo.c
1850.1.1 by John Arbash Meinel
Annotate the diff examples to explain what they do
1115
            Show just the differences for 'foo.c'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1116
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1117
    # TODO: Option to use external diff command; could be GNU diff, wdiff,
1118
    #       or a graphical diff.
1119
1120
    # TODO: Python difflib is not exactly the same as unidiff; should
1121
    #       either fix it up or prefer to use an external diff.
1122
1123
    # TODO: Selected-file diff is inefficient and doesn't show you
1124
    #       deleted files.
1125
1126
    # TODO: This probably handles non-Unix newlines poorly.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1127
    
1128
    takes_args = ['file*']
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1129
    takes_options = ['revision', 'diff-options', 'prefix']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1130
    aliases = ['di', 'dif']
1185.85.36 by John Arbash Meinel
Working on tests for revision-history, ancestry, and diff
1131
    encoding_type = 'exact'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1132
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1133
    @display_command
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1134
    def run(self, revision=None, file_list=None, diff_options=None,
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1135
            prefix=None):
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1136
        from bzrlib.diff import diff_cmd_helper, show_diff_trees
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1137
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1138
        if (prefix is None) or (prefix == '0'):
1139
            # diff -p0 format
1694.2.1 by Martin Pool
Remove 'a/', 'b/' default prefixes on diff output.
1140
            old_label = ''
1141
            new_label = ''
1694.2.3 by Martin Pool
Add -p0, -p1 options for diff.
1142
        elif prefix == '1':
1143
            old_label = 'old/'
1144
            new_label = 'new/'
1145
        else:
1146
            if not ':' in prefix:
1147
                 raise BzrError("--diff-prefix expects two values separated by a colon")
1148
            old_label, new_label = prefix.split(":")
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1149
        
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1150
        try:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1151
            tree1, file_list = internal_tree_files(file_list)
1152
            tree2 = None
1508.1.15 by Robert Collins
Merge from mpool.
1153
            b = None
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1154
            b2 = None
1185.35.32 by Aaron Bentley
Fixed handling of files in mixed branches
1155
        except FileInWrongBranch:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1156
            if len(file_list) != 2:
1157
                raise BzrCommandError("Files are in different branches")
1158
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1159
            tree1, file1 = WorkingTree.open_containing(file_list[0])
1160
            tree2, file2 = WorkingTree.open_containing(file_list[1])
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1161
            if file1 != "" or file2 != "":
1508.1.15 by Robert Collins
Merge from mpool.
1162
                # FIXME diff those two files. rbc 20051123
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1163
                raise BzrCommandError("Files are in different branches")
1164
            file_list = None
1732.3.1 by Matthieu Moy
Implementation of -r revno:N:/path/to/branch
1165
        except NotBranchError:
1881.1.2 by Matthieu Moy
Formatting and style for the last patch.
1166
            if (revision is not None and len(revision) == 2
1881.1.4 by Matthieu Moy
needs_tree -> needs_branch
1167
                and not revision[0].needs_branch()
1168
                and not revision[1].needs_branch()):
1711.2.100 by John Arbash Meinel
clean up comment.
1169
                # If both revision specs include a branch, we can
1170
                # diff them without needing a local working tree
1881.1.2 by Matthieu Moy
Formatting and style for the last patch.
1171
                tree1, tree2 = None, None
1881.1.1 by Matthieu Moy
Fixed and tested "bzr diff" outside a working tree.
1172
            else:
1173
                raise
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1174
        if revision is not None:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1175
            if tree2 is not None:
1185.35.28 by Aaron Bentley
Support diff with two branches as input.
1176
                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.
1177
            if (len(revision) == 1) or (revision[1].spec is None):
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1178
                return diff_cmd_helper(tree1, file_list, diff_options,
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1179
                                       revision[0], 
1180
                                       old_label=old_label, new_label=new_label)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1181
            elif len(revision) == 2:
1551.2.15 by Aaron Bentley
Rename cmd_show_diff to diff_cmd_helper
1182
                return diff_cmd_helper(tree1, file_list, diff_options,
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1183
                                       revision[0], revision[1],
1184
                                       old_label=old_label, new_label=new_label)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1185
            else:
1186
                raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
1187
        else:
1551.2.13 by Aaron Bentley
Got diff working properly with checkouts
1188
            if tree2 is not None:
1189
                return show_diff_trees(tree1, tree2, sys.stdout, 
1190
                                       specific_files=file_list,
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1191
                                       external_diff_options=diff_options,
1192
                                       old_label=old_label, new_label=new_label)
1508.1.15 by Robert Collins
Merge from mpool.
1193
            else:
1684.1.6 by Martin Pool
(patch) --diff-prefix option (goffredo, alexander)
1194
                return diff_cmd_helper(tree1, file_list, diff_options,
1195
                                       old_label=old_label, new_label=new_label)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1196
1197
1198
class cmd_deleted(Command):
1199
    """List files deleted in the working tree.
1200
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1201
    # TODO: Show files deleted since a previous revision, or
1202
    # between two revisions.
1203
    # TODO: Much more efficient way to do this: read in new
1204
    # directories with readdir, rather than stating each one.  Same
1205
    # level of effort but possibly much less IO.  (Or possibly not,
1206
    # if the directories are very large...)
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1207
    takes_options = ['show-ids']
1208
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1209
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1210
    def run(self, show_ids=False):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1211
        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()
1212
        old = tree.basis_tree()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1213
        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
1214
            if not tree.has_id(ie.file_id):
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1215
                self.outf.write(path)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1216
                if show_ids:
1185.85.49 by John Arbash Meinel
Updated cmd_deleted, including adding --show-ids option.
1217
                    self.outf.write(' ')
1218
                    self.outf.write(ie.file_id)
1219
                self.outf.write('\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1220
1221
1222
class cmd_modified(Command):
1223
    """List files modified in working tree."""
1224
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1225
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1226
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1227
        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.
1228
        td = tree.changes_from(tree.basis_tree())
1398 by Robert Collins
integrate in Gustavos x-bit patch
1229
        for path, id, kind, text_modified, meta_modified in td.modified:
1685.1.80 by Wouter van Heyst
more code cleanup
1230
            self.outf.write(path + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1231
1232
1233
class cmd_added(Command):
1234
    """List files added in working tree."""
1235
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1236
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1237
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1238
        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()
1239
        basis_inv = wt.basis_tree().inventory
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1240
        inv = wt.inventory
1241
        for file_id in inv:
1242
            if file_id in basis_inv:
1243
                continue
1244
            path = inv.id2path(file_id)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1245
            if not os.access(osutils.abspath(path), os.F_OK):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1246
                continue
1685.1.80 by Wouter van Heyst
more code cleanup
1247
            self.outf.write(path + '\n')
1185.85.53 by John Arbash Meinel
Updated cmd_root
1248
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1249
1250
class cmd_root(Command):
1251
    """Show the tree root directory.
1252
1253
    The root is the nearest enclosing directory with a .bzr control
1254
    directory."""
1255
    takes_args = ['filename?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1256
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1257
    def run(self, filename=None):
1258
        """Print the branch root."""
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1259
        tree = WorkingTree.open_containing(filename)[0]
1685.1.80 by Wouter van Heyst
more code cleanup
1260
        self.outf.write(tree.basedir + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1261
1262
1263
class cmd_log(Command):
1626.1.2 by Martin Pool
Better help message for log command.
1264
    """Show log of a branch, file, or directory.
1265
1266
    By default show the log of the branch containing the working directory.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1267
1185.16.153 by Martin Pool
[patch] fix help for bzr log (Matthieu)
1268
    To request a range of logs, you can use the command -r begin..end
1269
    -r revision requests a specific revision, -r ..end or -r begin.. are
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1270
    also valid.
1626.1.2 by Martin Pool
Better help message for log command.
1271
1272
    examples:
1273
        bzr log
1274
        bzr log foo.c
1275
        bzr log -r -10.. http://server/branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1276
    """
1277
1393.1.55 by Martin Pool
doc
1278
    # TODO: Make --revision support uuid: and hash: [future tag:] notation.
1279
1626.1.2 by Martin Pool
Better help message for log command.
1280
    takes_args = ['location?']
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1281
    takes_options = [Option('forward', 
1282
                            help='show from oldest to newest'),
1626.1.2 by Martin Pool
Better help message for log command.
1283
                     'timezone', 
1284
                     Option('verbose', 
1285
                             help='show files changed in each revision'),
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1286
                     'show-ids', 'revision',
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1287
                     'log-format',
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
1288
                     'line', 'long', 
1185.16.46 by mbp at sourcefrog
- add help strings to some options
1289
                     Option('message',
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1290
                            help='show revisions whose message matches this regexp',
1291
                            type=str),
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
1292
                     'short',
1185.16.57 by Martin Pool
[merge] from aaron
1293
                     ]
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()
1294
    encoding_type = 'replace'
1295
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1296
    @display_command
1626.1.2 by Martin Pool
Better help message for log command.
1297
    def run(self, location=None, timezone='original',
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1298
            verbose=False,
1299
            show_ids=False,
1300
            forward=False,
1301
            revision=None,
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1302
            log_format=None,
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1303
            message=None,
1304
            long=False,
1185.12.25 by Aaron Bentley
Added one-line log format
1305
            short=False,
1306
            line=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1307
        from bzrlib.log import log_formatter, show_log
1185.16.49 by mbp at sourcefrog
- more refactoring and tests of commandline
1308
        assert message is None or isinstance(message, basestring), \
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1309
            "invalid message argument %r" % message
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1310
        direction = (forward and 'forward') or 'reverse'
1311
        
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1312
        # log everything
1313
        file_id = None
1626.1.2 by Martin Pool
Better help message for log command.
1314
        if location:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1315
            # find the file id to log:
1316
1626.1.2 by Martin Pool
Better help message for log command.
1317
            dir, fp = bzrdir.BzrDir.open_containing(location)
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1318
            b = dir.open_branch()
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1319
            if fp != '':
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1320
                try:
1321
                    # might be a tree:
1322
                    inv = dir.open_workingtree().inventory
1323
                except (errors.NotBranchError, errors.NotLocalUrl):
1324
                    # either no tree, or is remote.
1325
                    inv = b.basis_tree().inventory
1497 by Robert Collins
Move Branch.read_working_inventory to WorkingTree.
1326
                file_id = inv.path2id(fp)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1327
        else:
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1328
            # local dir only
1329
            # 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.
1330
            dir, relpath = bzrdir.BzrDir.open_containing('.')
1534.4.46 by Robert Collins
Nearly complete .bzr/checkout splitout.
1331
            b = dir.open_branch()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1332
1333
        if revision is None:
1334
            rev1 = None
1335
            rev2 = None
1336
        elif len(revision) == 1:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1337
            rev1 = rev2 = revision[0].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1338
        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
1339
            if revision[0].spec is None:
1340
                # missing begin-range means first revision
1341
                rev1 = 1
1342
            else:
1343
                rev1 = revision[0].in_history(b).revno
1344
1540.2.6 by Robey Pointer
make 'log' and 'status' treat '-r N..' as implicitly '-r N..-1'
1345
            if revision[1].spec is None:
1346
                # missing end-range means last known revision
1347
                rev2 = b.revno()
1348
            else:
1349
                rev2 = revision[1].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1350
        else:
1351
            raise BzrCommandError('bzr log --revision takes one or two values.')
1352
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
1353
        # By this point, the revision numbers are converted to the +ve
1354
        # form if they were supplied in the -ve form, so we can do
1355
        # this comparison in relative safety
1356
        if rev1 > rev2:
1357
            (rev2, rev1) = (rev1, rev2)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1358
1553.2.1 by Erik Bågfors
Support for plugins to register log formatters and set default formatter
1359
        if (log_format == None):
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
1360
            default = b.get_config().log_format()
1361
            log_format = get_log_format(long=long, short=short, line=line, 
1362
                                        default=default)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1363
        lf = log_formatter(log_format,
1364
                           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()
1365
                           to_file=self.outf,
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1366
                           show_timezone=timezone)
1367
1368
        show_log(b,
1369
                 lf,
1370
                 file_id,
1371
                 verbose=verbose,
1372
                 direction=direction,
1373
                 start_revision=rev1,
1374
                 end_revision=rev2,
1375
                 search=message)
1376
1185.85.4 by John Arbash Meinel
currently broken, trying to fix things up.
1377
1553.2.4 by Erik Bågfors
Support for setting the default log format at a configuration option
1378
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
1379
    log_format = default
1380
    if long:
1381
        log_format = 'long'
1382
    if short:
1383
        log_format = 'short'
1384
    if line:
1385
        log_format = 'line'
1386
    return log_format
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1387
1388
1389
class cmd_touching_revisions(Command):
1390
    """Return revision-ids which affected a particular file.
1391
1685.1.80 by Wouter van Heyst
more code cleanup
1392
    A more user-friendly interface is "bzr log FILE".
1393
    """
1394
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1395
    hidden = True
1396
    takes_args = ["filename"]
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1397
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1398
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1399
    def run(self, filename):
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1400
        tree, relpath = WorkingTree.open_containing(filename)
1401
        b = tree.branch
1402
        inv = tree.read_working_inventory()
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
1403
        file_id = inv.path2id(relpath)
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1404
        for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1185.85.55 by John Arbash Meinel
Updated cmd_touching_revisions
1405
            self.outf.write("%6d %s\n" % (revno, what))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1406
1407
1408
class cmd_ls(Command):
1409
    """List files in a tree.
1410
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1411
    # TODO: Take a revision or remote path and list that tree instead.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1412
    hidden = True
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1413
    takes_options = ['verbose', 'revision',
1414
                     Option('non-recursive',
1415
                            help='don\'t recurse into sub-directories'),
1416
                     Option('from-root',
1417
                            help='Print all paths from the root of the branch.'),
1418
                     Option('unknown', help='Print unknown files'),
1419
                     Option('versioned', help='Print versioned files'),
1420
                     Option('ignored', help='Print ignored files'),
1421
1422
                     Option('null', help='Null separate the files'),
1423
                    ]
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1424
    @display_command
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1425
    def run(self, revision=None, verbose=False, 
1426
            non_recursive=False, from_root=False,
1427
            unknown=False, versioned=False, ignored=False,
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1428
            null=False):
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1429
1430
        if verbose and null:
1431
            raise BzrCommandError('Cannot set both --verbose and --null')
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1432
        all = not (unknown or versioned or ignored)
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1433
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1434
        selection = {'I':ignored, '?':unknown, 'V':versioned}
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1435
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1436
        tree, relpath = WorkingTree.open_containing(u'.')
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1437
        if from_root:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1438
            relpath = u''
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1439
        elif relpath:
1440
            relpath += '/'
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1441
        if revision is not None:
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1442
            tree = tree.branch.repository.revision_tree(
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1443
                revision[0].in_history(tree.branch).rev_id)
1551.6.36 by Aaron Bentley
Revert --debris/--detritus changes
1444
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
1445
        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.
1446
            if fp.startswith(relpath):
1447
                fp = fp[len(relpath):]
1448
                if non_recursive and '/' in fp:
1449
                    continue
1450
                if not all and not selection[fc]:
1451
                    continue
1452
                if verbose:
1453
                    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()
1454
                    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.
1455
                elif null:
1685.1.80 by Wouter van Heyst
more code cleanup
1456
                    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()
1457
                    self.outf.flush()
1185.26.1 by John Arbash Meinel
Made ls work again, and take extra arguments.
1458
                else:
1685.1.80 by Wouter van Heyst
more code cleanup
1459
                    self.outf.write(fp + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1460
1461
1462
class cmd_unknowns(Command):
1463
    """List unknown files."""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1464
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1465
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1466
        for f in WorkingTree.open_containing(u'.')[0].unknowns():
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
1467
            self.outf.write(osutils.quotefn(f) + '\n')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1468
1469
1470
class cmd_ignore(Command):
1471
    """Ignore a command or pattern.
1472
1473
    To remove patterns from the ignore list, edit the .bzrignore file.
1474
1475
    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
1476
    from the branch root.  Otherwise, it is compared to only the last
1477
    component of the path.  To match a file only in the root directory,
1478
    prepend './'.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1479
1480
    Ignore patterns are case-insensitive on case-insensitive systems.
1481
1482
    Note: wildcards must be quoted from the shell on Unix.
1483
1484
    examples:
1485
        bzr ignore ./Makefile
1486
        bzr ignore '*.class'
1487
    """
1185.16.4 by Martin Pool
- doc and todo for ignore command
1488
    # 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.
1489
    takes_args = ['name_pattern?']
1490
    takes_options = [
1491
                     Option('old-default-rules',
1492
                            help='Out the ignore rules bzr < 0.9 always used.')
1493
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1494
    
1765.1.1 by Robert Collins
Remove the default ignores list from bzr, lowering the minimum overhead in bzr add.
1495
    def run(self, name_pattern=None, old_default_rules=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1496
        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.
1497
        if old_default_rules is not None:
1498
            # 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.
1499
            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.
1500
                print pattern
1501
            return
1502
        if name_pattern is None:
1503
            raise BzrCommandError("ignore requires a NAME_PATTERN")
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1504
        tree, relpath = WorkingTree.open_containing(u'.')
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1505
        ifn = tree.abspath('.bzrignore')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1506
        if os.path.exists(ifn):
1507
            f = open(ifn, 'rt')
1508
            try:
1509
                igns = f.read().decode('utf-8')
1510
            finally:
1511
                f.close()
1512
        else:
1513
            igns = ''
1514
1515
        # TODO: If the file already uses crlf-style termination, maybe
1516
        # we should use that for the newly added lines?
1517
1518
        if igns and igns[-1] != '\n':
1519
            igns += '\n'
1520
        igns += name_pattern + '\n'
1521
1704.2.22 by Martin Pool
Fix misplaced try/finally (Debian #352791, madduck)
1522
        f = AtomicFile(ifn, 'wt')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1523
        try:
1524
            f.write(igns.encode('utf-8'))
1525
            f.commit()
1526
        finally:
1527
            f.close()
1528
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1529
        inv = tree.inventory
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1530
        if inv.path2id('.bzrignore'):
1531
            mutter('.bzrignore is already versioned')
1532
        else:
1533
            mutter('need to make new .bzrignore file versioned')
1508.1.5 by Robert Collins
Move add from Branch to WorkingTree.
1534
            tree.add(['.bzrignore'])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1535
1536
1537
class cmd_ignored(Command):
1538
    """List ignored files and the patterns that matched them.
1539
1540
    See also: bzr ignore"""
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1541
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1542
    def run(self):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1543
        tree = WorkingTree.open_containing(u'.')[0]
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
1544
        for path, file_class, kind, file_id, entry in tree.list_files():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1545
            if file_class != 'I':
1546
                continue
1547
            ## XXX: Slightly inefficient since this was already calculated
1548
            pat = tree.is_ignored(path)
1549
            print '%-50s %s' % (path, pat)
1550
1551
1552
class cmd_lookup_revision(Command):
1553
    """Lookup the revision-id from a revision-number
1554
1555
    example:
1556
        bzr lookup-revision 33
1557
    """
1558
    hidden = True
1559
    takes_args = ['revno']
1560
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1561
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1562
    def run(self, revno):
1563
        try:
1564
            revno = int(revno)
1565
        except ValueError:
1566
            raise BzrCommandError("not a valid revision-number: %r" % revno)
1567
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1568
        print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1569
1570
1571
class cmd_export(Command):
1572
    """Export past revision to destination directory.
1573
1574
    If no revision is specified this exports the last committed revision.
1575
1576
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
1577
    given, try to find the format with the extension. If no extension
1578
    is found exports to a directory (equivalent to --format=dir).
1579
1580
    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
1581
    is given, the top directory will be the root name of the file.
1582
1583
    Note: export of tree with non-ascii filenames to zip is not supported.
1584
1551.3.11 by Aaron Bentley
Merge from Robert
1585
     Supported formats       Autodetected by extension
1586
     -----------------       -------------------------
1185.31.11 by John Arbash Meinel
Merging Alexander's zip export patch
1587
         dir                            -
1588
         tar                          .tar
1589
         tbz2                    .tar.bz2, .tbz2
1590
         tgz                      .tar.gz, .tgz
1591
         zip                          .zip
1592
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1593
    takes_args = ['dest']
1594
    takes_options = ['revision', 'format', 'root']
1595
    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.
1596
        from bzrlib.export import export
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1597
        tree = WorkingTree.open_containing(u'.')[0]
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1598
        b = tree.branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1599
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1600
            # should be tree.last_revision  FIXME
1241 by Martin Pool
- rename last_patch to last_revision
1601
            rev_id = b.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1602
        else:
1603
            if len(revision) != 1:
1604
                raise BzrError('bzr export --revision takes exactly 1 argument')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1605
            rev_id = revision[0].in_history(b).rev_id
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
1606
        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.
1607
        try:
1608
            export(t, dest, format, root)
1609
        except errors.NoSuchExportFormat, e:
1610
            raise BzrCommandError('Unsupported export format: %s' % e.format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1611
1612
1613
class cmd_cat(Command):
1614
    """Write a file's text from a previous revision."""
1615
1616
    takes_options = ['revision']
1617
    takes_args = ['filename']
1618
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1619
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1620
    def run(self, filename, revision=None):
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1621
        if revision is not None and len(revision) != 1:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1622
            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
1623
        tree = None
1624
        try:
1625
            tree, relpath = WorkingTree.open_containing(filename)
1626
            b = tree.branch
1627
        except NotBranchError:
1628
            pass
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1629
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1630
        if tree is None:
1631
            b, relpath = Branch.open_containing(filename)
1185.50.9 by John Arbash Meinel
[bug 3632] Matthieu Moy- bzr cat should default to last revision
1632
        if revision is None:
1633
            revision_id = b.last_revision()
1634
        else:
1635
            revision_id = revision[0].in_history(b).rev_id
1636
        b.print_file(relpath, revision_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1637
1638
1639
class cmd_local_time_offset(Command):
1640
    """Show the offset in seconds from GMT to local time."""
1641
    hidden = True    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1642
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1643
    def run(self):
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1644
        print osutils.local_time_offset()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1645
1646
1647
1648
class cmd_commit(Command):
1649
    """Commit changes into a new revision.
1650
    
1651
    If no arguments are given, the entire tree is committed.
1652
1653
    If selected files are specified, only changes to those files are
1654
    committed.  If a directory is specified then the directory and everything 
1655
    within it is committed.
1656
1657
    A selected-file commit may fail in some cases where the committed
1658
    tree would be invalid, such as trying to commit a file in a
1659
    newly-added directory that is not itself committed.
1660
    """
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1661
    # TODO: Run hooks on tree to-be-committed, and after commit.
1662
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1663
    # TODO: Strict commit that fails if there are deleted files.
1664
    #       (what does "deleted files" mean ??)
1665
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
1666
    # TODO: Give better message for -s, --summary, used by tla people
1667
1668
    # XXX: verbose currently does nothing
1669
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1670
    takes_args = ['selected*']
1185.16.48 by mbp at sourcefrog
- more refactoring of and tests for option parsing
1671
    takes_options = ['message', 'verbose', 
1672
                     Option('unchanged',
1673
                            help='commit even if nothing has changed'),
1674
                     Option('file', type=str, 
1675
                            argname='msgfile',
1676
                            help='file containing commit message'),
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1677
                     Option('strict',
1678
                            help="refuse to commit if there are unknown "
1679
                            "files in the working tree."),
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1680
                     Option('local',
1681
                            help="perform a local only commit in a bound "
1682
                                 "branch. Such commits are not pushed to "
1683
                                 "the master branch until a normal commit "
1684
                                 "is performed."
1685
                            ),
1185.16.43 by Martin Pool
- clean up handling of option objects
1686
                     ]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1687
    aliases = ['ci', 'checkin']
1688
1689
    def run(self, message=None, file=None, verbose=True, selected_list=None,
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1690
            unchanged=False, strict=False, local=False):
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1691
        from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1692
        from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1693
                StrictCommitFailed)
1185.33.76 by Martin Pool
Fix import error.
1694
        from bzrlib.msgeditor import edit_commit_message, \
1695
                make_commit_message_template
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
1696
        from tempfile import TemporaryFile
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1697
1185.33.77 by Martin Pool
doc
1698
        # TODO: Need a blackbox test for invoking the external editor; may be
1699
        # slightly problematic to run this cross-platform.
1700
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
1701
        # TODO: do more checks that the commit will succeed before 
1702
        # spending the user's valuable time typing a commit message.
1703
        #
1704
        # TODO: if the commit *does* happen to fail, then save the commit 
1705
        # 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
1706
        tree, selected_list = tree_files(selected_list)
1704.2.11 by Martin Pool
Handle 'bzr commit DIR' when dir contains pending merges.
1707
        if selected_list == ['']:
1708
            # workaround - commit of root of tree should be exactly the same
1709
            # as just default commit in that tree, and succeed even though
1710
            # selected-file merge commit is not done yet
1711
            selected_list = []
1712
1587.1.8 by Robert Collins
Local commits on unbound branches fail.
1713
        if local and not tree.branch.get_bound_location():
1714
            raise errors.LocalRequiresBoundBranch()
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1715
        if message is None and not file:
1185.33.76 by Martin Pool
Fix import error.
1716
            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
1717
            message = edit_commit_message(template)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1718
            if message is None:
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1719
                raise BzrCommandError("please specify a commit message"
1720
                                      " with either --message or --file")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1721
        elif message and file:
1722
            raise BzrCommandError("please specify either --message or --file")
1723
        
1724
        if file:
1773.4.2 by Martin Pool
Cleanup of imports; undeprecate all_revision_ids()
1725
            message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1726
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1727
        if message == "":
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1728
            raise BzrCommandError("empty commit message specified")
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1729
        
1730
        if verbose:
1731
            reporter = ReportCommitToLog()
1732
        else:
1733
            reporter = NullCommitReporter()
1734
        
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1735
        try:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
1736
            tree.commit(message, specific_files=selected_list,
1607.1.5 by Robert Collins
Make commit verbose mode work!.
1737
                        allow_pointless=unchanged, strict=strict, local=local,
1738
                        reporter=reporter)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1739
        except PointlessCommit:
1740
            # FIXME: This should really happen before the file is read in;
1741
            # 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.
1742
            raise BzrCommandError("no changes to commit."
1743
                                  " use --unchanged to commit anyhow")
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
1744
        except ConflictsInTree:
1745
            raise BzrCommandError("Conflicts detected in working tree.  "
1746
                'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1185.16.65 by mbp at sourcefrog
- new commit --strict option
1747
        except StrictCommitFailed:
1748
            raise BzrCommandError("Commit refused because there are unknown "
1749
                                  "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
1750
        except errors.BoundBranchOutOfDate, e:
1878.3.1 by Adeodato Simó
cmd_commit.run:
1751
            raise BzrCommandError(str(e) + "\n"
1878.3.2 by Adeodato Simó
Update with suggestions from John Arbash Meinel.
1752
                'To commit to master branch, run update and then commit.\n'
1753
                'You can also pass --local to commit to continue working '
1754
                'disconnected.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1755
1756
class cmd_check(Command):
1757
    """Validate consistency of branch history.
1758
1759
    This command checks various invariants about the branch storage to
1760
    detect data corruption or bzr bugs.
1761
    """
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1762
    takes_args = ['branch?']
1449 by Robert Collins
teach check about ghosts
1763
    takes_options = ['verbose']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1764
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1765
    def run(self, branch=None, verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1766
        from bzrlib.check import check
1512 by Robert Collins
Merge from Martin. Adjust check to work with HTTP again.
1767
        if branch is None:
1768
            tree = WorkingTree.open_containing()[0]
1769
            branch = tree.branch
1770
        else:
1771
            branch = Branch.open(branch)
1772
        check(branch, verbose)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1773
1774
1775
class cmd_scan_cache(Command):
1776
    hidden = True
1777
    def run(self):
1778
        from bzrlib.hashcache import HashCache
1779
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1780
        c = HashCache(u'.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1781
        c.read()
1782
        c.scan()
1783
            
1784
        print '%6d stats' % c.stat_count
1785
        print '%6d in hashcache' % len(c._cache)
1786
        print '%6d files removed from cache' % c.removed_count
1787
        print '%6d hashes updated' % c.update_count
1788
        print '%6d files changed too recently to cache' % c.danger_count
1789
1790
        if c.needs_write:
1791
            c.write()
1534.5.16 by Robert Collins
Review feedback.
1792
1793
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1794
class cmd_upgrade(Command):
1795
    """Upgrade branch storage to current format.
1796
1797
    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.
1798
    this command. When the default format has changed you may also be warned
1799
    during other operations to upgrade.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1800
    """
1534.4.13 by Robert Collins
Give a reasonable warning on attempts to upgrade a readonly url.
1801
    takes_args = ['url?']
1534.5.13 by Robert Collins
Correct buggy test.
1802
    takes_options = [
1803
                     Option('format', 
1694.2.6 by Martin Pool
[merge] bzr.dev
1804
                            help='Upgrade to a specific format. Current formats'
1805
                                 ' are: default, knit, metaweave and weave.'
1806
                                 ' Default is knit; metaweave and weave are'
1807
                                 ' deprecated',
1534.5.13 by Robert Collins
Correct buggy test.
1808
                            type=get_format_type),
1809
                    ]
1810
1811
1812
    def run(self, url='.', format=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1813
        from bzrlib.upgrade import upgrade
1694.2.6 by Martin Pool
[merge] bzr.dev
1814
        if format is None:
1815
            format = get_format_type('default')
1534.5.13 by Robert Collins
Correct buggy test.
1816
        upgrade(url, format)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1817
1818
1819
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
1820
    """Show or set bzr user id.
1821
    
1822
    examples:
1823
        bzr whoami --email
1824
        bzr whoami 'Frank Chu <fchu@example.com>'
1825
    """
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
1826
    takes_options = [ Option('email',
1827
                             help='display email address only'),
1828
                      Option('branch',
1829
                             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
1830
                                  'globally'),
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
1831
                    ]
1832
    takes_args = ['name?']
1833
    encoding_type = 'replace'
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1834
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1835
    @display_command
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
1836
    def run(self, email=False, branch=False, name=None):
1837
        if name is None:
1838
            # use branch if we're inside one; otherwise global config
1839
            try:
1816.2.10 by Robey Pointer
code style changes
1840
                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
1841
            except NotBranchError:
1842
                c = config.GlobalConfig()
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
1843
            if email:
1816.2.10 by Robey Pointer
code style changes
1844
                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
1845
            else:
1816.2.10 by Robey Pointer
code style changes
1846
                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
1847
            return
1816.2.2 by Robey Pointer
fix 'whoami' to use encodings and allow setting the global or branch identity
1848
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
1849
        # display a warning if an email address isn't included in the given name.
1850
        try:
1851
            config.extract_email_address(name)
1852
        except BzrError, e:
1840.1.5 by Robey Pointer
change the warning message for a 'whoami' with no email address, on jam's recommendation
1853
            warning('"%s" does not seem to contain an email address.  '
1854
                    '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
1855
        
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
1856
        # use global config unless --branch given
1857
        if branch:
1816.2.10 by Robey Pointer
code style changes
1858
            c = Branch.open_containing('.')[0].get_config()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1859
        else:
1816.2.4 by Robey Pointer
flesh out 'whoami' docs a little, and don't display the identity after setting it
1860
            c = config.GlobalConfig()
1861
        c.set_user_option('email', name)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1862
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.
1863
1185.35.14 by Aaron Bentley
Implemented nick command
1864
class cmd_nick(Command):
1551.3.11 by Aaron Bentley
Merge from Robert
1865
    """Print or set the branch nickname.  
1866
1185.35.14 by Aaron Bentley
Implemented nick command
1867
    If unset, the tree root directory name is used as the nickname
1868
    To print the current nickname, execute with no argument.  
1869
    """
1870
    takes_args = ['nickname?']
1871
    def run(self, nickname=None):
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
1872
        branch = Branch.open_containing(u'.')[0]
1185.35.14 by Aaron Bentley
Implemented nick command
1873
        if nickname is None:
1874
            self.printme(branch)
1875
        else:
1876
            branch.nick = nickname
1877
1878
    @display_command
1879
    def printme(self, branch):
1880
        print branch.nick 
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1881
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.
1882
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1883
class cmd_selftest(Command):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1884
    """Run internal test suite.
1885
    
1886
    This creates temporary test directories in the working directory,
1887
    but not existing data is affected.  These directories are deleted
1888
    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
1889
    fail and --keep-output is specified.
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1890
    
1891
    If arguments are given, they are regular expressions that say
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1892
    which tests should run.
1552 by Martin Pool
Improved help text for bzr selftest
1893
1894
    If the global option '--no-plugins' is given, plugins are not loaded
1895
    before running the selftests.  This has two effects: features provided or
1896
    modified by plugins will not be tested, and tests provided by plugins will
1897
    not be run.
1898
1899
    examples:
1900
        bzr selftest ignore
1901
        bzr --no-plugins selftest -v
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1902
    """
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1903
    # 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.
1904
1905
    # NB: this is used from the class without creating an instance, which is
1906
    # why it does not have a self parameter.
1907
    def get_transport_type(typestring):
1908
        """Parse and return a transport specifier."""
1909
        if typestring == "sftp":
1910
            from bzrlib.transport.sftp import SFTPAbsoluteServer
1911
            return SFTPAbsoluteServer
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1912
        if typestring == "memory":
1913
            from bzrlib.transport.memory import MemoryServer
1914
            return MemoryServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
1915
        if typestring == "fakenfs":
1558.10.2 by Robert Collins
Refactor the FakeNFS support into a TransportDecorator.
1916
            from bzrlib.transport.fakenfs import FakeNFSServer
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
1917
            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.
1918
        msg = "No known transport type %s. Supported types are: sftp\n" %\
1919
            (typestring)
1920
        raise BzrCommandError(msg)
1921
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1922
    hidden = True
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1923
    takes_args = ['testspecs*']
1552 by Martin Pool
Improved help text for bzr selftest
1924
    takes_options = ['verbose',
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1925
                     Option('one', help='stop when one test fails'),
1185.35.20 by Aaron Bentley
Only keep test failure directories if --keep-output is specified
1926
                     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.
1927
                            help='keep output directories when tests fail'),
1928
                     Option('transport', 
1929
                            help='Use a different transport by default '
1930
                                 'throughout the test suite.',
1931
                            type=get_transport_type),
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1932
                     Option('benchmark', help='run the bzr bencharks.'),
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1933
                     Option('lsprof-timed',
1934
                            help='generate lsprof output for benchmarked'
1935
                                 ' sections of code.'),
1908.2.4 by John Arbash Meinel
Add the ability to specify a benchmark cache directory.
1936
                     Option('cache-dir', type=str,
1937
                            help='a directory to cache intermediate'
1938
                                 ' benchmark steps'),
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1939
                     ]
1185.16.58 by mbp at sourcefrog
- run all selftests by default
1940
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1941
    def run(self, testspecs_list=None, verbose=None, one=False,
1942
            keep_output=False, transport=None, benchmark=None,
1908.2.4 by John Arbash Meinel
Add the ability to specify a benchmark cache directory.
1943
            lsprof_timed=None, cache_dir=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1944
        import bzrlib.ui
1707.2.2 by Robert Collins
Start on bench_add, an add benchtest.
1945
        from bzrlib.tests import selftest
1946
        import bzrlib.benchmarks as benchmarks
1908.2.16 by John Arbash Meinel
Move all the new TreeCreator classes into separate files.
1947
        from bzrlib.benchmarks import tree_creator
1908.2.4 by John Arbash Meinel
Add the ability to specify a benchmark cache directory.
1948
1949
        if cache_dir is not None:
1908.2.16 by John Arbash Meinel
Move all the new TreeCreator classes into separate files.
1950
            tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1951
        # we don't want progress meters from the tests to go to the
1952
        # real output; and we don't want log messages cluttering up
1953
        # the real logs.
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1954
        save_ui = ui.ui_factory
1955
        print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1956
        print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
1957
        print
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1958
        info('running tests...')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1959
        try:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1960
            ui.ui_factory = ui.SilentUIFactory()
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1961
            if testspecs_list is not None:
1962
                pattern = '|'.join(testspecs_list)
1963
            else:
1964
                pattern = ".*"
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1965
            if benchmark:
1707.2.2 by Robert Collins
Start on bench_add, an add benchtest.
1966
                test_suite_factory = benchmarks.test_suite
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1967
                if verbose is None:
1968
                    verbose = True
1819.1.3 by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history
1969
                benchfile = open(".perf_history", "at")
1707.2.1 by Robert Collins
'bzr selftest --benchmark' will run a new benchmarking selftest.
1970
            else:
1971
                test_suite_factory = None
1725.1.1 by Robert Collins
'bzr selftest --benchmark --lsprof-timed' will use lsprofile to generate
1972
                if verbose is None:
1973
                    verbose = False
1819.1.3 by Carl Friedrich Bolz
(lifeless, cfbolz): Add recording of benchmark results to the benchmark history
1974
                benchfile = None
1975
            try:
1976
                result = selftest(verbose=verbose, 
1977
                                  pattern=pattern,
1978
                                  stop_on_failure=one, 
1979
                                  keep_output=keep_output,
1980
                                  transport=transport,
1981
                                  test_suite_factory=test_suite_factory,
1982
                                  lsprof_timed=lsprof_timed,
1983
                                  bench_history=benchfile)
1984
            finally:
1985
                if benchfile is not None:
1986
                    benchfile.close()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1987
            if result:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1988
                info('tests passed')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1989
            else:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1990
                info('tests failed')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1991
            return int(not result)
1992
        finally:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
1993
            ui.ui_factory = save_ui
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1994
1995
1996
class cmd_version(Command):
1997
    """Show version of bzr."""
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
1998
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
1999
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2000
    def run(self):
1819.1.8 by Martin Pool
Improved reporting of bzrlib revision_id
2001
        from bzrlib.version import show_version
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2002
        show_version()
2003
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2004
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2005
class cmd_rocks(Command):
2006
    """Statement of optimism."""
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2007
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2008
    hidden = True
1871.1.1 by Robert Collins
Relocate bzrlib selftest external output tests to bzrlib/tests/blackbox/test_selftest.py.
2009
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2010
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2011
    def run(self):
2012
        print "it sure does!"
2013
2014
2015
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.
2016
    """Find and print a base revision for merging two branches."""
1185.16.3 by Martin Pool
- remove all TODOs from bzr help messages
2017
    # TODO: Options to specify revisions on either side, as if
2018
    #       merging only part of the history.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2019
    takes_args = ['branch', 'other']
2020
    hidden = True
2021
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2022
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2023
    def run(self, branch, other):
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2024
        from bzrlib.revision import common_ancestor, MultipleRevisionSources
2025
        
1442.1.64 by Robert Collins
Branch.open_containing now returns a tuple (Branch, relative-path).
2026
        branch1 = Branch.open_containing(branch)[0]
2027
        branch2 = Branch.open_containing(other)[0]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2028
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2029
        history_1 = branch1.revision_history()
2030
        history_2 = branch2.revision_history()
2031
1241 by Martin Pool
- rename last_patch to last_revision
2032
        last1 = branch1.last_revision()
2033
        last2 = branch2.last_revision()
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2034
1551.2.2 by Aaron Bentley
Fix find-merge-base for new API [recommit]
2035
        source = MultipleRevisionSources(branch1.repository, 
2036
                                         branch2.repository)
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
2037
        
2038
        base_rev_id = common_ancestor(last1, last2, source)
2039
2040
        print 'merge base is revision %s' % base_rev_id
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2041
2042
2043
class cmd_merge(Command):
2044
    """Perform a three-way merge.
2045
    
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2046
    The branch is the branch you will merge from.  By default, it will merge
2047
    the latest revision.  If you specify a revision, that revision will be
2048
    merged.  If you specify two revisions, the first will be used as a BASE,
2049
    and the second one as OTHER.  Revision numbers are always relative to the
2050
    specified branch.
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2051
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
2052
    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
2053
    branch, automatically determining an appropriate base.  If this
2054
    fails, you may need to give an explicit base.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2055
    
1551.2.18 by Aaron Bentley
Updated docs to clarify conflict handling
2056
    Merge will do its best to combine the changes in two branches, but there
2057
    are some kinds of problems only a human can fix.  When it encounters those,
2058
    it will mark a conflict.  A conflict means that you need to fix something,
2059
    before you should commit.
2060
1551.2.19 by Aaron Bentley
Added See Conflicts to merge help
2061
    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
2062
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2063
    If there is no default branch set, the first merge will set it. After
2064
    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.
2065
    default, use --remember. The value will only be saved if the remote
2066
    location can be accessed.
1614.2.2 by Olaf Conradi
Merge command:
2067
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2068
    Examples:
2069
2070
    To merge the latest revision from bzr.dev
2071
    bzr merge ../bzr.dev
2072
2073
    To merge changes up to and including revision 82 from bzr.dev
2074
    bzr merge -r 82 ../bzr.dev
2075
2076
    To merge the changes introduced by 82, without previous changes:
2077
    bzr merge -r 81..82 ../bzr.dev
2078
    
2079
    merge refuses to run if there are any uncommitted changes, unless
2080
    --force is given.
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2081
2082
    The following merge types are available:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2083
    """
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2084
    takes_args = ['branch?']
1614.2.2 by Olaf Conradi
Merge command:
2085
    takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
1185.18.1 by Aaron Bentley
Added --show-base to merge
2086
                     Option('show-base', help="Show base revision text in "
1910.1.1 by Aaron Bentley
Merge takes --uncommitted parameter
2087
                            "conflicts"), 
2088
                     Option('uncommitted', help='Apply uncommitted changes'
2089
                            ' from a working copy, instead of branch changes')]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2090
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2091
    def help(self):
2092
        from merge import merge_type_help
2093
        from inspect import getdoc
2094
        return getdoc(self) + '\n' + merge_type_help() 
2095
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2096
    def run(self, branch=None, revision=None, force=False, merge_type=None,
1910.1.1 by Aaron Bentley
Merge takes --uncommitted parameter
2097
            show_base=False, reprocess=False, remember=False, 
2098
            uncommitted=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2099
        if merge_type is None:
1534.7.139 by Aaron Bentley
ApplyMerge3 -> Merge3Merger
2100
            merge_type = Merge3Merger
1614.2.2 by Olaf Conradi
Merge command:
2101
2102
        tree = WorkingTree.open_containing(u'.')[0]
1685.1.69 by Wouter van Heyst
merge bzr.dev 1740
2103
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2104
        if branch is not None:
2105
            try:
1773.4.3 by Martin Pool
[merge] bzr.dev
2106
                reader = bundle.read_bundle_from_url(branch)
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2107
            except NotABundle:
2108
                pass # Continue on considering this url a Branch
1185.82.25 by Aaron Bentley
Added changeset-merging functionality
2109
            else:
1711.3.3 by John Arbash Meinel
Allow pull to use a bundle as a target,
2110
                conflicts = merge_bundle(reader, tree, not force, merge_type,
2111
                                            reprocess, show_base)
2112
                if conflicts == 0:
2113
                    return 0
2114
                else:
2115
                    return 1
1185.82.25 by Aaron Bentley
Added changeset-merging functionality
2116
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2117
        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
2118
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2119
        if revision is None or len(revision) < 1:
1910.1.1 by Aaron Bentley
Merge takes --uncommitted parameter
2120
            if uncommitted:
2121
                base = [branch, -1]
2122
                other = [branch, None]
2123
            else:
2124
                base = [None, None]
2125
                other = [branch, -1]
1645.1.1 by Aaron Bentley
Implement single-file merge
2126
            other_branch, path = Branch.open_containing(branch)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2127
        else:
1910.1.1 by Aaron Bentley
Merge takes --uncommitted parameter
2128
            if uncommitted:
2129
                raise BzrCommandError('Cannot use --uncommitted and --revision'
2130
                                      ' at the same time.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2131
            if len(revision) == 1:
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
2132
                base = [None, None]
1645.1.1 by Aaron Bentley
Implement single-file merge
2133
                other_branch, path = Branch.open_containing(branch)
1185.12.46 by Aaron Bentley
Fixed -r brokenness in merge
2134
                revno = revision[0].in_history(other_branch).revno
1614.2.4 by Olaf Conradi
Renamed argument location in command merge back to branch.
2135
                other = [branch, revno]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2136
            else:
2137
                assert len(revision) == 2
2138
                if None in revision:
2139
                    raise BzrCommandError(
2140
                        "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
2141
                other_branch, path = Branch.open_containing(branch)
2142
2143
                base = [branch, revision[0].in_history(other_branch).revno]
2144
                other = [branch, revision[1].in_history(other_branch).revno]
2145
2146
        if tree.branch.get_parent() is None or remember:
2147
            tree.branch.set_parent(other_branch.base)
2148
1645.1.1 by Aaron Bentley
Implement single-file merge
2149
        if path != "":
2150
            interesting_files = [path]
2151
        else:
2152
            interesting_files = None
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2153
        pb = ui.ui_factory.nested_progress_bar()
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2154
        try:
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2155
            try:
2156
                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
2157
                                       merge_type=merge_type,
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2158
                                       reprocess=reprocess,
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2159
                                       show_base=show_base,
1645.1.1 by Aaron Bentley
Implement single-file merge
2160
                                       pb=pb, file_list=interesting_files)
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2161
            finally:
2162
                pb.finished()
1476 by Robert Collins
Merge now has a retcode of 1 when conflicts occur. (Robert Collins)
2163
            if conflict_count != 0:
2164
                return 1
2165
            else:
2166
                return 0
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2167
        except errors.AmbiguousBase, e:
1173 by Martin Pool
- message typo
2168
            m = ("sorry, bzr can't determine the right merge base yet\n"
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
2169
                 "candidates are:\n  "
2170
                 + "\n  ".join(e.bases)
2171
                 + "\n"
2172
                 "please specify an explicit base with -r,\n"
2173
                 "and (if you want) report this to the bzr developers\n")
2174
            log_error(m)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2175
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2176
    # TODO: move up to common parent; this isn't merge-specific anymore. 
2177
    def _get_remembered_parent(self, tree, supplied_location, verb_string):
2178
        """Use tree.branch's parent if none was supplied.
2179
2180
        Report if the remembered location was used.
2181
        """
2182
        if supplied_location is not None:
2183
            return supplied_location
2184
        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
2185
        mutter("%s", stored_location)
1685.1.59 by Martin Pool
[broken] Fix up & refactor display of remembered urls to unescape properly
2186
        if stored_location is None:
2187
            raise BzrCommandError("No location specified or remembered")
2188
        display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2189
        self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2190
        return stored_location
2191
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2192
1185.35.4 by Aaron Bentley
Implemented remerge
2193
class cmd_remerge(Command):
2194
    """Redo a merge.
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2195
2196
    Use this if you want to try a different merge technique while resolving
2197
    conflicts.  Some merge techniques are better than others, and remerge 
2198
    lets you try different ones on different files.
2199
2200
    The options for remerge have the same meaning and defaults as the ones for
2201
    merge.  The difference is that remerge can (only) be run when there is a
2202
    pending merge, and it lets you specify particular files.
2203
2204
    Examples:
2205
    $ bzr remerge --show-base
2206
        Re-do the merge of all conflicted files, and show the base text in
2207
        conflict regions, in addition to the usual THIS and OTHER texts.
2208
2209
    $ bzr remerge --merge-type weave --reprocess foobar
2210
        Re-do the merge of "foobar", using the weave merge algorithm, with
2211
        additional processing to reduce the size of conflict regions.
2212
    
2213
    The following merge types are available:"""
1185.35.4 by Aaron Bentley
Implemented remerge
2214
    takes_args = ['file*']
2215
    takes_options = ['merge-type', 'reprocess',
2216
                     Option('show-base', help="Show base revision text in "
2217
                            "conflicts")]
2218
1551.6.22 by Aaron Bentley
Improved help for remerge and merge
2219
    def help(self):
2220
        from merge import merge_type_help
2221
        from inspect import getdoc
2222
        return getdoc(self) + '\n' + merge_type_help() 
2223
1185.35.4 by Aaron Bentley
Implemented remerge
2224
    def run(self, file_list=None, merge_type=None, show_base=False,
2225
            reprocess=False):
2226
        from bzrlib.merge import merge_inner, transform_tree
2227
        if merge_type is None:
1534.7.139 by Aaron Bentley
ApplyMerge3 -> Merge3Merger
2228
            merge_type = Merge3Merger
1508.1.15 by Robert Collins
Merge from mpool.
2229
        tree, file_list = tree_files(file_list)
2230
        tree.lock_write()
1185.35.4 by Aaron Bentley
Implemented remerge
2231
        try:
1508.1.15 by Robert Collins
Merge from mpool.
2232
            pending_merges = tree.pending_merges() 
1185.35.4 by Aaron Bentley
Implemented remerge
2233
            if len(pending_merges) != 1:
2234
                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.
2235
                                      " merges.  Not cherrypicking or"
2236
                                      " multi-merges.")
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2237
            repository = tree.branch.repository
1508.1.15 by Robert Collins
Merge from mpool.
2238
            base_revision = common_ancestor(tree.branch.last_revision(), 
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2239
                                            pending_merges[0], repository)
2240
            base_tree = repository.revision_tree(base_revision)
2241
            other_tree = repository.revision_tree(pending_merges[0])
1185.35.4 by Aaron Bentley
Implemented remerge
2242
            interesting_ids = None
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2243
            new_conflicts = []
2244
            conflicts = tree.conflicts()
1185.35.4 by Aaron Bentley
Implemented remerge
2245
            if file_list is not None:
2246
                interesting_ids = set()
2247
                for filename in file_list:
1508.1.15 by Robert Collins
Merge from mpool.
2248
                    file_id = tree.path2id(filename)
1558.2.1 by Aaron Bentley
Ensure remerge errors when file-id is None
2249
                    if file_id is None:
2250
                        raise NotVersionedError(filename)
1185.35.4 by Aaron Bentley
Implemented remerge
2251
                    interesting_ids.add(file_id)
1508.1.15 by Robert Collins
Merge from mpool.
2252
                    if tree.kind(file_id) != "directory":
1185.35.4 by Aaron Bentley
Implemented remerge
2253
                        continue
1185.35.13 by Aaron Bentley
Merged Martin
2254
                    
1508.1.15 by Robert Collins
Merge from mpool.
2255
                    for name, ie in tree.inventory.iter_entries(file_id):
1185.35.4 by Aaron Bentley
Implemented remerge
2256
                        interesting_ids.add(ie.file_id)
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2257
                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()
2258
            transform_tree(tree, tree.basis_tree(), interesting_ids)
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2259
            tree.set_conflicts(ConflictList(new_conflicts))
1185.35.4 by Aaron Bentley
Implemented remerge
2260
            if file_list is None:
1508.1.15 by Robert Collins
Merge from mpool.
2261
                restore_files = list(tree.iter_conflicts())
1185.35.4 by Aaron Bentley
Implemented remerge
2262
            else:
2263
                restore_files = file_list
2264
            for filename in restore_files:
2265
                try:
1508.1.15 by Robert Collins
Merge from mpool.
2266
                    restore(tree.abspath(filename))
1185.35.4 by Aaron Bentley
Implemented remerge
2267
                except NotConflicted:
2268
                    pass
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2269
            conflicts = merge_inner(tree.branch, other_tree, base_tree,
2270
                                    this_tree=tree,
1551.7.12 by Aaron Bentley
Fix spacing
2271
                                    interesting_ids=interesting_ids, 
1551.7.10 by Aaron Bentley
Remerge doesn't clear unrelated conflicts
2272
                                    other_rev_id=pending_merges[0], 
2273
                                    merge_type=merge_type, 
2274
                                    show_base=show_base,
2275
                                    reprocess=reprocess)
1185.35.4 by Aaron Bentley
Implemented remerge
2276
        finally:
1508.1.15 by Robert Collins
Merge from mpool.
2277
            tree.unlock()
1185.35.4 by Aaron Bentley
Implemented remerge
2278
        if conflicts > 0:
2279
            return 1
2280
        else:
2281
            return 0
2282
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2283
class cmd_revert(Command):
2284
    """Reverse all changes since the last commit.
2285
2286
    Only versioned files are affected.  Specify filenames to revert only 
2287
    those files.  By default, any files that are changed will be backed up
2288
    first.  Backup files have a '~' appended to their name.
2289
    """
2290
    takes_options = ['revision', 'no-backup']
2291
    takes_args = ['file*']
2292
    aliases = ['merge-revert']
2293
2294
    def run(self, revision=None, no_backup=False, file_list=None):
2295
        from bzrlib.commands import parse_spec
2296
        if file_list is not None:
2297
            if len(file_list) == 0:
2298
                raise BzrCommandError("No files specified")
1457.1.9 by Robert Collins
Change cmd_revert implementation to call workingtree.Revert.
2299
        else:
2300
            file_list = []
1185.50.53 by John Arbash Meinel
[patch] Aaron Bentley: make revert work in a subdirectory.
2301
        
2302
        tree, file_list = tree_files(file_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2303
        if revision is None:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2304
            # FIXME should be tree.last_revision
1558.4.2 by Aaron Bentley
Revert in checkout works properly
2305
            rev_id = tree.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2306
        elif len(revision) != 1:
2307
            raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
2308
        else:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2309
            rev_id = revision[0].in_history(tree.branch).rev_id
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2310
        pb = ui.ui_factory.nested_progress_bar()
1551.2.25 by Aaron Bentley
Stop using deprecated methods in merge and revert
2311
        try:
2312
            tree.revert(file_list, 
2313
                        tree.branch.repository.revision_tree(rev_id),
2314
                        not no_backup, pb)
2315
        finally:
2316
            pb.finished()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2317
2318
2319
class cmd_assert_fail(Command):
2320
    """Test reporting of assertion failures"""
2321
    hidden = True
2322
    def run(self):
2323
        assert False, "always fails"
2324
2325
2326
class cmd_help(Command):
2327
    """Show help on a command or other topic.
2328
2329
    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.
2330
    takes_options = [Option('long', 'show help on all commands')]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2331
    takes_args = ['topic?']
1616.1.15 by Martin Pool
Handle 'bzr ?', etc.
2332
    aliases = ['?', '--help', '-?', '-h']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2333
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2334
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2335
    def run(self, topic=None, long=False):
2336
        import help
2337
        if topic is None and long:
2338
            topic = "commands"
2339
        help.help(topic)
2340
2341
2342
class cmd_shell_complete(Command):
2343
    """Show appropriate completions for context.
2344
2345
    For a list of all available commands, say 'bzr shell-complete'."""
2346
    takes_args = ['context?']
2347
    aliases = ['s-c']
2348
    hidden = True
2349
    
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2350
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2351
    def run(self, context=None):
2352
        import shellcomplete
2353
        shellcomplete.shellcomplete(context)
2354
2355
1228 by Martin Pool
- add fetch command as builtin
2356
class cmd_fetch(Command):
2357
    """Copy in history from another branch but don't merge it.
2358
2359
    This is an internal method used for pull and merge."""
2360
    hidden = True
2361
    takes_args = ['from_branch', 'to_branch']
2362
    def run(self, from_branch, to_branch):
2363
        from bzrlib.fetch import Fetcher
1185.16.100 by mbp at sourcefrog
Update fetch command for new Branch constructors.
2364
        from_b = Branch.open(from_branch)
2365
        to_b = Branch.open(to_branch)
1185.65.27 by Robert Collins
Tweak storage towards mergability.
2366
        Fetcher(to_b, from_b)
1228 by Martin Pool
- add fetch command as builtin
2367
2368
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2369
class cmd_missing(Command):
1185.54.3 by Aaron Bentley
Factored out find_unmerged
2370
    """Show unmerged/unpulled revisions between two branches.
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2371
1185.54.3 by Aaron Bentley
Factored out find_unmerged
2372
    OTHER_BRANCH may be local or remote."""
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2373
    takes_args = ['other_branch?']
2374
    takes_options = [Option('reverse', 'Reverse the order of revisions'),
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2375
                     Option('mine-only', 
2376
                            'Display changes in the local branch only'),
2377
                     Option('theirs-only', 
2378
                            'Display changes in the remote branch only'), 
1553.2.3 by Erik Bågfors
cover the missing command with formatters as well
2379
                     'log-format',
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2380
                     'line',
2381
                     'long', 
2382
                     'short',
2383
                     'show-ids',
1185.54.19 by Aaron Bentley
All tests pass
2384
                     'verbose'
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2385
                     ]
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
2386
    encoding_type = 'replace'
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2387
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
2388
    @display_command
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2389
    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
2390
            theirs_only=False, log_format=None, long=False, short=False, line=False, 
1185.54.19 by Aaron Bentley
All tests pass
2391
            show_ids=False, verbose=False):
2392
        from bzrlib.missing import find_unmerged, iter_log_data
1185.54.12 by Aaron Bentley
Added log formatter selection and show-ids to missing
2393
        from bzrlib.log import log_formatter
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2394
        local_branch = Branch.open_containing(u".")[0]
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
2395
        parent = local_branch.get_parent()
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2396
        if other_branch is None:
1185.54.16 by Aaron Bentley
fixed location handling to match old missing
2397
            other_branch = parent
2398
            if other_branch is None:
1624.4.8 by Jamie Wilkinson
doc: make error message make more sense
2399
                raise BzrCommandError("No peer location known or specified.")
1185.54.1 by Aaron Bentley
Import Kinnison's plugin
2400
            print "Using last location: " + local_branch.get_parent()
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2401
        remote_branch = Branch.open(other_branch)
1551.2.46 by abentley
Made bzr missing . work on win32
2402
        if remote_branch.base == local_branch.base:
2403
            remote_branch = local_branch
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2404
        local_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2405
        try:
1551.2.46 by abentley
Made bzr missing . work on win32
2406
            remote_branch.lock_read()
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2407
            try:
2408
                local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2409
                if (log_format == None):
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
2410
                    default = local_branch.get_config().log_format()
2411
                    log_format = get_log_format(long=long, short=short, 
2412
                                                line=line, default=default)
1816.1.2 by Alexander Belchenko
fix non-ascii messages handling in 'missing' command
2413
                lf = log_formatter(log_format,
2414
                                   to_file=self.outf,
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2415
                                   show_ids=show_ids,
2416
                                   show_timezone='original')
2417
                if reverse is False:
2418
                    local_extra.reverse()
2419
                    remote_extra.reverse()
2420
                if local_extra and not theirs_only:
2421
                    print "You have %d extra revision(s):" % len(local_extra)
2422
                    for data in iter_log_data(local_extra, local_branch.repository,
2423
                                              verbose):
2424
                        lf.show(*data)
2425
                    printed_local = True
2426
                else:
2427
                    printed_local = False
2428
                if remote_extra and not mine_only:
2429
                    if printed_local is True:
2430
                        print "\n\n"
2431
                    print "You are missing %d revision(s):" % len(remote_extra)
2432
                    for data in iter_log_data(remote_extra, remote_branch.repository, 
2433
                                              verbose):
2434
                        lf.show(*data)
2435
                if not remote_extra and not local_extra:
2436
                    status_code = 0
2437
                    print "Branches are up to date."
2438
                else:
2439
                    status_code = 1
2440
            finally:
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2441
                remote_branch.unlock()
2442
        finally:
2443
            local_branch.unlock()
2444
        if not status_code and parent is None and other_branch is not None:
2445
            local_branch.lock_write()
2446
            try:
2447
                # handle race conditions - a parent might be set while we run.
2448
                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
2449
                    local_branch.set_parent(remote_branch.base)
1594.3.6 by Robert Collins
Take out appropriate locks for missing.
2450
            finally:
2451
                local_branch.unlock()
1666.1.5 by Robert Collins
Merge bound branch test performance improvements.
2452
        return status_code
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2453
2454
2455
class cmd_plugins(Command):
2456
    """List plugins"""
2457
    hidden = True
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2458
    @display_command
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2459
    def run(self):
2460
        import bzrlib.plugin
2461
        from inspect import getdoc
1516 by Robert Collins
* bzrlib.plugin.all_plugins has been changed from an attribute to a
2462
        for name, plugin in bzrlib.plugin.all_plugins().items():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
2463
            if hasattr(plugin, '__path__'):
2464
                print plugin.__path__[0]
2465
            elif hasattr(plugin, '__file__'):
2466
                print plugin.__file__
2467
            else:
2468
                print `plugin`
2469
                
2470
            d = getdoc(plugin)
2471
            if d:
2472
                print '\t', d.split('\n')[0]
2473
2474
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2475
class cmd_testament(Command):
2476
    """Show testament (signing-form) of a revision."""
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
2477
    takes_options = ['revision', 'long', 
2478
                     Option('strict', help='Produce a strict-format'
2479
                            ' testament')]
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2480
    takes_args = ['branch?']
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2481
    @display_command
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
2482
    def run(self, branch=u'.', revision=None, long=False, strict=False):
2483
        from bzrlib.testament import Testament, StrictTestament
2484
        if strict is True:
2485
            testament_class = StrictTestament
2486
        else:
2487
            testament_class = Testament
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2488
        b = WorkingTree.open_containing(branch)[0].branch
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2489
        b.lock_read()
2490
        try:
2491
            if revision is None:
2492
                rev_id = b.last_revision()
2493
            else:
2494
                rev_id = revision[0].in_history(b).rev_id
1551.7.1 by Aaron Bentley
Implement --strict at commandline, fix up strict format
2495
            t = testament_class.from_revision(b.repository, rev_id)
1185.16.24 by Martin Pool
- add and test 'testament' builtin command
2496
            if long:
2497
                sys.stdout.writelines(t.as_text_lines())
2498
            else:
2499
                sys.stdout.write(t.as_short_text())
2500
        finally:
2501
            b.unlock()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2502
2503
2504
class cmd_annotate(Command):
2505
    """Show the origin of each line in a file.
2506
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2507
    This prints out the given file with an annotation on the left side
2508
    indicating which revision, author and date introduced the change.
2509
2510
    If the origin is the same for a run of consecutive lines, it is 
2511
    shown only at the top, unless the --all option is given.
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2512
    """
2513
    # 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
2514
    # TODO: if the working copy is modified, show annotations on that 
2515
    #       with new uncommitted lines marked
1733.2.8 by Michael Ellerman
Add CVS compatible aliases for checkout and annotate, from fullermd.
2516
    aliases = ['ann', 'blame', 'praise']
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2517
    takes_args = ['filename']
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2518
    takes_options = [Option('all', help='show annotations on all lines'),
2519
                     Option('long', help='show date in annotations'),
1694.2.6 by Martin Pool
[merge] bzr.dev
2520
                     'revision'
1185.16.53 by Martin Pool
- annotate improvements from Goffreddo, with extra bug fixes and tests
2521
                     ]
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2522
1185.12.56 by Aaron Bentley
Prevented display commands from printing broken pipe errors
2523
    @display_command
1694.2.6 by Martin Pool
[merge] bzr.dev
2524
    def run(self, filename, all=False, long=False, revision=None):
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2525
        from bzrlib.annotate import annotate_file
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2526
        tree, relpath = WorkingTree.open_containing(filename)
2527
        branch = tree.branch
2528
        branch.lock_read()
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2529
        try:
1694.2.6 by Martin Pool
[merge] bzr.dev
2530
            if revision is None:
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2531
                revision_id = branch.last_revision()
1694.2.6 by Martin Pool
[merge] bzr.dev
2532
            elif len(revision) != 1:
2533
                raise BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2534
            else:
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2535
                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).
2536
            file_id = tree.inventory.path2id(relpath)
1558.14.5 by Aaron Bentley
Changed rev_id to revision_id in cmd_annotate
2537
            tree = branch.repository.revision_tree(revision_id)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2538
            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
2539
            annotate_file(branch, file_version, file_id, long, all, sys.stdout)
1185.16.32 by Martin Pool
- add a basic annotate built-in command
2540
        finally:
1508.1.4 by Robert Collins
Convert most of the front ends commands to use WorkingTree.open_containing
2541
            branch.unlock()
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
2542
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2543
2544
class cmd_re_sign(Command):
2545
    """Create a digital signature for an existing revision."""
2546
    # TODO be able to replace existing ones.
2547
2548
    hidden = True # is this right ?
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2549
    takes_args = ['revision_id*']
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2550
    takes_options = ['revision']
2551
    
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2552
    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.
2553
        import bzrlib.gpg as gpg
1185.78.1 by John Arbash Meinel
Updating bzr re-sign to allow multiple arguments, and updating tests
2554
        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.
2555
            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
2556
        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.
2557
            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)
2558
        b = WorkingTree.open_containing(u'.')[0].branch
1770.2.9 by Aaron Bentley
Add Branch.get_config, update BranchConfig() callers
2559
        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
2560
        if revision_id_list is not None:
2561
            for revision_id in revision_id_list:
2562
                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.
2563
        elif revision is not None:
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2564
            if len(revision) == 1:
2565
                revno, rev_id = revision[0].in_history(b)
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2566
                b.repository.sign_revision(rev_id, gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2567
            elif len(revision) == 2:
2568
                # are they both on rh- if so we can walk between them
2569
                # might be nice to have a range helper for arbitrary
2570
                # revision paths. hmm.
2571
                from_revno, from_revid = revision[0].in_history(b)
2572
                to_revno, to_revid = revision[1].in_history(b)
2573
                if to_revid is None:
2574
                    to_revno = b.revno()
2575
                if from_revno is None or to_revno is None:
2576
                    raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2577
                for revno in range(from_revno, to_revno + 1):
1185.67.2 by Aaron Bentley
Renamed Branch.storage to Branch.repository
2578
                    b.repository.sign_revision(b.get_rev_id(revno), 
2579
                                               gpg_strategy)
1483 by Robert Collins
BUGFIX: re-sign should accept ranges
2580
            else:
2581
                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.
2582
1505.1.22 by John Arbash Meinel
Some small cleanup and discussion in preparation for modifying commit, pull, and merge
2583
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2584
class cmd_bind(Command):
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2585
    """Bind the current branch to a master branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2586
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2587
    After binding, commits must succeed on the master branch
2588
    before they are executed on the local one.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2589
    """
2590
1587.1.14 by Robert Collins
Make bound branch creation happen via 'checkout'
2591
    takes_args = ['location']
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2592
    takes_options = []
2593
2594
    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
2595
        b, relpath = Branch.open_containing(u'.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2596
        b_other = Branch.open(location)
1505.1.3 by John Arbash Meinel
(broken) Adding more tests, and some functionality
2597
        try:
2598
            b.bind(b_other)
2599
        except DivergedBranches:
2600
            raise BzrCommandError('These branches have diverged.'
1505.1.12 by John Arbash Meinel
Fixing up the error message for a failed bind.
2601
                                  ' Try merging, and then bind again.')
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
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_unbind(Command):
1702.1.1 by Martin Pool
(patch) Fix for unbind help text (olaf)
2605
    """Unbind the current branch from its master branch.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2606
2607
    After unbinding, the local branch is considered independent.
1702.1.1 by Martin Pool
(patch) Fix for unbind help text (olaf)
2608
    All subsequent commits will be local.
1505.1.2 by John Arbash Meinel
(broken) working on implementing bound branches.
2609
    """
2610
2611
    takes_args = []
2612
    takes_options = []
2613
2614
    def run(self):
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'.')
2616
        if not b.unbind():
2617
            raise BzrCommandError('Local branch is not bound')
2618
1442.1.59 by Robert Collins
Add re-sign command to generate a digital signature on a single revision.
2619
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
2620
class cmd_uncommit(Command):
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2621
    """Remove the last committed revision.
2622
2623
    --verbose will print out what is being removed.
2624
    --dry-run will go through all the motions, but not actually
2625
    remove anything.
2626
    
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
2627
    In the future, uncommit will create a revision bundle, which can then
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2628
    be re-applied.
1553.5.34 by Martin Pool
Stub lock-breaking command
2629
    """
1185.62.11 by John Arbash Meinel
Added TODO for bzr uncommit to remove unreferenced information.
2630
1553.5.34 by Martin Pool
Stub lock-breaking command
2631
    # TODO: jam 20060108 Add an option to allow uncommit to remove
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
2632
    # unreferenced information in 'branch-as-repository' branches.
1553.5.34 by Martin Pool
Stub lock-breaking command
2633
    # TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2634
    # information in shared branches as well.
1185.62.10 by John Arbash Meinel
Removed --all from bzr uncommit, it was broken anyway.
2635
    takes_options = ['verbose', 'revision',
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2636
                    Option('dry-run', help='Don\'t actually make changes'),
2637
                    Option('force', help='Say yes to all questions.')]
2638
    takes_args = ['location?']
2639
    aliases = []
2640
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
2641
    def run(self, location=None,
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2642
            dry_run=False, verbose=False,
2643
            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
2644
        from bzrlib.log import log_formatter, show_log
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2645
        import sys
2646
        from bzrlib.uncommit import uncommit
2647
2648
        if location is None:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
2649
            location = u'.'
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2650
        control, relpath = bzrdir.BzrDir.open_containing(location)
2651
        try:
2652
            tree = control.open_workingtree()
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
2653
            b = tree.branch
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2654
        except (errors.NoWorkingTree, errors.NotLocalUrl):
2655
            tree = None
1558.9.1 by Aaron Bentley
Fix uncommit to handle bound branches, and to do locking
2656
            b = control.open_branch()
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2657
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
2658
        rev_id = None
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2659
        if revision is None:
2660
            revno = b.revno()
2661
        else:
1850.3.2 by John Arbash Meinel
Change uncommit -r 10 so that it uncommits *to* 10, rather than removing 10
2662
            # 'bzr uncommit -r 10' actually means uncommit
2663
            # so that the final tree is at revno 10.
2664
            # but bzrlib.uncommit.uncommit() actually uncommits
2665
            # the revisions that are supplied.
2666
            # So we need to offset it by one
2667
            revno = revision[0].in_history(b).revno+1
2668
2669
        if revno <= b.revno():
2670
            rev_id = b.get_rev_id(revno)
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2671
        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
2672
            self.outf.write('No revisions to uncommit.\n')
2673
            return 1
2674
2675
        lf = log_formatter('short',
2676
                           to_file=self.outf,
2677
                           show_timezone='original')
2678
2679
        show_log(b,
2680
                 lf,
2681
                 verbose=False,
2682
                 direction='forward',
2683
                 start_revision=revno,
2684
                 end_revision=b.revno())
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2685
2686
        if dry_run:
2687
            print 'Dry-run, pretending to remove the above revisions.'
2688
            if not force:
2689
                val = raw_input('Press <enter> to continue')
2690
        else:
2691
            print 'The above revision(s) will be removed.'
2692
            if not force:
2693
                val = raw_input('Are you sure [y/N]? ')
2694
                if val.lower() not in ('y', 'yes'):
2695
                    print 'Canceled'
2696
                    return 0
2697
1558.1.12 by Aaron Bentley
Got uncommit working properly with checkouts
2698
        uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
1185.31.24 by John Arbash Meinel
[merge] Added the uncommit plugin
2699
                revno=revno)
2700
2701
1553.5.34 by Martin Pool
Stub lock-breaking command
2702
class cmd_break_lock(Command):
2703
    """Break a dead lock on a repository, branch or working directory.
2704
1553.5.35 by Martin Pool
Start break-lock --show
2705
    CAUTION: Locks should only be broken when you are sure that the process
1553.5.34 by Martin Pool
Stub lock-breaking command
2706
    holding the lock has been stopped.
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2707
2708
    You can get information on what locks are open via the 'bzr info' command.
1553.5.35 by Martin Pool
Start break-lock --show
2709
    
2710
    example:
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2711
        bzr break-lock
1553.5.34 by Martin Pool
Stub lock-breaking command
2712
    """
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2713
    takes_args = ['location?']
2714
2715
    def run(self, location=None, show=False):
2716
        if location is None:
2717
            location = u'.'
2718
        control, relpath = bzrdir.BzrDir.open_containing(location)
1687.1.17 by Robert Collins
Test break lock on old format branches.
2719
        try:
2720
            control.break_lock()
2721
        except NotImplementedError:
2722
            pass
1687.1.12 by Robert Collins
Hook in the full break-lock ui.
2723
        
1553.5.35 by Martin Pool
Start break-lock --show
2724
2725
2726
# command-line interpretation helper for merge-related commands
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2727
def merge(other_revision, base_revision,
2728
          check_clean=True, ignore_zero=False,
1534.7.118 by Aaron Bentley
Dirty merge of the mainline
2729
          this_dir=None, backup_files=False, merge_type=Merge3Merger,
1553.5.35 by Martin Pool
Start break-lock --show
2730
          file_list=None, show_base=False, reprocess=False,
1534.9.6 by Aaron Bentley
Disable merge progress bars, except from the merge command
2731
          pb=DummyProgress()):
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2732
    """Merge changes into a tree.
2733
2734
    base_revision
2735
        list(path, revno) Base for three-way merge.  
2736
        If [None, None] then a base will be automatically determined.
2737
    other_revision
2738
        list(path, revno) Other revision for three-way merge.
2739
    this_dir
2740
        Directory to merge changes into; '.' by default.
2741
    check_clean
2742
        If true, this_dir must have no uncommitted changes before the
2743
        merge begins.
2744
    ignore_zero - If true, suppress the "zero conflicts" message when 
2745
        there are no conflicts; should be set when doing something we expect
2746
        to complete perfectly.
2747
    file_list - If supplied, merge only changes to selected files.
2748
2749
    All available ancestors of other_revision and base_revision are
2750
    automatically pulled into the branch.
2751
2752
    The revno may be -1 to indicate the last revision on the branch, which is
2753
    the typical case.
2754
2755
    This function is intended for use from the command line; programmatic
2756
    clients might prefer to call merge.merge_inner(), which has less magic 
2757
    behavior.
2758
    """
1534.7.129 by Aaron Bentley
Converted test cases to Tree Transform
2759
    from bzrlib.merge import Merger
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2760
    if this_dir is None:
2761
        this_dir = u'.'
1534.4.28 by Robert Collins
first cut at merge from integration.
2762
    this_tree = WorkingTree.open_containing(this_dir)[0]
1534.7.118 by Aaron Bentley
Dirty merge of the mainline
2763
    if show_base and not merge_type is Merge3Merger:
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2764
        raise BzrCommandError("Show-base is not supported for this merge"
2765
                              " type. %s" % merge_type)
1551.6.8 by Aaron Bentley
Implemented reprocess for weave
2766
    if reprocess and not merge_type.supports_reprocess:
1551.6.14 by Aaron Bentley
Tweaks from merge review
2767
        raise BzrCommandError("Conflict reduction is not supported for merge"
2768
                              " type %s." % merge_type)
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2769
    if reprocess and show_base:
1551.6.14 by Aaron Bentley
Tweaks from merge review
2770
        raise BzrCommandError("Cannot do conflict reduction and show base.")
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
2771
    try:
2772
        merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2773
        merger.pp = ProgressPhase("Merge phase", 5, pb)
2774
        merger.pp.next_phase()
2775
        merger.check_basis(check_clean)
2776
        merger.set_other(other_revision)
2777
        merger.pp.next_phase()
2778
        merger.set_base(base_revision)
2779
        if merger.base_rev_id == merger.other_rev_id:
2780
            note('Nothing to do.')
2781
            return 0
2782
        merger.backup_files = backup_files
2783
        merger.merge_type = merge_type 
2784
        merger.set_interesting_files(file_list)
2785
        merger.show_base = show_base 
2786
        merger.reprocess = reprocess
2787
        conflicts = merger.do_merge()
1645.1.1 by Aaron Bentley
Implement single-file merge
2788
        if file_list is None:
2789
            merger.set_pending()
1551.2.32 by Aaron Bentley
Handle progress phases more nicely in merge
2790
    finally:
2791
        pb.clear()
1545.2.9 by Aaron Bentley
Moved merge.merge to builtins
2792
    return conflicts
2793
2794
1185.16.33 by Martin Pool
- move 'conflict' and 'resolved' from shipped plugin to regular builtins
2795
# these get imported and then picked up by the scan for cmd_*
2796
# TODO: Some more consistent way to split command definitions across files;
2797
# 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'.
2798
# aliases.  ideally we would avoid loading the implementation until the
2799
# details were needed.
1185.35.4 by Aaron Bentley
Implemented remerge
2800
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
1185.82.130 by Aaron Bentley
Rename changesets to revision bundles
2801
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.
2802
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
2803
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
2804
        cmd_weave_plan_merge, cmd_weave_merge_text