1
# Copyright (C) 2004, 2005, 2006 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"""
22
from shutil import rmtree
27
from bzrlib.branch import Branch
28
import bzrlib.bzrdir as bzrdir
29
from bzrlib.commands import Command, display_command
30
from bzrlib.revision import common_ancestor
31
import bzrlib.errors as errors
32
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
33
NotBranchError, DivergedBranches, NotConflicted,
34
NoSuchFile, NoWorkingTree, FileInWrongBranch,
36
from bzrlib.log import show_one_log
37
from bzrlib.merge import Merge3Merger
38
from bzrlib.option import Option
39
from bzrlib.progress import DummyProgress, ProgressPhase
40
from bzrlib.revisionspec import RevisionSpec
42
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
43
from bzrlib.transport.local import LocalTransport
45
from bzrlib.workingtree import WorkingTree
48
def tree_files(file_list, default_branch=u'.'):
50
return internal_tree_files(file_list, default_branch)
51
except FileInWrongBranch, e:
52
raise BzrCommandError("%s is not in the same branch as %s" %
53
(e.path, file_list[0]))
55
def internal_tree_files(file_list, default_branch=u'.'):
57
Return a branch and list of branch-relative paths.
58
If supplied file_list is empty or None, the branch default will be used,
59
and returned file_list will match the original.
61
if file_list is None or len(file_list) == 0:
62
return WorkingTree.open_containing(default_branch)[0], file_list
63
tree = WorkingTree.open_containing(file_list[0])[0]
65
for filename in file_list:
67
new_list.append(tree.relpath(filename))
68
except errors.PathNotChild:
69
raise FileInWrongBranch(tree.branch, filename)
73
def get_format_type(typestring):
74
"""Parse and return a format specifier."""
75
if typestring == "metadir":
76
return bzrdir.BzrDirMetaFormat1()
77
if typestring == "knit":
78
format = bzrdir.BzrDirMetaFormat1()
79
format.repository_format = bzrlib.repository.RepositoryFormatKnit1()
81
msg = "No known bzr-dir format %s. Supported types are: metadir\n" %\
83
raise BzrCommandError(msg)
86
# TODO: Make sure no commands unconditionally use the working directory as a
87
# branch. If a filename argument is used, the first of them should be used to
88
# specify the branch. (Perhaps this can be factored out into some kind of
89
# Argument class, representing a file in a branch, where the first occurrence
92
class cmd_status(Command):
93
"""Display status summary.
95
This reports on versioned and unknown files, reporting them
96
grouped by state. Possible states are:
99
Versioned in the working copy but not in the previous revision.
102
Versioned in the previous revision but removed or deleted
106
Path of this file changed from the previous revision;
107
the text may also have changed. This includes files whose
108
parent directory was renamed.
111
Text has changed since the previous revision.
114
Nothing about this file has changed since the previous revision.
115
Only shown with --all.
118
Not versioned and not matching an ignore pattern.
120
To see ignored files use 'bzr ignored'. For details in the
121
changes to file texts, use 'bzr diff'.
123
If no arguments are specified, the status of the entire working
124
directory is shown. Otherwise, only the status of the specified
125
files or directories is reported. If a directory is given, status
126
is reported for everything inside that directory.
128
If a revision argument is given, the status is calculated against
129
that revision, or between two revisions if two are provided.
132
# TODO: --no-recurse, --recurse options
134
takes_args = ['file*']
135
takes_options = ['all', 'show-ids', 'revision']
136
aliases = ['st', 'stat']
139
def run(self, all=False, show_ids=False, file_list=None, revision=None):
140
tree, file_list = tree_files(file_list)
142
from bzrlib.status import show_tree_status
143
show_tree_status(tree, show_unchanged=all, show_ids=show_ids,
144
specific_files=file_list, revision=revision)
147
class cmd_cat_revision(Command):
148
"""Write out metadata for a revision.
150
The revision to print can either be specified by a specific
151
revision identifier, or you can use --revision.
155
takes_args = ['revision_id?']
156
takes_options = ['revision']
159
def run(self, revision_id=None, revision=None):
161
if revision_id is not None and revision is not None:
162
raise BzrCommandError('You can only supply one of revision_id or --revision')
163
if revision_id is None and revision is None:
164
raise BzrCommandError('You must supply either --revision or a revision_id')
165
b = WorkingTree.open_containing(u'.')[0].branch
166
if revision_id is not None:
167
sys.stdout.write(b.repository.get_revision_xml(revision_id))
168
elif revision is not None:
171
raise BzrCommandError('You cannot specify a NULL revision.')
172
revno, rev_id = rev.in_history(b)
173
sys.stdout.write(b.repository.get_revision_xml(rev_id))
176
class cmd_revno(Command):
177
"""Show current revision number.
179
This is equal to the number of revisions on this branch."""
180
takes_args = ['location?']
182
def run(self, location=u'.'):
183
print Branch.open_containing(location)[0].revno()
186
class cmd_revision_info(Command):
187
"""Show revision number and revision id for a given revision identifier.
190
takes_args = ['revision_info*']
191
takes_options = ['revision']
193
def run(self, revision=None, revision_info_list=[]):
196
if revision is not None:
197
revs.extend(revision)
198
if revision_info_list is not None:
199
for rev in revision_info_list:
200
revs.append(RevisionSpec(rev))
202
raise BzrCommandError('You must supply a revision identifier')
204
b = WorkingTree.open_containing(u'.')[0].branch
207
revinfo = rev.in_history(b)
208
if revinfo.revno is None:
209
print ' %s' % revinfo.rev_id
211
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
214
class cmd_add(Command):
215
"""Add specified files or directories.
217
In non-recursive mode, all the named items are added, regardless
218
of whether they were previously ignored. A warning is given if
219
any of the named files are already versioned.
221
In recursive mode (the default), files are treated the same way
222
but the behaviour for directories is different. Directories that
223
are already versioned do not give a warning. All directories,
224
whether already versioned or not, are searched for files or
225
subdirectories that are neither versioned or ignored, and these
226
are added. This search proceeds recursively into versioned
227
directories. If no names are given '.' is assumed.
229
Therefore simply saying 'bzr add' will version all files that
230
are currently unknown.
232
Adding a file whose parent directory is not versioned will
233
implicitly add the parent, and so on up to the root. This means
234
you should never need to explictly add a directory, they'll just
235
get added when you add a file in the directory.
237
--dry-run will show which files would be added, but not actually
240
takes_args = ['file*']
241
takes_options = ['no-recurse', 'dry-run', 'verbose']
243
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False):
248
# This is pointless, but I'd rather not raise an error
249
action = bzrlib.add.add_action_null
251
action = bzrlib.add.add_action_print
253
action = bzrlib.add.add_action_add
255
action = bzrlib.add.add_action_add_and_print
257
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
260
for glob in sorted(ignored.keys()):
261
match_len = len(ignored[glob])
263
for path in ignored[glob]:
264
print "ignored %s matching \"%s\"" % (path, glob)
266
print "ignored %d file(s) matching \"%s\"" % (match_len,
268
print "If you wish to add some of these files, please add them"\
272
class cmd_mkdir(Command):
273
"""Create a new versioned directory.
275
This is equivalent to creating the directory and then adding it.
277
takes_args = ['dir+']
279
def run(self, dir_list):
282
wt, dd = WorkingTree.open_containing(d)
287
class cmd_relpath(Command):
288
"""Show path of a file relative to root"""
289
takes_args = ['filename']
293
def run(self, filename):
294
tree, relpath = WorkingTree.open_containing(filename)
298
class cmd_inventory(Command):
299
"""Show inventory of the current working copy or a revision.
301
It is possible to limit the output to a particular entry
302
type using the --kind option. For example; --kind file.
304
takes_options = ['revision', 'show-ids', 'kind']
307
def run(self, revision=None, show_ids=False, kind=None):
308
if kind and kind not in ['file', 'directory', 'symlink']:
309
raise BzrCommandError('invalid kind specified')
310
tree = WorkingTree.open_containing(u'.')[0]
312
inv = tree.read_working_inventory()
314
if len(revision) > 1:
315
raise BzrCommandError('bzr inventory --revision takes'
316
' exactly one revision identifier')
317
inv = tree.branch.repository.get_revision_inventory(
318
revision[0].in_history(tree.branch).rev_id)
320
for path, entry in inv.entries():
321
if kind and kind != entry.kind:
324
print '%-50s %s' % (path, entry.file_id)
329
class cmd_mv(Command):
330
"""Move or rename a file.
333
bzr mv OLDNAME NEWNAME
334
bzr mv SOURCE... DESTINATION
336
If the last argument is a versioned directory, all the other names
337
are moved into it. Otherwise, there must be exactly two arguments
338
and the file is changed to a new name, which must not already exist.
340
Files cannot be moved between branches.
342
takes_args = ['names*']
343
aliases = ['move', 'rename']
345
def run(self, names_list):
346
if len(names_list) < 2:
347
raise BzrCommandError("missing file argument")
348
tree, rel_names = tree_files(names_list)
350
if os.path.isdir(names_list[-1]):
351
# move into existing directory
352
for pair in tree.move(rel_names[:-1], rel_names[-1]):
353
print "%s => %s" % pair
355
if len(names_list) != 2:
356
raise BzrCommandError('to mv multiple files the destination '
357
'must be a versioned directory')
358
tree.rename_one(rel_names[0], rel_names[1])
359
print "%s => %s" % (rel_names[0], rel_names[1])
362
class cmd_pull(Command):
363
"""Pull any changes from another branch into the current one.
365
If there is no default location set, the first pull will set it. After
366
that, you can omit the location to use the default. To change the
367
default, use --remember.
369
This command only works on branches that have not diverged. Branches are
370
considered diverged if both branches have had commits without first
371
pulling from the other.
373
If branches have diverged, you can use 'bzr merge' to pull the text changes
374
from one into the other. Once one branch has merged, the other should
375
be able to pull it again.
377
If you want to forget your local changes and just update your branch to
378
match the remote one, use --overwrite.
380
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
381
takes_args = ['location?']
383
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
384
# FIXME: too much stuff is in the command class
386
tree_to = WorkingTree.open_containing(u'.')[0]
387
branch_to = tree_to.branch
388
except NoWorkingTree:
390
branch_to = Branch.open_containing(u'.')[0]
391
stored_loc = branch_to.get_parent()
393
if stored_loc is None:
394
raise BzrCommandError("No pull location known or specified.")
396
print "Using saved location: %s" % stored_loc
397
location = stored_loc
399
br_from = Branch.open(location)
403
elif len(revision) == 1:
404
rev_id = revision[0].in_history(br_from).rev_id
406
raise BzrCommandError('bzr pull --revision takes one value.')
408
old_rh = branch_to.revision_history()
409
if tree_to is not None:
410
count = tree_to.pull(br_from, overwrite, rev_id)
412
count = branch_to.pull(br_from, overwrite, rev_id)
414
if branch_to.get_parent() is None or remember:
415
branch_to.set_parent(location)
416
note('%d revision(s) pulled.' % (count,))
419
new_rh = branch_to.revision_history()
422
from bzrlib.log import show_changed_revisions
423
show_changed_revisions(branch_to, old_rh, new_rh)
426
class cmd_push(Command):
427
"""Push this branch into another branch.
429
The remote branch will not have its working tree populated because this
430
is both expensive, and may not be supported on the remote file system.
432
Some smart servers or protocols *may* put the working tree in place.
434
If there is no default push location set, the first push will set it.
435
After that, you can omit the location to use the default. To change the
436
default, use --remember.
438
This command only works on branches that have not diverged. Branches are
439
considered diverged if the branch being pushed to is not an older version
442
If branches have diverged, you can use 'bzr push --overwrite' to replace
443
the other branch completely.
445
If you want to ensure you have the different changes in the other branch,
446
do a merge (see bzr help merge) from the other branch, and commit that
447
before doing a 'push --overwrite'.
449
takes_options = ['remember', 'overwrite',
450
Option('create-prefix',
451
help='Create the path leading up to the branch '
452
'if it does not already exist')]
453
takes_args = ['location?']
455
def run(self, location=None, remember=False, overwrite=False,
456
create_prefix=False, verbose=False):
457
# FIXME: Way too big! Put this into a function called from the
459
from bzrlib.transport import get_transport
461
tree_from = WorkingTree.open_containing(u'.')[0]
462
br_from = tree_from.branch
463
stored_loc = tree_from.branch.get_push_location()
465
if stored_loc is None:
466
raise BzrCommandError("No push location known or specified.")
468
print "Using saved location: %s" % stored_loc
469
location = stored_loc
471
dir_to = bzrlib.bzrdir.BzrDir.open(location)
472
br_to = dir_to.open_branch()
473
except NotBranchError:
475
transport = get_transport(location).clone('..')
476
if not create_prefix:
478
transport.mkdir(transport.relpath(location))
480
raise BzrCommandError("Parent directory of %s "
481
"does not exist." % location)
483
current = transport.base
484
needed = [(transport, transport.relpath(location))]
487
transport, relpath = needed[-1]
488
transport.mkdir(relpath)
491
new_transport = transport.clone('..')
492
needed.append((new_transport,
493
new_transport.relpath(transport.base)))
494
if new_transport.base == transport.base:
495
raise BzrCommandError("Could not creeate "
497
dir_to = br_from.bzrdir.clone(location)
498
br_to = dir_to.open_branch()
499
old_rh = br_to.revision_history()
502
tree_to = dir_to.open_workingtree()
503
except errors.NotLocalUrl:
504
# TODO: This should be updated for branches which don't have a
505
# working tree, as opposed to ones where we just couldn't
507
warning('Unable to update the working tree of: %s' % (br_to.base,))
508
count = br_to.pull(br_from, overwrite)
509
except NoWorkingTree:
510
count = br_to.pull(br_from, overwrite)
512
count = tree_to.pull(br_from, overwrite)
513
except DivergedBranches:
514
raise BzrCommandError("These branches have diverged."
515
" Try a merge then push with overwrite.")
516
if br_from.get_push_location() is None or remember:
517
br_from.set_push_location(location)
518
note('%d revision(s) pushed.' % (count,))
521
new_rh = br_to.revision_history()
524
from bzrlib.log import show_changed_revisions
525
show_changed_revisions(br_to, old_rh, new_rh)
528
class cmd_branch(Command):
529
"""Create a new copy of a branch.
531
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
532
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
534
To retrieve the branch as of a particular revision, supply the --revision
535
parameter, as in "branch foo/bar -r 5".
537
--basis is to speed up branching from remote branches. When specified, it
538
copies all the file-contents, inventory and revision data from the basis
539
branch before copying anything from the remote branch.
541
takes_args = ['from_location', 'to_location?']
542
takes_options = ['revision', 'basis']
543
aliases = ['get', 'clone']
545
def run(self, from_location, to_location=None, revision=None, basis=None):
548
elif len(revision) > 1:
549
raise BzrCommandError(
550
'bzr branch --revision takes exactly 1 revision value')
552
br_from = Branch.open(from_location)
554
if e.errno == errno.ENOENT:
555
raise BzrCommandError('Source location "%s" does not'
556
' exist.' % to_location)
561
if basis is not None:
562
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
565
if len(revision) == 1 and revision[0] is not None:
566
revision_id = revision[0].in_history(br_from)[1]
568
# FIXME - wt.last_revision, fallback to branch, fall back to
569
# None or perhaps NULL_REVISION to mean copy nothing
571
revision_id = br_from.last_revision()
572
if to_location is None:
573
to_location = os.path.basename(from_location.rstrip("/\\"))
576
name = os.path.basename(to_location) + '\n'
578
os.mkdir(to_location)
580
if e.errno == errno.EEXIST:
581
raise BzrCommandError('Target directory "%s" already'
582
' exists.' % to_location)
583
if e.errno == errno.ENOENT:
584
raise BzrCommandError('Parent of "%s" does not exist.' %
589
# preserve whatever source format we have.
590
dir = br_from.bzrdir.sprout(to_location, revision_id, basis_dir)
591
branch = dir.open_branch()
592
except bzrlib.errors.NoSuchRevision:
594
msg = "The branch %s has no revision %s." % (from_location, revision[0])
595
raise BzrCommandError(msg)
596
except bzrlib.errors.UnlistableBranch:
598
msg = "The branch %s cannot be used as a --basis" % (basis,)
599
raise BzrCommandError(msg)
601
branch.control_files.put_utf8('branch-name', name)
603
note('Branched %d revision(s).' % branch.revno())
608
class cmd_checkout(Command):
609
"""Create a new checkout of an existing branch.
611
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
612
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
614
To retrieve the branch as of a particular revision, supply the --revision
615
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
616
out of date [so you cannot commit] but it may be useful (i.e. to examine old
619
--basis is to speed up checking out from remote branches. When specified, it
620
uses the inventory and file contents from the basis branch in preference to the
621
branch being checked out. [Not implemented yet.]
623
takes_args = ['branch_location', 'to_location?']
624
takes_options = ['revision', # , 'basis']
625
Option('lightweight',
626
help="perform a lightweight checkout. Lightweight "
627
"checkouts depend on access to the branch for "
628
"every operation. Normal checkouts can perform "
629
"common operations like diff and status without "
630
"such access, and also support local commits."
634
def run(self, branch_location, to_location=None, revision=None, basis=None,
638
elif len(revision) > 1:
639
raise BzrCommandError(
640
'bzr checkout --revision takes exactly 1 revision value')
641
source = Branch.open(branch_location)
642
if len(revision) == 1 and revision[0] is not None:
643
revision_id = revision[0].in_history(source)[1]
646
if to_location is None:
647
to_location = os.path.basename(branch_location.rstrip("/\\"))
649
os.mkdir(to_location)
651
if e.errno == errno.EEXIST:
652
raise BzrCommandError('Target directory "%s" already'
653
' exists.' % to_location)
654
if e.errno == errno.ENOENT:
655
raise BzrCommandError('Parent of "%s" does not exist.' %
659
old_format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
660
bzrlib.bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
663
checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
664
bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
666
checkout_branch = bzrlib.bzrdir.BzrDir.create_branch_convenience(
667
to_location, force_new_tree=False)
668
checkout = checkout_branch.bzrdir
669
checkout_branch.bind(source)
670
if revision_id is not None:
671
rh = checkout_branch.revision_history()
672
checkout_branch.set_revision_history(rh[:rh.index(revision_id) + 1])
673
checkout.create_workingtree(revision_id)
675
bzrlib.bzrdir.BzrDirFormat.set_default_format(old_format)
678
class cmd_renames(Command):
679
"""Show list of renamed files.
681
# TODO: Option to show renames between two historical versions.
683
# TODO: Only show renames under dir, rather than in the whole branch.
684
takes_args = ['dir?']
687
def run(self, dir=u'.'):
688
tree = WorkingTree.open_containing(dir)[0]
689
old_inv = tree.basis_tree().inventory
690
new_inv = tree.read_working_inventory()
692
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
694
for old_name, new_name in renames:
695
print "%s => %s" % (old_name, new_name)
698
class cmd_update(Command):
699
"""Update a tree to have the latest code committed to its branch.
701
This will perform a merge into the working tree, and may generate
702
conflicts. If you have any local changes, you will still
703
need to commit them after the update for the update to be complete.
705
If you want to discard your local changes, you can just do a
706
'bzr revert' instead of 'bzr commit' after the update.
708
takes_args = ['dir?']
710
def run(self, dir='.'):
711
tree = WorkingTree.open_containing(dir)[0]
714
if tree.last_revision() == tree.branch.last_revision():
715
# may be up to date, check master too.
716
master = tree.branch.get_master_branch()
717
if master is None or master.last_revision == tree.last_revision():
718
note("Tree is up to date.")
720
conflicts = tree.update()
721
note('Updated to revision %d.' %
722
(tree.branch.revision_id_to_revno(tree.last_revision()),))
731
class cmd_info(Command):
732
"""Show statistical information about a branch."""
733
takes_args = ['branch?']
736
def run(self, branch=None):
738
bzrlib.info.show_bzrdir_info(bzrdir.BzrDir.open_containing(branch)[0])
741
class cmd_remove(Command):
742
"""Make a file unversioned.
744
This makes bzr stop tracking changes to a versioned file. It does
745
not delete the working copy.
747
takes_args = ['file+']
748
takes_options = ['verbose']
751
def run(self, file_list, verbose=False):
752
tree, file_list = tree_files(file_list)
753
tree.remove(file_list, verbose=verbose)
756
class cmd_file_id(Command):
757
"""Print file_id of a particular file or directory.
759
The file_id is assigned when the file is first added and remains the
760
same through all revisions where the file exists, even when it is
764
takes_args = ['filename']
766
def run(self, filename):
767
tree, relpath = WorkingTree.open_containing(filename)
768
i = tree.inventory.path2id(relpath)
770
raise BzrError("%r is not a versioned file" % filename)
775
class cmd_file_path(Command):
776
"""Print path of file_ids to a file or directory.
778
This prints one line for each directory down to the target,
779
starting at the branch root."""
781
takes_args = ['filename']
783
def run(self, filename):
784
tree, relpath = WorkingTree.open_containing(filename)
786
fid = inv.path2id(relpath)
788
raise BzrError("%r is not a versioned file" % filename)
789
for fip in inv.get_idpath(fid):
793
class cmd_reconcile(Command):
794
"""Reconcile bzr metadata in a branch.
796
This can correct data mismatches that may have been caused by
797
previous ghost operations or bzr upgrades. You should only
798
need to run this command if 'bzr check' or a bzr developer
799
advises you to run it.
801
If a second branch is provided, cross-branch reconciliation is
802
also attempted, which will check that data like the tree root
803
id which was not present in very early bzr versions is represented
804
correctly in both branches.
806
At the same time it is run it may recompress data resulting in
807
a potential saving in disk space or performance gain.
809
The branch *MUST* be on a listable system such as local disk or sftp.
811
takes_args = ['branch?']
813
def run(self, branch="."):
814
from bzrlib.reconcile import reconcile
815
dir = bzrlib.bzrdir.BzrDir.open(branch)
819
class cmd_revision_history(Command):
820
"""Display list of revision ids on this branch."""
824
branch = WorkingTree.open_containing(u'.')[0].branch
825
for patchid in branch.revision_history():
829
class cmd_ancestry(Command):
830
"""List all revisions merged into this branch."""
834
tree = WorkingTree.open_containing(u'.')[0]
836
# FIXME. should be tree.last_revision
837
for revision_id in b.repository.get_ancestry(b.last_revision()):
841
class cmd_init(Command):
842
"""Make a directory into a versioned branch.
844
Use this to create an empty branch, or before importing an
847
Recipe for importing a tree of files:
852
bzr commit -m 'imported project'
854
takes_args = ['location?']
857
help='Create a specific format rather than the'
858
' current default format. Currently this '
859
' option only accepts =metadir',
860
type=get_format_type),
862
def run(self, location=None, format=None):
863
from bzrlib.branch import Branch
867
# The path has to exist to initialize a
868
# branch inside of it.
869
# Just using os.mkdir, since I don't
870
# believe that we want to create a bunch of
871
# locations if the user supplies an extended path
872
if not os.path.exists(location):
874
bzrdir.BzrDir.create_branch_convenience(location, format=format)
877
class cmd_init_repository(Command):
878
"""Create a shared repository to keep branches in."""
879
takes_args = ["location"]
880
takes_options = [Option('format',
881
help='Use a specific format rather than the'
882
' current default format. Currently this '
883
' option only accepts "metadir" and "knit"',
884
type=get_format_type)]
885
aliases = ["init-repo"]
886
def run(self, location, format=None):
887
from bzrlib.bzrdir import BzrDirMetaFormat1
888
from bzrlib.transport import get_transport
890
format = BzrDirMetaFormat1()
891
get_transport(location).mkdir('')
892
newdir = format.initialize(location)
893
repo = newdir.create_repository(shared=True)
894
repo.set_make_working_trees(False)
897
class cmd_diff(Command):
898
"""Show differences in working tree.
900
If files are listed, only the changes in those files are listed.
901
Otherwise, all changes for the tree are listed.
908
# TODO: Allow diff across branches.
909
# TODO: Option to use external diff command; could be GNU diff, wdiff,
910
# or a graphical diff.
912
# TODO: Python difflib is not exactly the same as unidiff; should
913
# either fix it up or prefer to use an external diff.
915
# TODO: If a directory is given, diff everything under that.
917
# TODO: Selected-file diff is inefficient and doesn't show you
920
# TODO: This probably handles non-Unix newlines poorly.
922
takes_args = ['file*']
923
takes_options = ['revision', 'diff-options']
924
aliases = ['di', 'dif']
927
def run(self, revision=None, file_list=None, diff_options=None):
928
from bzrlib.diff import diff_cmd_helper, show_diff_trees
930
tree1, file_list = internal_tree_files(file_list)
934
except FileInWrongBranch:
935
if len(file_list) != 2:
936
raise BzrCommandError("Files are in different branches")
938
tree1, file1 = WorkingTree.open_containing(file_list[0])
939
tree2, file2 = WorkingTree.open_containing(file_list[1])
940
if file1 != "" or file2 != "":
941
# FIXME diff those two files. rbc 20051123
942
raise BzrCommandError("Files are in different branches")
944
if revision is not None:
945
if tree2 is not None:
946
raise BzrCommandError("Can't specify -r with two branches")
947
if (len(revision) == 1) or (revision[1].spec is None):
948
return diff_cmd_helper(tree1, file_list, diff_options,
950
elif len(revision) == 2:
951
return diff_cmd_helper(tree1, file_list, diff_options,
952
revision[0], revision[1])
954
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
956
if tree2 is not None:
957
return show_diff_trees(tree1, tree2, sys.stdout,
958
specific_files=file_list,
959
external_diff_options=diff_options)
961
return diff_cmd_helper(tree1, file_list, diff_options)
964
class cmd_deleted(Command):
965
"""List files deleted in the working tree.
967
# TODO: Show files deleted since a previous revision, or
968
# between two revisions.
969
# TODO: Much more efficient way to do this: read in new
970
# directories with readdir, rather than stating each one. Same
971
# level of effort but possibly much less IO. (Or possibly not,
972
# if the directories are very large...)
974
def run(self, show_ids=False):
975
tree = WorkingTree.open_containing(u'.')[0]
976
old = tree.basis_tree()
977
for path, ie in old.inventory.iter_entries():
978
if not tree.has_id(ie.file_id):
980
print '%-50s %s' % (path, ie.file_id)
985
class cmd_modified(Command):
986
"""List files modified in working tree."""
990
from bzrlib.delta import compare_trees
992
tree = WorkingTree.open_containing(u'.')[0]
993
td = compare_trees(tree.basis_tree(), tree)
995
for path, id, kind, text_modified, meta_modified in td.modified:
1000
class cmd_added(Command):
1001
"""List files added in working tree."""
1005
wt = WorkingTree.open_containing(u'.')[0]
1006
basis_inv = wt.basis_tree().inventory
1009
if file_id in basis_inv:
1011
path = inv.id2path(file_id)
1012
if not os.access(bzrlib.osutils.abspath(path), os.F_OK):
1018
class cmd_root(Command):
1019
"""Show the tree root directory.
1021
The root is the nearest enclosing directory with a .bzr control
1023
takes_args = ['filename?']
1025
def run(self, filename=None):
1026
"""Print the branch root."""
1027
tree = WorkingTree.open_containing(filename)[0]
1031
class cmd_log(Command):
1032
"""Show log of this branch.
1034
To request a range of logs, you can use the command -r begin..end
1035
-r revision requests a specific revision, -r ..end or -r begin.. are
1039
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1041
takes_args = ['filename?']
1042
takes_options = [Option('forward',
1043
help='show from oldest to newest'),
1044
'timezone', 'verbose',
1045
'show-ids', 'revision',
1049
help='show revisions whose message matches this regexp',
1054
def run(self, filename=None, timezone='original',
1064
from bzrlib.log import log_formatter, show_log
1066
assert message is None or isinstance(message, basestring), \
1067
"invalid message argument %r" % message
1068
direction = (forward and 'forward') or 'reverse'
1073
# find the file id to log:
1075
dir, fp = bzrdir.BzrDir.open_containing(filename)
1076
b = dir.open_branch()
1080
inv = dir.open_workingtree().inventory
1081
except (errors.NotBranchError, errors.NotLocalUrl):
1082
# either no tree, or is remote.
1083
inv = b.basis_tree().inventory
1084
file_id = inv.path2id(fp)
1087
# FIXME ? log the current subdir only RBC 20060203
1088
dir, relpath = bzrdir.BzrDir.open_containing('.')
1089
b = dir.open_branch()
1091
if revision is None:
1094
elif len(revision) == 1:
1095
rev1 = rev2 = revision[0].in_history(b).revno
1096
elif len(revision) == 2:
1097
if revision[0].spec is None:
1098
# missing begin-range means first revision
1101
rev1 = revision[0].in_history(b).revno
1103
if revision[1].spec is None:
1104
# missing end-range means last known revision
1107
rev2 = revision[1].in_history(b).revno
1109
raise BzrCommandError('bzr log --revision takes one or two values.')
1111
# By this point, the revision numbers are converted to the +ve
1112
# form if they were supplied in the -ve form, so we can do
1113
# this comparison in relative safety
1115
(rev2, rev1) = (rev1, rev2)
1117
mutter('encoding log as %r', bzrlib.user_encoding)
1119
# use 'replace' so that we don't abort if trying to write out
1120
# in e.g. the default C locale.
1121
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
1123
if (log_format == None):
1124
default = bzrlib.config.BranchConfig(b).log_format()
1125
log_format = get_log_format(long=long, short=short, line=line, default=default)
1127
lf = log_formatter(log_format,
1130
show_timezone=timezone)
1136
direction=direction,
1137
start_revision=rev1,
1142
def get_log_format(long=False, short=False, line=False, default='long'):
1143
log_format = default
1147
log_format = 'short'
1153
class cmd_touching_revisions(Command):
1154
"""Return revision-ids which affected a particular file.
1156
A more user-friendly interface is "bzr log FILE"."""
1158
takes_args = ["filename"]
1160
def run(self, filename):
1161
tree, relpath = WorkingTree.open_containing(filename)
1163
inv = tree.read_working_inventory()
1164
file_id = inv.path2id(relpath)
1165
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1166
print "%6d %s" % (revno, what)
1169
class cmd_ls(Command):
1170
"""List files in a tree.
1172
# TODO: Take a revision or remote path and list that tree instead.
1174
takes_options = ['verbose', 'revision',
1175
Option('non-recursive',
1176
help='don\'t recurse into sub-directories'),
1178
help='Print all paths from the root of the branch.'),
1179
Option('unknown', help='Print unknown files'),
1180
Option('versioned', help='Print versioned files'),
1181
Option('ignored', help='Print ignored files'),
1183
Option('null', help='Null separate the files'),
1186
def run(self, revision=None, verbose=False,
1187
non_recursive=False, from_root=False,
1188
unknown=False, versioned=False, ignored=False,
1191
if verbose and null:
1192
raise BzrCommandError('Cannot set both --verbose and --null')
1193
all = not (unknown or versioned or ignored)
1195
selection = {'I':ignored, '?':unknown, 'V':versioned}
1197
tree, relpath = WorkingTree.open_containing(u'.')
1202
if revision is not None:
1203
tree = tree.branch.repository.revision_tree(
1204
revision[0].in_history(tree.branch).rev_id)
1205
for fp, fc, kind, fid, entry in tree.list_files():
1206
if fp.startswith(relpath):
1207
fp = fp[len(relpath):]
1208
if non_recursive and '/' in fp:
1210
if not all and not selection[fc]:
1213
kindch = entry.kind_character()
1214
print '%-8s %s%s' % (fc, fp, kindch)
1216
sys.stdout.write(fp)
1217
sys.stdout.write('\0')
1223
class cmd_unknowns(Command):
1224
"""List unknown files."""
1227
from bzrlib.osutils import quotefn
1228
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1232
class cmd_ignore(Command):
1233
"""Ignore a command or pattern.
1235
To remove patterns from the ignore list, edit the .bzrignore file.
1237
If the pattern contains a slash, it is compared to the whole path
1238
from the branch root. Otherwise, it is compared to only the last
1239
component of the path. To match a file only in the root directory,
1242
Ignore patterns are case-insensitive on case-insensitive systems.
1244
Note: wildcards must be quoted from the shell on Unix.
1247
bzr ignore ./Makefile
1248
bzr ignore '*.class'
1250
# TODO: Complain if the filename is absolute
1251
takes_args = ['name_pattern']
1253
def run(self, name_pattern):
1254
from bzrlib.atomicfile import AtomicFile
1257
tree, relpath = WorkingTree.open_containing(u'.')
1258
ifn = tree.abspath('.bzrignore')
1260
if os.path.exists(ifn):
1263
igns = f.read().decode('utf-8')
1269
# TODO: If the file already uses crlf-style termination, maybe
1270
# we should use that for the newly added lines?
1272
if igns and igns[-1] != '\n':
1274
igns += name_pattern + '\n'
1277
f = AtomicFile(ifn, 'wt')
1278
f.write(igns.encode('utf-8'))
1283
inv = tree.inventory
1284
if inv.path2id('.bzrignore'):
1285
mutter('.bzrignore is already versioned')
1287
mutter('need to make new .bzrignore file versioned')
1288
tree.add(['.bzrignore'])
1291
class cmd_ignored(Command):
1292
"""List ignored files and the patterns that matched them.
1294
See also: bzr ignore"""
1297
tree = WorkingTree.open_containing(u'.')[0]
1298
for path, file_class, kind, file_id, entry in tree.list_files():
1299
if file_class != 'I':
1301
## XXX: Slightly inefficient since this was already calculated
1302
pat = tree.is_ignored(path)
1303
print '%-50s %s' % (path, pat)
1306
class cmd_lookup_revision(Command):
1307
"""Lookup the revision-id from a revision-number
1310
bzr lookup-revision 33
1313
takes_args = ['revno']
1316
def run(self, revno):
1320
raise BzrCommandError("not a valid revision-number: %r" % revno)
1322
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1325
class cmd_export(Command):
1326
"""Export past revision to destination directory.
1328
If no revision is specified this exports the last committed revision.
1330
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1331
given, try to find the format with the extension. If no extension
1332
is found exports to a directory (equivalent to --format=dir).
1334
Root may be the top directory for tar, tgz and tbz2 formats. If none
1335
is given, the top directory will be the root name of the file.
1337
Note: export of tree with non-ascii filenames to zip is not supported.
1339
Supported formats Autodetected by extension
1340
----------------- -------------------------
1343
tbz2 .tar.bz2, .tbz2
1347
takes_args = ['dest']
1348
takes_options = ['revision', 'format', 'root']
1349
def run(self, dest, revision=None, format=None, root=None):
1351
from bzrlib.export import export
1352
tree = WorkingTree.open_containing(u'.')[0]
1354
if revision is None:
1355
# should be tree.last_revision FIXME
1356
rev_id = b.last_revision()
1358
if len(revision) != 1:
1359
raise BzrError('bzr export --revision takes exactly 1 argument')
1360
rev_id = revision[0].in_history(b).rev_id
1361
t = b.repository.revision_tree(rev_id)
1363
export(t, dest, format, root)
1364
except errors.NoSuchExportFormat, e:
1365
raise BzrCommandError('Unsupported export format: %s' % e.format)
1368
class cmd_cat(Command):
1369
"""Write a file's text from a previous revision."""
1371
takes_options = ['revision']
1372
takes_args = ['filename']
1375
def run(self, filename, revision=None):
1376
if revision is not None and len(revision) != 1:
1377
raise BzrCommandError("bzr cat --revision takes exactly one number")
1380
tree, relpath = WorkingTree.open_containing(filename)
1382
except NotBranchError:
1386
b, relpath = Branch.open_containing(filename)
1387
if revision is None:
1388
revision_id = b.last_revision()
1390
revision_id = revision[0].in_history(b).rev_id
1391
b.print_file(relpath, revision_id)
1394
class cmd_local_time_offset(Command):
1395
"""Show the offset in seconds from GMT to local time."""
1399
print bzrlib.osutils.local_time_offset()
1403
class cmd_commit(Command):
1404
"""Commit changes into a new revision.
1406
If no arguments are given, the entire tree is committed.
1408
If selected files are specified, only changes to those files are
1409
committed. If a directory is specified then the directory and everything
1410
within it is committed.
1412
A selected-file commit may fail in some cases where the committed
1413
tree would be invalid, such as trying to commit a file in a
1414
newly-added directory that is not itself committed.
1416
# TODO: Run hooks on tree to-be-committed, and after commit.
1418
# TODO: Strict commit that fails if there are deleted files.
1419
# (what does "deleted files" mean ??)
1421
# TODO: Give better message for -s, --summary, used by tla people
1423
# XXX: verbose currently does nothing
1425
takes_args = ['selected*']
1426
takes_options = ['message', 'verbose',
1428
help='commit even if nothing has changed'),
1429
Option('file', type=str,
1431
help='file containing commit message'),
1433
help="refuse to commit if there are unknown "
1434
"files in the working tree."),
1436
help="perform a local only commit in a bound "
1437
"branch. Such commits are not pushed to "
1438
"the master branch until a normal commit "
1442
aliases = ['ci', 'checkin']
1444
def run(self, message=None, file=None, verbose=True, selected_list=None,
1445
unchanged=False, strict=False, local=False):
1446
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1447
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1449
from bzrlib.msgeditor import edit_commit_message, \
1450
make_commit_message_template
1451
from tempfile import TemporaryFile
1454
# TODO: Need a blackbox test for invoking the external editor; may be
1455
# slightly problematic to run this cross-platform.
1457
# TODO: do more checks that the commit will succeed before
1458
# spending the user's valuable time typing a commit message.
1460
# TODO: if the commit *does* happen to fail, then save the commit
1461
# message to a temporary file where it can be recovered
1462
tree, selected_list = tree_files(selected_list)
1463
if local and not tree.branch.get_bound_location():
1464
raise errors.LocalRequiresBoundBranch()
1465
if message is None and not file:
1466
template = make_commit_message_template(tree, selected_list)
1467
message = edit_commit_message(template)
1469
raise BzrCommandError("please specify a commit message"
1470
" with either --message or --file")
1471
elif message and file:
1472
raise BzrCommandError("please specify either --message or --file")
1476
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1479
raise BzrCommandError("empty commit message specified")
1482
reporter = ReportCommitToLog()
1484
reporter = NullCommitReporter()
1487
tree.commit(message, specific_files=selected_list,
1488
allow_pointless=unchanged, strict=strict, local=local,
1490
except PointlessCommit:
1491
# FIXME: This should really happen before the file is read in;
1492
# perhaps prepare the commit; get the message; then actually commit
1493
raise BzrCommandError("no changes to commit",
1494
["use --unchanged to commit anyhow"])
1495
except ConflictsInTree:
1496
raise BzrCommandError("Conflicts detected in working tree. "
1497
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1498
except StrictCommitFailed:
1499
raise BzrCommandError("Commit refused because there are unknown "
1500
"files in the working tree.")
1501
except errors.BoundBranchOutOfDate, e:
1502
raise BzrCommandError(str(e)
1503
+ ' Either unbind, update, or'
1504
' pass --local to commit.')
1507
class cmd_check(Command):
1508
"""Validate consistency of branch history.
1510
This command checks various invariants about the branch storage to
1511
detect data corruption or bzr bugs.
1513
takes_args = ['branch?']
1514
takes_options = ['verbose']
1516
def run(self, branch=None, verbose=False):
1517
from bzrlib.check import check
1519
tree = WorkingTree.open_containing()[0]
1520
branch = tree.branch
1522
branch = Branch.open(branch)
1523
check(branch, verbose)
1526
class cmd_scan_cache(Command):
1529
from bzrlib.hashcache import HashCache
1535
print '%6d stats' % c.stat_count
1536
print '%6d in hashcache' % len(c._cache)
1537
print '%6d files removed from cache' % c.removed_count
1538
print '%6d hashes updated' % c.update_count
1539
print '%6d files changed too recently to cache' % c.danger_count
1545
class cmd_upgrade(Command):
1546
"""Upgrade branch storage to current format.
1548
The check command or bzr developers may sometimes advise you to run
1549
this command. When the default format has changed you may also be warned
1550
during other operations to upgrade.
1552
takes_args = ['url?']
1555
help='Upgrade to a specific format rather than the'
1556
' current default format. Currently this '
1557
' option only accepts =metadir',
1558
type=get_format_type),
1562
def run(self, url='.', format=None):
1563
from bzrlib.upgrade import upgrade
1564
upgrade(url, format)
1567
class cmd_whoami(Command):
1568
"""Show bzr user id."""
1569
takes_options = ['email']
1572
def run(self, email=False):
1574
b = WorkingTree.open_containing(u'.')[0].branch
1575
config = bzrlib.config.BranchConfig(b)
1576
except NotBranchError:
1577
config = bzrlib.config.GlobalConfig()
1580
print config.user_email()
1582
print config.username()
1585
class cmd_nick(Command):
1586
"""Print or set the branch nickname.
1588
If unset, the tree root directory name is used as the nickname
1589
To print the current nickname, execute with no argument.
1591
takes_args = ['nickname?']
1592
def run(self, nickname=None):
1593
branch = Branch.open_containing(u'.')[0]
1594
if nickname is None:
1595
self.printme(branch)
1597
branch.nick = nickname
1600
def printme(self, branch):
1604
class cmd_selftest(Command):
1605
"""Run internal test suite.
1607
This creates temporary test directories in the working directory,
1608
but not existing data is affected. These directories are deleted
1609
if the tests pass, or left behind to help in debugging if they
1610
fail and --keep-output is specified.
1612
If arguments are given, they are regular expressions that say
1613
which tests should run.
1615
If the global option '--no-plugins' is given, plugins are not loaded
1616
before running the selftests. This has two effects: features provided or
1617
modified by plugins will not be tested, and tests provided by plugins will
1622
bzr --no-plugins selftest -v
1624
# TODO: --list should give a list of all available tests
1626
# NB: this is used from the class without creating an instance, which is
1627
# why it does not have a self parameter.
1628
def get_transport_type(typestring):
1629
"""Parse and return a transport specifier."""
1630
if typestring == "sftp":
1631
from bzrlib.transport.sftp import SFTPAbsoluteServer
1632
return SFTPAbsoluteServer
1633
if typestring == "memory":
1634
from bzrlib.transport.memory import MemoryServer
1636
msg = "No known transport type %s. Supported types are: sftp\n" %\
1638
raise BzrCommandError(msg)
1641
takes_args = ['testspecs*']
1642
takes_options = ['verbose',
1643
Option('one', help='stop when one test fails'),
1644
Option('keep-output',
1645
help='keep output directories when tests fail'),
1647
help='Use a different transport by default '
1648
'throughout the test suite.',
1649
type=get_transport_type),
1652
def run(self, testspecs_list=None, verbose=False, one=False,
1653
keep_output=False, transport=None):
1655
from bzrlib.tests import selftest
1656
# we don't want progress meters from the tests to go to the
1657
# real output; and we don't want log messages cluttering up
1659
save_ui = bzrlib.ui.ui_factory
1660
bzrlib.trace.info('running tests...')
1662
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1663
if testspecs_list is not None:
1664
pattern = '|'.join(testspecs_list)
1667
result = selftest(verbose=verbose,
1669
stop_on_failure=one,
1670
keep_output=keep_output,
1671
transport=transport)
1673
bzrlib.trace.info('tests passed')
1675
bzrlib.trace.info('tests failed')
1676
return int(not result)
1678
bzrlib.ui.ui_factory = save_ui
1681
def _get_bzr_branch():
1682
"""If bzr is run from a branch, return Branch or None"""
1683
import bzrlib.errors
1684
from bzrlib.branch import Branch
1685
from bzrlib.osutils import abspath
1686
from os.path import dirname
1689
branch = Branch.open(dirname(abspath(dirname(__file__))))
1691
except bzrlib.errors.BzrError:
1696
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1697
# is bzrlib itself in a branch?
1698
branch = _get_bzr_branch()
1700
rh = branch.revision_history()
1702
print " bzr checkout, revision %d" % (revno,)
1703
print " nick: %s" % (branch.nick,)
1705
print " revid: %s" % (rh[-1],)
1706
print bzrlib.__copyright__
1707
print "http://bazaar-ng.org/"
1709
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1710
print "you may use, modify and redistribute it under the terms of the GNU"
1711
print "General Public License version 2 or later."
1714
class cmd_version(Command):
1715
"""Show version of bzr."""
1720
class cmd_rocks(Command):
1721
"""Statement of optimism."""
1725
print "it sure does!"
1728
class cmd_find_merge_base(Command):
1729
"""Find and print a base revision for merging two branches.
1731
# TODO: Options to specify revisions on either side, as if
1732
# merging only part of the history.
1733
takes_args = ['branch', 'other']
1737
def run(self, branch, other):
1738
from bzrlib.revision import common_ancestor, MultipleRevisionSources
1740
branch1 = Branch.open_containing(branch)[0]
1741
branch2 = Branch.open_containing(other)[0]
1743
history_1 = branch1.revision_history()
1744
history_2 = branch2.revision_history()
1746
last1 = branch1.last_revision()
1747
last2 = branch2.last_revision()
1749
source = MultipleRevisionSources(branch1.repository,
1752
base_rev_id = common_ancestor(last1, last2, source)
1754
print 'merge base is revision %s' % base_rev_id
1758
if base_revno is None:
1759
raise bzrlib.errors.UnrelatedBranches()
1761
print ' r%-6d in %s' % (base_revno, branch)
1763
other_revno = branch2.revision_id_to_revno(base_revid)
1765
print ' r%-6d in %s' % (other_revno, other)
1769
class cmd_merge(Command):
1770
"""Perform a three-way merge.
1772
The branch is the branch you will merge from. By default, it will
1773
merge the latest revision. If you specify a revision, that
1774
revision will be merged. If you specify two revisions, the first
1775
will be used as a BASE, and the second one as OTHER. Revision
1776
numbers are always relative to the specified branch.
1778
By default, bzr will try to merge in all new work from the other
1779
branch, automatically determining an appropriate base. If this
1780
fails, you may need to give an explicit base.
1782
Merge will do its best to combine the changes in two branches, but there
1783
are some kinds of problems only a human can fix. When it encounters those,
1784
it will mark a conflict. A conflict means that you need to fix something,
1785
before you should commit.
1787
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
1791
To merge the latest revision from bzr.dev
1792
bzr merge ../bzr.dev
1794
To merge changes up to and including revision 82 from bzr.dev
1795
bzr merge -r 82 ../bzr.dev
1797
To merge the changes introduced by 82, without previous changes:
1798
bzr merge -r 81..82 ../bzr.dev
1800
merge refuses to run if there are any uncommitted changes, unless
1803
takes_args = ['branch?']
1804
takes_options = ['revision', 'force', 'merge-type', 'reprocess',
1805
Option('show-base', help="Show base revision text in "
1808
def run(self, branch=None, revision=None, force=False, merge_type=None,
1809
show_base=False, reprocess=False):
1810
if merge_type is None:
1811
merge_type = Merge3Merger
1813
branch = WorkingTree.open_containing(u'.')[0].branch.get_parent()
1815
raise BzrCommandError("No merge location known or specified.")
1817
print "Using saved location: %s" % branch
1818
if revision is None or len(revision) < 1:
1820
other = [branch, -1]
1822
if len(revision) == 1:
1824
other_branch = Branch.open_containing(branch)[0]
1825
revno = revision[0].in_history(other_branch).revno
1826
other = [branch, revno]
1828
assert len(revision) == 2
1829
if None in revision:
1830
raise BzrCommandError(
1831
"Merge doesn't permit that revision specifier.")
1832
b = Branch.open_containing(branch)[0]
1834
base = [branch, revision[0].in_history(b).revno]
1835
other = [branch, revision[1].in_history(b).revno]
1836
pb = bzrlib.ui.ui_factory.nested_progress_bar()
1839
conflict_count = merge(other, base, check_clean=(not force),
1840
merge_type=merge_type,
1841
reprocess=reprocess,
1842
show_base=show_base,
1846
if conflict_count != 0:
1850
except bzrlib.errors.AmbiguousBase, e:
1851
m = ("sorry, bzr can't determine the right merge base yet\n"
1852
"candidates are:\n "
1853
+ "\n ".join(e.bases)
1855
"please specify an explicit base with -r,\n"
1856
"and (if you want) report this to the bzr developers\n")
1860
class cmd_remerge(Command):
1863
takes_args = ['file*']
1864
takes_options = ['merge-type', 'reprocess',
1865
Option('show-base', help="Show base revision text in "
1868
def run(self, file_list=None, merge_type=None, show_base=False,
1870
from bzrlib.merge import merge_inner, transform_tree
1871
if merge_type is None:
1872
merge_type = Merge3Merger
1873
tree, file_list = tree_files(file_list)
1876
pending_merges = tree.pending_merges()
1877
if len(pending_merges) != 1:
1878
raise BzrCommandError("Sorry, remerge only works after normal"
1879
+ " merges. Not cherrypicking or"
1881
repository = tree.branch.repository
1882
base_revision = common_ancestor(tree.branch.last_revision(),
1883
pending_merges[0], repository)
1884
base_tree = repository.revision_tree(base_revision)
1885
other_tree = repository.revision_tree(pending_merges[0])
1886
interesting_ids = None
1887
if file_list is not None:
1888
interesting_ids = set()
1889
for filename in file_list:
1890
file_id = tree.path2id(filename)
1892
raise NotVersionedError(filename)
1893
interesting_ids.add(file_id)
1894
if tree.kind(file_id) != "directory":
1897
for name, ie in tree.inventory.iter_entries(file_id):
1898
interesting_ids.add(ie.file_id)
1899
transform_tree(tree, tree.basis_tree(), interesting_ids)
1900
if file_list is None:
1901
restore_files = list(tree.iter_conflicts())
1903
restore_files = file_list
1904
for filename in restore_files:
1906
restore(tree.abspath(filename))
1907
except NotConflicted:
1909
conflicts = merge_inner(tree.branch, other_tree, base_tree,
1911
interesting_ids = interesting_ids,
1912
other_rev_id=pending_merges[0],
1913
merge_type=merge_type,
1914
show_base=show_base,
1915
reprocess=reprocess)
1923
class cmd_revert(Command):
1924
"""Reverse all changes since the last commit.
1926
Only versioned files are affected. Specify filenames to revert only
1927
those files. By default, any files that are changed will be backed up
1928
first. Backup files have a '~' appended to their name.
1930
takes_options = ['revision', 'no-backup']
1931
takes_args = ['file*']
1932
aliases = ['merge-revert']
1934
def run(self, revision=None, no_backup=False, file_list=None):
1935
from bzrlib.commands import parse_spec
1936
if file_list is not None:
1937
if len(file_list) == 0:
1938
raise BzrCommandError("No files specified")
1942
tree, file_list = tree_files(file_list)
1943
if revision is None:
1944
# FIXME should be tree.last_revision
1945
rev_id = tree.last_revision()
1946
elif len(revision) != 1:
1947
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
1949
rev_id = revision[0].in_history(tree.branch).rev_id
1950
pb = bzrlib.ui.ui_factory.nested_progress_bar()
1952
tree.revert(file_list,
1953
tree.branch.repository.revision_tree(rev_id),
1959
class cmd_assert_fail(Command):
1960
"""Test reporting of assertion failures"""
1963
assert False, "always fails"
1966
class cmd_help(Command):
1967
"""Show help on a command or other topic.
1969
For a list of all available commands, say 'bzr help commands'."""
1970
takes_options = [Option('long', 'show help on all commands')]
1971
takes_args = ['topic?']
1975
def run(self, topic=None, long=False):
1977
if topic is None and long:
1982
class cmd_shell_complete(Command):
1983
"""Show appropriate completions for context.
1985
For a list of all available commands, say 'bzr shell-complete'."""
1986
takes_args = ['context?']
1991
def run(self, context=None):
1992
import shellcomplete
1993
shellcomplete.shellcomplete(context)
1996
class cmd_fetch(Command):
1997
"""Copy in history from another branch but don't merge it.
1999
This is an internal method used for pull and merge."""
2001
takes_args = ['from_branch', 'to_branch']
2002
def run(self, from_branch, to_branch):
2003
from bzrlib.fetch import Fetcher
2004
from bzrlib.branch import Branch
2005
from_b = Branch.open(from_branch)
2006
to_b = Branch.open(to_branch)
2007
Fetcher(to_b, from_b)
2010
class cmd_missing(Command):
2011
"""Show unmerged/unpulled revisions between two branches.
2013
OTHER_BRANCH may be local or remote."""
2014
takes_args = ['other_branch?']
2015
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2017
'Display changes in the local branch only'),
2018
Option('theirs-only',
2019
'Display changes in the remote branch only'),
2028
def run(self, other_branch=None, reverse=False, mine_only=False,
2029
theirs_only=False, log_format=None, long=False, short=False, line=False,
2030
show_ids=False, verbose=False):
2031
from bzrlib.missing import find_unmerged, iter_log_data
2032
from bzrlib.log import log_formatter
2033
local_branch = bzrlib.branch.Branch.open_containing(u".")[0]
2034
parent = local_branch.get_parent()
2035
if other_branch is None:
2036
other_branch = parent
2037
if other_branch is None:
2038
raise BzrCommandError("No missing location known or specified.")
2039
print "Using last location: " + local_branch.get_parent()
2040
remote_branch = bzrlib.branch.Branch.open(other_branch)
2041
remote_branch.lock_read()
2043
local_branch.lock_write()
2045
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2046
if (log_format == None):
2047
default = bzrlib.config.BranchConfig(local_branch).log_format()
2048
log_format = get_log_format(long=long, short=short, line=line, default=default)
2049
lf = log_formatter(log_format, sys.stdout,
2051
show_timezone='original')
2052
if reverse is False:
2053
local_extra.reverse()
2054
remote_extra.reverse()
2055
if local_extra and not theirs_only:
2056
print "You have %d extra revision(s):" % len(local_extra)
2057
for data in iter_log_data(local_extra, local_branch.repository,
2060
printed_local = True
2062
printed_local = False
2063
if remote_extra and not mine_only:
2064
if printed_local is True:
2066
print "You are missing %d revision(s):" % len(remote_extra)
2067
for data in iter_log_data(remote_extra, remote_branch.repository,
2070
if not remote_extra and not local_extra:
2072
print "Branches are up to date."
2075
if parent is None and other_branch is not None:
2076
local_branch.set_parent(other_branch)
2079
local_branch.unlock()
2081
remote_branch.unlock()
2084
class cmd_plugins(Command):
2089
import bzrlib.plugin
2090
from inspect import getdoc
2091
for name, plugin in bzrlib.plugin.all_plugins().items():
2092
if hasattr(plugin, '__path__'):
2093
print plugin.__path__[0]
2094
elif hasattr(plugin, '__file__'):
2095
print plugin.__file__
2101
print '\t', d.split('\n')[0]
2104
class cmd_testament(Command):
2105
"""Show testament (signing-form) of a revision."""
2106
takes_options = ['revision', 'long']
2107
takes_args = ['branch?']
2109
def run(self, branch=u'.', revision=None, long=False):
2110
from bzrlib.testament import Testament
2111
b = WorkingTree.open_containing(branch)[0].branch
2114
if revision is None:
2115
rev_id = b.last_revision()
2117
rev_id = revision[0].in_history(b).rev_id
2118
t = Testament.from_revision(b.repository, rev_id)
2120
sys.stdout.writelines(t.as_text_lines())
2122
sys.stdout.write(t.as_short_text())
2127
class cmd_annotate(Command):
2128
"""Show the origin of each line in a file.
2130
This prints out the given file with an annotation on the left side
2131
indicating which revision, author and date introduced the change.
2133
If the origin is the same for a run of consecutive lines, it is
2134
shown only at the top, unless the --all option is given.
2136
# TODO: annotate directories; showing when each file was last changed
2137
# TODO: annotate a previous version of a file
2138
# TODO: if the working copy is modified, show annotations on that
2139
# with new uncommitted lines marked
2140
aliases = ['blame', 'praise']
2141
takes_args = ['filename']
2142
takes_options = [Option('all', help='show annotations on all lines'),
2143
Option('long', help='show date in annotations'),
2147
def run(self, filename, all=False, long=False):
2148
from bzrlib.annotate import annotate_file
2149
tree, relpath = WorkingTree.open_containing(filename)
2150
branch = tree.branch
2153
file_id = tree.inventory.path2id(relpath)
2154
tree = branch.repository.revision_tree(branch.last_revision())
2155
file_version = tree.inventory[file_id].revision
2156
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
2161
class cmd_re_sign(Command):
2162
"""Create a digital signature for an existing revision."""
2163
# TODO be able to replace existing ones.
2165
hidden = True # is this right ?
2166
takes_args = ['revision_id*']
2167
takes_options = ['revision']
2169
def run(self, revision_id_list=None, revision=None):
2170
import bzrlib.config as config
2171
import bzrlib.gpg as gpg
2172
if revision_id_list is not None and revision is not None:
2173
raise BzrCommandError('You can only supply one of revision_id or --revision')
2174
if revision_id_list is None and revision is None:
2175
raise BzrCommandError('You must supply either --revision or a revision_id')
2176
b = WorkingTree.open_containing(u'.')[0].branch
2177
gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
2178
if revision_id_list is not None:
2179
for revision_id in revision_id_list:
2180
b.repository.sign_revision(revision_id, gpg_strategy)
2181
elif revision is not None:
2182
if len(revision) == 1:
2183
revno, rev_id = revision[0].in_history(b)
2184
b.repository.sign_revision(rev_id, gpg_strategy)
2185
elif len(revision) == 2:
2186
# are they both on rh- if so we can walk between them
2187
# might be nice to have a range helper for arbitrary
2188
# revision paths. hmm.
2189
from_revno, from_revid = revision[0].in_history(b)
2190
to_revno, to_revid = revision[1].in_history(b)
2191
if to_revid is None:
2192
to_revno = b.revno()
2193
if from_revno is None or to_revno is None:
2194
raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2195
for revno in range(from_revno, to_revno + 1):
2196
b.repository.sign_revision(b.get_rev_id(revno),
2199
raise BzrCommandError('Please supply either one revision, or a range.')
2202
class cmd_bind(Command):
2203
"""Bind the current branch to a master branch.
2205
After binding, commits must succeed on the master branch
2206
before they are executed on the local one.
2209
takes_args = ['location']
2212
def run(self, location=None):
2213
b, relpath = Branch.open_containing(u'.')
2214
b_other = Branch.open(location)
2217
except DivergedBranches:
2218
raise BzrCommandError('These branches have diverged.'
2219
' Try merging, and then bind again.')
2222
class cmd_unbind(Command):
2223
"""Bind the current branch to its parent.
2225
After unbinding, the local branch is considered independent.
2232
b, relpath = Branch.open_containing(u'.')
2234
raise BzrCommandError('Local branch is not bound')
2237
class cmd_uncommit(bzrlib.commands.Command):
2238
"""Remove the last committed revision.
2240
By supplying the --all flag, it will not only remove the entry
2241
from revision_history, but also remove all of the entries in the
2244
--verbose will print out what is being removed.
2245
--dry-run will go through all the motions, but not actually
2248
In the future, uncommit will create a changeset, which can then
2252
# TODO: jam 20060108 Add an option to allow uncommit to remove
2253
# unreferenced information in 'branch-as-repostory' branches.
2254
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2255
# information in shared branches as well.
2256
takes_options = ['verbose', 'revision',
2257
Option('dry-run', help='Don\'t actually make changes'),
2258
Option('force', help='Say yes to all questions.')]
2259
takes_args = ['location?']
2262
def run(self, location=None,
2263
dry_run=False, verbose=False,
2264
revision=None, force=False):
2265
from bzrlib.branch import Branch
2266
from bzrlib.log import log_formatter
2268
from bzrlib.uncommit import uncommit
2270
if location is None:
2272
control, relpath = bzrdir.BzrDir.open_containing(location)
2273
b = control.open_branch()
2275
tree = control.open_workingtree()
2276
except (errors.NoWorkingTree, errors.NotLocalUrl):
2279
if revision is None:
2281
rev_id = b.last_revision()
2283
revno, rev_id = revision[0].in_history(b)
2285
print 'No revisions to uncommit.'
2287
for r in range(revno, b.revno()+1):
2288
rev_id = b.get_rev_id(r)
2289
lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
2290
lf.show(r, b.repository.get_revision(rev_id), None)
2293
print 'Dry-run, pretending to remove the above revisions.'
2295
val = raw_input('Press <enter> to continue')
2297
print 'The above revision(s) will be removed.'
2299
val = raw_input('Are you sure [y/N]? ')
2300
if val.lower() not in ('y', 'yes'):
2304
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
2308
class cmd_break_lock(Command):
2309
"""Break a dead lock on a repository, branch or working directory.
2311
CAUTION: Locks should only be broken when you are sure that the process
2312
holding the lock has been stopped.
2317
takes_args = ['location']
2318
takes_options = [Option('show',
2319
help="just show information on the lock, " \
2322
def run(self, location, show=False):
2323
d = bzrdir.BzrDir.open(location)
2324
repo = d.open_repository()
2325
if not repo.is_locked():
2326
raise errors.ObjectNotLocked(repo)
2329
# command-line interpretation helper for merge-related commands
2330
def merge(other_revision, base_revision,
2331
check_clean=True, ignore_zero=False,
2332
this_dir=None, backup_files=False, merge_type=Merge3Merger,
2333
file_list=None, show_base=False, reprocess=False,
2334
pb=DummyProgress()):
2335
"""Merge changes into a tree.
2338
list(path, revno) Base for three-way merge.
2339
If [None, None] then a base will be automatically determined.
2341
list(path, revno) Other revision for three-way merge.
2343
Directory to merge changes into; '.' by default.
2345
If true, this_dir must have no uncommitted changes before the
2347
ignore_zero - If true, suppress the "zero conflicts" message when
2348
there are no conflicts; should be set when doing something we expect
2349
to complete perfectly.
2350
file_list - If supplied, merge only changes to selected files.
2352
All available ancestors of other_revision and base_revision are
2353
automatically pulled into the branch.
2355
The revno may be -1 to indicate the last revision on the branch, which is
2358
This function is intended for use from the command line; programmatic
2359
clients might prefer to call merge.merge_inner(), which has less magic
2362
from bzrlib.merge import Merger
2363
if this_dir is None:
2365
this_tree = WorkingTree.open_containing(this_dir)[0]
2366
if show_base and not merge_type is Merge3Merger:
2367
raise BzrCommandError("Show-base is not supported for this merge"
2368
" type. %s" % merge_type)
2369
if reprocess and not merge_type is Merge3Merger:
2370
raise BzrCommandError("Reprocess is not supported for this merge"
2371
" type. %s" % merge_type)
2372
if reprocess and show_base:
2373
raise BzrCommandError("Cannot reprocess and show base.")
2375
merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2376
merger.pp = ProgressPhase("Merge phase", 5, pb)
2377
merger.pp.next_phase()
2378
merger.check_basis(check_clean)
2379
merger.set_other(other_revision)
2380
merger.pp.next_phase()
2381
merger.set_base(base_revision)
2382
if merger.base_rev_id == merger.other_rev_id:
2383
note('Nothing to do.')
2385
merger.backup_files = backup_files
2386
merger.merge_type = merge_type
2387
merger.set_interesting_files(file_list)
2388
merger.show_base = show_base
2389
merger.reprocess = reprocess
2390
conflicts = merger.do_merge()
2391
merger.set_pending()
2397
# these get imported and then picked up by the scan for cmd_*
2398
# TODO: Some more consistent way to split command definitions across files;
2399
# we do need to load at least some information about them to know of
2400
# aliases. ideally we would avoid loading the implementation until the
2401
# details were needed.
2402
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2403
from bzrlib.sign_my_commits import cmd_sign_my_commits
2404
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join
added
removed
bzrlib/builtins.py
