/brz/remove-bazaar

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