/brz/remove-bazaar

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