/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1
# Copyright (C) 2004, 2005 by Canonical Ltd
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
17
18
import sys
19
import os
20
21
import bzrlib
22
import bzrlib.trace
23
from bzrlib.trace import mutter, note, log_error, warning
1371 by Martin Pool
- raise NotBranchError if format file can't be read
24
from bzrlib.errors import BzrError, BzrCheckError, BzrCommandError, NotBranchError
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
25
from bzrlib.errors import DivergedBranches
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
26
from bzrlib.branch import Branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
27
from bzrlib import BZRDIR
28
from bzrlib.commands import Command
29
30
31
class cmd_status(Command):
32
    """Display status summary.
33
34
    This reports on versioned and unknown files, reporting them
35
    grouped by state.  Possible states are:
36
37
    added
38
        Versioned in the working copy but not in the previous revision.
39
40
    removed
41
        Versioned in the previous revision but removed or deleted
42
        in the working copy.
43
44
    renamed
45
        Path of this file changed from the previous revision;
46
        the text may also have changed.  This includes files whose
47
        parent directory was renamed.
48
49
    modified
50
        Text has changed since the previous revision.
51
52
    unchanged
53
        Nothing about this file has changed since the previous revision.
54
        Only shown with --all.
55
56
    unknown
57
        Not versioned and not matching an ignore pattern.
58
59
    To see ignored files use 'bzr ignored'.  For details in the
60
    changes to file texts, use 'bzr diff'.
61
62
    If no arguments are specified, the status of the entire working
63
    directory is shown.  Otherwise, only the status of the specified
64
    files or directories is reported.  If a directory is given, status
65
    is reported for everything inside that directory.
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
66
67
    If a revision argument is given, the status is calculated against
68
    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
69
    """
1185.1.11 by Robert Collins
fixme note for bzr status
70
    # XXX: FIXME: bzr status should accept a -r option to show changes
71
    # relative to a revision, or between revisions
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
72
73
    takes_args = ['file*']
1092.3.4 by Robert Collins
update symlink branch to integration
74
    takes_options = ['all', 'show-ids']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
75
    aliases = ['st', 'stat']
76
    
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
77
    def run(self, all=False, show_ids=False, file_list=None, revision=None):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
78
        if file_list:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
79
            b = Branch.open_containing(file_list[0])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
80
            file_list = [b.relpath(x) for x in file_list]
81
            # special case: only one path was given and it's the root
82
            # of the branch
83
            if file_list == ['']:
84
                file_list = None
85
        else:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
86
            b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
87
            
88
        from bzrlib.status import show_status
89
        show_status(b, show_unchanged=all, show_ids=show_ids,
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
90
                    specific_files=file_list, revision=revision)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
91
92
93
class cmd_cat_revision(Command):
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
94
    """Write out metadata for a revision.
95
    
96
    The revision to print can either be specified by a specific
97
    revision identifier, or you can use --revision.
98
    """
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
99
100
    hidden = True
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
101
    takes_args = ['revision_id?']
102
    takes_options = ['revision']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
103
    
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
104
    def run(self, revision_id=None, revision=None):
105
        from bzrlib.revisionspec import RevisionSpec
106
107
        if revision_id is not None and revision is not None:
108
            raise BzrCommandError('You can only supply one of revision_id or --revision')
109
        if revision_id is None and revision is None:
110
            raise BzrCommandError('You must supply either --revision or a revision_id')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
111
        b = Branch.open_containing('.')
1185.5.3 by John Arbash Meinel
cat-revision allows --revision for easier investigation.
112
        if revision_id is not None:
113
            sys.stdout.write(b.get_revision_xml_file(revision_id).read())
114
        elif revision is not None:
115
            for rev in revision:
116
                if rev is None:
117
                    raise BzrCommandError('You cannot specify a NULL revision.')
118
                revno, rev_id = rev.in_history(b)
119
                sys.stdout.write(b.get_revision_xml_file(rev_id).read())
1185.1.29 by Robert Collins
merge merge tweaks from aaron, which includes latest .dev
120
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
121
122
class cmd_revno(Command):
123
    """Show current revision number.
124
125
    This is equal to the number of revisions on this branch."""
126
    def run(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
127
        print Branch.open_containing('.').revno()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
128
1182 by Martin Pool
- more disentangling of xml storage format from objects
129
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
130
class cmd_revision_info(Command):
131
    """Show revision number and revision id for a given revision identifier.
132
    """
133
    hidden = True
134
    takes_args = ['revision_info*']
135
    takes_options = ['revision']
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
136
    def run(self, revision=None, revision_info_list=[]):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
137
        from bzrlib.revisionspec import RevisionSpec
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
138
139
        revs = []
140
        if revision is not None:
141
            revs.extend(revision)
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
142
        if revision_info_list is not None:
143
            for rev in revision_info_list:
144
                revs.append(RevisionSpec(rev))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
145
        if len(revs) == 0:
146
            raise BzrCommandError('You must supply a revision identifier')
147
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
148
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
149
150
        for rev in revs:
1185.5.4 by John Arbash Meinel
Updated bzr revision-info, created tests.
151
            revinfo = rev.in_history(b)
152
            if revinfo.revno is None:
153
                print '     %s' % revinfo.rev_id
154
            else:
155
                print '%4d %s' % (revinfo.revno, revinfo.rev_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
156
157
    
158
class cmd_add(Command):
159
    """Add specified files or directories.
160
161
    In non-recursive mode, all the named items are added, regardless
162
    of whether they were previously ignored.  A warning is given if
163
    any of the named files are already versioned.
164
165
    In recursive mode (the default), files are treated the same way
166
    but the behaviour for directories is different.  Directories that
167
    are already versioned do not give a warning.  All directories,
168
    whether already versioned or not, are searched for files or
169
    subdirectories that are neither versioned or ignored, and these
170
    are added.  This search proceeds recursively into versioned
171
    directories.  If no names are given '.' is assumed.
172
173
    Therefore simply saying 'bzr add' will version all files that
174
    are currently unknown.
175
1185.3.3 by Martin Pool
- patch from mpe to automatically add parent directories
176
    Adding a file whose parent directory is not versioned will
177
    implicitly add the parent, and so on up to the root. This means
178
    you should never need to explictly add a directory, they'll just
179
    get added when you add a file in the directory.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
180
    """
181
    takes_args = ['file*']
182
    takes_options = ['verbose', 'no-recurse']
183
    
184
    def run(self, file_list, verbose=False, no_recurse=False):
1159 by Martin Pool
- clean up parameters to smart_add and smart_add_branch
185
        # verbose currently has no effect
186
        from bzrlib.add import smart_add, add_reporter_print
187
        smart_add(file_list, not no_recurse, add_reporter_print)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
188
189
190
191
class cmd_mkdir(Command):
192
    """Create a new versioned directory.
193
194
    This is equivalent to creating the directory and then adding it.
195
    """
196
    takes_args = ['dir+']
197
198
    def run(self, dir_list):
199
        b = None
200
        
201
        for d in dir_list:
202
            os.mkdir(d)
203
            if not b:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
204
                b = Branch.open_containing(d)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
205
            b.add([d])
206
            print 'added', d
207
208
209
class cmd_relpath(Command):
210
    """Show path of a file relative to root"""
211
    takes_args = ['filename']
212
    hidden = True
213
    
214
    def run(self, filename):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
215
        print Branch.open_containing(filename).relpath(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
216
217
218
219
class cmd_inventory(Command):
220
    """Show inventory of the current working copy or a revision."""
221
    takes_options = ['revision', 'show-ids']
222
    
223
    def run(self, revision=None, show_ids=False):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
224
        b = Branch.open_containing('.')
225
        if revision is None:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
226
            inv = b.read_working_inventory()
227
        else:
228
            if len(revision) > 1:
229
                raise BzrCommandError('bzr inventory --revision takes'
230
                    ' exactly one revision identifier')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
231
            inv = b.get_revision_inventory(revision[0].in_history(b).rev_id)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
232
233
        for path, entry in inv.entries():
234
            if show_ids:
235
                print '%-50s %s' % (path, entry.file_id)
236
            else:
237
                print path
238
239
240
class cmd_move(Command):
241
    """Move files to a different directory.
242
243
    examples:
244
        bzr move *.txt doc
245
246
    The destination must be a versioned directory in the same branch.
247
    """
248
    takes_args = ['source$', 'dest']
249
    def run(self, source_list, dest):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
250
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
251
252
        # TODO: glob expansion on windows?
253
        b.move([b.relpath(s) for s in source_list], b.relpath(dest))
254
255
256
class cmd_rename(Command):
257
    """Change the name of an entry.
258
259
    examples:
260
      bzr rename frob.c frobber.c
261
      bzr rename src/frob.c lib/frob.c
262
263
    It is an error if the destination name exists.
264
265
    See also the 'move' command, which moves files into a different
266
    directory without changing their name.
267
268
    TODO: Some way to rename multiple files without invoking bzr for each
269
    one?"""
270
    takes_args = ['from_name', 'to_name']
271
    
272
    def run(self, from_name, to_name):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
273
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
274
        b.rename_one(b.relpath(from_name), b.relpath(to_name))
275
276
277
278
class cmd_mv(Command):
279
    """Move or rename a file.
280
281
    usage:
282
        bzr mv OLDNAME NEWNAME
283
        bzr mv SOURCE... DESTINATION
284
285
    If the last argument is a versioned directory, all the other names
286
    are moved into it.  Otherwise, there must be exactly two arguments
287
    and the file is changed to a new name, which must not already exist.
288
289
    Files cannot be moved between branches.
290
    """
291
    takes_args = ['names*']
292
    def run(self, names_list):
293
        if len(names_list) < 2:
294
            raise BzrCommandError("missing file argument")
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
295
        b = Branch.open_containing(names_list[0])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
296
297
        rel_names = [b.relpath(x) for x in names_list]
298
        
299
        if os.path.isdir(names_list[-1]):
300
            # move into existing directory
301
            for pair in b.move(rel_names[:-1], rel_names[-1]):
302
                print "%s => %s" % pair
303
        else:
304
            if len(names_list) != 2:
305
                raise BzrCommandError('to mv multiple files the destination '
306
                                      'must be a versioned directory')
1185.1.8 by Robert Collins
David Clymers patch to use rename rather than mv for two argument non-directory target bzr mv calls.
307
            b.rename_one(rel_names[0], rel_names[1])
308
            print "%s => %s" % (rel_names[0], rel_names[1])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
309
            
310
    
311
312
313
class cmd_pull(Command):
314
    """Pull any changes from another branch into the current one.
315
316
    If the location is omitted, the last-used location will be used.
317
    Both the revision history and the working directory will be
318
    updated.
319
320
    This command only works on branches that have not diverged.  Branches are
321
    considered diverged if both branches have had commits without first
322
    pulling from the other.
323
324
    If branches have diverged, you can use 'bzr merge' to pull the text changes
325
    from one into the other.
326
    """
1185.12.11 by Aaron Bentley
Made pull only save the parent location if it is unset, or on --remember
327
    takes_options = ['remember']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
328
    takes_args = ['location?']
329
1185.12.11 by Aaron Bentley
Made pull only save the parent location if it is unset, or on --remember
330
    def run(self, location=None, remember=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
331
        from bzrlib.merge import merge
332
        import tempfile
333
        from shutil import rmtree
334
        import errno
335
        
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
336
        br_to = Branch.open_containing('.')
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
337
        stored_loc = br_to.get_parent()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
338
        if location is None:
339
            if stored_loc is None:
340
                raise BzrCommandError("No pull location known or specified.")
341
            else:
1185.12.12 by Aaron Bentley
Made merge use pull location or die if no branch specified.
342
                print "Using saved location: %s" % stored_loc
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
343
                location = stored_loc
344
        cache_root = tempfile.mkdtemp()
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
345
        br_from = Branch.open(location)
346
        br_from.lock_read()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
347
        try:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
348
            br_from.setup_caching(cache_root)
1185.2.3 by Lalo Martins
unifying 'base' (from Branch) and 'baseurl' (from RemoteBranch) attributes;
349
            location = br_from.base
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
350
            old_revno = br_to.revno()
1442 by Robert Collins
only do a local merge during pull if the revision history changed
351
            old_revision_history = br_to.revision_history()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
352
            try:
353
                br_to.update_revisions(br_from)
354
            except DivergedBranches:
355
                raise BzrCommandError("These branches have diverged."
356
                    "  Try merge.")
1442 by Robert Collins
only do a local merge during pull if the revision history changed
357
            new_revision_history = br_to.revision_history()
358
            if new_revision_history != old_revision_history:
359
                merge(('.', -1), ('.', old_revno), check_clean=False)
1185.12.11 by Aaron Bentley
Made pull only save the parent location if it is unset, or on --remember
360
            if stored_loc is None or remember:
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
361
                br_to.set_parent(location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
362
        finally:
1439 by Robert Collins
fix a prior bad merge of cmd_pull, which had resulted in double opens of remote branches
363
            br_from.unlock()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
364
            rmtree(cache_root)
365
366
367
368
class cmd_branch(Command):
369
    """Create a new copy of a branch.
370
371
    If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
372
    be used.  In other words, "branch ../foo/bar" will attempt to create ./bar.
373
374
    To retrieve the branch as of a particular revision, supply the --revision
375
    parameter, as in "branch foo/bar -r 5".
1185.10.2 by Aaron Bentley
Updated help message
376
377
    --basis is to speed up branching from remote branches.  When specified, it
378
    copies all the file-contents, inventory and revision data from the basis
379
    branch before copying anything from the remote branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
380
    """
381
    takes_args = ['from_location', 'to_location?']
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
382
    takes_options = ['revision', 'basis']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
383
    aliases = ['get', 'clone']
384
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
385
    def run(self, from_location, to_location=None, revision=None, basis=None):
1393.1.5 by Martin Pool
- move copy_branch into bzrlib.clone
386
        from bzrlib.clone import copy_branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
387
        import tempfile
388
        import errno
389
        from shutil import rmtree
390
        cache_root = tempfile.mkdtemp()
391
        try:
392
            if revision is None:
393
                revision = [None]
394
            elif len(revision) > 1:
395
                raise BzrCommandError(
396
                    'bzr branch --revision takes exactly 1 revision value')
397
            try:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
398
                br_from = Branch.open(from_location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
399
            except OSError, e:
400
                if e.errno == errno.ENOENT:
401
                    raise BzrCommandError('Source location "%s" does not'
402
                                          ' exist.' % to_location)
403
                else:
404
                    raise
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
405
            br_from.setup_caching(cache_root)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
406
            if basis is not None:
407
                basis_branch = Branch.open_containing(basis)
408
            else:
409
                basis_branch = None
1185.8.4 by Aaron Bentley
Fixed branch -r
410
            if len(revision) == 1 and revision[0] is not None:
1390 by Robert Collins
pair programming worx... merge integration and weave
411
                revision_id = revision[0].in_history(br_from)[1]
1185.8.4 by Aaron Bentley
Fixed branch -r
412
            else:
1390 by Robert Collins
pair programming worx... merge integration and weave
413
                revision_id = None
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
414
            if to_location is None:
415
                to_location = os.path.basename(from_location.rstrip("/\\"))
416
            try:
417
                os.mkdir(to_location)
418
            except OSError, e:
419
                if e.errno == errno.EEXIST:
420
                    raise BzrCommandError('Target directory "%s" already'
421
                                          ' exists.' % to_location)
422
                if e.errno == errno.ENOENT:
423
                    raise BzrCommandError('Parent of "%s" does not exist.' %
424
                                          to_location)
425
                else:
426
                    raise
427
            try:
1391 by Robert Collins
merge from integration
428
                copy_branch(br_from, to_location, revision_id, basis_branch)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
429
            except bzrlib.errors.NoSuchRevision:
430
                rmtree(to_location)
431
                msg = "The branch %s has no revision %d." % (from_location, revision[0])
432
                raise BzrCommandError(msg)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
433
            except bzrlib.errors.UnlistableBranch:
434
                msg = "The branch %s cannot be used as a --basis"
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
435
        finally:
436
            rmtree(cache_root)
437
438
439
class cmd_renames(Command):
440
    """Show list of renamed files.
441
442
    TODO: Option to show renames between two historical versions.
443
444
    TODO: Only show renames under dir, rather than in the whole branch.
445
    """
446
    takes_args = ['dir?']
447
448
    def run(self, dir='.'):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
449
        b = Branch.open_containing(dir)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
450
        old_inv = b.basis_tree().inventory
451
        new_inv = b.read_working_inventory()
452
453
        renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
454
        renames.sort()
455
        for old_name, new_name in renames:
456
            print "%s => %s" % (old_name, new_name)        
457
458
459
class cmd_info(Command):
460
    """Show statistical information about a branch."""
461
    takes_args = ['branch?']
462
    
463
    def run(self, branch=None):
464
        import info
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
465
        b = Branch.open_containing(branch)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
466
        info.show_info(b)
467
468
469
class cmd_remove(Command):
470
    """Make a file unversioned.
471
472
    This makes bzr stop tracking changes to a versioned file.  It does
473
    not delete the working copy.
474
    """
475
    takes_args = ['file+']
476
    takes_options = ['verbose']
1424 by Robert Collins
add rm alias to remove
477
    aliases = ['rm']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
478
    
479
    def run(self, file_list, verbose=False):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
480
        b = Branch.open_containing(file_list[0])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
481
        b.remove([b.relpath(f) for f in file_list], verbose=verbose)
482
483
484
class cmd_file_id(Command):
485
    """Print file_id of a particular file or directory.
486
487
    The file_id is assigned when the file is first added and remains the
488
    same through all revisions where the file exists, even when it is
489
    moved or renamed.
490
    """
491
    hidden = True
492
    takes_args = ['filename']
493
    def run(self, filename):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
494
        b = Branch.open_containing(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
495
        i = b.inventory.path2id(b.relpath(filename))
496
        if i == None:
497
            raise BzrError("%r is not a versioned file" % filename)
498
        else:
499
            print i
500
501
502
class cmd_file_path(Command):
503
    """Print path of file_ids to a file or directory.
504
505
    This prints one line for each directory down to the target,
506
    starting at the branch root."""
507
    hidden = True
508
    takes_args = ['filename']
509
    def run(self, filename):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
510
        b = Branch.open_containing(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
511
        inv = b.inventory
512
        fid = inv.path2id(b.relpath(filename))
513
        if fid == None:
514
            raise BzrError("%r is not a versioned file" % filename)
515
        for fip in inv.get_idpath(fid):
516
            print fip
517
518
519
class cmd_revision_history(Command):
520
    """Display list of revision ids on this branch."""
521
    hidden = True
522
    def run(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
523
        for patchid in Branch.open_containing('.').revision_history():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
524
            print patchid
525
526
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
527
class cmd_ancestry(Command):
528
    """List all revisions merged into this branch."""
529
    hidden = True
530
    def run(self):
531
        b = find_branch('.')
1241 by Martin Pool
- rename last_patch to last_revision
532
        for revision_id in b.get_ancestry(b.last_revision()):
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
533
            print revision_id
534
535
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
536
class cmd_directories(Command):
537
    """Display list of versioned directories in this branch."""
538
    def run(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
539
        for name, ie in Branch.open_containing('.').read_working_inventory().directories():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
540
            if name == '':
541
                print '.'
542
            else:
543
                print name
544
545
546
class cmd_init(Command):
547
    """Make a directory into a versioned branch.
548
549
    Use this to create an empty branch, or before importing an
550
    existing project.
551
552
    Recipe for importing a tree of files:
553
        cd ~/project
554
        bzr init
555
        bzr add -v .
556
        bzr status
557
        bzr commit -m 'imported project'
558
    """
559
    def run(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
560
        Branch.initialize('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
561
562
563
class cmd_diff(Command):
564
    """Show differences in working tree.
565
    
566
    If files are listed, only the changes in those files are listed.
567
    Otherwise, all changes for the tree are listed.
568
569
    TODO: Allow diff across branches.
570
571
    TODO: Option to use external diff command; could be GNU diff, wdiff,
572
          or a graphical diff.
573
574
    TODO: Python difflib is not exactly the same as unidiff; should
575
          either fix it up or prefer to use an external diff.
576
577
    TODO: If a directory is given, diff everything under that.
578
579
    TODO: Selected-file diff is inefficient and doesn't show you
580
          deleted files.
581
582
    TODO: This probably handles non-Unix newlines poorly.
583
584
    examples:
585
        bzr diff
586
        bzr diff -r1
1185.1.2 by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd
587
        bzr diff -r1..2
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
588
    """
589
    
590
    takes_args = ['file*']
591
    takes_options = ['revision', 'diff-options']
592
    aliases = ['di', 'dif']
593
594
    def run(self, revision=None, file_list=None, diff_options=None):
595
        from bzrlib.diff import show_diff
596
597
        if file_list:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
598
            b = Branch.open_containing(file_list[0])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
599
            file_list = [b.relpath(f) for f in file_list]
600
            if file_list == ['']:
601
                # just pointing to top-of-tree
602
                file_list = None
603
        else:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
604
            b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
605
606
        if revision is not None:
607
            if len(revision) == 1:
608
                show_diff(b, revision[0], specific_files=file_list,
609
                          external_diff_options=diff_options)
610
            elif len(revision) == 2:
611
                show_diff(b, revision[0], specific_files=file_list,
612
                          external_diff_options=diff_options,
613
                          revision2=revision[1])
614
            else:
615
                raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
616
        else:
617
            show_diff(b, None, specific_files=file_list,
618
                      external_diff_options=diff_options)
619
620
        
621
622
623
class cmd_deleted(Command):
624
    """List files deleted in the working tree.
625
626
    TODO: Show files deleted since a previous revision, or between two revisions.
627
    """
628
    def run(self, show_ids=False):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
629
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
630
        old = b.basis_tree()
631
        new = b.working_tree()
632
633
        ## TODO: Much more efficient way to do this: read in new
634
        ## directories with readdir, rather than stating each one.  Same
635
        ## level of effort but possibly much less IO.  (Or possibly not,
636
        ## if the directories are very large...)
637
638
        for path, ie in old.inventory.iter_entries():
639
            if not new.has_id(ie.file_id):
640
                if show_ids:
641
                    print '%-50s %s' % (path, ie.file_id)
642
                else:
643
                    print path
644
645
646
class cmd_modified(Command):
647
    """List files modified in working tree."""
648
    hidden = True
649
    def run(self):
650
        from bzrlib.delta import compare_trees
651
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
652
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
653
        td = compare_trees(b.basis_tree(), b.working_tree())
654
1398 by Robert Collins
integrate in Gustavos x-bit patch
655
        for path, id, kind, text_modified, meta_modified in td.modified:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
656
            print path
657
658
659
660
class cmd_added(Command):
661
    """List files added in working tree."""
662
    hidden = True
663
    def run(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
664
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
665
        wt = b.working_tree()
666
        basis_inv = b.basis_tree().inventory
667
        inv = wt.inventory
668
        for file_id in inv:
669
            if file_id in basis_inv:
670
                continue
671
            path = inv.id2path(file_id)
672
            if not os.access(b.abspath(path), os.F_OK):
673
                continue
674
            print path
675
                
676
        
677
678
class cmd_root(Command):
679
    """Show the tree root directory.
680
681
    The root is the nearest enclosing directory with a .bzr control
682
    directory."""
683
    takes_args = ['filename?']
684
    def run(self, filename=None):
685
        """Print the branch root."""
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
686
        b = Branch.open_containing(filename)
1185.2.3 by Lalo Martins
unifying 'base' (from Branch) and 'baseurl' (from RemoteBranch) attributes;
687
        print b.base
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
688
689
690
class cmd_log(Command):
691
    """Show log of this branch.
692
693
    To request a range of logs, you can use the command -r begin:end
694
    -r revision requests a specific revision, -r :end or -r begin: are
695
    also valid.
696
697
    --message allows you to give a regular expression, which will be evaluated
698
    so that only matching entries will be displayed.
699
    """
700
1393.1.55 by Martin Pool
doc
701
    # TODO: Make --revision support uuid: and hash: [future tag:] notation.
702
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
703
    takes_args = ['filename?']
704
    takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision',
705
                     'long', 'message', 'short',]
706
    
707
    def run(self, filename=None, timezone='original',
708
            verbose=False,
709
            show_ids=False,
710
            forward=False,
711
            revision=None,
712
            message=None,
713
            long=False,
714
            short=False):
715
        from bzrlib.log import log_formatter, show_log
716
        import codecs
717
718
        direction = (forward and 'forward') or 'reverse'
719
        
720
        if filename:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
721
            b = Branch.open_containing(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
722
            fp = b.relpath(filename)
723
            if fp:
724
                file_id = b.read_working_inventory().path2id(fp)
725
            else:
726
                file_id = None  # points to branch root
727
        else:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
728
            b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
729
            file_id = None
730
731
        if revision is None:
732
            rev1 = None
733
            rev2 = None
734
        elif len(revision) == 1:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
735
            rev1 = rev2 = revision[0].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
736
        elif len(revision) == 2:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
737
            rev1 = revision[0].in_history(b).revno
738
            rev2 = revision[1].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
739
        else:
740
            raise BzrCommandError('bzr log --revision takes one or two values.')
741
742
        if rev1 == 0:
743
            rev1 = None
744
        if rev2 == 0:
745
            rev2 = None
746
747
        mutter('encoding log as %r' % bzrlib.user_encoding)
748
749
        # use 'replace' so that we don't abort if trying to write out
750
        # in e.g. the default C locale.
751
        outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
752
753
        if not short:
754
            log_format = 'long'
755
        else:
756
            log_format = 'short'
757
        lf = log_formatter(log_format,
758
                           show_ids=show_ids,
759
                           to_file=outf,
760
                           show_timezone=timezone)
761
762
        show_log(b,
763
                 lf,
764
                 file_id,
765
                 verbose=verbose,
766
                 direction=direction,
767
                 start_revision=rev1,
768
                 end_revision=rev2,
769
                 search=message)
770
771
772
773
class cmd_touching_revisions(Command):
774
    """Return revision-ids which affected a particular file.
775
776
    A more user-friendly interface is "bzr log FILE"."""
777
    hidden = True
778
    takes_args = ["filename"]
779
    def run(self, filename):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
780
        b = Branch.open_containing(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
781
        inv = b.read_working_inventory()
782
        file_id = inv.path2id(b.relpath(filename))
783
        for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
784
            print "%6d %s" % (revno, what)
785
786
787
class cmd_ls(Command):
788
    """List files in a tree.
789
790
    TODO: Take a revision or remote path and list that tree instead.
791
    """
792
    hidden = True
793
    def run(self, revision=None, verbose=False):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
794
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
795
        if revision == None:
796
            tree = b.working_tree()
797
        else:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
798
            tree = b.revision_tree(revision.in_history(b).rev_id)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
799
        for fp, fc, kind, fid, entry in tree.list_files():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
800
            if verbose:
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
801
                kindch = entry.kind_character()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
802
                print '%-8s %s%s' % (fc, fp, kindch)
803
            else:
804
                print fp
805
806
807
808
class cmd_unknowns(Command):
809
    """List unknown files."""
810
    def run(self):
811
        from bzrlib.osutils import quotefn
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
812
        for f in Branch.open_containing('.').unknowns():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
813
            print quotefn(f)
814
815
816
817
class cmd_ignore(Command):
818
    """Ignore a command or pattern.
819
820
    To remove patterns from the ignore list, edit the .bzrignore file.
821
822
    If the pattern contains a slash, it is compared to the whole path
823
    from the branch root.  Otherwise, it is comapred to only the last
824
    component of the path.
825
826
    Ignore patterns are case-insensitive on case-insensitive systems.
827
828
    Note: wildcards must be quoted from the shell on Unix.
829
830
    examples:
831
        bzr ignore ./Makefile
832
        bzr ignore '*.class'
833
    """
834
    takes_args = ['name_pattern']
835
    
836
    def run(self, name_pattern):
837
        from bzrlib.atomicfile import AtomicFile
838
        import os.path
839
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
840
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
841
        ifn = b.abspath('.bzrignore')
842
843
        if os.path.exists(ifn):
844
            f = open(ifn, 'rt')
845
            try:
846
                igns = f.read().decode('utf-8')
847
            finally:
848
                f.close()
849
        else:
850
            igns = ''
851
852
        # TODO: If the file already uses crlf-style termination, maybe
853
        # we should use that for the newly added lines?
854
855
        if igns and igns[-1] != '\n':
856
            igns += '\n'
857
        igns += name_pattern + '\n'
858
859
        try:
860
            f = AtomicFile(ifn, 'wt')
861
            f.write(igns.encode('utf-8'))
862
            f.commit()
863
        finally:
864
            f.close()
865
866
        inv = b.working_tree().inventory
867
        if inv.path2id('.bzrignore'):
868
            mutter('.bzrignore is already versioned')
869
        else:
870
            mutter('need to make new .bzrignore file versioned')
871
            b.add(['.bzrignore'])
872
873
874
875
class cmd_ignored(Command):
876
    """List ignored files and the patterns that matched them.
877
878
    See also: bzr ignore"""
879
    def run(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
880
        tree = Branch.open_containing('.').working_tree()
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
881
        for path, file_class, kind, file_id, entry in tree.list_files():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
882
            if file_class != 'I':
883
                continue
884
            ## XXX: Slightly inefficient since this was already calculated
885
            pat = tree.is_ignored(path)
886
            print '%-50s %s' % (path, pat)
887
888
889
class cmd_lookup_revision(Command):
890
    """Lookup the revision-id from a revision-number
891
892
    example:
893
        bzr lookup-revision 33
894
    """
895
    hidden = True
896
    takes_args = ['revno']
897
    
898
    def run(self, revno):
899
        try:
900
            revno = int(revno)
901
        except ValueError:
902
            raise BzrCommandError("not a valid revision-number: %r" % revno)
903
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
904
        print Branch.open_containing('.').get_rev_id(revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
905
906
907
class cmd_export(Command):
908
    """Export past revision to destination directory.
909
910
    If no revision is specified this exports the last committed revision.
911
912
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
913
    given, try to find the format with the extension. If no extension
914
    is found exports to a directory (equivalent to --format=dir).
915
916
    Root may be the top directory for tar, tgz and tbz2 formats. If none
917
    is given, the top directory will be the root name of the file."""
918
    # TODO: list known exporters
919
    takes_args = ['dest']
920
    takes_options = ['revision', 'format', 'root']
921
    def run(self, dest, revision=None, format=None, root=None):
922
        import os.path
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
923
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
924
        if revision is None:
1241 by Martin Pool
- rename last_patch to last_revision
925
            rev_id = b.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
926
        else:
927
            if len(revision) != 1:
928
                raise BzrError('bzr export --revision takes exactly 1 argument')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
929
            rev_id = revision[0].in_history(b).rev_id
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
930
        t = b.revision_tree(rev_id)
1185.12.1 by Aaron Bentley
Fixed export
931
        arg_root, ext = os.path.splitext(os.path.basename(dest))
932
        if ext in ('.gz', '.bz2'):
933
            new_root, new_ext = os.path.splitext(arg_root)
934
            if new_ext == '.tar':
935
                arg_root = new_root
936
                ext = new_ext + ext
937
        if root is None:
938
            root = arg_root
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
939
        if not format:
940
            if ext in (".tar",):
941
                format = "tar"
1185.12.1 by Aaron Bentley
Fixed export
942
            elif ext in (".tar.gz", ".tgz"):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
943
                format = "tgz"
1185.12.1 by Aaron Bentley
Fixed export
944
            elif ext in (".tar.bz2", ".tbz2"):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
945
                format = "tbz2"
946
            else:
947
                format = "dir"
948
        t.export(dest, format, root)
949
950
951
class cmd_cat(Command):
952
    """Write a file's text from a previous revision."""
953
954
    takes_options = ['revision']
955
    takes_args = ['filename']
956
957
    def run(self, filename, revision=None):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
958
        if revision is None:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
959
            raise BzrCommandError("bzr cat requires a revision number")
960
        elif len(revision) != 1:
961
            raise BzrCommandError("bzr cat --revision takes exactly one number")
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
962
        b = Branch.open_containing('.')
963
        b.print_file(b.relpath(filename), revision[0].in_history(b).revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
964
965
966
class cmd_local_time_offset(Command):
967
    """Show the offset in seconds from GMT to local time."""
968
    hidden = True    
969
    def run(self):
970
        print bzrlib.osutils.local_time_offset()
971
972
973
974
class cmd_commit(Command):
975
    """Commit changes into a new revision.
976
    
977
    If no arguments are given, the entire tree is committed.
978
979
    If selected files are specified, only changes to those files are
980
    committed.  If a directory is specified then the directory and everything 
981
    within it is committed.
982
983
    A selected-file commit may fail in some cases where the committed
984
    tree would be invalid, such as trying to commit a file in a
985
    newly-added directory that is not itself committed.
986
987
    TODO: Run hooks on tree to-be-committed, and after commit.
988
989
    TODO: Strict commit that fails if there are unknown or deleted files.
990
    """
991
    takes_args = ['selected*']
992
    takes_options = ['message', 'file', 'verbose', 'unchanged']
993
    aliases = ['ci', 'checkin']
994
995
    # TODO: Give better message for -s, --summary, used by tla people
1189 by Martin Pool
- BROKEN: partial support for commit into weave
996
997
    # XXX: verbose currently does nothing
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
998
    
999
    def run(self, message=None, file=None, verbose=True, selected_list=None,
1000
            unchanged=False):
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
1001
        from bzrlib.errors import PointlessCommit, ConflictsInTree
1167 by Martin Pool
- split commit message editor functions out into own file
1002
        from bzrlib.msgeditor import edit_commit_message
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1003
        from bzrlib.status import show_status
1004
        from cStringIO import StringIO
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1005
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1006
        b = Branch.open_containing('.')
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1007
        if selected_list:
1008
            selected_list = [b.relpath(s) for s in selected_list]
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
1009
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1010
            
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1011
        if message is None and not file:
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1012
            catcher = StringIO()
1013
            show_status(b, specific_files=selected_list,
1014
                        to_file=catcher)
1015
            message = edit_commit_message(catcher.getvalue())
1393.3.2 by Jelmer Vernooij
Fix error message when an empty commit message was specified (when using an editor). Previously bzr warned that it wanted either --message or --file.
1016
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1017
            if message is None:
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1018
                raise BzrCommandError("please specify a commit message"
1019
                                      " with either --message or --file")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1020
        elif message and file:
1021
            raise BzrCommandError("please specify either --message or --file")
1022
        
1023
        if file:
1024
            import codecs
1025
            message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1026
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1027
        if message == "":
1028
                raise BzrCommandError("empty commit message specified")
1029
            
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1030
        try:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
1031
            b.commit(message,
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1032
                     specific_files=selected_list,
1033
                     allow_pointless=unchanged)
1034
        except PointlessCommit:
1035
            # FIXME: This should really happen before the file is read in;
1036
            # perhaps prepare the commit; get the message; then actually commit
1037
            raise BzrCommandError("no changes to commit",
1038
                                  ["use --unchanged to commit anyhow"])
1185.14.10 by Aaron Bentley
Commit aborts with conflicts in the tree.
1039
        except ConflictsInTree:
1040
            raise BzrCommandError("Conflicts detected in working tree.  "
1041
                'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1042
1043
1044
class cmd_check(Command):
1045
    """Validate consistency of branch history.
1046
1047
    This command checks various invariants about the branch storage to
1048
    detect data corruption or bzr bugs.
1049
    """
1050
    takes_args = ['dir?']
1051
1052
    def run(self, dir='.'):
1053
        from bzrlib.check import check
1054
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1055
        check(Branch.open_containing(dir))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1056
1057
1058
class cmd_scan_cache(Command):
1059
    hidden = True
1060
    def run(self):
1061
        from bzrlib.hashcache import HashCache
1062
1063
        c = HashCache('.')
1064
        c.read()
1065
        c.scan()
1066
            
1067
        print '%6d stats' % c.stat_count
1068
        print '%6d in hashcache' % len(c._cache)
1069
        print '%6d files removed from cache' % c.removed_count
1070
        print '%6d hashes updated' % c.update_count
1071
        print '%6d files changed too recently to cache' % c.danger_count
1072
1073
        if c.needs_write:
1074
            c.write()
1075
            
1076
1077
1078
class cmd_upgrade(Command):
1079
    """Upgrade branch storage to current format.
1080
1081
    The check command or bzr developers may sometimes advise you to run
1082
    this command.
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
1083
1084
    This version of this command upgrades from the full-text storage
1085
    used by bzr 0.0.8 and earlier to the weave format (v5).
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1086
    """
1087
    takes_args = ['dir?']
1088
1089
    def run(self, dir='.'):
1090
        from bzrlib.upgrade import upgrade
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
1091
        upgrade(dir)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1092
1093
1094
class cmd_whoami(Command):
1095
    """Show bzr user id."""
1096
    takes_options = ['email']
1097
    
1098
    def run(self, email=False):
1371 by Martin Pool
- raise NotBranchError if format file can't be read
1099
        try:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1100
            b = bzrlib.branch.Branch.open_containing('.')
1371 by Martin Pool
- raise NotBranchError if format file can't be read
1101
        except NotBranchError:
1102
            b = None
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1103
        
1104
        if email:
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
1105
            print bzrlib.config.user_email(b)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1106
        else:
1442.1.2 by Robert Collins
create a config module - there is enough config logic to make this worthwhile, and start testing config processing.
1107
            print bzrlib.config.username(b)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1108
1109
1110
class cmd_selftest(Command):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1111
    """Run internal test suite.
1112
    
1113
    This creates temporary test directories in the working directory,
1114
    but not existing data is affected.  These directories are deleted
1115
    if the tests pass, or left behind to help in debugging if they
1116
    fail.
1117
    
1118
    If arguments are given, they are regular expressions that say
1119
    which tests should run."""
1120
    # TODO: --list should give a list of all available tests
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1121
    hidden = True
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1122
    takes_args = ['testspecs*']
1123
    takes_options = ['verbose']
1124
    def run(self, testspecs_list=None, verbose=False):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1125
        import bzrlib.ui
1126
        from bzrlib.selftest import selftest
1127
        # we don't want progress meters from the tests to go to the
1128
        # real output; and we don't want log messages cluttering up
1129
        # the real logs.
1130
        save_ui = bzrlib.ui.ui_factory
1131
        bzrlib.trace.info('running tests...')
1132
        try:
1133
            bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1134
            if testspecs_list is not None:
1135
                pattern = '|'.join(testspecs_list)
1136
            else:
1137
                pattern = ".*"
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1138
            result = selftest(verbose=verbose, 
1185.1.57 by Robert Collins
nuke --pattern to selftest, replace with regexp.search calls.
1139
                              pattern=pattern)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1140
            if result:
1141
                bzrlib.trace.info('tests passed')
1142
            else:
1143
                bzrlib.trace.info('tests failed')
1144
            return int(not result)
1145
        finally:
1146
            bzrlib.ui.ui_factory = save_ui
1147
1148
1149
def show_version():
1150
    print "bzr (bazaar-ng) %s" % bzrlib.__version__
1151
    # is bzrlib itself in a branch?
1152
    bzrrev = bzrlib.get_bzr_revision()
1153
    if bzrrev:
1154
        print "  (bzr checkout, revision %d {%s})" % bzrrev
1155
    print bzrlib.__copyright__
1156
    print "http://bazaar-ng.org/"
1157
    print
1158
    print "bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and"
1159
    print "you may use, modify and redistribute it under the terms of the GNU"
1160
    print "General Public License version 2 or later."
1161
1162
1163
class cmd_version(Command):
1164
    """Show version of bzr."""
1165
    def run(self):
1166
        show_version()
1167
1168
class cmd_rocks(Command):
1169
    """Statement of optimism."""
1170
    hidden = True
1171
    def run(self):
1172
        print "it sure does!"
1173
1174
1175
class cmd_find_merge_base(Command):
1176
    """Find and print a base revision for merging two branches.
1177
1178
    TODO: Options to specify revisions on either side, as if
1179
          merging only part of the history.
1180
    """
1181
    takes_args = ['branch', 'other']
1182
    hidden = True
1183
    
1184
    def run(self, branch, other):
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1185
        from bzrlib.revision import common_ancestor, MultipleRevisionSources
1186
        
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1187
        branch1 = Branch.open_containing(branch)
1188
        branch2 = Branch.open_containing(other)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1189
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1190
        history_1 = branch1.revision_history()
1191
        history_2 = branch2.revision_history()
1192
1241 by Martin Pool
- rename last_patch to last_revision
1193
        last1 = branch1.last_revision()
1194
        last2 = branch2.last_revision()
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1195
1196
        source = MultipleRevisionSources(branch1, branch2)
1197
        
1198
        base_rev_id = common_ancestor(last1, last2, source)
1199
1200
        print 'merge base is revision %s' % base_rev_id
1201
        
1202
        return
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1203
1204
        if base_revno is None:
1205
            raise bzrlib.errors.UnrelatedBranches()
1206
1207
        print ' r%-6d in %s' % (base_revno, branch)
1208
1209
        other_revno = branch2.revision_id_to_revno(base_revid)
1210
        
1211
        print ' r%-6d in %s' % (other_revno, other)
1212
1213
1214
1215
class cmd_merge(Command):
1216
    """Perform a three-way merge.
1217
    
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1218
    The branch is the branch you will merge from.  By default, it will
1219
    merge the latest revision.  If you specify a revision, that
1220
    revision will be merged.  If you specify two revisions, the first
1221
    will be used as a BASE, and the second one as OTHER.  Revision
1222
    numbers are always relative to the specified branch.
1223
1224
    By default bzr will try to merge in all new work from the other
1225
    branch, automatically determining an appropriate base.  If this
1226
    fails, you may need to give an explicit base.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1227
    
1228
    Examples:
1229
1230
    To merge the latest revision from bzr.dev
1231
    bzr merge ../bzr.dev
1232
1233
    To merge changes up to and including revision 82 from bzr.dev
1234
    bzr merge -r 82 ../bzr.dev
1235
1236
    To merge the changes introduced by 82, without previous changes:
1237
    bzr merge -r 81..82 ../bzr.dev
1238
    
1239
    merge refuses to run if there are any uncommitted changes, unless
1240
    --force is given.
1241
    """
1242
    takes_args = ['branch?']
1243
    takes_options = ['revision', 'force', 'merge-type']
1244
1185.12.12 by Aaron Bentley
Made merge use pull location or die if no branch specified.
1245
    def run(self, branch=None, revision=None, force=False, 
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1246
            merge_type=None):
1247
        from bzrlib.merge import merge
1248
        from bzrlib.merge_core import ApplyMerge3
1249
        if merge_type is None:
1250
            merge_type = ApplyMerge3
1185.12.12 by Aaron Bentley
Made merge use pull location or die if no branch specified.
1251
        if branch is None:
1252
            branch = Branch.open_containing('.').get_parent()
1253
            if branch is None:
1254
                raise BzrCommandError("No merge location known or specified.")
1255
            else:
1256
                print "Using saved location: %s" % branch 
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1257
        if revision is None or len(revision) < 1:
1258
            base = [None, None]
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
1259
            other = [branch, -1]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1260
        else:
1261
            if len(revision) == 1:
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
1262
                base = [None, None]
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1263
                other = [branch, revision[0].in_history(branch).revno]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1264
            else:
1265
                assert len(revision) == 2
1266
                if None in revision:
1267
                    raise BzrCommandError(
1268
                        "Merge doesn't permit that revision specifier.")
1185.5.1 by John Arbash Meinel
Applying bad-merge revision patch.
1269
                b = Branch.open(branch)
1270
1271
                base = [branch, revision[0].in_history(b).revno]
1272
                other = [branch, revision[1].in_history(b).revno]
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1273
1274
        try:
1275
            merge(other, base, check_clean=(not force), merge_type=merge_type)
1276
        except bzrlib.errors.AmbiguousBase, e:
1173 by Martin Pool
- message typo
1277
            m = ("sorry, bzr can't determine the right merge base yet\n"
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1278
                 "candidates are:\n  "
1279
                 + "\n  ".join(e.bases)
1280
                 + "\n"
1281
                 "please specify an explicit base with -r,\n"
1282
                 "and (if you want) report this to the bzr developers\n")
1283
            log_error(m)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1284
1285
1286
class cmd_revert(Command):
1287
    """Reverse all changes since the last commit.
1288
1289
    Only versioned files are affected.  Specify filenames to revert only 
1290
    those files.  By default, any files that are changed will be backed up
1291
    first.  Backup files have a '~' appended to their name.
1292
    """
1293
    takes_options = ['revision', 'no-backup']
1294
    takes_args = ['file*']
1295
    aliases = ['merge-revert']
1296
1297
    def run(self, revision=None, no_backup=False, file_list=None):
1298
        from bzrlib.merge import merge
1299
        from bzrlib.commands import parse_spec
1300
1301
        if file_list is not None:
1302
            if len(file_list) == 0:
1303
                raise BzrCommandError("No files specified")
1304
        if revision is None:
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
1305
            revno = -1
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1306
        elif len(revision) != 1:
1307
            raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
1308
        else:
1309
            b = Branch.open_containing('.')
1310
            revno = revision[0].in_history(b).revno
1311
        merge(('.', revno), parse_spec('.'),
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1312
              check_clean=False,
1313
              ignore_zero=True,
1314
              backup_files=not no_backup,
1315
              file_list=file_list)
1316
        if not file_list:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1317
            Branch.open_containing('.').set_pending_merges([])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1318
1319
1320
class cmd_assert_fail(Command):
1321
    """Test reporting of assertion failures"""
1322
    hidden = True
1323
    def run(self):
1324
        assert False, "always fails"
1325
1326
1327
class cmd_help(Command):
1328
    """Show help on a command or other topic.
1329
1330
    For a list of all available commands, say 'bzr help commands'."""
1331
    takes_options = ['long']
1332
    takes_args = ['topic?']
1333
    aliases = ['?']
1334
    
1335
    def run(self, topic=None, long=False):
1336
        import help
1337
        if topic is None and long:
1338
            topic = "commands"
1339
        help.help(topic)
1340
1341
1342
class cmd_shell_complete(Command):
1343
    """Show appropriate completions for context.
1344
1345
    For a list of all available commands, say 'bzr shell-complete'."""
1346
    takes_args = ['context?']
1347
    aliases = ['s-c']
1348
    hidden = True
1349
    
1350
    def run(self, context=None):
1351
        import shellcomplete
1352
        shellcomplete.shellcomplete(context)
1353
1354
1228 by Martin Pool
- add fetch command as builtin
1355
class cmd_fetch(Command):
1356
    """Copy in history from another branch but don't merge it.
1357
1358
    This is an internal method used for pull and merge."""
1359
    hidden = True
1360
    takes_args = ['from_branch', 'to_branch']
1361
    def run(self, from_branch, to_branch):
1362
        from bzrlib.fetch import Fetcher
1363
        from bzrlib.branch import Branch
1364
        from_b = Branch(from_branch)
1365
        to_b = Branch(to_branch)
1366
        Fetcher(to_b, from_b)
1367
        
1368
1369
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1370
class cmd_missing(Command):
1371
    """What is missing in this branch relative to other branch.
1372
    """
1228 by Martin Pool
- add fetch command as builtin
1373
    # TODO: rewrite this in terms of ancestry so that it shows only
1374
    # unmerged things
1375
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1376
    takes_args = ['remote?']
1377
    aliases = ['mis', 'miss']
1378
    # We don't have to add quiet to the list, because 
1379
    # unknown options are parsed as booleans
1380
    takes_options = ['verbose', 'quiet']
1381
1382
    def run(self, remote=None, verbose=False, quiet=False):
1383
        from bzrlib.errors import BzrCommandError
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1384
        from bzrlib.missing import show_missing
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1385
1386
        if verbose and quiet:
1387
            raise BzrCommandError('Cannot pass both quiet and verbose')
1388
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1389
        b = Branch.open_containing('.')
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1390
        parent = b.get_parent()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1391
        if remote is None:
1392
            if parent is None:
1393
                raise BzrCommandError("No missing location known or specified.")
1394
            else:
1395
                if not quiet:
1396
                    print "Using last location: %s" % parent
1397
                remote = parent
1398
        elif parent is None:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1399
            # We only update parent if it did not exist, missing
1400
            # should not change the parent
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
1401
            b.set_parent(remote)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1402
        br_remote = Branch.open_containing(remote)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1403
        return show_missing(b, br_remote, verbose=verbose, quiet=quiet)
1404
1405
1406
class cmd_plugins(Command):
1407
    """List plugins"""
1408
    hidden = True
1409
    def run(self):
1410
        import bzrlib.plugin
1411
        from inspect import getdoc
1412
        for plugin in bzrlib.plugin.all_plugins:
1413
            if hasattr(plugin, '__path__'):
1414
                print plugin.__path__[0]
1415
            elif hasattr(plugin, '__file__'):
1416
                print plugin.__file__
1417
            else:
1418
                print `plugin`
1419
                
1420
            d = getdoc(plugin)
1421
            if d:
1422
                print '\t', d.split('\n')[0]
1423
1424