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