1
# Copyright (C) 2004, 2005 by Canonical Ltd
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.
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.
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
17
"""builtin bzr commands"""
19
# DO NOT change this to cStringIO - it results in control files
21
# FIXIT! (Only deal with byte streams OR unicode at any one layer.)
24
from StringIO import StringIO
29
from bzrlib import BZRDIR
30
from bzrlib.commands import Command, display_command
31
from bzrlib.branch import Branch
32
from bzrlib.revision import common_ancestor
33
import bzrlib.errors as errors
34
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
35
NotBranchError, DivergedBranches, NotConflicted,
36
NoSuchFile, NoWorkingTree, FileInWrongBranch)
37
from bzrlib.option import Option
38
from bzrlib.revisionspec import RevisionSpec
40
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
41
from bzrlib.workingtree import WorkingTree
42
from bzrlib.log import show_one_log
45
def tree_files(file_list, default_branch=u'.'):
47
return internal_tree_files(file_list, default_branch)
48
except FileInWrongBranch, e:
49
raise BzrCommandError("%s is not in the same branch as %s" %
50
(e.path, file_list[0]))
52
def internal_tree_files(file_list, default_branch=u'.'):
54
Return a branch and list of branch-relative paths.
55
If supplied file_list is empty or None, the branch default will be used,
56
and returned file_list will match the original.
58
if file_list is None or len(file_list) == 0:
59
return WorkingTree.open_containing(default_branch)[0], file_list
60
tree = WorkingTree.open_containing(file_list[0])[0]
62
for filename in file_list:
64
new_list.append(tree.relpath(filename))
65
except errors.PathNotChild:
66
raise FileInWrongBranch(tree.branch, filename)
70
# TODO: Make sure no commands unconditionally use the working directory as a
71
# branch. If a filename argument is used, the first of them should be used to
72
# specify the branch. (Perhaps this can be factored out into some kind of
73
# Argument class, representing a file in a branch, where the first occurrence
76
class cmd_status(Command):
77
"""Display status summary.
79
This reports on versioned and unknown files, reporting them
80
grouped by state. Possible states are:
83
Versioned in the working copy but not in the previous revision.
86
Versioned in the previous revision but removed or deleted
90
Path of this file changed from the previous revision;
91
the text may also have changed. This includes files whose
92
parent directory was renamed.
95
Text has changed since the previous revision.
98
Nothing about this file has changed since the previous revision.
99
Only shown with --all.
102
Not versioned and not matching an ignore pattern.
104
To see ignored files use 'bzr ignored'. For details in the
105
changes to file texts, use 'bzr diff'.
107
If no arguments are specified, the status of the entire working
108
directory is shown. Otherwise, only the status of the specified
109
files or directories is reported. If a directory is given, status
110
is reported for everything inside that directory.
112
If a revision argument is given, the status is calculated against
113
that revision, or between two revisions if two are provided.
116
# TODO: --no-recurse, --recurse options
118
takes_args = ['file*']
119
takes_options = ['all', 'show-ids', 'revision']
120
aliases = ['st', 'stat']
123
def run(self, all=False, show_ids=False, file_list=None, revision=None):
124
tree, file_list = tree_files(file_list)
126
from bzrlib.status import show_status
127
show_status(tree.branch, show_unchanged=all, show_ids=show_ids,
128
specific_files=file_list, revision=revision)
131
class cmd_cat_revision(Command):
132
"""Write out metadata for a revision.
134
The revision to print can either be specified by a specific
135
revision identifier, or you can use --revision.
139
takes_args = ['revision_id?']
140
takes_options = ['revision']
143
def run(self, revision_id=None, revision=None):
145
if revision_id is not None and revision is not None:
146
raise BzrCommandError('You can only supply one of revision_id or --revision')
147
if revision_id is None and revision is None:
148
raise BzrCommandError('You must supply either --revision or a revision_id')
149
b = WorkingTree.open_containing(u'.')[0].branch
150
if revision_id is not None:
151
sys.stdout.write(b.repository.get_revision_xml(revision_id))
152
elif revision is not None:
155
raise BzrCommandError('You cannot specify a NULL revision.')
156
revno, rev_id = rev.in_history(b)
157
sys.stdout.write(b.repository.get_revision_xml(rev_id))
160
class cmd_revno(Command):
161
"""Show current revision number.
163
This is equal to the number of revisions on this branch."""
164
takes_args = ['location?']
166
def run(self, location=u'.'):
167
print Branch.open_containing(location)[0].revno()
170
class cmd_revision_info(Command):
171
"""Show revision number and revision id for a given revision identifier.
174
takes_args = ['revision_info*']
175
takes_options = ['revision']
177
def run(self, revision=None, revision_info_list=[]):
180
if revision is not None:
181
revs.extend(revision)
182
if revision_info_list is not None:
183
for rev in revision_info_list:
184
revs.append(RevisionSpec(rev))
186
raise BzrCommandError('You must supply a revision identifier')
188
b = WorkingTree.open_containing(u'.')[0].branch
191
revinfo = rev.in_history(b)
192
if revinfo.revno is None:
193
print ' %s' % revinfo.rev_id
195
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
198
class cmd_add(Command):
199
"""Add specified files or directories.
201
In non-recursive mode, all the named items are added, regardless
202
of whether they were previously ignored. A warning is given if
203
any of the named files are already versioned.
205
In recursive mode (the default), files are treated the same way
206
but the behaviour for directories is different. Directories that
207
are already versioned do not give a warning. All directories,
208
whether already versioned or not, are searched for files or
209
subdirectories that are neither versioned or ignored, and these
210
are added. This search proceeds recursively into versioned
211
directories. If no names are given '.' is assumed.
213
Therefore simply saying 'bzr add' will version all files that
214
are currently unknown.
216
Adding a file whose parent directory is not versioned will
217
implicitly add the parent, and so on up to the root. This means
218
you should never need to explictly add a directory, they'll just
219
get added when you add a file in the directory.
221
--dry-run will show which files would be added, but not actually
224
takes_args = ['file*']
225
takes_options = ['no-recurse', 'dry-run', 'verbose']
227
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False):
232
# This is pointless, but I'd rather not raise an error
233
action = bzrlib.add.add_action_null
235
action = bzrlib.add.add_action_print
237
action = bzrlib.add.add_action_add
239
action = bzrlib.add.add_action_add_and_print
241
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
244
for glob in sorted(ignored.keys()):
245
match_len = len(ignored[glob])
247
for path in ignored[glob]:
248
print "ignored %s matching \"%s\"" % (path, glob)
250
print "ignored %d file(s) matching \"%s\"" % (match_len,
252
print "If you wish to add some of these files, please add them"\
256
class cmd_mkdir(Command):
257
"""Create a new versioned directory.
259
This is equivalent to creating the directory and then adding it.
261
takes_args = ['dir+']
263
def run(self, dir_list):
266
wt, dd = WorkingTree.open_containing(d)
271
class cmd_relpath(Command):
272
"""Show path of a file relative to root"""
273
takes_args = ['filename']
277
def run(self, filename):
278
tree, relpath = WorkingTree.open_containing(filename)
282
class cmd_inventory(Command):
283
"""Show inventory of the current working copy or a revision.
285
It is possible to limit the output to a particular entry
286
type using the --kind option. For example; --kind file.
288
takes_options = ['revision', 'show-ids', 'kind']
291
def run(self, revision=None, show_ids=False, kind=None):
292
if kind and kind not in ['file', 'directory', 'symlink']:
293
raise BzrCommandError('invalid kind specified')
294
tree = WorkingTree.open_containing(u'.')[0]
296
inv = tree.read_working_inventory()
298
if len(revision) > 1:
299
raise BzrCommandError('bzr inventory --revision takes'
300
' exactly one revision identifier')
301
inv = tree.branch.repository.get_revision_inventory(
302
revision[0].in_history(tree.branch).rev_id)
304
for path, entry in inv.entries():
305
if kind and kind != entry.kind:
308
print '%-50s %s' % (path, entry.file_id)
313
class cmd_move(Command):
314
"""Move files to a different directory.
319
The destination must be a versioned directory in the same branch.
321
takes_args = ['source$', 'dest']
322
def run(self, source_list, dest):
323
tree, source_list = tree_files(source_list)
324
# TODO: glob expansion on windows?
325
tree.move(source_list, tree.relpath(dest))
328
class cmd_rename(Command):
329
"""Change the name of an entry.
332
bzr rename frob.c frobber.c
333
bzr rename src/frob.c lib/frob.c
335
It is an error if the destination name exists.
337
See also the 'move' command, which moves files into a different
338
directory without changing their name.
340
# TODO: Some way to rename multiple files without invoking
341
# bzr for each one?"""
342
takes_args = ['from_name', 'to_name']
344
def run(self, from_name, to_name):
345
tree, (from_name, to_name) = tree_files((from_name, to_name))
346
tree.rename_one(from_name, to_name)
349
class cmd_mv(Command):
350
"""Move or rename a file.
353
bzr mv OLDNAME NEWNAME
354
bzr mv SOURCE... DESTINATION
356
If the last argument is a versioned directory, all the other names
357
are moved into it. Otherwise, there must be exactly two arguments
358
and the file is changed to a new name, which must not already exist.
360
Files cannot be moved between branches.
362
takes_args = ['names*']
363
def run(self, names_list):
364
if len(names_list) < 2:
365
raise BzrCommandError("missing file argument")
366
tree, rel_names = tree_files(names_list)
368
if os.path.isdir(names_list[-1]):
369
# move into existing directory
370
for pair in tree.move(rel_names[:-1], rel_names[-1]):
371
print "%s => %s" % pair
373
if len(names_list) != 2:
374
raise BzrCommandError('to mv multiple files the destination '
375
'must be a versioned directory')
376
tree.rename_one(rel_names[0], rel_names[1])
377
print "%s => %s" % (rel_names[0], rel_names[1])
380
class cmd_pull(Command):
381
"""Pull any changes from another branch into the current one.
383
If there is no default location set, the first pull will set it. After
384
that, you can omit the location to use the default. To change the
385
default, use --remember.
387
This command only works on branches that have not diverged. Branches are
388
considered diverged if both branches have had commits without first
389
pulling from the other.
391
If branches have diverged, you can use 'bzr merge' to pull the text changes
392
from one into the other. Once one branch has merged, the other should
393
be able to pull it again.
395
If you want to forget your local changes and just update your branch to
396
match the remote one, use --overwrite.
398
takes_options = ['remember', 'overwrite', 'verbose']
399
takes_args = ['location?']
401
def run(self, location=None, remember=False, overwrite=False, verbose=False):
402
from bzrlib.merge import merge
403
from shutil import rmtree
405
# FIXME: too much stuff is in the command class
406
tree_to = WorkingTree.open_containing(u'.')[0]
407
stored_loc = tree_to.branch.get_parent()
409
if stored_loc is None:
410
raise BzrCommandError("No pull location known or specified.")
412
print "Using saved location: %s" % stored_loc
413
location = stored_loc
415
br_from = Branch.open(location)
416
br_to = tree_to.branch
418
old_rh = br_to.revision_history()
419
count = tree_to.pull(br_from, overwrite)
421
if br_to.get_parent() is None or remember:
422
br_to.set_parent(location)
423
note('%d revision(s) pulled.' % (count,))
426
new_rh = tree_to.branch.revision_history()
429
from bzrlib.log import show_changed_revisions
430
show_changed_revisions(tree_to.branch, old_rh, new_rh)
433
class cmd_push(Command):
434
"""Push this branch into another branch.
436
The remote branch will not have its working tree populated because this
437
is both expensive, and may not be supported on the remote file system.
439
Some smart servers or protocols *may* put the working tree in place.
441
If there is no default push location set, the first push will set it.
442
After that, you can omit the location to use the default. To change the
443
default, use --remember.
445
This command only works on branches that have not diverged. Branches are
446
considered diverged if the branch being pushed to is not an older version
449
If branches have diverged, you can use 'bzr push --overwrite' to replace
450
the other branch completely.
452
If you want to ensure you have the different changes in the other branch,
453
do a merge (see bzr help merge) from the other branch, and commit that
454
before doing a 'push --overwrite'.
456
takes_options = ['remember', 'overwrite',
457
Option('create-prefix',
458
help='Create the path leading up to the branch '
459
'if it does not already exist')]
460
takes_args = ['location?']
462
def run(self, location=None, remember=False, overwrite=False,
463
create_prefix=False, verbose=False):
464
# FIXME: Way too big! Put this into a function called from the
467
from shutil import rmtree
468
from bzrlib.transport import get_transport
470
tree_from = WorkingTree.open_containing(u'.')[0]
471
br_from = tree_from.branch
472
stored_loc = tree_from.branch.get_push_location()
474
if stored_loc is None:
475
raise BzrCommandError("No push location known or specified.")
477
print "Using saved location: %s" % stored_loc
478
location = stored_loc
480
br_to = Branch.open(location)
481
except NotBranchError:
483
transport = get_transport(location).clone('..')
484
if not create_prefix:
486
transport.mkdir(transport.relpath(location))
488
raise BzrCommandError("Parent directory of %s "
489
"does not exist." % location)
491
current = transport.base
492
needed = [(transport, transport.relpath(location))]
495
transport, relpath = needed[-1]
496
transport.mkdir(relpath)
499
new_transport = transport.clone('..')
500
needed.append((new_transport,
501
new_transport.relpath(transport.base)))
502
if new_transport.base == transport.base:
503
raise BzrCommandError("Could not creeate "
505
br_to = Branch.initialize(location)
506
old_rh = br_to.revision_history()
509
tree_to = br_to.working_tree()
510
except NoWorkingTree:
511
# TODO: This should be updated for branches which don't have a
512
# working tree, as opposed to ones where we just couldn't
514
warning('Unable to update the working tree of: %s' % (br_to.base,))
515
count = br_to.pull(br_from, overwrite)
517
count = tree_to.pull(br_from, overwrite)
518
except DivergedBranches:
519
raise BzrCommandError("These branches have diverged."
520
" Try a merge then push with overwrite.")
521
if br_from.get_push_location() is None or remember:
522
br_from.set_push_location(location)
523
note('%d revision(s) pushed.' % (count,))
526
new_rh = br_to.revision_history()
529
from bzrlib.log import show_changed_revisions
530
show_changed_revisions(br_to, old_rh, new_rh)
533
class cmd_branch(Command):
534
"""Create a new copy of a branch.
536
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
537
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
539
To retrieve the branch as of a particular revision, supply the --revision
540
parameter, as in "branch foo/bar -r 5".
542
--basis is to speed up branching from remote branches. When specified, it
543
copies all the file-contents, inventory and revision data from the basis
544
branch before copying anything from the remote branch.
546
takes_args = ['from_location', 'to_location?']
547
takes_options = ['revision', 'basis']
548
aliases = ['get', 'clone']
550
def run(self, from_location, to_location=None, revision=None, basis=None):
552
from shutil import rmtree
555
elif len(revision) > 1:
556
raise BzrCommandError(
557
'bzr branch --revision takes exactly 1 revision value')
559
br_from = Branch.open(from_location)
561
if e.errno == errno.ENOENT:
562
raise BzrCommandError('Source location "%s" does not'
563
' exist.' % to_location)
568
if basis is not None:
569
basis_branch = WorkingTree.open_containing(basis)[0].branch
572
if len(revision) == 1 and revision[0] is not None:
573
revision_id = revision[0].in_history(br_from)[1]
576
if to_location is None:
577
to_location = os.path.basename(from_location.rstrip("/\\"))
580
name = os.path.basename(to_location) + '\n'
582
os.mkdir(to_location)
584
if e.errno == errno.EEXIST:
585
raise BzrCommandError('Target directory "%s" already'
586
' exists.' % to_location)
587
if e.errno == errno.ENOENT:
588
raise BzrCommandError('Parent of "%s" does not exist.' %
593
br_from.clone(to_location, revision_id, basis_branch)
594
except bzrlib.errors.NoSuchRevision:
596
msg = "The branch %s has no revision %s." % (from_location, revision[0])
597
raise BzrCommandError(msg)
598
except bzrlib.errors.UnlistableBranch:
600
msg = "The branch %s cannot be used as a --basis"
601
raise BzrCommandError(msg)
602
branch = Branch.open(to_location)
604
name = StringIO(name)
607
branch.control_files.put_utf8('branch-name', name)
611
note('Branched %d revision(s).' % branch.revno())
616
class cmd_renames(Command):
617
"""Show list of renamed files.
619
# TODO: Option to show renames between two historical versions.
621
# TODO: Only show renames under dir, rather than in the whole branch.
622
takes_args = ['dir?']
625
def run(self, dir=u'.'):
626
tree = WorkingTree.open_containing(dir)[0]
627
old_inv = tree.branch.basis_tree().inventory
628
new_inv = tree.read_working_inventory()
630
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
632
for old_name, new_name in renames:
633
print "%s => %s" % (old_name, new_name)
636
class cmd_info(Command):
637
"""Show statistical information about a branch."""
638
takes_args = ['branch?']
641
def run(self, branch=None):
643
b = WorkingTree.open_containing(branch)[0].branch
647
class cmd_remove(Command):
648
"""Make a file unversioned.
650
This makes bzr stop tracking changes to a versioned file. It does
651
not delete the working copy.
653
takes_args = ['file+']
654
takes_options = ['verbose']
657
def run(self, file_list, verbose=False):
658
tree, file_list = tree_files(file_list)
659
tree.remove(file_list, verbose=verbose)
662
class cmd_file_id(Command):
663
"""Print file_id of a particular file or directory.
665
The file_id is assigned when the file is first added and remains the
666
same through all revisions where the file exists, even when it is
670
takes_args = ['filename']
672
def run(self, filename):
673
tree, relpath = WorkingTree.open_containing(filename)
674
i = tree.inventory.path2id(relpath)
676
raise BzrError("%r is not a versioned file" % filename)
681
class cmd_file_path(Command):
682
"""Print path of file_ids to a file or directory.
684
This prints one line for each directory down to the target,
685
starting at the branch root."""
687
takes_args = ['filename']
689
def run(self, filename):
690
tree, relpath = WorkingTree.open_containing(filename)
692
fid = inv.path2id(relpath)
694
raise BzrError("%r is not a versioned file" % filename)
695
for fip in inv.get_idpath(fid):
699
class cmd_revision_history(Command):
700
"""Display list of revision ids on this branch."""
704
branch = WorkingTree.open_containing(u'.')[0].branch
705
for patchid in branch.revision_history():
709
class cmd_ancestry(Command):
710
"""List all revisions merged into this branch."""
714
tree = WorkingTree.open_containing(u'.')[0]
716
# FIXME. should be tree.last_revision
717
for revision_id in b.get_ancestry(b.last_revision()):
721
class cmd_init(Command):
722
"""Make a directory into a versioned branch.
724
Use this to create an empty branch, or before importing an
727
Recipe for importing a tree of files:
732
bzr commit -m 'imported project'
734
takes_args = ['location?']
735
def run(self, location=None):
736
from bzrlib.branch import Branch
740
# The path has to exist to initialize a
741
# branch inside of it.
742
# Just using os.mkdir, since I don't
743
# believe that we want to create a bunch of
744
# locations if the user supplies an extended path
745
if not os.path.exists(location):
747
Branch.initialize(location)
750
class cmd_diff(Command):
751
"""Show differences in working tree.
753
If files are listed, only the changes in those files are listed.
754
Otherwise, all changes for the tree are listed.
761
# TODO: Allow diff across branches.
762
# TODO: Option to use external diff command; could be GNU diff, wdiff,
763
# or a graphical diff.
765
# TODO: Python difflib is not exactly the same as unidiff; should
766
# either fix it up or prefer to use an external diff.
768
# TODO: If a directory is given, diff everything under that.
770
# TODO: Selected-file diff is inefficient and doesn't show you
773
# TODO: This probably handles non-Unix newlines poorly.
775
takes_args = ['file*']
776
takes_options = ['revision', 'diff-options']
777
aliases = ['di', 'dif']
780
def run(self, revision=None, file_list=None, diff_options=None):
781
from bzrlib.diff import show_diff
783
tree, file_list = internal_tree_files(file_list)
786
except FileInWrongBranch:
787
if len(file_list) != 2:
788
raise BzrCommandError("Files are in different branches")
790
b, file1 = Branch.open_containing(file_list[0])
791
b2, file2 = Branch.open_containing(file_list[1])
792
if file1 != "" or file2 != "":
793
# FIXME diff those two files. rbc 20051123
794
raise BzrCommandError("Files are in different branches")
796
if revision is not None:
798
raise BzrCommandError("Can't specify -r with two branches")
799
if len(revision) == 1:
800
return show_diff(tree.branch, revision[0], specific_files=file_list,
801
external_diff_options=diff_options)
802
elif len(revision) == 2:
803
return show_diff(tree.branch, revision[0], specific_files=file_list,
804
external_diff_options=diff_options,
805
revision2=revision[1])
807
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
810
return show_diff(b, None, specific_files=file_list,
811
external_diff_options=diff_options, b2=b2)
813
return show_diff(tree.branch, None, specific_files=file_list,
814
external_diff_options=diff_options)
817
class cmd_deleted(Command):
818
"""List files deleted in the working tree.
820
# TODO: Show files deleted since a previous revision, or
821
# between two revisions.
822
# TODO: Much more efficient way to do this: read in new
823
# directories with readdir, rather than stating each one. Same
824
# level of effort but possibly much less IO. (Or possibly not,
825
# if the directories are very large...)
827
def run(self, show_ids=False):
828
tree = WorkingTree.open_containing(u'.')[0]
829
old = tree.branch.basis_tree()
830
for path, ie in old.inventory.iter_entries():
831
if not tree.has_id(ie.file_id):
833
print '%-50s %s' % (path, ie.file_id)
838
class cmd_modified(Command):
839
"""List files modified in working tree."""
843
from bzrlib.delta import compare_trees
845
tree = WorkingTree.open_containing(u'.')[0]
846
td = compare_trees(tree.branch.basis_tree(), tree)
848
for path, id, kind, text_modified, meta_modified in td.modified:
853
class cmd_added(Command):
854
"""List files added in working tree."""
858
wt = WorkingTree.open_containing(u'.')[0]
859
basis_inv = wt.branch.basis_tree().inventory
862
if file_id in basis_inv:
864
path = inv.id2path(file_id)
865
if not os.access(b.abspath(path), os.F_OK):
871
class cmd_root(Command):
872
"""Show the tree root directory.
874
The root is the nearest enclosing directory with a .bzr control
876
takes_args = ['filename?']
878
def run(self, filename=None):
879
"""Print the branch root."""
880
tree = WorkingTree.open_containing(filename)[0]
884
class cmd_log(Command):
885
"""Show log of this branch.
887
To request a range of logs, you can use the command -r begin..end
888
-r revision requests a specific revision, -r ..end or -r begin.. are
892
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
894
takes_args = ['filename?']
895
takes_options = [Option('forward',
896
help='show from oldest to newest'),
897
'timezone', 'verbose',
898
'show-ids', 'revision',
901
help='show revisions whose message matches this regexp',
906
def run(self, filename=None, timezone='original',
915
from bzrlib.log import log_formatter, show_log
917
assert message is None or isinstance(message, basestring), \
918
"invalid message argument %r" % message
919
direction = (forward and 'forward') or 'reverse'
925
tree, fp = WorkingTree.open_containing(filename)
928
inv = tree.read_working_inventory()
929
except NotBranchError:
932
b, fp = Branch.open_containing(filename)
934
inv = b.repository.get_inventory(b.last_revision())
936
file_id = inv.path2id(fp)
938
file_id = None # points to branch root
940
tree, relpath = WorkingTree.open_containing(u'.')
947
elif len(revision) == 1:
948
rev1 = rev2 = revision[0].in_history(b).revno
949
elif len(revision) == 2:
950
rev1 = revision[0].in_history(b).revno
951
rev2 = revision[1].in_history(b).revno
953
raise BzrCommandError('bzr log --revision takes one or two values.')
955
# By this point, the revision numbers are converted to the +ve
956
# form if they were supplied in the -ve form, so we can do
957
# this comparison in relative safety
959
(rev2, rev1) = (rev1, rev2)
961
mutter('encoding log as %r', bzrlib.user_encoding)
963
# use 'replace' so that we don't abort if trying to write out
964
# in e.g. the default C locale.
965
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
967
log_format = get_log_format(long=long, short=short, line=line)
968
lf = log_formatter(log_format,
971
show_timezone=timezone)
982
def get_log_format(long=False, short=False, line=False, default='long'):
993
class cmd_touching_revisions(Command):
994
"""Return revision-ids which affected a particular file.
996
A more user-friendly interface is "bzr log FILE"."""
998
takes_args = ["filename"]
1000
def run(self, filename):
1001
tree, relpath = WorkingTree.open_containing(filename)
1003
inv = tree.read_working_inventory()
1004
file_id = inv.path2id(relpath)
1005
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1006
print "%6d %s" % (revno, what)
1009
class cmd_ls(Command):
1010
"""List files in a tree.
1012
# TODO: Take a revision or remote path and list that tree instead.
1014
takes_options = ['verbose', 'revision',
1015
Option('non-recursive',
1016
help='don\'t recurse into sub-directories'),
1018
help='Print all paths from the root of the branch.'),
1019
Option('unknown', help='Print unknown files'),
1020
Option('versioned', help='Print versioned files'),
1021
Option('ignored', help='Print ignored files'),
1023
Option('null', help='Null separate the files'),
1026
def run(self, revision=None, verbose=False,
1027
non_recursive=False, from_root=False,
1028
unknown=False, versioned=False, ignored=False,
1031
if verbose and null:
1032
raise BzrCommandError('Cannot set both --verbose and --null')
1033
all = not (unknown or versioned or ignored)
1035
selection = {'I':ignored, '?':unknown, 'V':versioned}
1037
tree, relpath = WorkingTree.open_containing(u'.')
1042
if revision is not None:
1043
tree = tree.branch.repository.revision_tree(
1044
revision[0].in_history(tree.branch).rev_id)
1045
for fp, fc, kind, fid, entry in tree.list_files():
1046
if fp.startswith(relpath):
1047
fp = fp[len(relpath):]
1048
if non_recursive and '/' in fp:
1050
if not all and not selection[fc]:
1053
kindch = entry.kind_character()
1054
print '%-8s %s%s' % (fc, fp, kindch)
1056
sys.stdout.write(fp)
1057
sys.stdout.write('\0')
1063
class cmd_unknowns(Command):
1064
"""List unknown files."""
1067
from bzrlib.osutils import quotefn
1068
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1072
class cmd_ignore(Command):
1073
"""Ignore a command or pattern.
1075
To remove patterns from the ignore list, edit the .bzrignore file.
1077
If the pattern contains a slash, it is compared to the whole path
1078
from the branch root. Otherwise, it is compared to only the last
1079
component of the path. To match a file only in the root directory,
1082
Ignore patterns are case-insensitive on case-insensitive systems.
1084
Note: wildcards must be quoted from the shell on Unix.
1087
bzr ignore ./Makefile
1088
bzr ignore '*.class'
1090
# TODO: Complain if the filename is absolute
1091
takes_args = ['name_pattern']
1093
def run(self, name_pattern):
1094
from bzrlib.atomicfile import AtomicFile
1097
tree, relpath = WorkingTree.open_containing(u'.')
1098
ifn = tree.abspath('.bzrignore')
1100
if os.path.exists(ifn):
1103
igns = f.read().decode('utf-8')
1109
# TODO: If the file already uses crlf-style termination, maybe
1110
# we should use that for the newly added lines?
1112
if igns and igns[-1] != '\n':
1114
igns += name_pattern + '\n'
1117
f = AtomicFile(ifn, 'wt')
1118
f.write(igns.encode('utf-8'))
1123
inv = tree.inventory
1124
if inv.path2id('.bzrignore'):
1125
mutter('.bzrignore is already versioned')
1127
mutter('need to make new .bzrignore file versioned')
1128
tree.add(['.bzrignore'])
1131
class cmd_ignored(Command):
1132
"""List ignored files and the patterns that matched them.
1134
See also: bzr ignore"""
1137
tree = WorkingTree.open_containing(u'.')[0]
1138
for path, file_class, kind, file_id, entry in tree.list_files():
1139
if file_class != 'I':
1141
## XXX: Slightly inefficient since this was already calculated
1142
pat = tree.is_ignored(path)
1143
print '%-50s %s' % (path, pat)
1146
class cmd_lookup_revision(Command):
1147
"""Lookup the revision-id from a revision-number
1150
bzr lookup-revision 33
1153
takes_args = ['revno']
1156
def run(self, revno):
1160
raise BzrCommandError("not a valid revision-number: %r" % revno)
1162
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1165
class cmd_export(Command):
1166
"""Export past revision to destination directory.
1168
If no revision is specified this exports the last committed revision.
1170
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1171
given, try to find the format with the extension. If no extension
1172
is found exports to a directory (equivalent to --format=dir).
1174
Root may be the top directory for tar, tgz and tbz2 formats. If none
1175
is given, the top directory will be the root name of the file.
1177
Note: export of tree with non-ascii filenames to zip is not supported.
1179
Supported formats Autodetected by extension
1180
----------------- -------------------------
1183
tbz2 .tar.bz2, .tbz2
1187
takes_args = ['dest']
1188
takes_options = ['revision', 'format', 'root']
1189
def run(self, dest, revision=None, format=None, root=None):
1191
from bzrlib.export import export
1192
tree = WorkingTree.open_containing(u'.')[0]
1194
if revision is None:
1195
# should be tree.last_revision FIXME
1196
rev_id = b.last_revision()
1198
if len(revision) != 1:
1199
raise BzrError('bzr export --revision takes exactly 1 argument')
1200
rev_id = revision[0].in_history(b).rev_id
1201
t = b.repository.revision_tree(rev_id)
1203
export(t, dest, format, root)
1204
except errors.NoSuchExportFormat, e:
1205
raise BzrCommandError('Unsupported export format: %s' % e.format)
1208
class cmd_cat(Command):
1209
"""Write a file's text from a previous revision."""
1211
takes_options = ['revision']
1212
takes_args = ['filename']
1215
def run(self, filename, revision=None):
1216
if revision is not None and len(revision) != 1:
1217
raise BzrCommandError("bzr cat --revision takes exactly one number")
1220
tree, relpath = WorkingTree.open_containing(filename)
1222
except NotBranchError:
1226
b, relpath = Branch.open_containing(filename)
1227
if revision is None:
1228
revision_id = b.last_revision()
1230
revision_id = revision[0].in_history(b).rev_id
1231
b.print_file(relpath, revision_id)
1234
class cmd_local_time_offset(Command):
1235
"""Show the offset in seconds from GMT to local time."""
1239
print bzrlib.osutils.local_time_offset()
1243
class cmd_commit(Command):
1244
"""Commit changes into a new revision.
1246
If no arguments are given, the entire tree is committed.
1248
If selected files are specified, only changes to those files are
1249
committed. If a directory is specified then the directory and everything
1250
within it is committed.
1252
A selected-file commit may fail in some cases where the committed
1253
tree would be invalid, such as trying to commit a file in a
1254
newly-added directory that is not itself committed.
1256
# TODO: Run hooks on tree to-be-committed, and after commit.
1258
# TODO: Strict commit that fails if there are deleted files.
1259
# (what does "deleted files" mean ??)
1261
# TODO: Give better message for -s, --summary, used by tla people
1263
# XXX: verbose currently does nothing
1265
takes_args = ['selected*']
1266
takes_options = ['message', 'verbose',
1268
help='commit even if nothing has changed'),
1269
Option('file', type=str,
1271
help='file containing commit message'),
1273
help="refuse to commit if there are unknown "
1274
"files in the working tree."),
1276
aliases = ['ci', 'checkin']
1278
def run(self, message=None, file=None, verbose=True, selected_list=None,
1279
unchanged=False, strict=False):
1280
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1282
from bzrlib.msgeditor import edit_commit_message, \
1283
make_commit_message_template
1284
from bzrlib.status import show_status
1285
from tempfile import TemporaryFile
1288
# TODO: Need a blackbox test for invoking the external editor; may be
1289
# slightly problematic to run this cross-platform.
1291
# TODO: do more checks that the commit will succeed before
1292
# spending the user's valuable time typing a commit message.
1294
# TODO: if the commit *does* happen to fail, then save the commit
1295
# message to a temporary file where it can be recovered
1296
tree, selected_list = tree_files(selected_list)
1297
if message is None and not file:
1298
template = make_commit_message_template(tree, selected_list)
1299
message = edit_commit_message(template)
1301
raise BzrCommandError("please specify a commit message"
1302
" with either --message or --file")
1303
elif message and file:
1304
raise BzrCommandError("please specify either --message or --file")
1308
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1311
raise BzrCommandError("empty commit message specified")
1314
tree.commit(message, specific_files=selected_list,
1315
allow_pointless=unchanged, strict=strict)
1316
except PointlessCommit:
1317
# FIXME: This should really happen before the file is read in;
1318
# perhaps prepare the commit; get the message; then actually commit
1319
raise BzrCommandError("no changes to commit",
1320
["use --unchanged to commit anyhow"])
1321
except ConflictsInTree:
1322
raise BzrCommandError("Conflicts detected in working tree. "
1323
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1324
except StrictCommitFailed:
1325
raise BzrCommandError("Commit refused because there are unknown "
1326
"files in the working tree.")
1327
note('Committed revision %d.' % (tree.branch.revno(),))
1330
class cmd_check(Command):
1331
"""Validate consistency of branch history.
1333
This command checks various invariants about the branch storage to
1334
detect data corruption or bzr bugs.
1336
takes_args = ['branch?']
1337
takes_options = ['verbose']
1339
def run(self, branch=None, verbose=False):
1340
from bzrlib.check import check
1342
tree = WorkingTree.open_containing()[0]
1343
branch = tree.branch
1345
branch = Branch.open(branch)
1346
check(branch, verbose)
1349
class cmd_scan_cache(Command):
1352
from bzrlib.hashcache import HashCache
1358
print '%6d stats' % c.stat_count
1359
print '%6d in hashcache' % len(c._cache)
1360
print '%6d files removed from cache' % c.removed_count
1361
print '%6d hashes updated' % c.update_count
1362
print '%6d files changed too recently to cache' % c.danger_count
1369
class cmd_upgrade(Command):
1370
"""Upgrade branch storage to current format.
1372
The check command or bzr developers may sometimes advise you to run
1375
This version of this command upgrades from the full-text storage
1376
used by bzr 0.0.8 and earlier to the weave format (v5).
1378
takes_args = ['dir?']
1380
def run(self, dir=u'.'):
1381
from bzrlib.upgrade import upgrade
1385
class cmd_whoami(Command):
1386
"""Show bzr user id."""
1387
takes_options = ['email']
1390
def run(self, email=False):
1392
b = WorkingTree.open_containing(u'.')[0].branch
1393
config = bzrlib.config.BranchConfig(b)
1394
except NotBranchError:
1395
config = bzrlib.config.GlobalConfig()
1398
print config.user_email()
1400
print config.username()
1402
class cmd_nick(Command):
1404
Print or set the branch nickname.
1405
If unset, the tree root directory name is used as the nickname
1406
To print the current nickname, execute with no argument.
1408
takes_args = ['nickname?']
1409
def run(self, nickname=None):
1410
branch = Branch.open_containing(u'.')[0]
1411
if nickname is None:
1412
self.printme(branch)
1414
branch.nick = nickname
1417
def printme(self, branch):
1420
class cmd_selftest(Command):
1421
"""Run internal test suite.
1423
This creates temporary test directories in the working directory,
1424
but not existing data is affected. These directories are deleted
1425
if the tests pass, or left behind to help in debugging if they
1426
fail and --keep-output is specified.
1428
If arguments are given, they are regular expressions that say
1429
which tests should run.
1431
# TODO: --list should give a list of all available tests
1433
takes_args = ['testspecs*']
1434
takes_options = ['verbose',
1435
Option('one', help='stop when one test fails'),
1436
Option('keep-output',
1437
help='keep output directories when tests fail')
1440
def run(self, testspecs_list=None, verbose=False, one=False,
1443
from bzrlib.tests import selftest
1444
# we don't want progress meters from the tests to go to the
1445
# real output; and we don't want log messages cluttering up
1447
save_ui = bzrlib.ui.ui_factory
1448
bzrlib.trace.info('running tests...')
1450
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1451
if testspecs_list is not None:
1452
pattern = '|'.join(testspecs_list)
1455
result = selftest(verbose=verbose,
1457
stop_on_failure=one,
1458
keep_output=keep_output)
1460
bzrlib.trace.info('tests passed')
1462
bzrlib.trace.info('tests failed')
1463
return int(not result)
1465
bzrlib.ui.ui_factory = save_ui
1469
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1470
# is bzrlib itself in a branch?
1471
bzrrev = bzrlib.get_bzr_revision()
1473
print " (bzr checkout, revision %d {%s})" % bzrrev
1474
print bzrlib.__copyright__
1475
print "http://bazaar-ng.org/"
1477
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1478
print "you may use, modify and redistribute it under the terms of the GNU"
1479
print "General Public License version 2 or later."
1482
class cmd_version(Command):
1483
"""Show version of bzr."""
1488
class cmd_rocks(Command):
1489
"""Statement of optimism."""
1493
print "it sure does!"
1496
class cmd_find_merge_base(Command):
1497
"""Find and print a base revision for merging two branches.
1499
# TODO: Options to specify revisions on either side, as if
1500
# merging only part of the history.
1501
takes_args = ['branch', 'other']
1505
def run(self, branch, other):
1506
from bzrlib.revision import common_ancestor, MultipleRevisionSources
1508
branch1 = Branch.open_containing(branch)[0]
1509
branch2 = Branch.open_containing(other)[0]
1511
history_1 = branch1.revision_history()
1512
history_2 = branch2.revision_history()
1514
last1 = branch1.last_revision()
1515
last2 = branch2.last_revision()
1517
source = MultipleRevisionSources(branch1, branch2)
1519
base_rev_id = common_ancestor(last1, last2, source)
1521
print 'merge base is revision %s' % base_rev_id
1525
if base_revno is None:
1526
raise bzrlib.errors.UnrelatedBranches()
1528
print ' r%-6d in %s' % (base_revno, branch)
1530
other_revno = branch2.revision_id_to_revno(base_revid)
1532
print ' r%-6d in %s' % (other_revno, other)
1536
class cmd_merge(Command):
1537
"""Perform a three-way merge.
1539
The branch is the branch you will merge from. By default, it will
1540
merge the latest revision. If you specify a revision, that
1541
revision will be merged. If you specify two revisions, the first
1542
will be used as a BASE, and the second one as OTHER. Revision
1543
numbers are always relative to the specified branch.
1545
By default bzr will try to merge in all new work from the other
1546
branch, automatically determining an appropriate base. If this
1547
fails, you may need to give an explicit base.
1551
To merge the latest revision from bzr.dev
1552
bzr merge ../bzr.dev
1554
To merge changes up to and including revision 82 from bzr.dev
1555
bzr merge -r 82 ../bzr.dev
1557
To merge the changes introduced by 82, without previous changes:
1558
bzr merge -r 81..82 ../bzr.dev
1560
merge refuses to run if there are any uncommitted changes, unless
1563
takes_args = ['branch?']
1564
takes_options = ['revision', 'force', 'merge-type', 'reprocess',
1565
Option('show-base', help="Show base revision text in "
1568
def run(self, branch=None, revision=None, force=False, merge_type=None,
1569
show_base=False, reprocess=False):
1570
from bzrlib.merge import merge
1571
from bzrlib.merge_core import ApplyMerge3
1572
if merge_type is None:
1573
merge_type = ApplyMerge3
1575
branch = WorkingTree.open_containing(u'.')[0].branch.get_parent()
1577
raise BzrCommandError("No merge location known or specified.")
1579
print "Using saved location: %s" % branch
1580
if revision is None or len(revision) < 1:
1582
other = [branch, -1]
1584
if len(revision) == 1:
1586
other_branch = Branch.open_containing(branch)[0]
1587
revno = revision[0].in_history(other_branch).revno
1588
other = [branch, revno]
1590
assert len(revision) == 2
1591
if None in revision:
1592
raise BzrCommandError(
1593
"Merge doesn't permit that revision specifier.")
1594
b = Branch.open_containing(branch)[0]
1596
base = [branch, revision[0].in_history(b).revno]
1597
other = [branch, revision[1].in_history(b).revno]
1600
conflict_count = merge(other, base, check_clean=(not force),
1601
merge_type=merge_type, reprocess=reprocess,
1602
show_base=show_base)
1603
if conflict_count != 0:
1607
except bzrlib.errors.AmbiguousBase, e:
1608
m = ("sorry, bzr can't determine the right merge base yet\n"
1609
"candidates are:\n "
1610
+ "\n ".join(e.bases)
1612
"please specify an explicit base with -r,\n"
1613
"and (if you want) report this to the bzr developers\n")
1617
class cmd_remerge(Command):
1620
takes_args = ['file*']
1621
takes_options = ['merge-type', 'reprocess',
1622
Option('show-base', help="Show base revision text in "
1625
def run(self, file_list=None, merge_type=None, show_base=False,
1627
from bzrlib.merge import merge_inner, transform_tree
1628
from bzrlib.merge_core import ApplyMerge3
1629
if merge_type is None:
1630
merge_type = ApplyMerge3
1631
tree, file_list = tree_files(file_list)
1634
pending_merges = tree.pending_merges()
1635
if len(pending_merges) != 1:
1636
raise BzrCommandError("Sorry, remerge only works after normal"
1637
+ " merges. Not cherrypicking or"
1639
repository = tree.branch.repository
1640
base_revision = common_ancestor(tree.branch.last_revision(),
1641
pending_merges[0], repository)
1642
base_tree = repository.revision_tree(base_revision)
1643
other_tree = repository.revision_tree(pending_merges[0])
1644
interesting_ids = None
1645
if file_list is not None:
1646
interesting_ids = set()
1647
for filename in file_list:
1648
file_id = tree.path2id(filename)
1649
interesting_ids.add(file_id)
1650
if tree.kind(file_id) != "directory":
1653
for name, ie in tree.inventory.iter_entries(file_id):
1654
interesting_ids.add(ie.file_id)
1655
transform_tree(tree, tree.branch.basis_tree(), interesting_ids)
1656
if file_list is None:
1657
restore_files = list(tree.iter_conflicts())
1659
restore_files = file_list
1660
for filename in restore_files:
1662
restore(tree.abspath(filename))
1663
except NotConflicted:
1665
conflicts = merge_inner(tree.branch, other_tree, base_tree,
1666
interesting_ids = interesting_ids,
1667
other_rev_id=pending_merges[0],
1668
merge_type=merge_type,
1669
show_base=show_base,
1670
reprocess=reprocess)
1678
class cmd_revert(Command):
1679
"""Reverse all changes since the last commit.
1681
Only versioned files are affected. Specify filenames to revert only
1682
those files. By default, any files that are changed will be backed up
1683
first. Backup files have a '~' appended to their name.
1685
takes_options = ['revision', 'no-backup']
1686
takes_args = ['file*']
1687
aliases = ['merge-revert']
1689
def run(self, revision=None, no_backup=False, file_list=None):
1690
from bzrlib.merge import merge_inner
1691
from bzrlib.commands import parse_spec
1692
if file_list is not None:
1693
if len(file_list) == 0:
1694
raise BzrCommandError("No files specified")
1697
if revision is None:
1699
tree = WorkingTree.open_containing(u'.')[0]
1700
# FIXME should be tree.last_revision
1701
rev_id = tree.branch.last_revision()
1702
elif len(revision) != 1:
1703
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1705
tree, file_list = tree_files(file_list)
1706
rev_id = revision[0].in_history(tree.branch).rev_id
1707
tree.revert(file_list, tree.branch.repository.revision_tree(rev_id),
1711
class cmd_assert_fail(Command):
1712
"""Test reporting of assertion failures"""
1715
assert False, "always fails"
1718
class cmd_help(Command):
1719
"""Show help on a command or other topic.
1721
For a list of all available commands, say 'bzr help commands'."""
1722
takes_options = ['long']
1723
takes_args = ['topic?']
1727
def run(self, topic=None, long=False):
1729
if topic is None and long:
1734
class cmd_shell_complete(Command):
1735
"""Show appropriate completions for context.
1737
For a list of all available commands, say 'bzr shell-complete'."""
1738
takes_args = ['context?']
1743
def run(self, context=None):
1744
import shellcomplete
1745
shellcomplete.shellcomplete(context)
1748
class cmd_fetch(Command):
1749
"""Copy in history from another branch but don't merge it.
1751
This is an internal method used for pull and merge."""
1753
takes_args = ['from_branch', 'to_branch']
1754
def run(self, from_branch, to_branch):
1755
from bzrlib.fetch import Fetcher
1756
from bzrlib.branch import Branch
1757
from_b = Branch.open(from_branch)
1758
to_b = Branch.open(to_branch)
1763
Fetcher(to_b, from_b)
1770
class cmd_missing(Command):
1771
"""Show unmerged/unpulled revisions between two branches.
1773
OTHER_BRANCH may be local or remote."""
1774
takes_args = ['other_branch?']
1775
takes_options = [Option('reverse', 'Reverse the order of revisions'),
1777
'Display changes in the local branch only'),
1778
Option('theirs-only',
1779
'Display changes in the remote branch only'),
1787
def run(self, other_branch=None, reverse=False, mine_only=False,
1788
theirs_only=False, long=True, short=False, line=False,
1789
show_ids=False, verbose=False):
1790
from bzrlib.missing import find_unmerged, iter_log_data
1791
from bzrlib.log import log_formatter
1792
local_branch = bzrlib.branch.Branch.open_containing(u".")[0]
1793
parent = local_branch.get_parent()
1794
if other_branch is None:
1795
other_branch = parent
1796
if other_branch is None:
1797
raise BzrCommandError("No missing location known or specified.")
1798
print "Using last location: " + local_branch.get_parent()
1799
remote_branch = bzrlib.branch.Branch.open(other_branch)
1800
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
1801
log_format = get_log_format(long=long, short=short, line=line)
1802
lf = log_formatter(log_format, sys.stdout,
1804
show_timezone='original')
1805
if reverse is False:
1806
local_extra.reverse()
1807
remote_extra.reverse()
1808
if local_extra and not theirs_only:
1809
print "You have %d extra revision(s):" % len(local_extra)
1810
for data in iter_log_data(local_extra, local_branch.repository,
1813
printed_local = True
1815
printed_local = False
1816
if remote_extra and not mine_only:
1817
if printed_local is True:
1819
print "You are missing %d revision(s):" % len(remote_extra)
1820
for data in iter_log_data(remote_extra, remote_branch.repository,
1823
if not remote_extra and not local_extra:
1825
print "Branches are up to date."
1828
if parent is None and other_branch is not None:
1829
local_branch.set_parent(other_branch)
1833
class cmd_plugins(Command):
1838
import bzrlib.plugin
1839
from inspect import getdoc
1840
for name, plugin in bzrlib.plugin.all_plugins().items():
1841
if hasattr(plugin, '__path__'):
1842
print plugin.__path__[0]
1843
elif hasattr(plugin, '__file__'):
1844
print plugin.__file__
1850
print '\t', d.split('\n')[0]
1853
class cmd_testament(Command):
1854
"""Show testament (signing-form) of a revision."""
1855
takes_options = ['revision', 'long']
1856
takes_args = ['branch?']
1858
def run(self, branch=u'.', revision=None, long=False):
1859
from bzrlib.testament import Testament
1860
b = WorkingTree.open_containing(branch)[0].branch
1863
if revision is None:
1864
rev_id = b.last_revision()
1866
rev_id = revision[0].in_history(b).rev_id
1867
t = Testament.from_revision(b.repository, rev_id)
1869
sys.stdout.writelines(t.as_text_lines())
1871
sys.stdout.write(t.as_short_text())
1876
class cmd_annotate(Command):
1877
"""Show the origin of each line in a file.
1879
This prints out the given file with an annotation on the left side
1880
indicating which revision, author and date introduced the change.
1882
If the origin is the same for a run of consecutive lines, it is
1883
shown only at the top, unless the --all option is given.
1885
# TODO: annotate directories; showing when each file was last changed
1886
# TODO: annotate a previous version of a file
1887
# TODO: if the working copy is modified, show annotations on that
1888
# with new uncommitted lines marked
1889
aliases = ['blame', 'praise']
1890
takes_args = ['filename']
1891
takes_options = [Option('all', help='show annotations on all lines'),
1892
Option('long', help='show date in annotations'),
1896
def run(self, filename, all=False, long=False):
1897
from bzrlib.annotate import annotate_file
1898
tree, relpath = WorkingTree.open_containing(filename)
1899
branch = tree.branch
1902
file_id = tree.inventory.path2id(relpath)
1903
tree = branch.repository.revision_tree(branch.last_revision())
1904
file_version = tree.inventory[file_id].revision
1905
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
1910
class cmd_re_sign(Command):
1911
"""Create a digital signature for an existing revision."""
1912
# TODO be able to replace existing ones.
1914
hidden = True # is this right ?
1915
takes_args = ['revision_id?']
1916
takes_options = ['revision']
1918
def run(self, revision_id=None, revision=None):
1919
import bzrlib.config as config
1920
import bzrlib.gpg as gpg
1921
if revision_id is not None and revision is not None:
1922
raise BzrCommandError('You can only supply one of revision_id or --revision')
1923
if revision_id is None and revision is None:
1924
raise BzrCommandError('You must supply either --revision or a revision_id')
1925
b = WorkingTree.open_containing(u'.')[0].branch
1926
gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
1927
if revision_id is not None:
1928
b.repository.sign_revision(revision_id, gpg_strategy)
1929
elif revision is not None:
1930
if len(revision) == 1:
1931
revno, rev_id = revision[0].in_history(b)
1932
b.repository.sign_revision(rev_id, gpg_strategy)
1933
elif len(revision) == 2:
1934
# are they both on rh- if so we can walk between them
1935
# might be nice to have a range helper for arbitrary
1936
# revision paths. hmm.
1937
from_revno, from_revid = revision[0].in_history(b)
1938
to_revno, to_revid = revision[1].in_history(b)
1939
if to_revid is None:
1940
to_revno = b.revno()
1941
if from_revno is None or to_revno is None:
1942
raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
1943
for revno in range(from_revno, to_revno + 1):
1944
b.repository.sign_revision(b.get_rev_id(revno),
1947
raise BzrCommandError('Please supply either one revision, or a range.')
1950
class cmd_uncommit(bzrlib.commands.Command):
1951
"""Remove the last committed revision.
1953
By supplying the --all flag, it will not only remove the entry
1954
from revision_history, but also remove all of the entries in the
1957
--verbose will print out what is being removed.
1958
--dry-run will go through all the motions, but not actually
1961
In the future, uncommit will create a changeset, which can then
1964
takes_options = ['all', 'verbose', 'revision',
1965
Option('dry-run', help='Don\'t actually make changes'),
1966
Option('force', help='Say yes to all questions.')]
1967
takes_args = ['location?']
1970
def run(self, location=None, all=False,
1971
dry_run=False, verbose=False,
1972
revision=None, force=False):
1973
from bzrlib.branch import Branch
1974
from bzrlib.log import log_formatter
1976
from bzrlib.uncommit import uncommit
1978
if location is None:
1980
b, relpath = Branch.open_containing(location)
1982
if revision is None:
1984
rev_id = b.last_revision()
1986
revno, rev_id = revision[0].in_history(b)
1988
print 'No revisions to uncommit.'
1990
for r in range(revno, b.revno()+1):
1991
rev_id = b.get_rev_id(r)
1992
lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
1993
lf.show(r, b.repository.get_revision(rev_id), None)
1996
print 'Dry-run, pretending to remove the above revisions.'
1998
val = raw_input('Press <enter> to continue')
2000
print 'The above revision(s) will be removed.'
2002
val = raw_input('Are you sure [y/N]? ')
2003
if val.lower() not in ('y', 'yes'):
2007
uncommit(b, remove_files=all,
2008
dry_run=dry_run, verbose=verbose,
2012
# these get imported and then picked up by the scan for cmd_*
2013
# TODO: Some more consistent way to split command definitions across files;
2014
# we do need to load at least some information about them to know of
2016
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
added
removed
bzrlib/builtins.py
