~bzr-pqm/bzr/bzr.dev

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