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