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