/brz/remove-bazaar

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