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"""
24
from bzrlib.bzrdir import BzrDir
25
from bzrlib._merge_core import ApplyMerge3
26
from bzrlib.commands import Command, display_command
27
from bzrlib.branch import Branch
28
from bzrlib.revision import common_ancestor
29
import bzrlib.errors as errors
30
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
31
NotBranchError, DivergedBranches, NotConflicted,
32
NoSuchFile, NoWorkingTree, FileInWrongBranch)
33
from bzrlib.log import show_one_log
34
from bzrlib.option import Option
35
from bzrlib.revisionspec import RevisionSpec
37
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
38
from bzrlib.transport.local import LocalTransport
39
from bzrlib.workingtree import WorkingTree
42
def tree_files(file_list, default_branch=u'.'):
44
return internal_tree_files(file_list, default_branch)
45
except FileInWrongBranch, e:
46
raise BzrCommandError("%s is not in the same branch as %s" %
47
(e.path, file_list[0]))
49
def internal_tree_files(file_list, default_branch=u'.'):
51
Return a branch and list of branch-relative paths.
52
If supplied file_list is empty or None, the branch default will be used,
53
and returned file_list will match the original.
55
if file_list is None or len(file_list) == 0:
56
return WorkingTree.open_containing(default_branch)[0], file_list
57
tree = WorkingTree.open_containing(file_list[0])[0]
59
for filename in file_list:
61
new_list.append(tree.relpath(filename))
62
except errors.PathNotChild:
63
raise FileInWrongBranch(tree.branch, filename)
67
# TODO: Make sure no commands unconditionally use the working directory as a
68
# branch. If a filename argument is used, the first of them should be used to
69
# specify the branch. (Perhaps this can be factored out into some kind of
70
# Argument class, representing a file in a branch, where the first occurrence
73
class cmd_status(Command):
74
"""Display status summary.
76
This reports on versioned and unknown files, reporting them
77
grouped by state. Possible states are:
80
Versioned in the working copy but not in the previous revision.
83
Versioned in the previous revision but removed or deleted
87
Path of this file changed from the previous revision;
88
the text may also have changed. This includes files whose
89
parent directory was renamed.
92
Text has changed since the previous revision.
95
Nothing about this file has changed since the previous revision.
96
Only shown with --all.
99
Not versioned and not matching an ignore pattern.
101
To see ignored files use 'bzr ignored'. For details in the
102
changes to file texts, use 'bzr diff'.
104
If no arguments are specified, the status of the entire working
105
directory is shown. Otherwise, only the status of the specified
106
files or directories is reported. If a directory is given, status
107
is reported for everything inside that directory.
109
If a revision argument is given, the status is calculated against
110
that revision, or between two revisions if two are provided.
113
# TODO: --no-recurse, --recurse options
115
takes_args = ['file*']
116
takes_options = ['all', 'show-ids', 'revision']
117
aliases = ['st', 'stat']
120
def run(self, all=False, show_ids=False, file_list=None, revision=None):
121
tree, file_list = tree_files(file_list)
123
from bzrlib.status import show_status
124
show_status(tree.branch, show_unchanged=all, show_ids=show_ids,
125
specific_files=file_list, revision=revision)
128
class cmd_cat_revision(Command):
129
"""Write out metadata for a revision.
131
The revision to print can either be specified by a specific
132
revision identifier, or you can use --revision.
136
takes_args = ['revision_id?']
137
takes_options = ['revision']
140
def run(self, revision_id=None, revision=None):
142
if revision_id is not None and revision is not None:
143
raise BzrCommandError('You can only supply one of revision_id or --revision')
144
if revision_id is None and revision is None:
145
raise BzrCommandError('You must supply either --revision or a revision_id')
146
b = WorkingTree.open_containing(u'.')[0].branch
147
if revision_id is not None:
148
sys.stdout.write(b.repository.get_revision_xml(revision_id))
149
elif revision is not None:
152
raise BzrCommandError('You cannot specify a NULL revision.')
153
revno, rev_id = rev.in_history(b)
154
sys.stdout.write(b.repository.get_revision_xml(rev_id))
157
class cmd_revno(Command):
158
"""Show current revision number.
160
This is equal to the number of revisions on this branch."""
161
takes_args = ['location?']
163
def run(self, location=u'.'):
164
print Branch.open_containing(location)[0].revno()
167
class cmd_revision_info(Command):
168
"""Show revision number and revision id for a given revision identifier.
171
takes_args = ['revision_info*']
172
takes_options = ['revision']
174
def run(self, revision=None, revision_info_list=[]):
177
if revision is not None:
178
revs.extend(revision)
179
if revision_info_list is not None:
180
for rev in revision_info_list:
181
revs.append(RevisionSpec(rev))
183
raise BzrCommandError('You must supply a revision identifier')
185
b = WorkingTree.open_containing(u'.')[0].branch
188
revinfo = rev.in_history(b)
189
if revinfo.revno is None:
190
print ' %s' % revinfo.rev_id
192
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
195
class cmd_add(Command):
196
"""Add specified files or directories.
198
In non-recursive mode, all the named items are added, regardless
199
of whether they were previously ignored. A warning is given if
200
any of the named files are already versioned.
202
In recursive mode (the default), files are treated the same way
203
but the behaviour for directories is different. Directories that
204
are already versioned do not give a warning. All directories,
205
whether already versioned or not, are searched for files or
206
subdirectories that are neither versioned or ignored, and these
207
are added. This search proceeds recursively into versioned
208
directories. If no names are given '.' is assumed.
210
Therefore simply saying 'bzr add' will version all files that
211
are currently unknown.
213
Adding a file whose parent directory is not versioned will
214
implicitly add the parent, and so on up to the root. This means
215
you should never need to explictly add a directory, they'll just
216
get added when you add a file in the directory.
218
--dry-run will show which files would be added, but not actually
221
takes_args = ['file*']
222
takes_options = ['no-recurse', 'dry-run', 'verbose']
224
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False):
229
# This is pointless, but I'd rather not raise an error
230
action = bzrlib.add.add_action_null
232
action = bzrlib.add.add_action_print
234
action = bzrlib.add.add_action_add
236
action = bzrlib.add.add_action_add_and_print
238
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
241
for glob in sorted(ignored.keys()):
242
match_len = len(ignored[glob])
244
for path in ignored[glob]:
245
print "ignored %s matching \"%s\"" % (path, glob)
247
print "ignored %d file(s) matching \"%s\"" % (match_len,
249
print "If you wish to add some of these files, please add them"\
253
class cmd_mkdir(Command):
254
"""Create a new versioned directory.
256
This is equivalent to creating the directory and then adding it.
258
takes_args = ['dir+']
260
def run(self, dir_list):
263
wt, dd = WorkingTree.open_containing(d)
268
class cmd_relpath(Command):
269
"""Show path of a file relative to root"""
270
takes_args = ['filename']
274
def run(self, filename):
275
tree, relpath = WorkingTree.open_containing(filename)
279
class cmd_inventory(Command):
280
"""Show inventory of the current working copy or a revision.
282
It is possible to limit the output to a particular entry
283
type using the --kind option. For example; --kind file.
285
takes_options = ['revision', 'show-ids', 'kind']
288
def run(self, revision=None, show_ids=False, kind=None):
289
if kind and kind not in ['file', 'directory', 'symlink']:
290
raise BzrCommandError('invalid kind specified')
291
tree = WorkingTree.open_containing(u'.')[0]
293
inv = tree.read_working_inventory()
295
if len(revision) > 1:
296
raise BzrCommandError('bzr inventory --revision takes'
297
' exactly one revision identifier')
298
inv = tree.branch.repository.get_revision_inventory(
299
revision[0].in_history(tree.branch).rev_id)
301
for path, entry in inv.entries():
302
if kind and kind != entry.kind:
305
print '%-50s %s' % (path, entry.file_id)
310
class cmd_move(Command):
311
"""Move files to a different directory.
316
The destination must be a versioned directory in the same branch.
318
takes_args = ['source$', 'dest']
319
def run(self, source_list, dest):
320
tree, source_list = tree_files(source_list)
321
# TODO: glob expansion on windows?
322
tree.move(source_list, tree.relpath(dest))
325
class cmd_rename(Command):
326
"""Change the name of an entry.
329
bzr rename frob.c frobber.c
330
bzr rename src/frob.c lib/frob.c
332
It is an error if the destination name exists.
334
See also the 'move' command, which moves files into a different
335
directory without changing their name.
337
# TODO: Some way to rename multiple files without invoking
338
# bzr for each one?"""
339
takes_args = ['from_name', 'to_name']
341
def run(self, from_name, to_name):
342
tree, (from_name, to_name) = tree_files((from_name, to_name))
343
tree.rename_one(from_name, to_name)
346
class cmd_mv(Command):
347
"""Move or rename a file.
350
bzr mv OLDNAME NEWNAME
351
bzr mv SOURCE... DESTINATION
353
If the last argument is a versioned directory, all the other names
354
are moved into it. Otherwise, there must be exactly two arguments
355
and the file is changed to a new name, which must not already exist.
357
Files cannot be moved between branches.
359
takes_args = ['names*']
360
def run(self, names_list):
361
if len(names_list) < 2:
362
raise BzrCommandError("missing file argument")
363
tree, rel_names = tree_files(names_list)
365
if os.path.isdir(names_list[-1]):
366
# move into existing directory
367
for pair in tree.move(rel_names[:-1], rel_names[-1]):
368
print "%s => %s" % pair
370
if len(names_list) != 2:
371
raise BzrCommandError('to mv multiple files the destination '
372
'must be a versioned directory')
373
tree.rename_one(rel_names[0], rel_names[1])
374
print "%s => %s" % (rel_names[0], rel_names[1])
377
class cmd_pull(Command):
378
"""Pull any changes from another branch into the current one.
380
If there is no default location set, the first pull will set it. After
381
that, you can omit the location to use the default. To change the
382
default, use --remember.
384
This command only works on branches that have not diverged. Branches are
385
considered diverged if both branches have had commits without first
386
pulling from the other.
388
If branches have diverged, you can use 'bzr merge' to pull the text changes
389
from one into the other. Once one branch has merged, the other should
390
be able to pull it again.
392
If you want to forget your local changes and just update your branch to
393
match the remote one, use --overwrite.
395
takes_options = ['remember', 'overwrite', 'verbose']
396
takes_args = ['location?']
398
def run(self, location=None, remember=False, overwrite=False, verbose=False):
399
from shutil import rmtree
401
# FIXME: too much stuff is in the command class
402
tree_to = WorkingTree.open_containing(u'.')[0]
403
stored_loc = tree_to.branch.get_parent()
405
if stored_loc is None:
406
raise BzrCommandError("No pull location known or specified.")
408
print "Using saved location: %s" % stored_loc
409
location = stored_loc
411
br_from = Branch.open(location)
412
br_to = tree_to.branch
414
old_rh = br_to.revision_history()
415
count = tree_to.pull(br_from, overwrite)
417
if br_to.get_parent() is None or remember:
418
br_to.set_parent(location)
419
note('%d revision(s) pulled.' % (count,))
422
new_rh = tree_to.branch.revision_history()
425
from bzrlib.log import show_changed_revisions
426
show_changed_revisions(tree_to.branch, old_rh, new_rh)
429
class cmd_push(Command):
430
"""Push this branch into another branch.
432
The remote branch will not have its working tree populated because this
433
is both expensive, and may not be supported on the remote file system.
435
Some smart servers or protocols *may* put the working tree in place.
437
If there is no default push location set, the first push will set it.
438
After that, you can omit the location to use the default. To change the
439
default, use --remember.
441
This command only works on branches that have not diverged. Branches are
442
considered diverged if the branch being pushed to is not an older version
445
If branches have diverged, you can use 'bzr push --overwrite' to replace
446
the other branch completely.
448
If you want to ensure you have the different changes in the other branch,
449
do a merge (see bzr help merge) from the other branch, and commit that
450
before doing a 'push --overwrite'.
452
takes_options = ['remember', 'overwrite',
453
Option('create-prefix',
454
help='Create the path leading up to the branch '
455
'if it does not already exist')]
456
takes_args = ['location?']
458
def run(self, location=None, remember=False, overwrite=False,
459
create_prefix=False, verbose=False):
460
# FIXME: Way too big! Put this into a function called from the
463
from shutil import rmtree
464
from bzrlib.transport import get_transport
466
tree_from = WorkingTree.open_containing(u'.')[0]
467
br_from = tree_from.branch
468
stored_loc = tree_from.branch.get_push_location()
470
if stored_loc is None:
471
raise BzrCommandError("No push location known or specified.")
473
print "Using saved location: %s" % stored_loc
474
location = stored_loc
476
br_to = Branch.open(location)
477
except NotBranchError:
479
transport = get_transport(location).clone('..')
480
if not create_prefix:
482
transport.mkdir(transport.relpath(location))
484
raise BzrCommandError("Parent directory of %s "
485
"does not exist." % location)
487
current = transport.base
488
needed = [(transport, transport.relpath(location))]
491
transport, relpath = needed[-1]
492
transport.mkdir(relpath)
495
new_transport = transport.clone('..')
496
needed.append((new_transport,
497
new_transport.relpath(transport.base)))
498
if new_transport.base == transport.base:
499
raise BzrCommandError("Could not creeate "
501
if isinstance(transport, LocalTransport):
502
br_to = WorkingTree.create_standalone(location).branch
504
br_to = Branch.create(location)
505
old_rh = br_to.revision_history()
508
tree_to = br_to.working_tree()
509
except NoWorkingTree:
510
# TODO: This should be updated for branches which don't have a
511
# working tree, as opposed to ones where we just couldn't
513
warning('Unable to update the working tree of: %s' % (br_to.base,))
514
count = br_to.pull(br_from, overwrite)
516
count = tree_to.pull(br_from, overwrite)
517
except DivergedBranches:
518
raise BzrCommandError("These branches have diverged."
519
" Try a merge then push with overwrite.")
520
if br_from.get_push_location() is None or remember:
521
br_from.set_push_location(location)
522
note('%d revision(s) pushed.' % (count,))
525
new_rh = br_to.revision_history()
528
from bzrlib.log import show_changed_revisions
529
show_changed_revisions(br_to, old_rh, new_rh)
532
class cmd_branch(Command):
533
"""Create a new copy of a branch.
535
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
536
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
538
To retrieve the branch as of a particular revision, supply the --revision
539
parameter, as in "branch foo/bar -r 5".
541
--basis is to speed up branching from remote branches. When specified, it
542
copies all the file-contents, inventory and revision data from the basis
543
branch before copying anything from the remote branch.
545
takes_args = ['from_location', 'to_location?']
546
takes_options = ['revision', 'basis']
547
aliases = ['get', 'clone']
549
def run(self, from_location, to_location=None, revision=None, basis=None):
551
from shutil import rmtree
554
elif len(revision) > 1:
555
raise BzrCommandError(
556
'bzr branch --revision takes exactly 1 revision value')
558
br_from = Branch.open(from_location)
560
if e.errno == errno.ENOENT:
561
raise BzrCommandError('Source location "%s" does not'
562
' exist.' % to_location)
567
if basis is not None:
568
basis_branch = WorkingTree.open_containing(basis)[0].branch
571
if len(revision) == 1 and revision[0] is not None:
572
revision_id = revision[0].in_history(br_from)[1]
575
if to_location is None:
576
to_location = os.path.basename(from_location.rstrip("/\\"))
579
name = os.path.basename(to_location) + '\n'
581
os.mkdir(to_location)
583
if e.errno == errno.EEXIST:
584
raise BzrCommandError('Target directory "%s" already'
585
' exists.' % to_location)
586
if e.errno == errno.ENOENT:
587
raise BzrCommandError('Parent of "%s" does not exist.' %
592
branch = br_from.clone(to_location, revision_id, basis_branch)
593
except bzrlib.errors.NoSuchRevision:
595
msg = "The branch %s has no revision %s." % (from_location, revision[0])
596
raise BzrCommandError(msg)
597
except bzrlib.errors.UnlistableBranch:
599
msg = "The branch %s cannot be used as a --basis"
600
raise BzrCommandError(msg)
601
WorkingTree.create(branch, to_location)
603
branch.control_files.put_utf8('branch-name', name)
605
note('Branched %d revision(s).' % branch.revno())
610
class cmd_renames(Command):
611
"""Show list of renamed files.
613
# TODO: Option to show renames between two historical versions.
615
# TODO: Only show renames under dir, rather than in the whole branch.
616
takes_args = ['dir?']
619
def run(self, dir=u'.'):
620
tree = WorkingTree.open_containing(dir)[0]
621
old_inv = tree.basis_tree().inventory
622
new_inv = tree.read_working_inventory()
624
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
626
for old_name, new_name in renames:
627
print "%s => %s" % (old_name, new_name)
630
class cmd_info(Command):
631
"""Show statistical information about a branch."""
632
takes_args = ['branch?']
635
def run(self, branch=None):
637
b = WorkingTree.open_containing(branch)[0].branch
641
class cmd_remove(Command):
642
"""Make a file unversioned.
644
This makes bzr stop tracking changes to a versioned file. It does
645
not delete the working copy.
647
takes_args = ['file+']
648
takes_options = ['verbose']
651
def run(self, file_list, verbose=False):
652
tree, file_list = tree_files(file_list)
653
tree.remove(file_list, verbose=verbose)
656
class cmd_file_id(Command):
657
"""Print file_id of a particular file or directory.
659
The file_id is assigned when the file is first added and remains the
660
same through all revisions where the file exists, even when it is
664
takes_args = ['filename']
666
def run(self, filename):
667
tree, relpath = WorkingTree.open_containing(filename)
668
i = tree.inventory.path2id(relpath)
670
raise BzrError("%r is not a versioned file" % filename)
675
class cmd_file_path(Command):
676
"""Print path of file_ids to a file or directory.
678
This prints one line for each directory down to the target,
679
starting at the branch root."""
681
takes_args = ['filename']
683
def run(self, filename):
684
tree, relpath = WorkingTree.open_containing(filename)
686
fid = inv.path2id(relpath)
688
raise BzrError("%r is not a versioned file" % filename)
689
for fip in inv.get_idpath(fid):
693
class cmd_revision_history(Command):
694
"""Display list of revision ids on this branch."""
698
branch = WorkingTree.open_containing(u'.')[0].branch
699
for patchid in branch.revision_history():
703
class cmd_ancestry(Command):
704
"""List all revisions merged into this branch."""
708
tree = WorkingTree.open_containing(u'.')[0]
710
# FIXME. should be tree.last_revision
711
for revision_id in b.repository.get_ancestry(b.last_revision()):
715
class cmd_init(Command):
716
"""Make a directory into a versioned branch.
718
Use this to create an empty branch, or before importing an
721
Recipe for importing a tree of files:
726
bzr commit -m 'imported project'
728
takes_args = ['location?']
729
def run(self, location=None):
730
from bzrlib.branch import Branch
734
# The path has to exist to initialize a
735
# branch inside of it.
736
# Just using os.mkdir, since I don't
737
# believe that we want to create a bunch of
738
# locations if the user supplies an extended path
739
if not os.path.exists(location):
741
WorkingTree.create_standalone(location)
744
class cmd_diff(Command):
745
"""Show differences in working tree.
747
If files are listed, only the changes in those files are listed.
748
Otherwise, all changes for the tree are listed.
755
# TODO: Allow diff across branches.
756
# TODO: Option to use external diff command; could be GNU diff, wdiff,
757
# or a graphical diff.
759
# TODO: Python difflib is not exactly the same as unidiff; should
760
# either fix it up or prefer to use an external diff.
762
# TODO: If a directory is given, diff everything under that.
764
# TODO: Selected-file diff is inefficient and doesn't show you
767
# TODO: This probably handles non-Unix newlines poorly.
769
takes_args = ['file*']
770
takes_options = ['revision', 'diff-options']
771
aliases = ['di', 'dif']
774
def run(self, revision=None, file_list=None, diff_options=None):
775
from bzrlib.diff import show_diff
777
tree, file_list = internal_tree_files(file_list)
780
except FileInWrongBranch:
781
if len(file_list) != 2:
782
raise BzrCommandError("Files are in different branches")
784
b, file1 = Branch.open_containing(file_list[0])
785
b2, file2 = Branch.open_containing(file_list[1])
786
if file1 != "" or file2 != "":
787
# FIXME diff those two files. rbc 20051123
788
raise BzrCommandError("Files are in different branches")
790
if revision is not None:
792
raise BzrCommandError("Can't specify -r with two branches")
793
if (len(revision) == 1) or (revision[1].spec is None):
794
return show_diff(tree.branch, revision[0], specific_files=file_list,
795
external_diff_options=diff_options)
796
elif len(revision) == 2:
797
return show_diff(tree.branch, revision[0], specific_files=file_list,
798
external_diff_options=diff_options,
799
revision2=revision[1])
801
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
804
return show_diff(b, None, specific_files=file_list,
805
external_diff_options=diff_options, b2=b2)
807
return show_diff(tree.branch, None, specific_files=file_list,
808
external_diff_options=diff_options)
811
class cmd_deleted(Command):
812
"""List files deleted in the working tree.
814
# TODO: Show files deleted since a previous revision, or
815
# between two revisions.
816
# TODO: Much more efficient way to do this: read in new
817
# directories with readdir, rather than stating each one. Same
818
# level of effort but possibly much less IO. (Or possibly not,
819
# if the directories are very large...)
821
def run(self, show_ids=False):
822
tree = WorkingTree.open_containing(u'.')[0]
823
old = tree.basis_tree()
824
for path, ie in old.inventory.iter_entries():
825
if not tree.has_id(ie.file_id):
827
print '%-50s %s' % (path, ie.file_id)
832
class cmd_modified(Command):
833
"""List files modified in working tree."""
837
from bzrlib.delta import compare_trees
839
tree = WorkingTree.open_containing(u'.')[0]
840
td = compare_trees(tree.basis_tree(), tree)
842
for path, id, kind, text_modified, meta_modified in td.modified:
847
class cmd_added(Command):
848
"""List files added in working tree."""
852
wt = WorkingTree.open_containing(u'.')[0]
853
basis_inv = wt.basis_tree().inventory
856
if file_id in basis_inv:
858
path = inv.id2path(file_id)
859
if not os.access(bzrlib.osutils.abspath(path), os.F_OK):
865
class cmd_root(Command):
866
"""Show the tree root directory.
868
The root is the nearest enclosing directory with a .bzr control
870
takes_args = ['filename?']
872
def run(self, filename=None):
873
"""Print the branch root."""
874
tree = WorkingTree.open_containing(filename)[0]
878
class cmd_log(Command):
879
"""Show log of this branch.
881
To request a range of logs, you can use the command -r begin..end
882
-r revision requests a specific revision, -r ..end or -r begin.. are
886
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
888
takes_args = ['filename?']
889
takes_options = [Option('forward',
890
help='show from oldest to newest'),
891
'timezone', 'verbose',
892
'show-ids', 'revision',
895
help='show revisions whose message matches this regexp',
900
def run(self, filename=None, timezone='original',
909
from bzrlib.log import log_formatter, show_log
911
assert message is None or isinstance(message, basestring), \
912
"invalid message argument %r" % message
913
direction = (forward and 'forward') or 'reverse'
918
# find the file id to log:
920
dir, fp = BzrDir.open_containing(filename)
921
b = dir.open_branch()
925
inv = dir.open_workingtree().inventory
926
except (errors.NotBranchError, errors.NotLocalUrl):
927
# either no tree, or is remote.
928
inv = b.basis_tree().inventory
929
file_id = inv.path2id(fp)
932
# FIXME ? log the current subdir only RBC 20060203
933
dir, relpath = BzrDir.open_containing('.')
934
b = dir.open_branch()
939
elif len(revision) == 1:
940
rev1 = rev2 = revision[0].in_history(b).revno
941
elif len(revision) == 2:
942
rev1 = revision[0].in_history(b).revno
943
rev2 = revision[1].in_history(b).revno
945
raise BzrCommandError('bzr log --revision takes one or two values.')
947
# By this point, the revision numbers are converted to the +ve
948
# form if they were supplied in the -ve form, so we can do
949
# this comparison in relative safety
951
(rev2, rev1) = (rev1, rev2)
953
mutter('encoding log as %r', bzrlib.user_encoding)
955
# use 'replace' so that we don't abort if trying to write out
956
# in e.g. the default C locale.
957
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
959
log_format = get_log_format(long=long, short=short, line=line)
960
lf = log_formatter(log_format,
963
show_timezone=timezone)
975
def get_log_format(long=False, short=False, line=False, default='long'):
986
class cmd_touching_revisions(Command):
987
"""Return revision-ids which affected a particular file.
989
A more user-friendly interface is "bzr log FILE"."""
991
takes_args = ["filename"]
993
def run(self, filename):
994
tree, relpath = WorkingTree.open_containing(filename)
996
inv = tree.read_working_inventory()
997
file_id = inv.path2id(relpath)
998
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
999
print "%6d %s" % (revno, what)
1002
class cmd_ls(Command):
1003
"""List files in a tree.
1005
# TODO: Take a revision or remote path and list that tree instead.
1007
takes_options = ['verbose', 'revision',
1008
Option('non-recursive',
1009
help='don\'t recurse into sub-directories'),
1011
help='Print all paths from the root of the branch.'),
1012
Option('unknown', help='Print unknown files'),
1013
Option('versioned', help='Print versioned files'),
1014
Option('ignored', help='Print ignored files'),
1016
Option('null', help='Null separate the files'),
1019
def run(self, revision=None, verbose=False,
1020
non_recursive=False, from_root=False,
1021
unknown=False, versioned=False, ignored=False,
1024
if verbose and null:
1025
raise BzrCommandError('Cannot set both --verbose and --null')
1026
all = not (unknown or versioned or ignored)
1028
selection = {'I':ignored, '?':unknown, 'V':versioned}
1030
tree, relpath = WorkingTree.open_containing(u'.')
1035
if revision is not None:
1036
tree = tree.branch.repository.revision_tree(
1037
revision[0].in_history(tree.branch).rev_id)
1038
for fp, fc, kind, fid, entry in tree.list_files():
1039
if fp.startswith(relpath):
1040
fp = fp[len(relpath):]
1041
if non_recursive and '/' in fp:
1043
if not all and not selection[fc]:
1046
kindch = entry.kind_character()
1047
print '%-8s %s%s' % (fc, fp, kindch)
1049
sys.stdout.write(fp)
1050
sys.stdout.write('\0')
1056
class cmd_unknowns(Command):
1057
"""List unknown files."""
1060
from bzrlib.osutils import quotefn
1061
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1065
class cmd_ignore(Command):
1066
"""Ignore a command or pattern.
1068
To remove patterns from the ignore list, edit the .bzrignore file.
1070
If the pattern contains a slash, it is compared to the whole path
1071
from the branch root. Otherwise, it is compared to only the last
1072
component of the path. To match a file only in the root directory,
1075
Ignore patterns are case-insensitive on case-insensitive systems.
1077
Note: wildcards must be quoted from the shell on Unix.
1080
bzr ignore ./Makefile
1081
bzr ignore '*.class'
1083
# TODO: Complain if the filename is absolute
1084
takes_args = ['name_pattern']
1086
def run(self, name_pattern):
1087
from bzrlib.atomicfile import AtomicFile
1090
tree, relpath = WorkingTree.open_containing(u'.')
1091
ifn = tree.abspath('.bzrignore')
1093
if os.path.exists(ifn):
1096
igns = f.read().decode('utf-8')
1102
# TODO: If the file already uses crlf-style termination, maybe
1103
# we should use that for the newly added lines?
1105
if igns and igns[-1] != '\n':
1107
igns += name_pattern + '\n'
1110
f = AtomicFile(ifn, 'wt')
1111
f.write(igns.encode('utf-8'))
1116
inv = tree.inventory
1117
if inv.path2id('.bzrignore'):
1118
mutter('.bzrignore is already versioned')
1120
mutter('need to make new .bzrignore file versioned')
1121
tree.add(['.bzrignore'])
1124
class cmd_ignored(Command):
1125
"""List ignored files and the patterns that matched them.
1127
See also: bzr ignore"""
1130
tree = WorkingTree.open_containing(u'.')[0]
1131
for path, file_class, kind, file_id, entry in tree.list_files():
1132
if file_class != 'I':
1134
## XXX: Slightly inefficient since this was already calculated
1135
pat = tree.is_ignored(path)
1136
print '%-50s %s' % (path, pat)
1139
class cmd_lookup_revision(Command):
1140
"""Lookup the revision-id from a revision-number
1143
bzr lookup-revision 33
1146
takes_args = ['revno']
1149
def run(self, revno):
1153
raise BzrCommandError("not a valid revision-number: %r" % revno)
1155
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1158
class cmd_export(Command):
1159
"""Export past revision to destination directory.
1161
If no revision is specified this exports the last committed revision.
1163
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1164
given, try to find the format with the extension. If no extension
1165
is found exports to a directory (equivalent to --format=dir).
1167
Root may be the top directory for tar, tgz and tbz2 formats. If none
1168
is given, the top directory will be the root name of the file.
1170
Note: export of tree with non-ascii filenames to zip is not supported.
1172
Supported formats Autodetected by extension
1173
----------------- -------------------------
1176
tbz2 .tar.bz2, .tbz2
1180
takes_args = ['dest']
1181
takes_options = ['revision', 'format', 'root']
1182
def run(self, dest, revision=None, format=None, root=None):
1184
from bzrlib.export import export
1185
tree = WorkingTree.open_containing(u'.')[0]
1187
if revision is None:
1188
# should be tree.last_revision FIXME
1189
rev_id = b.last_revision()
1191
if len(revision) != 1:
1192
raise BzrError('bzr export --revision takes exactly 1 argument')
1193
rev_id = revision[0].in_history(b).rev_id
1194
t = b.repository.revision_tree(rev_id)
1196
export(t, dest, format, root)
1197
except errors.NoSuchExportFormat, e:
1198
raise BzrCommandError('Unsupported export format: %s' % e.format)
1201
class cmd_cat(Command):
1202
"""Write a file's text from a previous revision."""
1204
takes_options = ['revision']
1205
takes_args = ['filename']
1208
def run(self, filename, revision=None):
1209
if revision is not None and len(revision) != 1:
1210
raise BzrCommandError("bzr cat --revision takes exactly one number")
1213
tree, relpath = WorkingTree.open_containing(filename)
1215
except NotBranchError:
1219
b, relpath = Branch.open_containing(filename)
1220
if revision is None:
1221
revision_id = b.last_revision()
1223
revision_id = revision[0].in_history(b).rev_id
1224
b.print_file(relpath, revision_id)
1227
class cmd_local_time_offset(Command):
1228
"""Show the offset in seconds from GMT to local time."""
1232
print bzrlib.osutils.local_time_offset()
1236
class cmd_commit(Command):
1237
"""Commit changes into a new revision.
1239
If no arguments are given, the entire tree is committed.
1241
If selected files are specified, only changes to those files are
1242
committed. If a directory is specified then the directory and everything
1243
within it is committed.
1245
A selected-file commit may fail in some cases where the committed
1246
tree would be invalid, such as trying to commit a file in a
1247
newly-added directory that is not itself committed.
1249
# TODO: Run hooks on tree to-be-committed, and after commit.
1251
# TODO: Strict commit that fails if there are deleted files.
1252
# (what does "deleted files" mean ??)
1254
# TODO: Give better message for -s, --summary, used by tla people
1256
# XXX: verbose currently does nothing
1258
takes_args = ['selected*']
1259
takes_options = ['message', 'verbose',
1261
help='commit even if nothing has changed'),
1262
Option('file', type=str,
1264
help='file containing commit message'),
1266
help="refuse to commit if there are unknown "
1267
"files in the working tree."),
1269
aliases = ['ci', 'checkin']
1271
def run(self, message=None, file=None, verbose=True, selected_list=None,
1272
unchanged=False, strict=False):
1273
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1275
from bzrlib.msgeditor import edit_commit_message, \
1276
make_commit_message_template
1277
from bzrlib.status import show_status
1278
from tempfile import TemporaryFile
1281
# TODO: Need a blackbox test for invoking the external editor; may be
1282
# slightly problematic to run this cross-platform.
1284
# TODO: do more checks that the commit will succeed before
1285
# spending the user's valuable time typing a commit message.
1287
# TODO: if the commit *does* happen to fail, then save the commit
1288
# message to a temporary file where it can be recovered
1289
tree, selected_list = tree_files(selected_list)
1290
if message is None and not file:
1291
template = make_commit_message_template(tree, selected_list)
1292
message = edit_commit_message(template)
1294
raise BzrCommandError("please specify a commit message"
1295
" with either --message or --file")
1296
elif message and file:
1297
raise BzrCommandError("please specify either --message or --file")
1301
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1304
raise BzrCommandError("empty commit message specified")
1307
tree.commit(message, specific_files=selected_list,
1308
allow_pointless=unchanged, strict=strict)
1309
except PointlessCommit:
1310
# FIXME: This should really happen before the file is read in;
1311
# perhaps prepare the commit; get the message; then actually commit
1312
raise BzrCommandError("no changes to commit",
1313
["use --unchanged to commit anyhow"])
1314
except ConflictsInTree:
1315
raise BzrCommandError("Conflicts detected in working tree. "
1316
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1317
except StrictCommitFailed:
1318
raise BzrCommandError("Commit refused because there are unknown "
1319
"files in the working tree.")
1320
note('Committed revision %d.' % (tree.branch.revno(),))
1323
class cmd_check(Command):
1324
"""Validate consistency of branch history.
1326
This command checks various invariants about the branch storage to
1327
detect data corruption or bzr bugs.
1329
takes_args = ['branch?']
1330
takes_options = ['verbose']
1332
def run(self, branch=None, verbose=False):
1333
from bzrlib.check import check
1335
tree = WorkingTree.open_containing()[0]
1336
branch = tree.branch
1338
branch = Branch.open(branch)
1339
check(branch, verbose)
1342
class cmd_scan_cache(Command):
1345
from bzrlib.hashcache import HashCache
1351
print '%6d stats' % c.stat_count
1352
print '%6d in hashcache' % len(c._cache)
1353
print '%6d files removed from cache' % c.removed_count
1354
print '%6d hashes updated' % c.update_count
1355
print '%6d files changed too recently to cache' % c.danger_count
1362
class cmd_upgrade(Command):
1363
"""Upgrade branch storage to current format.
1365
The check command or bzr developers may sometimes advise you to run
1366
this command. When the default format has changed you may also be warned
1367
during other operations to upgrade.
1369
takes_args = ['url?']
1371
def run(self, url='.'):
1372
from bzrlib.upgrade import upgrade
1376
class cmd_whoami(Command):
1377
"""Show bzr user id."""
1378
takes_options = ['email']
1381
def run(self, email=False):
1383
b = WorkingTree.open_containing(u'.')[0].branch
1384
config = bzrlib.config.BranchConfig(b)
1385
except NotBranchError:
1386
config = bzrlib.config.GlobalConfig()
1389
print config.user_email()
1391
print config.username()
1394
class cmd_nick(Command):
1395
"""Print or set the branch nickname.
1397
If unset, the tree root directory name is used as the nickname
1398
To print the current nickname, execute with no argument.
1400
takes_args = ['nickname?']
1401
def run(self, nickname=None):
1402
branch = Branch.open_containing(u'.')[0]
1403
if nickname is None:
1404
self.printme(branch)
1406
branch.nick = nickname
1409
def printme(self, branch):
1413
class cmd_selftest(Command):
1414
"""Run internal test suite.
1416
This creates temporary test directories in the working directory,
1417
but not existing data is affected. These directories are deleted
1418
if the tests pass, or left behind to help in debugging if they
1419
fail and --keep-output is specified.
1421
If arguments are given, they are regular expressions that say
1422
which tests should run.
1424
If the global option '--no-plugins' is given, plugins are not loaded
1425
before running the selftests. This has two effects: features provided or
1426
modified by plugins will not be tested, and tests provided by plugins will
1431
bzr --no-plugins selftest -v
1433
# TODO: --list should give a list of all available tests
1435
# NB: this is used from the class without creating an instance, which is
1436
# why it does not have a self parameter.
1437
def get_transport_type(typestring):
1438
"""Parse and return a transport specifier."""
1439
if typestring == "sftp":
1440
from bzrlib.transport.sftp import SFTPAbsoluteServer
1441
return SFTPAbsoluteServer
1442
if typestring == "memory":
1443
from bzrlib.transport.memory import MemoryServer
1445
msg = "No known transport type %s. Supported types are: sftp\n" %\
1447
raise BzrCommandError(msg)
1450
takes_args = ['testspecs*']
1451
takes_options = ['verbose',
1452
Option('one', help='stop when one test fails'),
1453
Option('keep-output',
1454
help='keep output directories when tests fail'),
1456
help='Use a different transport by default '
1457
'throughout the test suite.',
1458
type=get_transport_type),
1461
def run(self, testspecs_list=None, verbose=False, one=False,
1462
keep_output=False, transport=None):
1464
from bzrlib.tests import selftest
1465
# we don't want progress meters from the tests to go to the
1466
# real output; and we don't want log messages cluttering up
1468
save_ui = bzrlib.ui.ui_factory
1469
bzrlib.trace.info('running tests...')
1471
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1472
if testspecs_list is not None:
1473
pattern = '|'.join(testspecs_list)
1476
result = selftest(verbose=verbose,
1478
stop_on_failure=one,
1479
keep_output=keep_output,
1480
transport=transport)
1482
bzrlib.trace.info('tests passed')
1484
bzrlib.trace.info('tests failed')
1485
return int(not result)
1487
bzrlib.ui.ui_factory = save_ui
1490
def _get_bzr_branch():
1491
"""If bzr is run from a branch, return Branch or None"""
1492
import bzrlib.errors
1493
from bzrlib.branch import Branch
1494
from bzrlib.osutils import abspath
1495
from os.path import dirname
1498
branch = Branch.open(dirname(abspath(dirname(__file__))))
1500
except bzrlib.errors.BzrError:
1505
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1506
# is bzrlib itself in a branch?
1507
branch = _get_bzr_branch()
1509
rh = branch.revision_history()
1511
print " bzr checkout, revision %d" % (revno,)
1512
print " nick: %s" % (branch.nick,)
1514
print " revid: %s" % (rh[-1],)
1515
print bzrlib.__copyright__
1516
print "http://bazaar-ng.org/"
1518
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1519
print "you may use, modify and redistribute it under the terms of the GNU"
1520
print "General Public License version 2 or later."
1523
class cmd_version(Command):
1524
"""Show version of bzr."""
1529
class cmd_rocks(Command):
1530
"""Statement of optimism."""
1534
print "it sure does!"
1537
class cmd_find_merge_base(Command):
1538
"""Find and print a base revision for merging two branches.
1540
# TODO: Options to specify revisions on either side, as if
1541
# merging only part of the history.
1542
takes_args = ['branch', 'other']
1546
def run(self, branch, other):
1547
from bzrlib.revision import common_ancestor, MultipleRevisionSources
1549
branch1 = Branch.open_containing(branch)[0]
1550
branch2 = Branch.open_containing(other)[0]
1552
history_1 = branch1.revision_history()
1553
history_2 = branch2.revision_history()
1555
last1 = branch1.last_revision()
1556
last2 = branch2.last_revision()
1558
source = MultipleRevisionSources(branch1.repository,
1561
base_rev_id = common_ancestor(last1, last2, source)
1563
print 'merge base is revision %s' % base_rev_id
1567
if base_revno is None:
1568
raise bzrlib.errors.UnrelatedBranches()
1570
print ' r%-6d in %s' % (base_revno, branch)
1572
other_revno = branch2.revision_id_to_revno(base_revid)
1574
print ' r%-6d in %s' % (other_revno, other)
1578
class cmd_merge(Command):
1579
"""Perform a three-way merge.
1581
The branch is the branch you will merge from. By default, it will
1582
merge the latest revision. If you specify a revision, that
1583
revision will be merged. If you specify two revisions, the first
1584
will be used as a BASE, and the second one as OTHER. Revision
1585
numbers are always relative to the specified branch.
1587
By default bzr will try to merge in all new work from the other
1588
branch, automatically determining an appropriate base. If this
1589
fails, you may need to give an explicit base.
1593
To merge the latest revision from bzr.dev
1594
bzr merge ../bzr.dev
1596
To merge changes up to and including revision 82 from bzr.dev
1597
bzr merge -r 82 ../bzr.dev
1599
To merge the changes introduced by 82, without previous changes:
1600
bzr merge -r 81..82 ../bzr.dev
1602
merge refuses to run if there are any uncommitted changes, unless
1605
takes_args = ['branch?']
1606
takes_options = ['revision', 'force', 'merge-type', 'reprocess',
1607
Option('show-base', help="Show base revision text in "
1610
def run(self, branch=None, revision=None, force=False, merge_type=None,
1611
show_base=False, reprocess=False):
1612
from bzrlib._merge_core import ApplyMerge3
1613
if merge_type is None:
1614
merge_type = ApplyMerge3
1616
branch = WorkingTree.open_containing(u'.')[0].branch.get_parent()
1618
raise BzrCommandError("No merge location known or specified.")
1620
print "Using saved location: %s" % branch
1621
if revision is None or len(revision) < 1:
1623
other = [branch, -1]
1625
if len(revision) == 1:
1627
other_branch = Branch.open_containing(branch)[0]
1628
revno = revision[0].in_history(other_branch).revno
1629
other = [branch, revno]
1631
assert len(revision) == 2
1632
if None in revision:
1633
raise BzrCommandError(
1634
"Merge doesn't permit that revision specifier.")
1635
b = Branch.open_containing(branch)[0]
1637
base = [branch, revision[0].in_history(b).revno]
1638
other = [branch, revision[1].in_history(b).revno]
1641
conflict_count = merge(other, base, check_clean=(not force),
1642
merge_type=merge_type, reprocess=reprocess,
1643
show_base=show_base)
1644
if conflict_count != 0:
1648
except bzrlib.errors.AmbiguousBase, e:
1649
m = ("sorry, bzr can't determine the right merge base yet\n"
1650
"candidates are:\n "
1651
+ "\n ".join(e.bases)
1653
"please specify an explicit base with -r,\n"
1654
"and (if you want) report this to the bzr developers\n")
1658
class cmd_remerge(Command):
1661
takes_args = ['file*']
1662
takes_options = ['merge-type', 'reprocess',
1663
Option('show-base', help="Show base revision text in "
1666
def run(self, file_list=None, merge_type=None, show_base=False,
1668
from bzrlib.merge import merge_inner, transform_tree
1669
from bzrlib._merge_core import ApplyMerge3
1670
if merge_type is None:
1671
merge_type = ApplyMerge3
1672
tree, file_list = tree_files(file_list)
1675
pending_merges = tree.pending_merges()
1676
if len(pending_merges) != 1:
1677
raise BzrCommandError("Sorry, remerge only works after normal"
1678
+ " merges. Not cherrypicking or"
1680
repository = tree.branch.repository
1681
base_revision = common_ancestor(tree.branch.last_revision(),
1682
pending_merges[0], repository)
1683
base_tree = repository.revision_tree(base_revision)
1684
other_tree = repository.revision_tree(pending_merges[0])
1685
interesting_ids = None
1686
if file_list is not None:
1687
interesting_ids = set()
1688
for filename in file_list:
1689
file_id = tree.path2id(filename)
1690
interesting_ids.add(file_id)
1691
if tree.kind(file_id) != "directory":
1694
for name, ie in tree.inventory.iter_entries(file_id):
1695
interesting_ids.add(ie.file_id)
1696
transform_tree(tree, tree.basis_tree(), interesting_ids)
1697
if file_list is None:
1698
restore_files = list(tree.iter_conflicts())
1700
restore_files = file_list
1701
for filename in restore_files:
1703
restore(tree.abspath(filename))
1704
except NotConflicted:
1706
conflicts = merge_inner(tree.branch, other_tree, base_tree,
1707
interesting_ids = interesting_ids,
1708
other_rev_id=pending_merges[0],
1709
merge_type=merge_type,
1710
show_base=show_base,
1711
reprocess=reprocess)
1719
class cmd_revert(Command):
1720
"""Reverse all changes since the last commit.
1722
Only versioned files are affected. Specify filenames to revert only
1723
those files. By default, any files that are changed will be backed up
1724
first. Backup files have a '~' appended to their name.
1726
takes_options = ['revision', 'no-backup']
1727
takes_args = ['file*']
1728
aliases = ['merge-revert']
1730
def run(self, revision=None, no_backup=False, file_list=None):
1731
from bzrlib.commands import parse_spec
1732
if file_list is not None:
1733
if len(file_list) == 0:
1734
raise BzrCommandError("No files specified")
1738
tree, file_list = tree_files(file_list)
1739
if revision is None:
1740
# FIXME should be tree.last_revision
1741
rev_id = tree.branch.last_revision()
1742
elif len(revision) != 1:
1743
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1745
rev_id = revision[0].in_history(tree.branch).rev_id
1746
tree.revert(file_list, tree.branch.repository.revision_tree(rev_id),
1750
class cmd_assert_fail(Command):
1751
"""Test reporting of assertion failures"""
1754
assert False, "always fails"
1757
class cmd_help(Command):
1758
"""Show help on a command or other topic.
1760
For a list of all available commands, say 'bzr help commands'."""
1761
takes_options = ['long']
1762
takes_args = ['topic?']
1766
def run(self, topic=None, long=False):
1768
if topic is None and long:
1773
class cmd_shell_complete(Command):
1774
"""Show appropriate completions for context.
1776
For a list of all available commands, say 'bzr shell-complete'."""
1777
takes_args = ['context?']
1782
def run(self, context=None):
1783
import shellcomplete
1784
shellcomplete.shellcomplete(context)
1787
class cmd_fetch(Command):
1788
"""Copy in history from another branch but don't merge it.
1790
This is an internal method used for pull and merge."""
1792
takes_args = ['from_branch', 'to_branch']
1793
def run(self, from_branch, to_branch):
1794
from bzrlib.fetch import Fetcher
1795
from bzrlib.branch import Branch
1796
from_b = Branch.open(from_branch)
1797
to_b = Branch.open(to_branch)
1798
Fetcher(to_b, from_b)
1801
class cmd_missing(Command):
1802
"""Show unmerged/unpulled revisions between two branches.
1804
OTHER_BRANCH may be local or remote."""
1805
takes_args = ['other_branch?']
1806
takes_options = [Option('reverse', 'Reverse the order of revisions'),
1808
'Display changes in the local branch only'),
1809
Option('theirs-only',
1810
'Display changes in the remote branch only'),
1818
def run(self, other_branch=None, reverse=False, mine_only=False,
1819
theirs_only=False, long=True, short=False, line=False,
1820
show_ids=False, verbose=False):
1821
from bzrlib.missing import find_unmerged, iter_log_data
1822
from bzrlib.log import log_formatter
1823
local_branch = bzrlib.branch.Branch.open_containing(u".")[0]
1824
parent = local_branch.get_parent()
1825
if other_branch is None:
1826
other_branch = parent
1827
if other_branch is None:
1828
raise BzrCommandError("No missing location known or specified.")
1829
print "Using last location: " + local_branch.get_parent()
1830
remote_branch = bzrlib.branch.Branch.open(other_branch)
1831
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
1832
log_format = get_log_format(long=long, short=short, line=line)
1833
lf = log_formatter(log_format, sys.stdout,
1835
show_timezone='original')
1836
if reverse is False:
1837
local_extra.reverse()
1838
remote_extra.reverse()
1839
if local_extra and not theirs_only:
1840
print "You have %d extra revision(s):" % len(local_extra)
1841
for data in iter_log_data(local_extra, local_branch.repository,
1844
printed_local = True
1846
printed_local = False
1847
if remote_extra and not mine_only:
1848
if printed_local is True:
1850
print "You are missing %d revision(s):" % len(remote_extra)
1851
for data in iter_log_data(remote_extra, remote_branch.repository,
1854
if not remote_extra and not local_extra:
1856
print "Branches are up to date."
1859
if parent is None and other_branch is not None:
1860
local_branch.set_parent(other_branch)
1864
class cmd_plugins(Command):
1869
import bzrlib.plugin
1870
from inspect import getdoc
1871
for name, plugin in bzrlib.plugin.all_plugins().items():
1872
if hasattr(plugin, '__path__'):
1873
print plugin.__path__[0]
1874
elif hasattr(plugin, '__file__'):
1875
print plugin.__file__
1881
print '\t', d.split('\n')[0]
1884
class cmd_testament(Command):
1885
"""Show testament (signing-form) of a revision."""
1886
takes_options = ['revision', 'long']
1887
takes_args = ['branch?']
1889
def run(self, branch=u'.', revision=None, long=False):
1890
from bzrlib.testament import Testament
1891
b = WorkingTree.open_containing(branch)[0].branch
1894
if revision is None:
1895
rev_id = b.last_revision()
1897
rev_id = revision[0].in_history(b).rev_id
1898
t = Testament.from_revision(b.repository, rev_id)
1900
sys.stdout.writelines(t.as_text_lines())
1902
sys.stdout.write(t.as_short_text())
1907
class cmd_annotate(Command):
1908
"""Show the origin of each line in a file.
1910
This prints out the given file with an annotation on the left side
1911
indicating which revision, author and date introduced the change.
1913
If the origin is the same for a run of consecutive lines, it is
1914
shown only at the top, unless the --all option is given.
1916
# TODO: annotate directories; showing when each file was last changed
1917
# TODO: annotate a previous version of a file
1918
# TODO: if the working copy is modified, show annotations on that
1919
# with new uncommitted lines marked
1920
aliases = ['blame', 'praise']
1921
takes_args = ['filename']
1922
takes_options = [Option('all', help='show annotations on all lines'),
1923
Option('long', help='show date in annotations'),
1927
def run(self, filename, all=False, long=False):
1928
from bzrlib.annotate import annotate_file
1929
tree, relpath = WorkingTree.open_containing(filename)
1930
branch = tree.branch
1933
file_id = tree.inventory.path2id(relpath)
1934
tree = branch.repository.revision_tree(branch.last_revision())
1935
file_version = tree.inventory[file_id].revision
1936
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
1941
class cmd_re_sign(Command):
1942
"""Create a digital signature for an existing revision."""
1943
# TODO be able to replace existing ones.
1945
hidden = True # is this right ?
1946
takes_args = ['revision_id?']
1947
takes_options = ['revision']
1949
def run(self, revision_id=None, revision=None):
1950
import bzrlib.config as config
1951
import bzrlib.gpg as gpg
1952
if revision_id is not None and revision is not None:
1953
raise BzrCommandError('You can only supply one of revision_id or --revision')
1954
if revision_id is None and revision is None:
1955
raise BzrCommandError('You must supply either --revision or a revision_id')
1956
b = WorkingTree.open_containing(u'.')[0].branch
1957
gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
1958
if revision_id is not None:
1959
b.repository.sign_revision(revision_id, gpg_strategy)
1960
elif revision is not None:
1961
if len(revision) == 1:
1962
revno, rev_id = revision[0].in_history(b)
1963
b.repository.sign_revision(rev_id, gpg_strategy)
1964
elif len(revision) == 2:
1965
# are they both on rh- if so we can walk between them
1966
# might be nice to have a range helper for arbitrary
1967
# revision paths. hmm.
1968
from_revno, from_revid = revision[0].in_history(b)
1969
to_revno, to_revid = revision[1].in_history(b)
1970
if to_revid is None:
1971
to_revno = b.revno()
1972
if from_revno is None or to_revno is None:
1973
raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
1974
for revno in range(from_revno, to_revno + 1):
1975
b.repository.sign_revision(b.get_rev_id(revno),
1978
raise BzrCommandError('Please supply either one revision, or a range.')
1981
class cmd_uncommit(bzrlib.commands.Command):
1982
"""Remove the last committed revision.
1984
By supplying the --all flag, it will not only remove the entry
1985
from revision_history, but also remove all of the entries in the
1988
--verbose will print out what is being removed.
1989
--dry-run will go through all the motions, but not actually
1992
In the future, uncommit will create a changeset, which can then
1995
TODO: jam 20060108 Add an option to allow uncommit to remove unreferenced
1996
information in 'branch-as-repostory' branches.
1997
TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
1998
information in shared branches as well.
2000
takes_options = ['verbose', 'revision',
2001
Option('dry-run', help='Don\'t actually make changes'),
2002
Option('force', help='Say yes to all questions.')]
2003
takes_args = ['location?']
2006
def run(self, location=None,
2007
dry_run=False, verbose=False,
2008
revision=None, force=False):
2009
from bzrlib.branch import Branch
2010
from bzrlib.log import log_formatter
2012
from bzrlib.uncommit import uncommit
2014
if location is None:
2016
b, relpath = Branch.open_containing(location)
2018
if revision is None:
2020
rev_id = b.last_revision()
2022
revno, rev_id = revision[0].in_history(b)
2024
print 'No revisions to uncommit.'
2026
for r in range(revno, b.revno()+1):
2027
rev_id = b.get_rev_id(r)
2028
lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
2029
lf.show(r, b.repository.get_revision(rev_id), None)
2032
print 'Dry-run, pretending to remove the above revisions.'
2034
val = raw_input('Press <enter> to continue')
2036
print 'The above revision(s) will be removed.'
2038
val = raw_input('Are you sure [y/N]? ')
2039
if val.lower() not in ('y', 'yes'):
2043
uncommit(b, dry_run=dry_run, verbose=verbose,
2047
def merge(other_revision, base_revision,
2048
check_clean=True, ignore_zero=False,
2049
this_dir=None, backup_files=False, merge_type=ApplyMerge3,
2050
file_list=None, show_base=False, reprocess=False):
2051
"""Merge changes into a tree.
2054
list(path, revno) Base for three-way merge.
2055
If [None, None] then a base will be automatically determined.
2057
list(path, revno) Other revision for three-way merge.
2059
Directory to merge changes into; '.' by default.
2061
If true, this_dir must have no uncommitted changes before the
2063
ignore_zero - If true, suppress the "zero conflicts" message when
2064
there are no conflicts; should be set when doing something we expect
2065
to complete perfectly.
2066
file_list - If supplied, merge only changes to selected files.
2068
All available ancestors of other_revision and base_revision are
2069
automatically pulled into the branch.
2071
The revno may be -1 to indicate the last revision on the branch, which is
2074
This function is intended for use from the command line; programmatic
2075
clients might prefer to call merge.merge_inner(), which has less magic
2078
from bzrlib.merge import Merger, _MergeConflictHandler
2079
if this_dir is None:
2081
this_tree = WorkingTree.open_containing(this_dir)[0]
2082
if show_base and not merge_type is ApplyMerge3:
2083
raise BzrCommandError("Show-base is not supported for this merge"
2084
" type. %s" % merge_type)
2085
if reprocess and not merge_type is ApplyMerge3:
2086
raise BzrCommandError("Reprocess is not supported for this merge"
2087
" type. %s" % merge_type)
2088
if reprocess and show_base:
2089
raise BzrCommandError("Cannot reprocess and show base.")
2090
merger = Merger(this_tree.branch, this_tree=this_tree)
2091
merger.check_basis(check_clean)
2092
merger.set_other(other_revision)
2093
merger.set_base(base_revision)
2094
if merger.base_rev_id == merger.other_rev_id:
2095
note('Nothing to do.')
2097
merger.backup_files = backup_files
2098
merger.merge_type = merge_type
2099
merger.set_interesting_files(file_list)
2100
merger.show_base = show_base
2101
merger.reprocess = reprocess
2102
merger.conflict_handler = _MergeConflictHandler(merger.this_tree,
2105
ignore_zero=ignore_zero)
2106
conflicts = merger.do_merge()
2107
merger.set_pending()
2111
# these get imported and then picked up by the scan for cmd_*
2112
# TODO: Some more consistent way to split command definitions across files;
2113
# we do need to load at least some information about them to know of
2115
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
added
removed
bzrlib/builtins.py
