~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.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
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*']
1092.3.4 by Robert Collins
update symlink branch to integration
73
    takes_options = ['all', 'show-ids']
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.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
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.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
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.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
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.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
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.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
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.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
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.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
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.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
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.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
223
        b = Branch.open_containing('.')
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.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
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.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
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.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
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.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
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.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
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.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
343
        from bzrlib.errors import DivergedBranches
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.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
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".
1185.10.2 by Aaron Bentley
Updated help message
375
376
    --basis is to speed up branching from remote branches.  When specified, it
377
    copies all the file-contents, inventory and revision data from the basis
378
    branch before copying anything from the remote branch.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
379
    """
380
    takes_args = ['from_location', 'to_location?']
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
381
    takes_options = ['revision', 'basis']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
382
    aliases = ['get', 'clone']
383
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
384
    def run(self, from_location, to_location=None, revision=None, basis=None):
1393.1.5 by Martin Pool
- move copy_branch into bzrlib.clone
385
        from bzrlib.clone import copy_branch
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
386
        import tempfile
387
        import errno
388
        from shutil import rmtree
389
        cache_root = tempfile.mkdtemp()
390
        try:
391
            if revision is None:
392
                revision = [None]
393
            elif len(revision) > 1:
394
                raise BzrCommandError(
395
                    'bzr branch --revision takes exactly 1 revision value')
396
            try:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
397
                br_from = Branch.open(from_location)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
398
            except OSError, e:
399
                if e.errno == errno.ENOENT:
400
                    raise BzrCommandError('Source location "%s" does not'
401
                                          ' exist.' % to_location)
402
                else:
403
                    raise
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
404
            br_from.setup_caching(cache_root)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
405
            if basis is not None:
406
                basis_branch = Branch.open_containing(basis)
407
            else:
408
                basis_branch = None
1185.8.4 by Aaron Bentley
Fixed branch -r
409
            if len(revision) == 1 and revision[0] is not None:
1390 by Robert Collins
pair programming worx... merge integration and weave
410
                revision_id = revision[0].in_history(br_from)[1]
1185.8.4 by Aaron Bentley
Fixed branch -r
411
            else:
1390 by Robert Collins
pair programming worx... merge integration and weave
412
                revision_id = None
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
413
            if to_location is None:
414
                to_location = os.path.basename(from_location.rstrip("/\\"))
415
            try:
416
                os.mkdir(to_location)
417
            except OSError, e:
418
                if e.errno == errno.EEXIST:
419
                    raise BzrCommandError('Target directory "%s" already'
420
                                          ' exists.' % to_location)
421
                if e.errno == errno.ENOENT:
422
                    raise BzrCommandError('Parent of "%s" does not exist.' %
423
                                          to_location)
424
                else:
425
                    raise
426
            try:
1391 by Robert Collins
merge from integration
427
                copy_branch(br_from, to_location, revision_id, basis_branch)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
428
            except bzrlib.errors.NoSuchRevision:
429
                rmtree(to_location)
430
                msg = "The branch %s has no revision %d." % (from_location, revision[0])
431
                raise BzrCommandError(msg)
1185.10.1 by Aaron Bentley
Added --basis option to bzr branch
432
            except bzrlib.errors.UnlistableBranch:
433
                msg = "The branch %s cannot be used as a --basis"
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
434
        finally:
435
            rmtree(cache_root)
436
437
438
class cmd_renames(Command):
439
    """Show list of renamed files.
440
441
    TODO: Option to show renames between two historical versions.
442
443
    TODO: Only show renames under dir, rather than in the whole branch.
444
    """
445
    takes_args = ['dir?']
446
447
    def run(self, dir='.'):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
448
        b = Branch.open_containing(dir)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
449
        old_inv = b.basis_tree().inventory
450
        new_inv = b.read_working_inventory()
451
452
        renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
453
        renames.sort()
454
        for old_name, new_name in renames:
455
            print "%s => %s" % (old_name, new_name)        
456
457
458
class cmd_info(Command):
459
    """Show statistical information about a branch."""
460
    takes_args = ['branch?']
461
    
462
    def run(self, branch=None):
463
        import info
464
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']
477
    
478
    def run(self, file_list, verbose=False):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
479
        b = Branch.open_containing(file_list[0])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
480
        b.remove([b.relpath(f) for f in file_list], verbose=verbose)
481
482
483
class cmd_file_id(Command):
484
    """Print file_id of a particular file or directory.
485
486
    The file_id is assigned when the file is first added and remains the
487
    same through all revisions where the file exists, even when it is
488
    moved or renamed.
489
    """
490
    hidden = True
491
    takes_args = ['filename']
492
    def run(self, filename):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
493
        b = Branch.open_containing(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
494
        i = b.inventory.path2id(b.relpath(filename))
495
        if i == None:
496
            raise BzrError("%r is not a versioned file" % filename)
497
        else:
498
            print i
499
500
501
class cmd_file_path(Command):
502
    """Print path of file_ids to a file or directory.
503
504
    This prints one line for each directory down to the target,
505
    starting at the branch root."""
506
    hidden = True
507
    takes_args = ['filename']
508
    def run(self, filename):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
509
        b = Branch.open_containing(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
510
        inv = b.inventory
511
        fid = inv.path2id(b.relpath(filename))
512
        if fid == None:
513
            raise BzrError("%r is not a versioned file" % filename)
514
        for fip in inv.get_idpath(fid):
515
            print fip
516
517
518
class cmd_revision_history(Command):
519
    """Display list of revision ids on this branch."""
520
    hidden = True
521
    def run(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
522
        for patchid in Branch.open_containing('.').revision_history():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
523
            print patchid
524
525
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
526
class cmd_ancestry(Command):
527
    """List all revisions merged into this branch."""
528
    hidden = True
529
    def run(self):
530
        b = find_branch('.')
1241 by Martin Pool
- rename last_patch to last_revision
531
        for revision_id in b.get_ancestry(b.last_revision()):
1225 by Martin Pool
- branch now tracks ancestry - all merged revisions
532
            print revision_id
533
534
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
535
class cmd_directories(Command):
536
    """Display list of versioned directories in this branch."""
537
    def run(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
538
        for name, ie in Branch.open_containing('.').read_working_inventory().directories():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
539
            if name == '':
540
                print '.'
541
            else:
542
                print name
543
544
545
class cmd_init(Command):
546
    """Make a directory into a versioned branch.
547
548
    Use this to create an empty branch, or before importing an
549
    existing project.
550
551
    Recipe for importing a tree of files:
552
        cd ~/project
553
        bzr init
554
        bzr add -v .
555
        bzr status
556
        bzr commit -m 'imported project'
557
    """
558
    def run(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
559
        Branch.initialize('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
560
561
562
class cmd_diff(Command):
563
    """Show differences in working tree.
564
    
565
    If files are listed, only the changes in those files are listed.
566
    Otherwise, all changes for the tree are listed.
567
568
    TODO: Allow diff across branches.
569
570
    TODO: Option to use external diff command; could be GNU diff, wdiff,
571
          or a graphical diff.
572
573
    TODO: Python difflib is not exactly the same as unidiff; should
574
          either fix it up or prefer to use an external diff.
575
576
    TODO: If a directory is given, diff everything under that.
577
578
    TODO: Selected-file diff is inefficient and doesn't show you
579
          deleted files.
580
581
    TODO: This probably handles non-Unix newlines poorly.
582
583
    examples:
584
        bzr diff
585
        bzr diff -r1
1185.1.2 by Martin Pool
- merge various windows and other fixes from Ollie Rutherfurd
586
        bzr diff -r1..2
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
587
    """
588
    
589
    takes_args = ['file*']
590
    takes_options = ['revision', 'diff-options']
591
    aliases = ['di', 'dif']
592
593
    def run(self, revision=None, file_list=None, diff_options=None):
594
        from bzrlib.diff import show_diff
595
596
        if file_list:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
597
            b = Branch.open_containing(file_list[0])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
598
            file_list = [b.relpath(f) for f in file_list]
599
            if file_list == ['']:
600
                # just pointing to top-of-tree
601
                file_list = None
602
        else:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
603
            b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
604
605
        if revision is not None:
606
            if len(revision) == 1:
607
                show_diff(b, revision[0], specific_files=file_list,
608
                          external_diff_options=diff_options)
609
            elif len(revision) == 2:
610
                show_diff(b, revision[0], specific_files=file_list,
611
                          external_diff_options=diff_options,
612
                          revision2=revision[1])
613
            else:
614
                raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
615
        else:
616
            show_diff(b, None, specific_files=file_list,
617
                      external_diff_options=diff_options)
618
619
        
620
621
622
class cmd_deleted(Command):
623
    """List files deleted in the working tree.
624
625
    TODO: Show files deleted since a previous revision, or between two revisions.
626
    """
627
    def run(self, show_ids=False):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
628
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
629
        old = b.basis_tree()
630
        new = b.working_tree()
631
632
        ## TODO: Much more efficient way to do this: read in new
633
        ## directories with readdir, rather than stating each one.  Same
634
        ## level of effort but possibly much less IO.  (Or possibly not,
635
        ## if the directories are very large...)
636
637
        for path, ie in old.inventory.iter_entries():
638
            if not new.has_id(ie.file_id):
639
                if show_ids:
640
                    print '%-50s %s' % (path, ie.file_id)
641
                else:
642
                    print path
643
644
645
class cmd_modified(Command):
646
    """List files modified in working tree."""
647
    hidden = True
648
    def run(self):
649
        from bzrlib.delta import compare_trees
650
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
651
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
652
        td = compare_trees(b.basis_tree(), b.working_tree())
653
1398 by Robert Collins
integrate in Gustavos x-bit patch
654
        for path, id, kind, text_modified, meta_modified in td.modified:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
655
            print path
656
657
658
659
class cmd_added(Command):
660
    """List files added in working tree."""
661
    hidden = True
662
    def run(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
663
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
664
        wt = b.working_tree()
665
        basis_inv = b.basis_tree().inventory
666
        inv = wt.inventory
667
        for file_id in inv:
668
            if file_id in basis_inv:
669
                continue
670
            path = inv.id2path(file_id)
671
            if not os.access(b.abspath(path), os.F_OK):
672
                continue
673
            print path
674
                
675
        
676
677
class cmd_root(Command):
678
    """Show the tree root directory.
679
680
    The root is the nearest enclosing directory with a .bzr control
681
    directory."""
682
    takes_args = ['filename?']
683
    def run(self, filename=None):
684
        """Print the branch root."""
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
685
        b = Branch.open_containing(filename)
1185.2.3 by Lalo Martins
unifying 'base' (from Branch) and 'baseurl' (from RemoteBranch) attributes;
686
        print b.base
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
687
688
689
class cmd_log(Command):
690
    """Show log of this branch.
691
692
    To request a range of logs, you can use the command -r begin:end
693
    -r revision requests a specific revision, -r :end or -r begin: are
694
    also valid.
695
696
    --message allows you to give a regular expression, which will be evaluated
697
    so that only matching entries will be displayed.
698
    """
699
1393.1.55 by Martin Pool
doc
700
    # TODO: Make --revision support uuid: and hash: [future tag:] notation.
701
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
702
    takes_args = ['filename?']
703
    takes_options = ['forward', 'timezone', 'verbose', 'show-ids', 'revision',
704
                     'long', 'message', 'short',]
705
    
706
    def run(self, filename=None, timezone='original',
707
            verbose=False,
708
            show_ids=False,
709
            forward=False,
710
            revision=None,
711
            message=None,
712
            long=False,
713
            short=False):
714
        from bzrlib.log import log_formatter, show_log
715
        import codecs
716
717
        direction = (forward and 'forward') or 'reverse'
718
        
719
        if filename:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
720
            b = Branch.open_containing(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
721
            fp = b.relpath(filename)
722
            if fp:
723
                file_id = b.read_working_inventory().path2id(fp)
724
            else:
725
                file_id = None  # points to branch root
726
        else:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
727
            b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
728
            file_id = None
729
730
        if revision is None:
731
            rev1 = None
732
            rev2 = None
733
        elif len(revision) == 1:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
734
            rev1 = rev2 = revision[0].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
735
        elif len(revision) == 2:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
736
            rev1 = revision[0].in_history(b).revno
737
            rev2 = revision[1].in_history(b).revno
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
738
        else:
739
            raise BzrCommandError('bzr log --revision takes one or two values.')
740
741
        if rev1 == 0:
742
            rev1 = None
743
        if rev2 == 0:
744
            rev2 = None
745
746
        mutter('encoding log as %r' % bzrlib.user_encoding)
747
748
        # use 'replace' so that we don't abort if trying to write out
749
        # in e.g. the default C locale.
750
        outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
751
752
        if not short:
753
            log_format = 'long'
754
        else:
755
            log_format = 'short'
756
        lf = log_formatter(log_format,
757
                           show_ids=show_ids,
758
                           to_file=outf,
759
                           show_timezone=timezone)
760
761
        show_log(b,
762
                 lf,
763
                 file_id,
764
                 verbose=verbose,
765
                 direction=direction,
766
                 start_revision=rev1,
767
                 end_revision=rev2,
768
                 search=message)
769
770
771
772
class cmd_touching_revisions(Command):
773
    """Return revision-ids which affected a particular file.
774
775
    A more user-friendly interface is "bzr log FILE"."""
776
    hidden = True
777
    takes_args = ["filename"]
778
    def run(self, filename):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
779
        b = Branch.open_containing(filename)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
780
        inv = b.read_working_inventory()
781
        file_id = inv.path2id(b.relpath(filename))
782
        for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
783
            print "%6d %s" % (revno, what)
784
785
786
class cmd_ls(Command):
787
    """List files in a tree.
788
789
    TODO: Take a revision or remote path and list that tree instead.
790
    """
791
    hidden = True
792
    def run(self, revision=None, verbose=False):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
793
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
794
        if revision == None:
795
            tree = b.working_tree()
796
        else:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
797
            tree = b.revision_tree(revision.in_history(b).rev_id)
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
798
        for fp, fc, kind, fid, entry in tree.list_files():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
799
            if verbose:
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
800
                kindch = entry.kind_character()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
801
                print '%-8s %s%s' % (fc, fp, kindch)
802
            else:
803
                print fp
804
805
806
807
class cmd_unknowns(Command):
808
    """List unknown files."""
809
    def run(self):
810
        from bzrlib.osutils import quotefn
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
811
        for f in Branch.open_containing('.').unknowns():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
812
            print quotefn(f)
813
814
815
816
class cmd_ignore(Command):
817
    """Ignore a command or pattern.
818
819
    To remove patterns from the ignore list, edit the .bzrignore file.
820
821
    If the pattern contains a slash, it is compared to the whole path
822
    from the branch root.  Otherwise, it is comapred to only the last
823
    component of the path.
824
825
    Ignore patterns are case-insensitive on case-insensitive systems.
826
827
    Note: wildcards must be quoted from the shell on Unix.
828
829
    examples:
830
        bzr ignore ./Makefile
831
        bzr ignore '*.class'
832
    """
833
    takes_args = ['name_pattern']
834
    
835
    def run(self, name_pattern):
836
        from bzrlib.atomicfile import AtomicFile
837
        import os.path
838
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
839
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
840
        ifn = b.abspath('.bzrignore')
841
842
        if os.path.exists(ifn):
843
            f = open(ifn, 'rt')
844
            try:
845
                igns = f.read().decode('utf-8')
846
            finally:
847
                f.close()
848
        else:
849
            igns = ''
850
851
        # TODO: If the file already uses crlf-style termination, maybe
852
        # we should use that for the newly added lines?
853
854
        if igns and igns[-1] != '\n':
855
            igns += '\n'
856
        igns += name_pattern + '\n'
857
858
        try:
859
            f = AtomicFile(ifn, 'wt')
860
            f.write(igns.encode('utf-8'))
861
            f.commit()
862
        finally:
863
            f.close()
864
865
        inv = b.working_tree().inventory
866
        if inv.path2id('.bzrignore'):
867
            mutter('.bzrignore is already versioned')
868
        else:
869
            mutter('need to make new .bzrignore file versioned')
870
            b.add(['.bzrignore'])
871
872
873
874
class cmd_ignored(Command):
875
    """List ignored files and the patterns that matched them.
876
877
    See also: bzr ignore"""
878
    def run(self):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
879
        tree = Branch.open_containing('.').working_tree()
1399.1.2 by Robert Collins
push kind character creation into InventoryEntry and TreeEntry
880
        for path, file_class, kind, file_id, entry in tree.list_files():
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
881
            if file_class != 'I':
882
                continue
883
            ## XXX: Slightly inefficient since this was already calculated
884
            pat = tree.is_ignored(path)
885
            print '%-50s %s' % (path, pat)
886
887
888
class cmd_lookup_revision(Command):
889
    """Lookup the revision-id from a revision-number
890
891
    example:
892
        bzr lookup-revision 33
893
    """
894
    hidden = True
895
    takes_args = ['revno']
896
    
897
    def run(self, revno):
898
        try:
899
            revno = int(revno)
900
        except ValueError:
901
            raise BzrCommandError("not a valid revision-number: %r" % revno)
902
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
903
        print Branch.open_containing('.').get_rev_id(revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
904
905
906
class cmd_export(Command):
907
    """Export past revision to destination directory.
908
909
    If no revision is specified this exports the last committed revision.
910
911
    Format may be an "exporter" name, such as tar, tgz, tbz2.  If none is
912
    given, try to find the format with the extension. If no extension
913
    is found exports to a directory (equivalent to --format=dir).
914
915
    Root may be the top directory for tar, tgz and tbz2 formats. If none
916
    is given, the top directory will be the root name of the file."""
917
    # TODO: list known exporters
918
    takes_args = ['dest']
919
    takes_options = ['revision', 'format', 'root']
920
    def run(self, dest, revision=None, format=None, root=None):
921
        import os.path
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
922
        b = Branch.open_containing('.')
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
923
        if revision is None:
1241 by Martin Pool
- rename last_patch to last_revision
924
            rev_id = b.last_revision()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
925
        else:
926
            if len(revision) != 1:
927
                raise BzrError('bzr export --revision takes exactly 1 argument')
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
928
            rev_id = revision[0].in_history(b).rev_id
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
929
        t = b.revision_tree(rev_id)
1185.12.1 by Aaron Bentley
Fixed export
930
        arg_root, ext = os.path.splitext(os.path.basename(dest))
931
        if ext in ('.gz', '.bz2'):
932
            new_root, new_ext = os.path.splitext(arg_root)
933
            if new_ext == '.tar':
934
                arg_root = new_root
935
                ext = new_ext + ext
936
        if root is None:
937
            root = arg_root
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
938
        if not format:
939
            if ext in (".tar",):
940
                format = "tar"
1185.12.1 by Aaron Bentley
Fixed export
941
            elif ext in (".tar.gz", ".tgz"):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
942
                format = "tgz"
1185.12.1 by Aaron Bentley
Fixed export
943
            elif ext in (".tar.bz2", ".tbz2"):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
944
                format = "tbz2"
945
            else:
946
                format = "dir"
947
        t.export(dest, format, root)
948
949
950
class cmd_cat(Command):
951
    """Write a file's text from a previous revision."""
952
953
    takes_options = ['revision']
954
    takes_args = ['filename']
955
956
    def run(self, filename, revision=None):
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
957
        if revision is None:
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
958
            raise BzrCommandError("bzr cat requires a revision number")
959
        elif len(revision) != 1:
960
            raise BzrCommandError("bzr cat --revision takes exactly one number")
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
961
        b = Branch.open_containing('.')
962
        b.print_file(b.relpath(filename), revision[0].in_history(b).revno)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
963
964
965
class cmd_local_time_offset(Command):
966
    """Show the offset in seconds from GMT to local time."""
967
    hidden = True    
968
    def run(self):
969
        print bzrlib.osutils.local_time_offset()
970
971
972
973
class cmd_commit(Command):
974
    """Commit changes into a new revision.
975
    
976
    If no arguments are given, the entire tree is committed.
977
978
    If selected files are specified, only changes to those files are
979
    committed.  If a directory is specified then the directory and everything 
980
    within it is committed.
981
982
    A selected-file commit may fail in some cases where the committed
983
    tree would be invalid, such as trying to commit a file in a
984
    newly-added directory that is not itself committed.
985
986
    TODO: Run hooks on tree to-be-committed, and after commit.
987
988
    TODO: Strict commit that fails if there are unknown or deleted files.
989
    """
990
    takes_args = ['selected*']
991
    takes_options = ['message', 'file', 'verbose', 'unchanged']
992
    aliases = ['ci', 'checkin']
993
994
    # TODO: Give better message for -s, --summary, used by tla people
1189 by Martin Pool
- BROKEN: partial support for commit into weave
995
996
    # XXX: verbose currently does nothing
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
997
    
998
    def run(self, message=None, file=None, verbose=True, selected_list=None,
999
            unchanged=False):
1000
        from bzrlib.errors import PointlessCommit
1167 by Martin Pool
- split commit message editor functions out into own file
1001
        from bzrlib.msgeditor import edit_commit_message
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1002
        from bzrlib.status import show_status
1003
        from cStringIO import StringIO
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1004
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1005
        b = Branch.open_containing('.')
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1006
        if selected_list:
1007
            selected_list = [b.relpath(s) for s in selected_list]
1008
            
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1009
        if message is None and not file:
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1010
            catcher = StringIO()
1011
            show_status(b, specific_files=selected_list,
1012
                        to_file=catcher)
1013
            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.
1014
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1015
            if message is None:
1169 by Martin Pool
- clean up nasty code for inserting the status summary into commit template
1016
                raise BzrCommandError("please specify a commit message"
1017
                                      " with either --message or --file")
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1018
        elif message and file:
1019
            raise BzrCommandError("please specify either --message or --file")
1020
        
1021
        if file:
1022
            import codecs
1023
            message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1024
1414 by Robert Collins
merge in an adjusted version of Jelmer's empty-log detection patch.
1025
        if message == "":
1026
                raise BzrCommandError("empty commit message specified")
1027
            
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1028
        try:
1189 by Martin Pool
- BROKEN: partial support for commit into weave
1029
            b.commit(message,
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1030
                     specific_files=selected_list,
1031
                     allow_pointless=unchanged)
1032
        except PointlessCommit:
1033
            # FIXME: This should really happen before the file is read in;
1034
            # perhaps prepare the commit; get the message; then actually commit
1035
            raise BzrCommandError("no changes to commit",
1036
                                  ["use --unchanged to commit anyhow"])
1037
1038
1039
class cmd_check(Command):
1040
    """Validate consistency of branch history.
1041
1042
    This command checks various invariants about the branch storage to
1043
    detect data corruption or bzr bugs.
1044
    """
1045
    takes_args = ['dir?']
1046
1047
    def run(self, dir='.'):
1048
        from bzrlib.check import check
1049
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1050
        check(Branch.open_containing(dir))
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1051
1052
1053
class cmd_scan_cache(Command):
1054
    hidden = True
1055
    def run(self):
1056
        from bzrlib.hashcache import HashCache
1057
1058
        c = HashCache('.')
1059
        c.read()
1060
        c.scan()
1061
            
1062
        print '%6d stats' % c.stat_count
1063
        print '%6d in hashcache' % len(c._cache)
1064
        print '%6d files removed from cache' % c.removed_count
1065
        print '%6d hashes updated' % c.update_count
1066
        print '%6d files changed too recently to cache' % c.danger_count
1067
1068
        if c.needs_write:
1069
            c.write()
1070
            
1071
1072
1073
class cmd_upgrade(Command):
1074
    """Upgrade branch storage to current format.
1075
1076
    The check command or bzr developers may sometimes advise you to run
1077
    this command.
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
1078
1079
    This version of this command upgrades from the full-text storage
1080
    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;
1081
    """
1082
    takes_args = ['dir?']
1083
1084
    def run(self, dir='.'):
1085
        from bzrlib.upgrade import upgrade
1377 by Martin Pool
- run conversion to weaves from the 'bzr upgrade' command
1086
        upgrade(dir)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1087
1088
1089
class cmd_whoami(Command):
1090
    """Show bzr user id."""
1091
    takes_options = ['email']
1092
    
1093
    def run(self, email=False):
1371 by Martin Pool
- raise NotBranchError if format file can't be read
1094
        try:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1095
            b = bzrlib.branch.Branch.open_containing('.')
1371 by Martin Pool
- raise NotBranchError if format file can't be read
1096
        except NotBranchError:
1097
            b = None
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1098
        
1099
        if email:
1100
            print bzrlib.osutils.user_email(b)
1101
        else:
1102
            print bzrlib.osutils.username(b)
1103
1104
1105
class cmd_selftest(Command):
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1106
    """Run internal test suite.
1107
    
1108
    This creates temporary test directories in the working directory,
1109
    but not existing data is affected.  These directories are deleted
1110
    if the tests pass, or left behind to help in debugging if they
1111
    fail.
1112
    
1113
    If arguments are given, they are regular expressions that say
1114
    which tests should run."""
1115
    # TODO: --list should give a list of all available tests
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1116
    hidden = True
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1117
    takes_args = ['testnames*']
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1118
    takes_options = ['verbose', 'pattern']
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1119
    def run(self, testnames_list=None, verbose=False, pattern=".*"):
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1120
        import bzrlib.ui
1121
        from bzrlib.selftest import selftest
1122
        # we don't want progress meters from the tests to go to the
1123
        # real output; and we don't want log messages cluttering up
1124
        # the real logs.
1125
        save_ui = bzrlib.ui.ui_factory
1126
        bzrlib.trace.info('running tests...')
1127
        try:
1128
            bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1393.1.46 by Martin Pool
- bzr selftest arguments can be partial ids of tests to run
1129
            result = selftest(verbose=verbose, 
1130
                              pattern=pattern,
1131
                              testnames=testnames_list)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1132
            if result:
1133
                bzrlib.trace.info('tests passed')
1134
            else:
1135
                bzrlib.trace.info('tests failed')
1136
            return int(not result)
1137
        finally:
1138
            bzrlib.ui.ui_factory = save_ui
1139
1140
1141
def show_version():
1142
    print "bzr (bazaar-ng) %s" % bzrlib.__version__
1143
    # is bzrlib itself in a branch?
1144
    bzrrev = bzrlib.get_bzr_revision()
1145
    if bzrrev:
1146
        print "  (bzr checkout, revision %d {%s})" % bzrrev
1147
    print bzrlib.__copyright__
1148
    print "http://bazaar-ng.org/"
1149
    print
1150
    print "bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and"
1151
    print "you may use, modify and redistribute it under the terms of the GNU"
1152
    print "General Public License version 2 or later."
1153
1154
1155
class cmd_version(Command):
1156
    """Show version of bzr."""
1157
    def run(self):
1158
        show_version()
1159
1160
class cmd_rocks(Command):
1161
    """Statement of optimism."""
1162
    hidden = True
1163
    def run(self):
1164
        print "it sure does!"
1165
1166
1167
class cmd_find_merge_base(Command):
1168
    """Find and print a base revision for merging two branches.
1169
1170
    TODO: Options to specify revisions on either side, as if
1171
          merging only part of the history.
1172
    """
1173
    takes_args = ['branch', 'other']
1174
    hidden = True
1175
    
1176
    def run(self, branch, other):
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1177
        from bzrlib.revision import common_ancestor, MultipleRevisionSources
1178
        
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1179
        branch1 = Branch.open_containing(branch)
1180
        branch2 = Branch.open_containing(other)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1181
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1182
        history_1 = branch1.revision_history()
1183
        history_2 = branch2.revision_history()
1184
1241 by Martin Pool
- rename last_patch to last_revision
1185
        last1 = branch1.last_revision()
1186
        last2 = branch2.last_revision()
1155 by Martin Pool
- update find-merge-base to use new common_ancestor code
1187
1188
        source = MultipleRevisionSources(branch1, branch2)
1189
        
1190
        base_rev_id = common_ancestor(last1, last2, source)
1191
1192
        print 'merge base is revision %s' % base_rev_id
1193
        
1194
        return
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1195
1196
        if base_revno is None:
1197
            raise bzrlib.errors.UnrelatedBranches()
1198
1199
        print ' r%-6d in %s' % (base_revno, branch)
1200
1201
        other_revno = branch2.revision_id_to_revno(base_revid)
1202
        
1203
        print ' r%-6d in %s' % (other_revno, other)
1204
1205
1206
1207
class cmd_merge(Command):
1208
    """Perform a three-way merge.
1209
    
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1210
    The branch is the branch you will merge from.  By default, it will
1211
    merge the latest revision.  If you specify a revision, that
1212
    revision will be merged.  If you specify two revisions, the first
1213
    will be used as a BASE, and the second one as OTHER.  Revision
1214
    numbers are always relative to the specified branch.
1215
1216
    By default bzr will try to merge in all new work from the other
1217
    branch, automatically determining an appropriate base.  If this
1218
    fails, you may need to give an explicit base.
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1219
    
1220
    Examples:
1221
1222
    To merge the latest revision from bzr.dev
1223
    bzr merge ../bzr.dev
1224
1225
    To merge changes up to and including revision 82 from bzr.dev
1226
    bzr merge -r 82 ../bzr.dev
1227
1228
    To merge the changes introduced by 82, without previous changes:
1229
    bzr merge -r 81..82 ../bzr.dev
1230
    
1231
    merge refuses to run if there are any uncommitted changes, unless
1232
    --force is given.
1233
    """
1234
    takes_args = ['branch?']
1235
    takes_options = ['revision', 'force', 'merge-type']
1236
1237
    def run(self, branch='.', revision=None, force=False, 
1238
            merge_type=None):
1239
        from bzrlib.merge import merge
1240
        from bzrlib.merge_core import ApplyMerge3
1241
        if merge_type is None:
1242
            merge_type = ApplyMerge3
1243
1244
        if revision is None or len(revision) < 1:
1245
            base = [None, None]
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
1246
            other = [branch, -1]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1247
        else:
1248
            if len(revision) == 1:
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
1249
                base = [None, None]
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1250
                other = [branch, revision[0].in_history(branch).revno]
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1251
            else:
1252
                assert len(revision) == 2
1253
                if None in revision:
1254
                    raise BzrCommandError(
1255
                        "Merge doesn't permit that revision specifier.")
1185.5.1 by John Arbash Meinel
Applying bad-merge revision patch.
1256
                b = Branch.open(branch)
1257
1258
                base = [branch, revision[0].in_history(b).revno]
1259
                other = [branch, revision[1].in_history(b).revno]
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1260
1261
        try:
1262
            merge(other, base, check_clean=(not force), merge_type=merge_type)
1263
        except bzrlib.errors.AmbiguousBase, e:
1173 by Martin Pool
- message typo
1264
            m = ("sorry, bzr can't determine the right merge base yet\n"
1172 by Martin Pool
- better explanation when merge fails with AmbiguousBase
1265
                 "candidates are:\n  "
1266
                 + "\n  ".join(e.bases)
1267
                 + "\n"
1268
                 "please specify an explicit base with -r,\n"
1269
                 "and (if you want) report this to the bzr developers\n")
1270
            log_error(m)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1271
1272
1273
class cmd_revert(Command):
1274
    """Reverse all changes since the last commit.
1275
1276
    Only versioned files are affected.  Specify filenames to revert only 
1277
    those files.  By default, any files that are changed will be backed up
1278
    first.  Backup files have a '~' appended to their name.
1279
    """
1280
    takes_options = ['revision', 'no-backup']
1281
    takes_args = ['file*']
1282
    aliases = ['merge-revert']
1283
1284
    def run(self, revision=None, no_backup=False, file_list=None):
1285
        from bzrlib.merge import merge
1286
        from bzrlib.commands import parse_spec
1287
1288
        if file_list is not None:
1289
            if len(file_list) == 0:
1290
                raise BzrCommandError("No files specified")
1291
        if revision is None:
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
1292
            revno = -1
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1293
        elif len(revision) != 1:
1294
            raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1185.5.8 by John Arbash Meinel
Fixed bzr revert with the new RevisionSpec code.
1295
        else:
1296
            b = Branch.open_containing('.')
1297
            revno = revision[0].in_history(b).revno
1298
        merge(('.', revno), parse_spec('.'),
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1299
              check_clean=False,
1300
              ignore_zero=True,
1301
              backup_files=not no_backup,
1302
              file_list=file_list)
1303
        if not file_list:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1304
            Branch.open_containing('.').set_pending_merges([])
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1305
1306
1307
class cmd_assert_fail(Command):
1308
    """Test reporting of assertion failures"""
1309
    hidden = True
1310
    def run(self):
1311
        assert False, "always fails"
1312
1313
1314
class cmd_help(Command):
1315
    """Show help on a command or other topic.
1316
1317
    For a list of all available commands, say 'bzr help commands'."""
1318
    takes_options = ['long']
1319
    takes_args = ['topic?']
1320
    aliases = ['?']
1321
    
1322
    def run(self, topic=None, long=False):
1323
        import help
1324
        if topic is None and long:
1325
            topic = "commands"
1326
        help.help(topic)
1327
1328
1329
class cmd_shell_complete(Command):
1330
    """Show appropriate completions for context.
1331
1332
    For a list of all available commands, say 'bzr shell-complete'."""
1333
    takes_args = ['context?']
1334
    aliases = ['s-c']
1335
    hidden = True
1336
    
1337
    def run(self, context=None):
1338
        import shellcomplete
1339
        shellcomplete.shellcomplete(context)
1340
1341
1228 by Martin Pool
- add fetch command as builtin
1342
class cmd_fetch(Command):
1343
    """Copy in history from another branch but don't merge it.
1344
1345
    This is an internal method used for pull and merge."""
1346
    hidden = True
1347
    takes_args = ['from_branch', 'to_branch']
1348
    def run(self, from_branch, to_branch):
1349
        from bzrlib.fetch import Fetcher
1350
        from bzrlib.branch import Branch
1351
        from_b = Branch(from_branch)
1352
        to_b = Branch(to_branch)
1353
        Fetcher(to_b, from_b)
1354
        
1355
1356
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1357
class cmd_missing(Command):
1358
    """What is missing in this branch relative to other branch.
1359
    """
1228 by Martin Pool
- add fetch command as builtin
1360
    # TODO: rewrite this in terms of ancestry so that it shows only
1361
    # unmerged things
1362
    
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1363
    takes_args = ['remote?']
1364
    aliases = ['mis', 'miss']
1365
    # We don't have to add quiet to the list, because 
1366
    # unknown options are parsed as booleans
1367
    takes_options = ['verbose', 'quiet']
1368
1369
    def run(self, remote=None, verbose=False, quiet=False):
1370
        from bzrlib.errors import BzrCommandError
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1371
        from bzrlib.missing import show_missing
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1372
1373
        if verbose and quiet:
1374
            raise BzrCommandError('Cannot pass both quiet and verbose')
1375
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1376
        b = Branch.open_containing('.')
1149 by Martin Pool
- make get_parent() be a method of Branch; add simple tests for it
1377
        parent = b.get_parent()
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1378
        if remote is None:
1379
            if parent is None:
1380
                raise BzrCommandError("No missing location known or specified.")
1381
            else:
1382
                if not quiet:
1383
                    print "Using last location: %s" % parent
1384
                remote = parent
1385
        elif parent is None:
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1386
            # We only update parent if it did not exist, missing
1387
            # should not change the parent
974.1.79 by Aaron Bentley
Fixed issues with pull not having a default location after branch
1388
            b.set_parent(remote)
1185.11.5 by John Arbash Meinel
Merged up-to-date against mainline, still broken.
1389
        br_remote = Branch.open_containing(remote)
1147 by Martin Pool
- split builtin commands into separate module bzrlib.builtins;
1390
        return show_missing(b, br_remote, verbose=verbose, quiet=quiet)
1391
1392
1393
class cmd_plugins(Command):
1394
    """List plugins"""
1395
    hidden = True
1396
    def run(self):
1397
        import bzrlib.plugin
1398
        from inspect import getdoc
1399
        for plugin in bzrlib.plugin.all_plugins:
1400
            if hasattr(plugin, '__path__'):
1401
                print plugin.__path__[0]
1402
            elif hasattr(plugin, '__file__'):
1403
                print plugin.__file__
1404
            else:
1405
                print `plugin`
1406
                
1407
            d = getdoc(plugin)
1408
            if d:
1409
                print '\t', d.split('\n')[0]
1410
1411