~bzr-pqm/bzr/bzr.dev

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