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"""
23
from shutil import rmtree
28
from bzrlib.branch import Branch
29
import bzrlib.bzrdir as bzrdir
30
from bzrlib.bundle.read_bundle import BundleReader
31
from bzrlib.bundle.apply_bundle import merge_bundle
32
from bzrlib.commands import Command, display_command
33
import bzrlib.errors as errors
34
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
35
NotBranchError, DivergedBranches, NotConflicted,
36
NoSuchFile, NoWorkingTree, FileInWrongBranch,
37
NotVersionedError, NotABundle)
38
from bzrlib.log import show_one_log
39
from bzrlib.merge import Merge3Merger
40
from bzrlib.option import Option
42
from bzrlib.progress import DummyProgress, ProgressPhase
43
from bzrlib.revision import common_ancestor
44
from bzrlib.revisionspec import RevisionSpec
46
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
47
from bzrlib.transport.local import LocalTransport
49
import bzrlib.urlutils as urlutils
50
from bzrlib.workingtree import WorkingTree
53
def tree_files(file_list, default_branch=u'.'):
55
return internal_tree_files(file_list, default_branch)
56
except FileInWrongBranch, e:
57
raise BzrCommandError("%s is not in the same branch as %s" %
58
(e.path, file_list[0]))
61
# XXX: Bad function name; should possibly also be a class method of
62
# WorkingTree rather than a function.
63
def internal_tree_files(file_list, default_branch=u'.'):
64
"""Convert command-line paths to a WorkingTree and relative paths.
66
This is typically used for command-line processors that take one or
67
more filenames, and infer the workingtree that contains them.
69
The filenames given are not required to exist.
71
:param file_list: Filenames to convert.
73
:param default_branch: Fallback tree path to use if file_list is empty or None.
75
:return: workingtree, [relative_paths]
77
if file_list is None or len(file_list) == 0:
78
return WorkingTree.open_containing(default_branch)[0], file_list
79
tree = WorkingTree.open_containing(file_list[0])[0]
81
for filename in file_list:
83
new_list.append(tree.relpath(filename))
84
except errors.PathNotChild:
85
raise FileInWrongBranch(tree.branch, filename)
89
def get_format_type(typestring):
90
"""Parse and return a format specifier."""
91
if typestring == "weave":
92
return bzrdir.BzrDirFormat6()
93
if typestring == "default":
94
return bzrdir.BzrDirMetaFormat1()
95
if typestring == "metaweave":
96
format = bzrdir.BzrDirMetaFormat1()
97
format.repository_format = bzrlib.repository.RepositoryFormat7()
99
if typestring == "knit":
100
format = bzrdir.BzrDirMetaFormat1()
101
format.repository_format = bzrlib.repository.RepositoryFormatKnit1()
103
msg = "Unknown bzr format %s. Current formats are: default, knit,\n" \
104
"metaweave and weave" % typestring
105
raise BzrCommandError(msg)
108
# TODO: Make sure no commands unconditionally use the working directory as a
109
# branch. If a filename argument is used, the first of them should be used to
110
# specify the branch. (Perhaps this can be factored out into some kind of
111
# Argument class, representing a file in a branch, where the first occurrence
114
class cmd_status(Command):
115
"""Display status summary.
117
This reports on versioned and unknown files, reporting them
118
grouped by state. Possible states are:
121
Versioned in the working copy but not in the previous revision.
124
Versioned in the previous revision but removed or deleted
128
Path of this file changed from the previous revision;
129
the text may also have changed. This includes files whose
130
parent directory was renamed.
133
Text has changed since the previous revision.
136
Nothing about this file has changed since the previous revision.
137
Only shown with --all.
140
Not versioned and not matching an ignore pattern.
142
To see ignored files use 'bzr ignored'. For details in the
143
changes to file texts, use 'bzr diff'.
145
If no arguments are specified, the status of the entire working
146
directory is shown. Otherwise, only the status of the specified
147
files or directories is reported. If a directory is given, status
148
is reported for everything inside that directory.
150
If a revision argument is given, the status is calculated against
151
that revision, or between two revisions if two are provided.
154
# TODO: --no-recurse, --recurse options
156
takes_args = ['file*']
157
takes_options = ['all', 'show-ids', 'revision']
158
aliases = ['st', 'stat']
160
encoding_type = 'replace'
163
def run(self, all=False, show_ids=False, file_list=None, revision=None):
164
from bzrlib.status import show_tree_status
166
tree, file_list = tree_files(file_list)
168
show_tree_status(tree, show_unchanged=all, show_ids=show_ids,
169
specific_files=file_list, revision=revision,
173
class cmd_cat_revision(Command):
174
"""Write out metadata for a revision.
176
The revision to print can either be specified by a specific
177
revision identifier, or you can use --revision.
181
takes_args = ['revision_id?']
182
takes_options = ['revision']
183
# cat-revision is more for frontends so should be exact
187
def run(self, revision_id=None, revision=None):
189
if revision_id is not None and revision is not None:
190
raise BzrCommandError('You can only supply one of revision_id or --revision')
191
if revision_id is None and revision is None:
192
raise BzrCommandError('You must supply either --revision or a revision_id')
193
b = WorkingTree.open_containing(u'.')[0].branch
195
# TODO: jam 20060112 should cat-revision always output utf-8?
196
if revision_id is not None:
197
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
198
elif revision is not None:
201
raise BzrCommandError('You cannot specify a NULL revision.')
202
revno, rev_id = rev.in_history(b)
203
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
206
class cmd_revno(Command):
207
"""Show current revision number.
209
This is equal to the number of revisions on this branch.
212
takes_args = ['location?']
215
def run(self, location=u'.'):
216
self.outf.write(str(Branch.open_containing(location)[0].revno()))
217
self.outf.write('\n')
220
class cmd_revision_info(Command):
221
"""Show revision number and revision id for a given revision identifier.
224
takes_args = ['revision_info*']
225
takes_options = ['revision']
228
def run(self, revision=None, revision_info_list=[]):
231
if revision is not None:
232
revs.extend(revision)
233
if revision_info_list is not None:
234
for rev in revision_info_list:
235
revs.append(RevisionSpec(rev))
237
raise BzrCommandError('You must supply a revision identifier')
239
b = WorkingTree.open_containing(u'.')[0].branch
242
revinfo = rev.in_history(b)
243
if revinfo.revno is None:
244
print ' %s' % revinfo.rev_id
246
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
249
class cmd_add(Command):
250
"""Add specified files or directories.
252
In non-recursive mode, all the named items are added, regardless
253
of whether they were previously ignored. A warning is given if
254
any of the named files are already versioned.
256
In recursive mode (the default), files are treated the same way
257
but the behaviour for directories is different. Directories that
258
are already versioned do not give a warning. All directories,
259
whether already versioned or not, are searched for files or
260
subdirectories that are neither versioned or ignored, and these
261
are added. This search proceeds recursively into versioned
262
directories. If no names are given '.' is assumed.
264
Therefore simply saying 'bzr add' will version all files that
265
are currently unknown.
267
Adding a file whose parent directory is not versioned will
268
implicitly add the parent, and so on up to the root. This means
269
you should never need to explicitly add a directory, they'll just
270
get added when you add a file in the directory.
272
--dry-run will show which files would be added, but not actually
275
takes_args = ['file*']
276
takes_options = ['no-recurse', 'dry-run', 'verbose']
277
encoding_type = 'replace'
279
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False):
282
action = bzrlib.add.AddAction(to_file=self.outf,
283
should_print=(not is_quiet()))
285
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
286
action=action, save=not dry_run)
289
for glob in sorted(ignored.keys()):
290
for path in ignored[glob]:
291
self.outf.write("ignored %s matching \"%s\"\n"
295
for glob, paths in ignored.items():
296
match_len += len(paths)
297
self.outf.write("ignored %d file(s).\n" % match_len)
298
self.outf.write("If you wish to add some of these files,"
299
" please add them by name.\n")
302
class cmd_mkdir(Command):
303
"""Create a new versioned directory.
305
This is equivalent to creating the directory and then adding it.
308
takes_args = ['dir+']
309
encoding_type = 'replace'
311
def run(self, dir_list):
314
wt, dd = WorkingTree.open_containing(d)
316
self.outf.write('added %s\n' % d)
319
class cmd_relpath(Command):
320
"""Show path of a file relative to root"""
322
takes_args = ['filename']
326
def run(self, filename):
327
# TODO: jam 20050106 Can relpath return a munged path if
328
# sys.stdout encoding cannot represent it?
329
tree, relpath = WorkingTree.open_containing(filename)
330
self.outf.write(relpath)
331
self.outf.write('\n')
334
class cmd_inventory(Command):
335
"""Show inventory of the current working copy or a revision.
337
It is possible to limit the output to a particular entry
338
type using the --kind option. For example; --kind file.
341
takes_options = ['revision', 'show-ids', 'kind']
344
def run(self, revision=None, show_ids=False, kind=None):
345
if kind and kind not in ['file', 'directory', 'symlink']:
346
raise BzrCommandError('invalid kind specified')
347
tree = WorkingTree.open_containing(u'.')[0]
349
inv = tree.read_working_inventory()
351
if len(revision) > 1:
352
raise BzrCommandError('bzr inventory --revision takes'
353
' exactly one revision identifier')
354
inv = tree.branch.repository.get_revision_inventory(
355
revision[0].in_history(tree.branch).rev_id)
357
for path, entry in inv.entries():
358
if kind and kind != entry.kind:
361
self.outf.write('%-50s %s\n' % (path, entry.file_id))
363
self.outf.write(path)
364
self.outf.write('\n')
367
class cmd_mv(Command):
368
"""Move or rename a file.
371
bzr mv OLDNAME NEWNAME
372
bzr mv SOURCE... DESTINATION
374
If the last argument is a versioned directory, all the other names
375
are moved into it. Otherwise, there must be exactly two arguments
376
and the file is changed to a new name, which must not already exist.
378
Files cannot be moved between branches.
381
takes_args = ['names*']
382
aliases = ['move', 'rename']
383
encoding_type = 'replace'
385
def run(self, names_list):
386
if len(names_list) < 2:
387
raise BzrCommandError("missing file argument")
388
tree, rel_names = tree_files(names_list)
390
if os.path.isdir(names_list[-1]):
391
# move into existing directory
392
for pair in tree.move(rel_names[:-1], rel_names[-1]):
393
self.outf.write("%s => %s\n" % pair)
395
if len(names_list) != 2:
396
raise BzrCommandError('to mv multiple files the destination '
397
'must be a versioned directory')
398
tree.rename_one(rel_names[0], rel_names[1])
399
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
402
class cmd_pull(Command):
403
"""Turn this branch into a mirror of another branch.
405
This command only works on branches that have not diverged. Branches are
406
considered diverged if the destination branch's most recent commit is one
407
that has not been merged (directly or indirectly) into the parent.
409
If branches have diverged, you can use 'bzr merge' to integrate the changes
410
from one into the other. Once one branch has merged, the other should
411
be able to pull it again.
413
If branches have diverged, you can use 'bzr merge' to pull the text changes
414
from one into the other. Once one branch has merged, the other should
415
be able to pull it again.
417
If you want to forget your local changes and just update your branch to
418
match the remote one, use pull --overwrite.
420
If there is no default location set, the first pull will set it. After
421
that, you can omit the location to use the default. To change the
422
default, use --remember.
425
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
426
takes_args = ['location?']
427
encoding_type = 'replace'
429
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
430
# FIXME: too much stuff is in the command class
432
tree_to = WorkingTree.open_containing(u'.')[0]
433
branch_to = tree_to.branch
434
except NoWorkingTree:
436
branch_to = Branch.open_containing(u'.')[0]
437
stored_loc = branch_to.get_parent()
439
if stored_loc is None:
440
raise BzrCommandError("No pull location known or specified.")
442
display_url = urlutils.unescape_for_display(stored_loc,
444
self.outf.write("Using saved location: %s\n" % display_url)
445
location = stored_loc
447
branch_from = Branch.open(location)
449
if branch_to.get_parent() is None or remember:
450
branch_to.set_parent(branch_from.base)
454
elif len(revision) == 1:
455
rev_id = revision[0].in_history(branch_from).rev_id
457
raise BzrCommandError('bzr pull --revision takes one value.')
459
old_rh = branch_to.revision_history()
460
if tree_to is not None:
461
count = tree_to.pull(branch_from, overwrite, rev_id)
463
count = branch_to.pull(branch_from, overwrite, rev_id)
464
note('%d revision(s) pulled.' % (count,))
467
new_rh = branch_to.revision_history()
470
from bzrlib.log import show_changed_revisions
471
show_changed_revisions(branch_to, old_rh, new_rh,
475
class cmd_push(Command):
476
"""Update a mirror of this branch.
478
The target branch will not have its working tree populated because this
479
is both expensive, and is not supported on remote file systems.
481
Some smart servers or protocols *may* put the working tree in place in
484
This command only works on branches that have not diverged. Branches are
485
considered diverged if the destination branch's most recent commit is one
486
that has not been merged (directly or indirectly) by the source branch.
488
If branches have diverged, you can use 'bzr push --overwrite' to replace
489
the other branch completely, discarding its unmerged changes.
491
If you want to ensure you have the different changes in the other branch,
492
do a merge (see bzr help merge) from the other branch, and commit that.
493
After that you will be able to do a push without '--overwrite'.
495
If there is no default push location set, the first push will set it.
496
After that, you can omit the location to use the default. To change the
497
default, use --remember.
500
takes_options = ['remember', 'overwrite', 'verbose',
501
Option('create-prefix',
502
help='Create the path leading up to the branch '
503
'if it does not already exist')]
504
takes_args = ['location?']
505
encoding_type = 'replace'
507
def run(self, location=None, remember=False, overwrite=False,
508
create_prefix=False, verbose=False):
509
# FIXME: Way too big! Put this into a function called from the
511
from bzrlib.transport import get_transport
513
br_from = Branch.open_containing('.')[0]
514
stored_loc = br_from.get_push_location()
516
if stored_loc is None:
517
raise BzrCommandError("No push location known or specified.")
519
display_url = urlutils.unescape_for_display(stored_loc,
521
self.outf.write("Using saved location: %s" % display_url)
522
location = stored_loc
524
transport = get_transport(location)
525
location_url = transport.base
526
if br_from.get_push_location() is None or remember:
527
br_from.set_push_location(location_url)
531
dir_to = bzrlib.bzrdir.BzrDir.open(location_url)
532
br_to = dir_to.open_branch()
533
except NotBranchError:
535
transport = transport.clone('..')
536
if not create_prefix:
538
relurl = transport.relpath(location_url)
539
mutter('creating directory %s => %s', location_url, relurl)
540
transport.mkdir(relurl)
542
raise BzrCommandError("Parent directory of %s "
543
"does not exist." % location)
545
current = transport.base
546
needed = [(transport, transport.relpath(location_url))]
549
transport, relpath = needed[-1]
550
transport.mkdir(relpath)
553
new_transport = transport.clone('..')
554
needed.append((new_transport,
555
new_transport.relpath(transport.base)))
556
if new_transport.base == transport.base:
557
raise BzrCommandError("Could not create "
559
dir_to = br_from.bzrdir.clone(location_url,
560
revision_id=br_from.last_revision())
561
br_to = dir_to.open_branch()
562
count = len(br_to.revision_history())
564
old_rh = br_to.revision_history()
567
tree_to = dir_to.open_workingtree()
568
except errors.NotLocalUrl:
569
warning('This transport does not update the working '
570
'tree of: %s' % (br_to.base,))
571
count = br_to.pull(br_from, overwrite)
572
except NoWorkingTree:
573
count = br_to.pull(br_from, overwrite)
575
count = tree_to.pull(br_from, overwrite)
576
except DivergedBranches:
577
raise BzrCommandError("These branches have diverged."
578
" Try a merge then push with overwrite.")
579
note('%d revision(s) pushed.' % (count,))
582
new_rh = br_to.revision_history()
585
from bzrlib.log import show_changed_revisions
586
show_changed_revisions(br_to, old_rh, new_rh,
590
class cmd_branch(Command):
591
"""Create a new copy of a branch.
593
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
594
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
596
To retrieve the branch as of a particular revision, supply the --revision
597
parameter, as in "branch foo/bar -r 5".
599
--basis is to speed up branching from remote branches. When specified, it
600
copies all the file-contents, inventory and revision data from the basis
601
branch before copying anything from the remote branch.
603
takes_args = ['from_location', 'to_location?']
604
takes_options = ['revision', 'basis']
605
aliases = ['get', 'clone']
607
def run(self, from_location, to_location=None, revision=None, basis=None):
608
from bzrlib.transport import get_transport
609
from bzrlib.osutils import rmtree
612
elif len(revision) > 1:
613
raise BzrCommandError(
614
'bzr branch --revision takes exactly 1 revision value')
616
br_from = Branch.open(from_location)
618
if e.errno == errno.ENOENT:
619
raise BzrCommandError('Source location "%s" does not'
620
' exist.' % to_location)
625
if basis is not None:
626
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
629
if len(revision) == 1 and revision[0] is not None:
630
revision_id = revision[0].in_history(br_from)[1]
632
# FIXME - wt.last_revision, fallback to branch, fall back to
633
# None or perhaps NULL_REVISION to mean copy nothing
635
revision_id = br_from.last_revision()
636
if to_location is None:
637
to_location = os.path.basename(from_location.rstrip("/\\"))
640
name = os.path.basename(to_location) + '\n'
642
to_transport = get_transport(to_location)
644
to_transport.mkdir('.')
645
except bzrlib.errors.FileExists:
646
raise BzrCommandError('Target directory "%s" already'
647
' exists.' % to_location)
648
except bzrlib.errors.NoSuchFile:
649
raise BzrCommandError('Parent of "%s" does not exist.' %
652
# preserve whatever source format we have.
653
dir = br_from.bzrdir.sprout(to_transport.base,
654
revision_id, basis_dir)
655
branch = dir.open_branch()
656
except bzrlib.errors.NoSuchRevision:
657
to_transport.delete_tree('.')
658
msg = "The branch %s has no revision %s." % (from_location, revision[0])
659
raise BzrCommandError(msg)
660
except bzrlib.errors.UnlistableBranch:
662
msg = "The branch %s cannot be used as a --basis" % (basis,)
663
raise BzrCommandError(msg)
665
branch.control_files.put_utf8('branch-name', name)
666
note('Branched %d revision(s).' % branch.revno())
671
class cmd_checkout(Command):
672
"""Create a new checkout of an existing branch.
674
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
675
the branch found in '.'. This is useful if you have removed the working tree
676
or if it was never created - i.e. if you pushed the branch to its current
679
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
680
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
682
To retrieve the branch as of a particular revision, supply the --revision
683
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
684
out of date [so you cannot commit] but it may be useful (i.e. to examine old
687
--basis is to speed up checking out from remote branches. When specified, it
688
uses the inventory and file contents from the basis branch in preference to the
689
branch being checked out.
691
takes_args = ['branch_location?', 'to_location?']
692
takes_options = ['revision', # , 'basis']
693
Option('lightweight',
694
help="perform a lightweight checkout. Lightweight "
695
"checkouts depend on access to the branch for "
696
"every operation. Normal checkouts can perform "
697
"common operations like diff and status without "
698
"such access, and also support local commits."
702
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
706
elif len(revision) > 1:
707
raise BzrCommandError(
708
'bzr checkout --revision takes exactly 1 revision value')
709
if branch_location is None:
710
branch_location = bzrlib.osutils.getcwd()
711
to_location = branch_location
712
source = Branch.open(branch_location)
713
if len(revision) == 1 and revision[0] is not None:
714
revision_id = revision[0].in_history(source)[1]
717
if to_location is None:
718
to_location = os.path.basename(branch_location.rstrip("/\\"))
719
# if the source and to_location are the same,
720
# and there is no working tree,
721
# then reconstitute a branch
722
if (bzrlib.osutils.abspath(to_location) ==
723
bzrlib.osutils.abspath(branch_location)):
725
source.bzrdir.open_workingtree()
726
except errors.NoWorkingTree:
727
source.bzrdir.create_workingtree()
730
os.mkdir(to_location)
732
if e.errno == errno.EEXIST:
733
raise BzrCommandError('Target directory "%s" already'
734
' exists.' % to_location)
735
if e.errno == errno.ENOENT:
736
raise BzrCommandError('Parent of "%s" does not exist.' %
740
old_format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
741
bzrlib.bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
744
checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
745
bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
747
checkout_branch = bzrlib.bzrdir.BzrDir.create_branch_convenience(
748
to_location, force_new_tree=False)
749
checkout = checkout_branch.bzrdir
750
checkout_branch.bind(source)
751
if revision_id is not None:
752
rh = checkout_branch.revision_history()
753
checkout_branch.set_revision_history(rh[:rh.index(revision_id) + 1])
754
checkout.create_workingtree(revision_id)
756
bzrlib.bzrdir.BzrDirFormat.set_default_format(old_format)
759
class cmd_renames(Command):
760
"""Show list of renamed files.
762
# TODO: Option to show renames between two historical versions.
764
# TODO: Only show renames under dir, rather than in the whole branch.
765
takes_args = ['dir?']
768
def run(self, dir=u'.'):
769
tree = WorkingTree.open_containing(dir)[0]
770
old_inv = tree.basis_tree().inventory
771
new_inv = tree.read_working_inventory()
773
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
775
for old_name, new_name in renames:
776
self.outf.write("%s => %s\n" % (old_name, new_name))
779
class cmd_update(Command):
780
"""Update a tree to have the latest code committed to its branch.
782
This will perform a merge into the working tree, and may generate
783
conflicts. If you have any local changes, you will still
784
need to commit them after the update for the update to be complete.
786
If you want to discard your local changes, you can just do a
787
'bzr revert' instead of 'bzr commit' after the update.
789
takes_args = ['dir?']
791
def run(self, dir='.'):
792
tree = WorkingTree.open_containing(dir)[0]
795
if tree.last_revision() == tree.branch.last_revision():
796
# may be up to date, check master too.
797
master = tree.branch.get_master_branch()
798
if master is None or master.last_revision == tree.last_revision():
799
note("Tree is up to date.")
801
conflicts = tree.update()
802
note('Updated to revision %d.' %
803
(tree.branch.revision_id_to_revno(tree.last_revision()),))
812
class cmd_info(Command):
813
"""Show information about a working tree, branch or repository.
815
This command will show all known locations and formats associated to the
816
tree, branch or repository. Statistical information is included with
819
Branches and working trees will also report any missing revisions.
821
takes_args = ['location?']
822
takes_options = ['verbose']
825
def run(self, location=None, verbose=False):
826
from bzrlib.info import show_bzrdir_info
827
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
831
class cmd_remove(Command):
832
"""Make a file unversioned.
834
This makes bzr stop tracking changes to a versioned file. It does
835
not delete the working copy.
837
You can specify one or more files, and/or --new. If you specify --new,
838
only 'added' files will be removed. If you specify both, then new files
839
in the specified directories will be removed. If the directories are
840
also new, they will also be removed.
842
takes_args = ['file*']
843
takes_options = ['verbose', Option('new', help='remove newly-added files')]
845
encoding_type = 'replace'
847
def run(self, file_list, verbose=False, new=False):
848
tree, file_list = tree_files(file_list)
850
if file_list is None:
851
raise BzrCommandError('Specify one or more files to remove, or'
854
from bzrlib.delta import compare_trees
855
added = [compare_trees(tree.basis_tree(), tree,
856
specific_files=file_list).added]
857
file_list = sorted([f[0] for f in added[0]], reverse=True)
858
if len(file_list) == 0:
859
raise BzrCommandError('No matching files.')
860
tree.remove(file_list, verbose=verbose, to_file=self.outf)
863
class cmd_file_id(Command):
864
"""Print file_id of a particular file or directory.
866
The file_id is assigned when the file is first added and remains the
867
same through all revisions where the file exists, even when it is
872
takes_args = ['filename']
875
def run(self, filename):
876
tree, relpath = WorkingTree.open_containing(filename)
877
i = tree.inventory.path2id(relpath)
879
raise BzrError("%r is not a versioned file" % filename)
881
self.outf.write(i + '\n')
884
class cmd_file_path(Command):
885
"""Print path of file_ids to a file or directory.
887
This prints one line for each directory down to the target,
888
starting at the branch root.
892
takes_args = ['filename']
895
def run(self, filename):
896
tree, relpath = WorkingTree.open_containing(filename)
898
fid = inv.path2id(relpath)
900
raise BzrError("%r is not a versioned file" % filename)
901
for fip in inv.get_idpath(fid):
902
self.outf.write(fip + '\n')
905
class cmd_reconcile(Command):
906
"""Reconcile bzr metadata in a branch.
908
This can correct data mismatches that may have been caused by
909
previous ghost operations or bzr upgrades. You should only
910
need to run this command if 'bzr check' or a bzr developer
911
advises you to run it.
913
If a second branch is provided, cross-branch reconciliation is
914
also attempted, which will check that data like the tree root
915
id which was not present in very early bzr versions is represented
916
correctly in both branches.
918
At the same time it is run it may recompress data resulting in
919
a potential saving in disk space or performance gain.
921
The branch *MUST* be on a listable system such as local disk or sftp.
923
takes_args = ['branch?']
925
def run(self, branch="."):
926
from bzrlib.reconcile import reconcile
927
dir = bzrlib.bzrdir.BzrDir.open(branch)
931
class cmd_revision_history(Command):
932
"""Display the list of revision ids on a branch."""
933
takes_args = ['location?']
938
def run(self, location="."):
939
branch = Branch.open_containing(location)[0]
940
for revid in branch.revision_history():
941
self.outf.write(revid)
942
self.outf.write('\n')
945
class cmd_ancestry(Command):
946
"""List all revisions merged into this branch."""
947
takes_args = ['location?']
952
def run(self, location="."):
954
wt = WorkingTree.open_containing(location)[0]
955
except errors.NoWorkingTree:
956
b = Branch.open(location)
957
last_revision = b.last_revision()
960
last_revision = wt.last_revision()
962
revision_ids = b.repository.get_ancestry(last_revision)
963
assert revision_ids[0] == None
965
for revision_id in revision_ids:
966
self.outf.write(revision_id + '\n')
969
class cmd_init(Command):
970
"""Make a directory into a versioned branch.
972
Use this to create an empty branch, or before importing an
975
If there is a repository in a parent directory of the location, then
976
the history of the branch will be stored in the repository. Otherwise
977
init creates a standalone branch which carries its own history in
980
If there is already a branch at the location but it has no working tree,
981
the tree can be populated with 'bzr checkout'.
983
Recipe for importing a tree of files:
988
bzr commit -m 'imported project'
990
takes_args = ['location?']
993
help='Specify a format for this branch. Current'
994
' formats are: default, knit, metaweave and'
995
' weave. Default is knit; metaweave and'
996
' weave are deprecated',
997
type=get_format_type),
999
def run(self, location=None, format=None):
1000
from bzrlib.branch import Branch
1002
format = get_format_type('default')
1003
if location is None:
1006
# The path has to exist to initialize a
1007
# branch inside of it.
1008
# Just using os.mkdir, since I don't
1009
# believe that we want to create a bunch of
1010
# locations if the user supplies an extended path
1011
if not os.path.exists(location):
1014
existing_bzrdir = bzrdir.BzrDir.open(location)
1015
except NotBranchError:
1016
# really a NotBzrDir error...
1017
bzrdir.BzrDir.create_branch_convenience(location, format=format)
1019
if existing_bzrdir.has_branch():
1020
if existing_bzrdir.has_workingtree():
1021
raise errors.AlreadyBranchError(location)
1023
raise errors.BranchExistsWithoutWorkingTree(location)
1025
existing_bzrdir.create_branch()
1026
existing_bzrdir.create_workingtree()
1029
class cmd_init_repository(Command):
1030
"""Create a shared repository to hold branches.
1032
New branches created under the repository directory will store their revisions
1033
in the repository, not in the branch directory, if the branch format supports
1039
bzr checkout --lightweight repo/trunk trunk-checkout
1043
takes_args = ["location"]
1044
takes_options = [Option('format',
1045
help='Specify a format for this repository.'
1046
' Current formats are: default, knit,'
1047
' metaweave and weave. Default is knit;'
1048
' metaweave and weave are deprecated',
1049
type=get_format_type),
1051
help='Allows branches in repository to have'
1053
aliases = ["init-repo"]
1054
def run(self, location, format=None, trees=False):
1055
from bzrlib.transport import get_transport
1057
format = get_format_type('default')
1058
transport = get_transport(location)
1059
if not transport.has('.'):
1061
newdir = format.initialize_on_transport(transport)
1062
repo = newdir.create_repository(shared=True)
1063
repo.set_make_working_trees(trees)
1066
class cmd_diff(Command):
1067
"""Show differences in working tree.
1069
If files are listed, only the changes in those files are listed.
1070
Otherwise, all changes for the tree are listed.
1072
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1073
produces patches suitable for "patch -p1".
1079
bzr diff --diff-prefix old/:new/
1080
bzr diff bzr.mine bzr.dev
1083
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1084
# or a graphical diff.
1086
# TODO: Python difflib is not exactly the same as unidiff; should
1087
# either fix it up or prefer to use an external diff.
1089
# TODO: Selected-file diff is inefficient and doesn't show you
1092
# TODO: This probably handles non-Unix newlines poorly.
1094
takes_args = ['file*']
1095
takes_options = ['revision', 'diff-options', 'prefix']
1096
aliases = ['di', 'dif']
1097
encoding_type = 'exact'
1100
def run(self, revision=None, file_list=None, diff_options=None,
1102
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1104
if (prefix is None) or (prefix == '0'):
1112
if not ':' in prefix:
1113
raise BzrError("--diff-prefix expects two values separated by a colon")
1114
old_label, new_label = prefix.split(":")
1117
tree1, file_list = internal_tree_files(file_list)
1121
except FileInWrongBranch:
1122
if len(file_list) != 2:
1123
raise BzrCommandError("Files are in different branches")
1125
tree1, file1 = WorkingTree.open_containing(file_list[0])
1126
tree2, file2 = WorkingTree.open_containing(file_list[1])
1127
if file1 != "" or file2 != "":
1128
# FIXME diff those two files. rbc 20051123
1129
raise BzrCommandError("Files are in different branches")
1131
if revision is not None:
1132
if tree2 is not None:
1133
raise BzrCommandError("Can't specify -r with two branches")
1134
if (len(revision) == 1) or (revision[1].spec is None):
1135
return diff_cmd_helper(tree1, file_list, diff_options,
1137
old_label=old_label, new_label=new_label)
1138
elif len(revision) == 2:
1139
return diff_cmd_helper(tree1, file_list, diff_options,
1140
revision[0], revision[1],
1141
old_label=old_label, new_label=new_label)
1143
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
1145
if tree2 is not None:
1146
return show_diff_trees(tree1, tree2, sys.stdout,
1147
specific_files=file_list,
1148
external_diff_options=diff_options,
1149
old_label=old_label, new_label=new_label)
1151
return diff_cmd_helper(tree1, file_list, diff_options,
1152
old_label=old_label, new_label=new_label)
1155
class cmd_deleted(Command):
1156
"""List files deleted in the working tree.
1158
# TODO: Show files deleted since a previous revision, or
1159
# between two revisions.
1160
# TODO: Much more efficient way to do this: read in new
1161
# directories with readdir, rather than stating each one. Same
1162
# level of effort but possibly much less IO. (Or possibly not,
1163
# if the directories are very large...)
1164
takes_options = ['show-ids']
1167
def run(self, show_ids=False):
1168
tree = WorkingTree.open_containing(u'.')[0]
1169
old = tree.basis_tree()
1170
for path, ie in old.inventory.iter_entries():
1171
if not tree.has_id(ie.file_id):
1172
self.outf.write(path)
1174
self.outf.write(' ')
1175
self.outf.write(ie.file_id)
1176
self.outf.write('\n')
1179
class cmd_modified(Command):
1180
"""List files modified in working tree."""
1184
from bzrlib.delta import compare_trees
1186
tree = WorkingTree.open_containing(u'.')[0]
1187
td = compare_trees(tree.basis_tree(), tree)
1189
for path, id, kind, text_modified, meta_modified in td.modified:
1190
self.outf.write(path + '\n')
1193
class cmd_added(Command):
1194
"""List files added in working tree."""
1198
wt = WorkingTree.open_containing(u'.')[0]
1199
basis_inv = wt.basis_tree().inventory
1202
if file_id in basis_inv:
1204
path = inv.id2path(file_id)
1205
if not os.access(bzrlib.osutils.abspath(path), os.F_OK):
1207
self.outf.write(path + '\n')
1210
class cmd_root(Command):
1211
"""Show the tree root directory.
1213
The root is the nearest enclosing directory with a .bzr control
1215
takes_args = ['filename?']
1217
def run(self, filename=None):
1218
"""Print the branch root."""
1219
tree = WorkingTree.open_containing(filename)[0]
1220
self.outf.write(tree.basedir + '\n')
1223
class cmd_log(Command):
1224
"""Show log of a branch, file, or directory.
1226
By default show the log of the branch containing the working directory.
1228
To request a range of logs, you can use the command -r begin..end
1229
-r revision requests a specific revision, -r ..end or -r begin.. are
1235
bzr log -r -10.. http://server/branch
1238
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1240
takes_args = ['location?']
1241
takes_options = [Option('forward',
1242
help='show from oldest to newest'),
1245
help='show files changed in each revision'),
1246
'show-ids', 'revision',
1250
help='show revisions whose message matches this regexp',
1254
encoding_type = 'replace'
1257
def run(self, location=None, timezone='original',
1267
from bzrlib.log import log_formatter, show_log
1268
assert message is None or isinstance(message, basestring), \
1269
"invalid message argument %r" % message
1270
direction = (forward and 'forward') or 'reverse'
1275
# find the file id to log:
1277
dir, fp = bzrdir.BzrDir.open_containing(location)
1278
b = dir.open_branch()
1282
inv = dir.open_workingtree().inventory
1283
except (errors.NotBranchError, errors.NotLocalUrl):
1284
# either no tree, or is remote.
1285
inv = b.basis_tree().inventory
1286
file_id = inv.path2id(fp)
1289
# FIXME ? log the current subdir only RBC 20060203
1290
dir, relpath = bzrdir.BzrDir.open_containing('.')
1291
b = dir.open_branch()
1293
if revision is None:
1296
elif len(revision) == 1:
1297
rev1 = rev2 = revision[0].in_history(b).revno
1298
elif len(revision) == 2:
1299
if revision[0].spec is None:
1300
# missing begin-range means first revision
1303
rev1 = revision[0].in_history(b).revno
1305
if revision[1].spec is None:
1306
# missing end-range means last known revision
1309
rev2 = revision[1].in_history(b).revno
1311
raise BzrCommandError('bzr log --revision takes one or two values.')
1313
# By this point, the revision numbers are converted to the +ve
1314
# form if they were supplied in the -ve form, so we can do
1315
# this comparison in relative safety
1317
(rev2, rev1) = (rev1, rev2)
1319
if (log_format == None):
1320
default = bzrlib.config.BranchConfig(b).log_format()
1321
log_format = get_log_format(long=long, short=short, line=line, default=default)
1322
lf = log_formatter(log_format,
1325
show_timezone=timezone)
1331
direction=direction,
1332
start_revision=rev1,
1337
def get_log_format(long=False, short=False, line=False, default='long'):
1338
log_format = default
1342
log_format = 'short'
1348
class cmd_touching_revisions(Command):
1349
"""Return revision-ids which affected a particular file.
1351
A more user-friendly interface is "bzr log FILE".
1355
takes_args = ["filename"]
1358
def run(self, filename):
1359
tree, relpath = WorkingTree.open_containing(filename)
1361
inv = tree.read_working_inventory()
1362
file_id = inv.path2id(relpath)
1363
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1364
self.outf.write("%6d %s\n" % (revno, what))
1367
class cmd_ls(Command):
1368
"""List files in a tree.
1370
# TODO: Take a revision or remote path and list that tree instead.
1372
takes_options = ['verbose', 'revision',
1373
Option('non-recursive',
1374
help='don\'t recurse into sub-directories'),
1376
help='Print all paths from the root of the branch.'),
1377
Option('unknown', help='Print unknown files'),
1378
Option('versioned', help='Print versioned files'),
1379
Option('ignored', help='Print ignored files'),
1381
Option('null', help='Null separate the files'),
1384
def run(self, revision=None, verbose=False,
1385
non_recursive=False, from_root=False,
1386
unknown=False, versioned=False, ignored=False,
1389
if verbose and null:
1390
raise BzrCommandError('Cannot set both --verbose and --null')
1391
all = not (unknown or versioned or ignored)
1393
selection = {'I':ignored, '?':unknown, 'V':versioned}
1395
tree, relpath = WorkingTree.open_containing(u'.')
1400
if revision is not None:
1401
tree = tree.branch.repository.revision_tree(
1402
revision[0].in_history(tree.branch).rev_id)
1404
for fp, fc, kind, fid, entry in tree.list_files():
1405
if fp.startswith(relpath):
1406
fp = fp[len(relpath):]
1407
if non_recursive and '/' in fp:
1409
if not all and not selection[fc]:
1412
kindch = entry.kind_character()
1413
self.outf.write('%-8s %s%s\n' % (fc, fp, kindch))
1415
self.outf.write(fp + '\0')
1418
self.outf.write(fp + '\n')
1421
class cmd_unknowns(Command):
1422
"""List unknown files."""
1425
from bzrlib.osutils import quotefn
1426
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1427
self.outf.write(quotefn(f) + '\n')
1430
class cmd_ignore(Command):
1431
"""Ignore a command or pattern.
1433
To remove patterns from the ignore list, edit the .bzrignore file.
1435
If the pattern contains a slash, it is compared to the whole path
1436
from the branch root. Otherwise, it is compared to only the last
1437
component of the path. To match a file only in the root directory,
1440
Ignore patterns are case-insensitive on case-insensitive systems.
1442
Note: wildcards must be quoted from the shell on Unix.
1445
bzr ignore ./Makefile
1446
bzr ignore '*.class'
1448
# TODO: Complain if the filename is absolute
1449
takes_args = ['name_pattern']
1451
def run(self, name_pattern):
1452
from bzrlib.atomicfile import AtomicFile
1455
tree, relpath = WorkingTree.open_containing(u'.')
1456
ifn = tree.abspath('.bzrignore')
1458
if os.path.exists(ifn):
1461
igns = f.read().decode('utf-8')
1467
# TODO: If the file already uses crlf-style termination, maybe
1468
# we should use that for the newly added lines?
1470
if igns and igns[-1] != '\n':
1472
igns += name_pattern + '\n'
1474
f = AtomicFile(ifn, 'wt')
1476
f.write(igns.encode('utf-8'))
1481
inv = tree.inventory
1482
if inv.path2id('.bzrignore'):
1483
mutter('.bzrignore is already versioned')
1485
mutter('need to make new .bzrignore file versioned')
1486
tree.add(['.bzrignore'])
1489
class cmd_ignored(Command):
1490
"""List ignored files and the patterns that matched them.
1492
See also: bzr ignore"""
1495
tree = WorkingTree.open_containing(u'.')[0]
1496
for path, file_class, kind, file_id, entry in tree.list_files():
1497
if file_class != 'I':
1499
## XXX: Slightly inefficient since this was already calculated
1500
pat = tree.is_ignored(path)
1501
print '%-50s %s' % (path, pat)
1504
class cmd_lookup_revision(Command):
1505
"""Lookup the revision-id from a revision-number
1508
bzr lookup-revision 33
1511
takes_args = ['revno']
1514
def run(self, revno):
1518
raise BzrCommandError("not a valid revision-number: %r" % revno)
1520
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1523
class cmd_export(Command):
1524
"""Export past revision to destination directory.
1526
If no revision is specified this exports the last committed revision.
1528
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1529
given, try to find the format with the extension. If no extension
1530
is found exports to a directory (equivalent to --format=dir).
1532
Root may be the top directory for tar, tgz and tbz2 formats. If none
1533
is given, the top directory will be the root name of the file.
1535
Note: export of tree with non-ascii filenames to zip is not supported.
1537
Supported formats Autodetected by extension
1538
----------------- -------------------------
1541
tbz2 .tar.bz2, .tbz2
1545
takes_args = ['dest']
1546
takes_options = ['revision', 'format', 'root']
1547
def run(self, dest, revision=None, format=None, root=None):
1549
from bzrlib.export import export
1550
tree = WorkingTree.open_containing(u'.')[0]
1552
if revision is None:
1553
# should be tree.last_revision FIXME
1554
rev_id = b.last_revision()
1556
if len(revision) != 1:
1557
raise BzrError('bzr export --revision takes exactly 1 argument')
1558
rev_id = revision[0].in_history(b).rev_id
1559
t = b.repository.revision_tree(rev_id)
1561
export(t, dest, format, root)
1562
except errors.NoSuchExportFormat, e:
1563
raise BzrCommandError('Unsupported export format: %s' % e.format)
1566
class cmd_cat(Command):
1567
"""Write a file's text from a previous revision."""
1569
takes_options = ['revision']
1570
takes_args = ['filename']
1573
def run(self, filename, revision=None):
1574
if revision is not None and len(revision) != 1:
1575
raise BzrCommandError("bzr cat --revision takes exactly one number")
1578
tree, relpath = WorkingTree.open_containing(filename)
1580
except NotBranchError:
1584
b, relpath = Branch.open_containing(filename)
1585
if revision is None:
1586
revision_id = b.last_revision()
1588
revision_id = revision[0].in_history(b).rev_id
1589
b.print_file(relpath, revision_id)
1592
class cmd_local_time_offset(Command):
1593
"""Show the offset in seconds from GMT to local time."""
1597
print bzrlib.osutils.local_time_offset()
1601
class cmd_commit(Command):
1602
"""Commit changes into a new revision.
1604
If no arguments are given, the entire tree is committed.
1606
If selected files are specified, only changes to those files are
1607
committed. If a directory is specified then the directory and everything
1608
within it is committed.
1610
A selected-file commit may fail in some cases where the committed
1611
tree would be invalid, such as trying to commit a file in a
1612
newly-added directory that is not itself committed.
1614
# TODO: Run hooks on tree to-be-committed, and after commit.
1616
# TODO: Strict commit that fails if there are deleted files.
1617
# (what does "deleted files" mean ??)
1619
# TODO: Give better message for -s, --summary, used by tla people
1621
# XXX: verbose currently does nothing
1623
takes_args = ['selected*']
1624
takes_options = ['message', 'verbose',
1626
help='commit even if nothing has changed'),
1627
Option('file', type=str,
1629
help='file containing commit message'),
1631
help="refuse to commit if there are unknown "
1632
"files in the working tree."),
1634
help="perform a local only commit in a bound "
1635
"branch. Such commits are not pushed to "
1636
"the master branch until a normal commit "
1640
aliases = ['ci', 'checkin']
1642
def run(self, message=None, file=None, verbose=True, selected_list=None,
1643
unchanged=False, strict=False, local=False):
1644
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1645
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1647
from bzrlib.msgeditor import edit_commit_message, \
1648
make_commit_message_template
1649
from tempfile import TemporaryFile
1651
# TODO: Need a blackbox test for invoking the external editor; may be
1652
# slightly problematic to run this cross-platform.
1654
# TODO: do more checks that the commit will succeed before
1655
# spending the user's valuable time typing a commit message.
1657
# TODO: if the commit *does* happen to fail, then save the commit
1658
# message to a temporary file where it can be recovered
1659
tree, selected_list = tree_files(selected_list)
1660
if selected_list == ['']:
1661
# workaround - commit of root of tree should be exactly the same
1662
# as just default commit in that tree, and succeed even though
1663
# selected-file merge commit is not done yet
1666
if local and not tree.branch.get_bound_location():
1667
raise errors.LocalRequiresBoundBranch()
1668
if message is None and not file:
1669
template = make_commit_message_template(tree, selected_list)
1670
message = edit_commit_message(template)
1672
raise BzrCommandError("please specify a commit message"
1673
" with either --message or --file")
1674
elif message and file:
1675
raise BzrCommandError("please specify either --message or --file")
1678
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1681
raise BzrCommandError("empty commit message specified")
1684
reporter = ReportCommitToLog()
1686
reporter = NullCommitReporter()
1689
tree.commit(message, specific_files=selected_list,
1690
allow_pointless=unchanged, strict=strict, local=local,
1692
except PointlessCommit:
1693
# FIXME: This should really happen before the file is read in;
1694
# perhaps prepare the commit; get the message; then actually commit
1695
raise BzrCommandError("no changes to commit",
1696
["use --unchanged to commit anyhow"])
1697
except ConflictsInTree:
1698
raise BzrCommandError("Conflicts detected in working tree. "
1699
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1700
except StrictCommitFailed:
1701
raise BzrCommandError("Commit refused because there are unknown "
1702
"files in the working tree.")
1703
except errors.BoundBranchOutOfDate, e:
1704
raise BzrCommandError(str(e)
1705
+ ' Either unbind, update, or'
1706
' pass --local to commit.')
1709
class cmd_check(Command):
1710
"""Validate consistency of branch history.
1712
This command checks various invariants about the branch storage to
1713
detect data corruption or bzr bugs.
1715
takes_args = ['branch?']
1716
takes_options = ['verbose']
1718
def run(self, branch=None, verbose=False):
1719
from bzrlib.check import check
1721
tree = WorkingTree.open_containing()[0]
1722
branch = tree.branch
1724
branch = Branch.open(branch)
1725
check(branch, verbose)
1728
class cmd_scan_cache(Command):
1731
from bzrlib.hashcache import HashCache
1737
print '%6d stats' % c.stat_count
1738
print '%6d in hashcache' % len(c._cache)
1739
print '%6d files removed from cache' % c.removed_count
1740
print '%6d hashes updated' % c.update_count
1741
print '%6d files changed too recently to cache' % c.danger_count
1747
class cmd_upgrade(Command):
1748
"""Upgrade branch storage to current format.
1750
The check command or bzr developers may sometimes advise you to run
1751
this command. When the default format has changed you may also be warned
1752
during other operations to upgrade.
1754
takes_args = ['url?']
1757
help='Upgrade to a specific format. Current formats'
1758
' are: default, knit, metaweave and weave.'
1759
' Default is knit; metaweave and weave are'
1761
type=get_format_type),
1765
def run(self, url='.', format=None):
1766
from bzrlib.upgrade import upgrade
1768
format = get_format_type('default')
1769
upgrade(url, format)
1772
class cmd_whoami(Command):
1773
"""Show bzr user id."""
1774
takes_options = ['email']
1777
def run(self, email=False):
1779
b = WorkingTree.open_containing(u'.')[0].branch
1780
config = bzrlib.config.BranchConfig(b)
1781
except NotBranchError:
1782
config = bzrlib.config.GlobalConfig()
1785
print config.user_email()
1787
print config.username()
1790
class cmd_nick(Command):
1791
"""Print or set the branch nickname.
1793
If unset, the tree root directory name is used as the nickname
1794
To print the current nickname, execute with no argument.
1796
takes_args = ['nickname?']
1797
def run(self, nickname=None):
1798
branch = Branch.open_containing(u'.')[0]
1799
if nickname is None:
1800
self.printme(branch)
1802
branch.nick = nickname
1805
def printme(self, branch):
1809
class cmd_selftest(Command):
1810
"""Run internal test suite.
1812
This creates temporary test directories in the working directory,
1813
but not existing data is affected. These directories are deleted
1814
if the tests pass, or left behind to help in debugging if they
1815
fail and --keep-output is specified.
1817
If arguments are given, they are regular expressions that say
1818
which tests should run.
1820
If the global option '--no-plugins' is given, plugins are not loaded
1821
before running the selftests. This has two effects: features provided or
1822
modified by plugins will not be tested, and tests provided by plugins will
1827
bzr --no-plugins selftest -v
1829
# TODO: --list should give a list of all available tests
1831
# NB: this is used from the class without creating an instance, which is
1832
# why it does not have a self parameter.
1833
def get_transport_type(typestring):
1834
"""Parse and return a transport specifier."""
1835
if typestring == "sftp":
1836
from bzrlib.transport.sftp import SFTPAbsoluteServer
1837
return SFTPAbsoluteServer
1838
if typestring == "memory":
1839
from bzrlib.transport.memory import MemoryServer
1841
if typestring == "fakenfs":
1842
from bzrlib.transport.fakenfs import FakeNFSServer
1843
return FakeNFSServer
1844
msg = "No known transport type %s. Supported types are: sftp\n" %\
1846
raise BzrCommandError(msg)
1849
takes_args = ['testspecs*']
1850
takes_options = ['verbose',
1851
Option('one', help='stop when one test fails'),
1852
Option('keep-output',
1853
help='keep output directories when tests fail'),
1855
help='Use a different transport by default '
1856
'throughout the test suite.',
1857
type=get_transport_type),
1858
Option('benchmark', help='run the bzr bencharks.'),
1859
Option('lsprof-timed',
1860
help='generate lsprof output for benchmarked'
1861
' sections of code.'),
1864
def run(self, testspecs_list=None, verbose=None, one=False,
1865
keep_output=False, transport=None, benchmark=None,
1868
from bzrlib.tests import selftest
1869
import bzrlib.benchmarks as benchmarks
1870
# we don't want progress meters from the tests to go to the
1871
# real output; and we don't want log messages cluttering up
1873
save_ui = bzrlib.ui.ui_factory
1874
print '%10s: %s' % ('bzr', bzrlib.osutils.realpath(sys.argv[0]))
1875
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
1877
bzrlib.trace.info('running tests...')
1879
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1880
if testspecs_list is not None:
1881
pattern = '|'.join(testspecs_list)
1885
test_suite_factory = benchmarks.test_suite
1889
test_suite_factory = None
1892
result = selftest(verbose=verbose,
1894
stop_on_failure=one,
1895
keep_output=keep_output,
1896
transport=transport,
1897
test_suite_factory=test_suite_factory,
1898
lsprof_timed=lsprof_timed)
1900
bzrlib.trace.info('tests passed')
1902
bzrlib.trace.info('tests failed')
1903
return int(not result)
1905
bzrlib.ui.ui_factory = save_ui
1908
def _get_bzr_branch():
1909
"""If bzr is run from a branch, return Branch or None"""
1910
import bzrlib.errors
1911
from bzrlib.branch import Branch
1912
from bzrlib.osutils import abspath
1913
from os.path import dirname
1916
branch = Branch.open(dirname(abspath(dirname(__file__))))
1918
except bzrlib.errors.BzrError:
1923
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1924
# is bzrlib itself in a branch?
1925
branch = _get_bzr_branch()
1927
rh = branch.revision_history()
1929
print " bzr checkout, revision %d" % (revno,)
1930
print " nick: %s" % (branch.nick,)
1932
print " revid: %s" % (rh[-1],)
1933
print "Using python interpreter:", sys.executable
1935
print "Using python standard library:", os.path.dirname(site.__file__)
1936
print "Using bzrlib:",
1937
if len(bzrlib.__path__) > 1:
1938
# print repr, which is a good enough way of making it clear it's
1939
# more than one element (eg ['/foo/bar', '/foo/bzr'])
1940
print repr(bzrlib.__path__)
1942
print bzrlib.__path__[0]
1945
print bzrlib.__copyright__
1946
print "http://bazaar-vcs.org/"
1948
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1949
print "you may use, modify and redistribute it under the terms of the GNU"
1950
print "General Public License version 2 or later."
1953
class cmd_version(Command):
1954
"""Show version of bzr."""
1959
class cmd_rocks(Command):
1960
"""Statement of optimism."""
1964
print "it sure does!"
1967
class cmd_find_merge_base(Command):
1968
"""Find and print a base revision for merging two branches.
1970
# TODO: Options to specify revisions on either side, as if
1971
# merging only part of the history.
1972
takes_args = ['branch', 'other']
1976
def run(self, branch, other):
1977
from bzrlib.revision import common_ancestor, MultipleRevisionSources
1979
branch1 = Branch.open_containing(branch)[0]
1980
branch2 = Branch.open_containing(other)[0]
1982
history_1 = branch1.revision_history()
1983
history_2 = branch2.revision_history()
1985
last1 = branch1.last_revision()
1986
last2 = branch2.last_revision()
1988
source = MultipleRevisionSources(branch1.repository,
1991
base_rev_id = common_ancestor(last1, last2, source)
1993
print 'merge base is revision %s' % base_rev_id
1997
if base_revno is None:
1998
raise bzrlib.errors.UnrelatedBranches()
2000
print ' r%-6d in %s' % (base_revno, branch)
2002
other_revno = branch2.revision_id_to_revno(base_revid)
2004
print ' r%-6d in %s' % (other_revno, other)
2008
class cmd_merge(Command):
2009
"""Perform a three-way merge.
2011
The branch is the branch you will merge from. By default, it will
2012
merge the latest revision. If you specify a revision, that
2013
revision will be merged. If you specify two revisions, the first
2014
will be used as a BASE, and the second one as OTHER. Revision
2015
numbers are always relative to the specified branch.
2017
By default, bzr will try to merge in all new work from the other
2018
branch, automatically determining an appropriate base. If this
2019
fails, you may need to give an explicit base.
2021
Merge will do its best to combine the changes in two branches, but there
2022
are some kinds of problems only a human can fix. When it encounters those,
2023
it will mark a conflict. A conflict means that you need to fix something,
2024
before you should commit.
2026
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2028
If there is no default branch set, the first merge will set it. After
2029
that, you can omit the branch to use the default. To change the
2030
default, use --remember.
2034
To merge the latest revision from bzr.dev
2035
bzr merge ../bzr.dev
2037
To merge changes up to and including revision 82 from bzr.dev
2038
bzr merge -r 82 ../bzr.dev
2040
To merge the changes introduced by 82, without previous changes:
2041
bzr merge -r 81..82 ../bzr.dev
2043
merge refuses to run if there are any uncommitted changes, unless
2046
The following merge types are available:
2048
takes_args = ['branch?']
2049
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2050
Option('show-base', help="Show base revision text in "
2054
from merge import merge_type_help
2055
from inspect import getdoc
2056
return getdoc(self) + '\n' + merge_type_help()
2058
def run(self, branch=None, revision=None, force=False, merge_type=None,
2059
show_base=False, reprocess=False, remember=False):
2060
if merge_type is None:
2061
merge_type = Merge3Merger
2063
tree = WorkingTree.open_containing(u'.')[0]
2066
if branch is not None:
2067
reader = BundleReader(file(branch, 'rb'))
2071
if e.errno not in (errno.ENOENT, errno.EISDIR):
2076
if reader is not None:
2077
conflicts = merge_bundle(reader, tree, not force, merge_type,
2078
reprocess, show_base)
2084
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2086
if revision is None or len(revision) < 1:
2088
other = [branch, -1]
2089
other_branch, path = Branch.open_containing(branch)
2091
if len(revision) == 1:
2093
other_branch, path = Branch.open_containing(branch)
2094
revno = revision[0].in_history(other_branch).revno
2095
other = [branch, revno]
2097
assert len(revision) == 2
2098
if None in revision:
2099
raise BzrCommandError(
2100
"Merge doesn't permit that revision specifier.")
2101
other_branch, path = Branch.open_containing(branch)
2103
base = [branch, revision[0].in_history(other_branch).revno]
2104
other = [branch, revision[1].in_history(other_branch).revno]
2106
if tree.branch.get_parent() is None or remember:
2107
tree.branch.set_parent(other_branch.base)
2110
interesting_files = [path]
2112
interesting_files = None
2113
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2116
conflict_count = merge(other, base, check_clean=(not force),
2117
merge_type=merge_type,
2118
reprocess=reprocess,
2119
show_base=show_base,
2120
pb=pb, file_list=interesting_files)
2123
if conflict_count != 0:
2127
except bzrlib.errors.AmbiguousBase, e:
2128
m = ("sorry, bzr can't determine the right merge base yet\n"
2129
"candidates are:\n "
2130
+ "\n ".join(e.bases)
2132
"please specify an explicit base with -r,\n"
2133
"and (if you want) report this to the bzr developers\n")
2136
# TODO: move up to common parent; this isn't merge-specific anymore.
2137
def _get_remembered_parent(self, tree, supplied_location, verb_string):
2138
"""Use tree.branch's parent if none was supplied.
2140
Report if the remembered location was used.
2142
if supplied_location is not None:
2143
return supplied_location
2144
stored_location = tree.branch.get_parent()
2145
mutter("%s", stored_location)
2146
if stored_location is None:
2147
raise BzrCommandError("No location specified or remembered")
2148
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2149
self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2150
return stored_location
2153
class cmd_remerge(Command):
2156
Use this if you want to try a different merge technique while resolving
2157
conflicts. Some merge techniques are better than others, and remerge
2158
lets you try different ones on different files.
2160
The options for remerge have the same meaning and defaults as the ones for
2161
merge. The difference is that remerge can (only) be run when there is a
2162
pending merge, and it lets you specify particular files.
2165
$ bzr remerge --show-base
2166
Re-do the merge of all conflicted files, and show the base text in
2167
conflict regions, in addition to the usual THIS and OTHER texts.
2169
$ bzr remerge --merge-type weave --reprocess foobar
2170
Re-do the merge of "foobar", using the weave merge algorithm, with
2171
additional processing to reduce the size of conflict regions.
2173
The following merge types are available:"""
2174
takes_args = ['file*']
2175
takes_options = ['merge-type', 'reprocess',
2176
Option('show-base', help="Show base revision text in "
2180
from merge import merge_type_help
2181
from inspect import getdoc
2182
return getdoc(self) + '\n' + merge_type_help()
2184
def run(self, file_list=None, merge_type=None, show_base=False,
2186
from bzrlib.merge import merge_inner, transform_tree
2187
if merge_type is None:
2188
merge_type = Merge3Merger
2189
tree, file_list = tree_files(file_list)
2192
pending_merges = tree.pending_merges()
2193
if len(pending_merges) != 1:
2194
raise BzrCommandError("Sorry, remerge only works after normal"
2195
+ " merges. Not cherrypicking or"
2197
repository = tree.branch.repository
2198
base_revision = common_ancestor(tree.branch.last_revision(),
2199
pending_merges[0], repository)
2200
base_tree = repository.revision_tree(base_revision)
2201
other_tree = repository.revision_tree(pending_merges[0])
2202
interesting_ids = None
2203
if file_list is not None:
2204
interesting_ids = set()
2205
for filename in file_list:
2206
file_id = tree.path2id(filename)
2208
raise NotVersionedError(filename)
2209
interesting_ids.add(file_id)
2210
if tree.kind(file_id) != "directory":
2213
for name, ie in tree.inventory.iter_entries(file_id):
2214
interesting_ids.add(ie.file_id)
2215
transform_tree(tree, tree.basis_tree(), interesting_ids)
2216
if file_list is None:
2217
restore_files = list(tree.iter_conflicts())
2219
restore_files = file_list
2220
for filename in restore_files:
2222
restore(tree.abspath(filename))
2223
except NotConflicted:
2225
conflicts = merge_inner(tree.branch, other_tree, base_tree,
2227
interesting_ids = interesting_ids,
2228
other_rev_id=pending_merges[0],
2229
merge_type=merge_type,
2230
show_base=show_base,
2231
reprocess=reprocess)
2239
class cmd_revert(Command):
2240
"""Reverse all changes since the last commit.
2242
Only versioned files are affected. Specify filenames to revert only
2243
those files. By default, any files that are changed will be backed up
2244
first. Backup files have a '~' appended to their name.
2246
takes_options = ['revision', 'no-backup']
2247
takes_args = ['file*']
2248
aliases = ['merge-revert']
2250
def run(self, revision=None, no_backup=False, file_list=None):
2251
from bzrlib.commands import parse_spec
2252
if file_list is not None:
2253
if len(file_list) == 0:
2254
raise BzrCommandError("No files specified")
2258
tree, file_list = tree_files(file_list)
2259
if revision is None:
2260
# FIXME should be tree.last_revision
2261
rev_id = tree.last_revision()
2262
elif len(revision) != 1:
2263
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
2265
rev_id = revision[0].in_history(tree.branch).rev_id
2266
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2268
tree.revert(file_list,
2269
tree.branch.repository.revision_tree(rev_id),
2275
class cmd_assert_fail(Command):
2276
"""Test reporting of assertion failures"""
2279
assert False, "always fails"
2282
class cmd_help(Command):
2283
"""Show help on a command or other topic.
2285
For a list of all available commands, say 'bzr help commands'."""
2286
takes_options = [Option('long', 'show help on all commands')]
2287
takes_args = ['topic?']
2288
aliases = ['?', '--help', '-?', '-h']
2291
def run(self, topic=None, long=False):
2293
if topic is None and long:
2298
class cmd_shell_complete(Command):
2299
"""Show appropriate completions for context.
2301
For a list of all available commands, say 'bzr shell-complete'."""
2302
takes_args = ['context?']
2307
def run(self, context=None):
2308
import shellcomplete
2309
shellcomplete.shellcomplete(context)
2312
class cmd_fetch(Command):
2313
"""Copy in history from another branch but don't merge it.
2315
This is an internal method used for pull and merge."""
2317
takes_args = ['from_branch', 'to_branch']
2318
def run(self, from_branch, to_branch):
2319
from bzrlib.fetch import Fetcher
2320
from bzrlib.branch import Branch
2321
from_b = Branch.open(from_branch)
2322
to_b = Branch.open(to_branch)
2323
Fetcher(to_b, from_b)
2326
class cmd_missing(Command):
2327
"""Show unmerged/unpulled revisions between two branches.
2329
OTHER_BRANCH may be local or remote."""
2330
takes_args = ['other_branch?']
2331
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2333
'Display changes in the local branch only'),
2334
Option('theirs-only',
2335
'Display changes in the remote branch only'),
2344
def run(self, other_branch=None, reverse=False, mine_only=False,
2345
theirs_only=False, log_format=None, long=False, short=False, line=False,
2346
show_ids=False, verbose=False):
2347
from bzrlib.missing import find_unmerged, iter_log_data
2348
from bzrlib.log import log_formatter
2349
local_branch = bzrlib.branch.Branch.open_containing(u".")[0]
2350
parent = local_branch.get_parent()
2351
if other_branch is None:
2352
other_branch = parent
2353
if other_branch is None:
2354
raise BzrCommandError("No missing location known or specified.")
2355
print "Using last location: " + local_branch.get_parent()
2356
remote_branch = bzrlib.branch.Branch.open(other_branch)
2357
if remote_branch.base == local_branch.base:
2358
remote_branch = local_branch
2359
local_branch.lock_read()
2361
remote_branch.lock_read()
2363
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2364
if (log_format == None):
2365
default = bzrlib.config.BranchConfig(local_branch).log_format()
2366
log_format = get_log_format(long=long, short=short, line=line, default=default)
2367
lf = log_formatter(log_format, sys.stdout,
2369
show_timezone='original')
2370
if reverse is False:
2371
local_extra.reverse()
2372
remote_extra.reverse()
2373
if local_extra and not theirs_only:
2374
print "You have %d extra revision(s):" % len(local_extra)
2375
for data in iter_log_data(local_extra, local_branch.repository,
2378
printed_local = True
2380
printed_local = False
2381
if remote_extra and not mine_only:
2382
if printed_local is True:
2384
print "You are missing %d revision(s):" % len(remote_extra)
2385
for data in iter_log_data(remote_extra, remote_branch.repository,
2388
if not remote_extra and not local_extra:
2390
print "Branches are up to date."
2394
remote_branch.unlock()
2396
local_branch.unlock()
2397
if not status_code and parent is None and other_branch is not None:
2398
local_branch.lock_write()
2400
# handle race conditions - a parent might be set while we run.
2401
if local_branch.get_parent() is None:
2402
local_branch.set_parent(remote_branch.base)
2404
local_branch.unlock()
2408
class cmd_plugins(Command):
2413
import bzrlib.plugin
2414
from inspect import getdoc
2415
for name, plugin in bzrlib.plugin.all_plugins().items():
2416
if hasattr(plugin, '__path__'):
2417
print plugin.__path__[0]
2418
elif hasattr(plugin, '__file__'):
2419
print plugin.__file__
2425
print '\t', d.split('\n')[0]
2428
class cmd_testament(Command):
2429
"""Show testament (signing-form) of a revision."""
2430
takes_options = ['revision', 'long']
2431
takes_args = ['branch?']
2433
def run(self, branch=u'.', revision=None, long=False):
2434
from bzrlib.testament import Testament
2435
b = WorkingTree.open_containing(branch)[0].branch
2438
if revision is None:
2439
rev_id = b.last_revision()
2441
rev_id = revision[0].in_history(b).rev_id
2442
t = Testament.from_revision(b.repository, rev_id)
2444
sys.stdout.writelines(t.as_text_lines())
2446
sys.stdout.write(t.as_short_text())
2451
class cmd_annotate(Command):
2452
"""Show the origin of each line in a file.
2454
This prints out the given file with an annotation on the left side
2455
indicating which revision, author and date introduced the change.
2457
If the origin is the same for a run of consecutive lines, it is
2458
shown only at the top, unless the --all option is given.
2460
# TODO: annotate directories; showing when each file was last changed
2461
# TODO: if the working copy is modified, show annotations on that
2462
# with new uncommitted lines marked
2463
aliases = ['blame', 'praise']
2464
takes_args = ['filename']
2465
takes_options = [Option('all', help='show annotations on all lines'),
2466
Option('long', help='show date in annotations'),
2471
def run(self, filename, all=False, long=False, revision=None):
2472
from bzrlib.annotate import annotate_file
2473
tree, relpath = WorkingTree.open_containing(filename)
2474
branch = tree.branch
2477
if revision is None:
2478
revision_id = branch.last_revision()
2479
elif len(revision) != 1:
2480
raise BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2482
revision_id = revision[0].in_history(branch).rev_id
2483
file_id = tree.inventory.path2id(relpath)
2484
tree = branch.repository.revision_tree(revision_id)
2485
file_version = tree.inventory[file_id].revision
2486
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
2491
class cmd_re_sign(Command):
2492
"""Create a digital signature for an existing revision."""
2493
# TODO be able to replace existing ones.
2495
hidden = True # is this right ?
2496
takes_args = ['revision_id*']
2497
takes_options = ['revision']
2499
def run(self, revision_id_list=None, revision=None):
2500
import bzrlib.config as config
2501
import bzrlib.gpg as gpg
2502
if revision_id_list is not None and revision is not None:
2503
raise BzrCommandError('You can only supply one of revision_id or --revision')
2504
if revision_id_list is None and revision is None:
2505
raise BzrCommandError('You must supply either --revision or a revision_id')
2506
b = WorkingTree.open_containing(u'.')[0].branch
2507
gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
2508
if revision_id_list is not None:
2509
for revision_id in revision_id_list:
2510
b.repository.sign_revision(revision_id, gpg_strategy)
2511
elif revision is not None:
2512
if len(revision) == 1:
2513
revno, rev_id = revision[0].in_history(b)
2514
b.repository.sign_revision(rev_id, gpg_strategy)
2515
elif len(revision) == 2:
2516
# are they both on rh- if so we can walk between them
2517
# might be nice to have a range helper for arbitrary
2518
# revision paths. hmm.
2519
from_revno, from_revid = revision[0].in_history(b)
2520
to_revno, to_revid = revision[1].in_history(b)
2521
if to_revid is None:
2522
to_revno = b.revno()
2523
if from_revno is None or to_revno is None:
2524
raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2525
for revno in range(from_revno, to_revno + 1):
2526
b.repository.sign_revision(b.get_rev_id(revno),
2529
raise BzrCommandError('Please supply either one revision, or a range.')
2532
class cmd_bind(Command):
2533
"""Bind the current branch to a master branch.
2535
After binding, commits must succeed on the master branch
2536
before they are executed on the local one.
2539
takes_args = ['location']
2542
def run(self, location=None):
2543
b, relpath = Branch.open_containing(u'.')
2544
b_other = Branch.open(location)
2547
except DivergedBranches:
2548
raise BzrCommandError('These branches have diverged.'
2549
' Try merging, and then bind again.')
2552
class cmd_unbind(Command):
2553
"""Unbind the current branch from its master branch.
2555
After unbinding, the local branch is considered independent.
2556
All subsequent commits will be local.
2563
b, relpath = Branch.open_containing(u'.')
2565
raise BzrCommandError('Local branch is not bound')
2568
class cmd_uncommit(bzrlib.commands.Command):
2569
"""Remove the last committed revision.
2571
--verbose will print out what is being removed.
2572
--dry-run will go through all the motions, but not actually
2575
In the future, uncommit will create a revision bundle, which can then
2579
# TODO: jam 20060108 Add an option to allow uncommit to remove
2580
# unreferenced information in 'branch-as-repository' branches.
2581
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2582
# information in shared branches as well.
2583
takes_options = ['verbose', 'revision',
2584
Option('dry-run', help='Don\'t actually make changes'),
2585
Option('force', help='Say yes to all questions.')]
2586
takes_args = ['location?']
2589
def run(self, location=None,
2590
dry_run=False, verbose=False,
2591
revision=None, force=False):
2592
from bzrlib.branch import Branch
2593
from bzrlib.log import log_formatter
2595
from bzrlib.uncommit import uncommit
2597
if location is None:
2599
control, relpath = bzrdir.BzrDir.open_containing(location)
2601
tree = control.open_workingtree()
2603
except (errors.NoWorkingTree, errors.NotLocalUrl):
2605
b = control.open_branch()
2607
if revision is None:
2609
rev_id = b.last_revision()
2611
revno, rev_id = revision[0].in_history(b)
2613
print 'No revisions to uncommit.'
2615
for r in range(revno, b.revno()+1):
2616
rev_id = b.get_rev_id(r)
2617
lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
2618
lf.show(r, b.repository.get_revision(rev_id), None)
2621
print 'Dry-run, pretending to remove the above revisions.'
2623
val = raw_input('Press <enter> to continue')
2625
print 'The above revision(s) will be removed.'
2627
val = raw_input('Are you sure [y/N]? ')
2628
if val.lower() not in ('y', 'yes'):
2632
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
2636
class cmd_break_lock(Command):
2637
"""Break a dead lock on a repository, branch or working directory.
2639
CAUTION: Locks should only be broken when you are sure that the process
2640
holding the lock has been stopped.
2642
You can get information on what locks are open via the 'bzr info' command.
2647
takes_args = ['location?']
2649
def run(self, location=None, show=False):
2650
if location is None:
2652
control, relpath = bzrdir.BzrDir.open_containing(location)
2654
control.break_lock()
2655
except NotImplementedError:
2660
# command-line interpretation helper for merge-related commands
2661
def merge(other_revision, base_revision,
2662
check_clean=True, ignore_zero=False,
2663
this_dir=None, backup_files=False, merge_type=Merge3Merger,
2664
file_list=None, show_base=False, reprocess=False,
2665
pb=DummyProgress()):
2666
"""Merge changes into a tree.
2669
list(path, revno) Base for three-way merge.
2670
If [None, None] then a base will be automatically determined.
2672
list(path, revno) Other revision for three-way merge.
2674
Directory to merge changes into; '.' by default.
2676
If true, this_dir must have no uncommitted changes before the
2678
ignore_zero - If true, suppress the "zero conflicts" message when
2679
there are no conflicts; should be set when doing something we expect
2680
to complete perfectly.
2681
file_list - If supplied, merge only changes to selected files.
2683
All available ancestors of other_revision and base_revision are
2684
automatically pulled into the branch.
2686
The revno may be -1 to indicate the last revision on the branch, which is
2689
This function is intended for use from the command line; programmatic
2690
clients might prefer to call merge.merge_inner(), which has less magic
2693
from bzrlib.merge import Merger
2694
if this_dir is None:
2696
this_tree = WorkingTree.open_containing(this_dir)[0]
2697
if show_base and not merge_type is Merge3Merger:
2698
raise BzrCommandError("Show-base is not supported for this merge"
2699
" type. %s" % merge_type)
2700
if reprocess and not merge_type.supports_reprocess:
2701
raise BzrCommandError("Conflict reduction is not supported for merge"
2702
" type %s." % merge_type)
2703
if reprocess and show_base:
2704
raise BzrCommandError("Cannot do conflict reduction and show base.")
2706
merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2707
merger.pp = ProgressPhase("Merge phase", 5, pb)
2708
merger.pp.next_phase()
2709
merger.check_basis(check_clean)
2710
merger.set_other(other_revision)
2711
merger.pp.next_phase()
2712
merger.set_base(base_revision)
2713
if merger.base_rev_id == merger.other_rev_id:
2714
note('Nothing to do.')
2716
merger.backup_files = backup_files
2717
merger.merge_type = merge_type
2718
merger.set_interesting_files(file_list)
2719
merger.show_base = show_base
2720
merger.reprocess = reprocess
2721
conflicts = merger.do_merge()
2722
if file_list is None:
2723
merger.set_pending()
2729
# these get imported and then picked up by the scan for cmd_*
2730
# TODO: Some more consistent way to split command definitions across files;
2731
# we do need to load at least some information about them to know of
2732
# aliases. ideally we would avoid loading the implementation until the
2733
# details were needed.
2734
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2735
from bzrlib.bundle.commands import cmd_bundle_revisions
2736
from bzrlib.sign_my_commits import cmd_sign_my_commits
2737
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
2738
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
