/brz/remove-bazaar

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