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