/brz/remove-bazaar

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