/brz/remove-bazaar

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