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