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