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