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 import read_bundle_from_url
31
from bzrlib.bundle.read_bundle import BundleReader
32
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
33
from bzrlib.commands import Command, display_command
34
import bzrlib.errors as errors
35
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
36
NotBranchError, DivergedBranches, NotConflicted,
37
NoSuchFile, NoWorkingTree, FileInWrongBranch,
38
NotVersionedError, NotABundle)
39
from bzrlib.log import show_one_log
40
from bzrlib.merge import Merge3Merger
41
from bzrlib.option import Option
43
from bzrlib.progress import DummyProgress, ProgressPhase
44
from bzrlib.revision import common_ancestor
45
from bzrlib.revisionspec import RevisionSpec
47
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
48
from bzrlib.transport.local import LocalTransport
50
import bzrlib.urlutils as urlutils
51
from bzrlib.workingtree import WorkingTree
54
def tree_files(file_list, default_branch=u'.'):
56
return internal_tree_files(file_list, default_branch)
57
except FileInWrongBranch, e:
58
raise BzrCommandError("%s is not in the same branch as %s" %
59
(e.path, file_list[0]))
62
# XXX: Bad function name; should possibly also be a class method of
63
# WorkingTree rather than a function.
64
def internal_tree_files(file_list, default_branch=u'.'):
65
"""Convert command-line paths to a WorkingTree and relative paths.
67
This is typically used for command-line processors that take one or
68
more filenames, and infer the workingtree that contains them.
70
The filenames given are not required to exist.
72
:param file_list: Filenames to convert.
74
:param default_branch: Fallback tree path to use if file_list is empty or None.
76
:return: workingtree, [relative_paths]
78
if file_list is None or len(file_list) == 0:
79
return WorkingTree.open_containing(default_branch)[0], file_list
80
tree = WorkingTree.open_containing(file_list[0])[0]
82
for filename in file_list:
84
new_list.append(tree.relpath(filename))
85
except errors.PathNotChild:
86
raise FileInWrongBranch(tree.branch, filename)
90
def get_format_type(typestring):
91
"""Parse and return a format specifier."""
92
if typestring == "weave":
93
return bzrdir.BzrDirFormat6()
94
if typestring == "default":
95
return bzrdir.BzrDirMetaFormat1()
96
if typestring == "metaweave":
97
format = bzrdir.BzrDirMetaFormat1()
98
format.repository_format = bzrlib.repository.RepositoryFormat7()
100
if typestring == "knit":
101
format = bzrdir.BzrDirMetaFormat1()
102
format.repository_format = bzrlib.repository.RepositoryFormatKnit1()
104
msg = "Unknown bzr format %s. Current formats are: default, knit,\n" \
105
"metaweave and weave" % typestring
106
raise BzrCommandError(msg)
109
# TODO: Make sure no commands unconditionally use the working directory as a
110
# branch. If a filename argument is used, the first of them should be used to
111
# specify the branch. (Perhaps this can be factored out into some kind of
112
# Argument class, representing a file in a branch, where the first occurrence
115
class cmd_status(Command):
116
"""Display status summary.
118
This reports on versioned and unknown files, reporting them
119
grouped by state. Possible states are:
122
Versioned in the working copy but not in the previous revision.
125
Versioned in the previous revision but removed or deleted
129
Path of this file changed from the previous revision;
130
the text may also have changed. This includes files whose
131
parent directory was renamed.
134
Text has changed since the previous revision.
137
Not versioned and not matching an ignore pattern.
139
To see ignored files use 'bzr ignored'. For details in the
140
changes to file texts, use 'bzr diff'.
142
If no arguments are specified, the status of the entire working
143
directory is shown. Otherwise, only the status of the specified
144
files or directories is reported. If a directory is given, status
145
is reported for everything inside that directory.
147
If a revision argument is given, the status is calculated against
148
that revision, or between two revisions if two are provided.
151
# TODO: --no-recurse, --recurse options
153
takes_args = ['file*']
154
takes_options = ['show-ids', 'revision']
155
aliases = ['st', 'stat']
157
encoding_type = 'replace'
160
def run(self, show_ids=False, file_list=None, revision=None):
161
from bzrlib.status import show_tree_status
163
tree, file_list = tree_files(file_list)
165
show_tree_status(tree, show_ids=show_ids,
166
specific_files=file_list, revision=revision,
170
class cmd_cat_revision(Command):
171
"""Write out metadata for a revision.
173
The revision to print can either be specified by a specific
174
revision identifier, or you can use --revision.
178
takes_args = ['revision_id?']
179
takes_options = ['revision']
180
# cat-revision is more for frontends so should be exact
184
def run(self, revision_id=None, revision=None):
186
if revision_id is not None and revision is not None:
187
raise BzrCommandError('You can only supply one of revision_id or --revision')
188
if revision_id is None and revision is None:
189
raise BzrCommandError('You must supply either --revision or a revision_id')
190
b = WorkingTree.open_containing(u'.')[0].branch
192
# TODO: jam 20060112 should cat-revision always output utf-8?
193
if revision_id is not None:
194
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
195
elif revision is not None:
198
raise BzrCommandError('You cannot specify a NULL revision.')
199
revno, rev_id = rev.in_history(b)
200
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
203
class cmd_revno(Command):
204
"""Show current revision number.
206
This is equal to the number of revisions on this branch.
209
takes_args = ['location?']
212
def run(self, location=u'.'):
213
self.outf.write(str(Branch.open_containing(location)[0].revno()))
214
self.outf.write('\n')
217
class cmd_revision_info(Command):
218
"""Show revision number and revision id for a given revision identifier.
221
takes_args = ['revision_info*']
222
takes_options = ['revision']
225
def run(self, revision=None, revision_info_list=[]):
228
if revision is not None:
229
revs.extend(revision)
230
if revision_info_list is not None:
231
for rev in revision_info_list:
232
revs.append(RevisionSpec(rev))
234
raise BzrCommandError('You must supply a revision identifier')
236
b = WorkingTree.open_containing(u'.')[0].branch
239
revinfo = rev.in_history(b)
240
if revinfo.revno is None:
241
print ' %s' % revinfo.rev_id
243
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
246
class cmd_add(Command):
247
"""Add specified files or directories.
249
In non-recursive mode, all the named items are added, regardless
250
of whether they were previously ignored. A warning is given if
251
any of the named files are already versioned.
253
In recursive mode (the default), files are treated the same way
254
but the behaviour for directories is different. Directories that
255
are already versioned do not give a warning. All directories,
256
whether already versioned or not, are searched for files or
257
subdirectories that are neither versioned or ignored, and these
258
are added. This search proceeds recursively into versioned
259
directories. If no names are given '.' is assumed.
261
Therefore simply saying 'bzr add' will version all files that
262
are currently unknown.
264
Adding a file whose parent directory is not versioned will
265
implicitly add the parent, and so on up to the root. This means
266
you should never need to explicitly add a directory, they'll just
267
get added when you add a file in the directory.
269
--dry-run will show which files would be added, but not actually
272
takes_args = ['file*']
273
takes_options = ['no-recurse', 'dry-run', 'verbose']
274
encoding_type = 'replace'
276
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False):
279
action = bzrlib.add.AddAction(to_file=self.outf,
280
should_print=(not is_quiet()))
282
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
283
action=action, save=not dry_run)
286
for glob in sorted(ignored.keys()):
287
for path in ignored[glob]:
288
self.outf.write("ignored %s matching \"%s\"\n"
292
for glob, paths in ignored.items():
293
match_len += len(paths)
294
self.outf.write("ignored %d file(s).\n" % match_len)
295
self.outf.write("If you wish to add some of these files,"
296
" please add them by name.\n")
299
class cmd_mkdir(Command):
300
"""Create a new versioned directory.
302
This is equivalent to creating the directory and then adding it.
305
takes_args = ['dir+']
306
encoding_type = 'replace'
308
def run(self, dir_list):
311
wt, dd = WorkingTree.open_containing(d)
313
self.outf.write('added %s\n' % d)
316
class cmd_relpath(Command):
317
"""Show path of a file relative to root"""
319
takes_args = ['filename']
323
def run(self, filename):
324
# TODO: jam 20050106 Can relpath return a munged path if
325
# sys.stdout encoding cannot represent it?
326
tree, relpath = WorkingTree.open_containing(filename)
327
self.outf.write(relpath)
328
self.outf.write('\n')
331
class cmd_inventory(Command):
332
"""Show inventory of the current working copy or a revision.
334
It is possible to limit the output to a particular entry
335
type using the --kind option. For example; --kind file.
338
takes_options = ['revision', 'show-ids', 'kind']
341
def run(self, revision=None, show_ids=False, kind=None):
342
if kind and kind not in ['file', 'directory', 'symlink']:
343
raise BzrCommandError('invalid kind specified')
344
tree = WorkingTree.open_containing(u'.')[0]
346
inv = tree.read_working_inventory()
348
if len(revision) > 1:
349
raise BzrCommandError('bzr inventory --revision takes'
350
' exactly one revision identifier')
351
inv = tree.branch.repository.get_revision_inventory(
352
revision[0].in_history(tree.branch).rev_id)
354
for path, entry in inv.entries():
355
if kind and kind != entry.kind:
358
self.outf.write('%-50s %s\n' % (path, entry.file_id))
360
self.outf.write(path)
361
self.outf.write('\n')
364
class cmd_mv(Command):
365
"""Move or rename a file.
368
bzr mv OLDNAME NEWNAME
369
bzr mv SOURCE... DESTINATION
371
If the last argument is a versioned directory, all the other names
372
are moved into it. Otherwise, there must be exactly two arguments
373
and the file is changed to a new name, which must not already exist.
375
Files cannot be moved between branches.
378
takes_args = ['names*']
379
aliases = ['move', 'rename']
380
encoding_type = 'replace'
382
def run(self, names_list):
383
if len(names_list) < 2:
384
raise BzrCommandError("missing file argument")
385
tree, rel_names = tree_files(names_list)
387
if os.path.isdir(names_list[-1]):
388
# move into existing directory
389
for pair in tree.move(rel_names[:-1], rel_names[-1]):
390
self.outf.write("%s => %s\n" % pair)
392
if len(names_list) != 2:
393
raise BzrCommandError('to mv multiple files the destination '
394
'must be a versioned directory')
395
tree.rename_one(rel_names[0], rel_names[1])
396
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
399
class cmd_pull(Command):
400
"""Turn this branch into a mirror of another branch.
402
This command only works on branches that have not diverged. Branches are
403
considered diverged if the destination branch's most recent commit is one
404
that has not been merged (directly or indirectly) into the parent.
406
If branches have diverged, you can use 'bzr merge' to integrate the changes
407
from one into the other. Once one branch has merged, the other should
408
be able to pull it again.
410
If branches have diverged, you can use 'bzr merge' to pull the text changes
411
from one into the other. Once one branch has merged, the other should
412
be able to pull it again.
414
If you want to forget your local changes and just update your branch to
415
match the remote one, use pull --overwrite.
417
If there is no default location set, the first pull will set it. After
418
that, you can omit the location to use the default. To change the
419
default, use --remember.
422
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
423
takes_args = ['location?']
424
encoding_type = 'replace'
426
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
427
# FIXME: too much stuff is in the command class
429
tree_to = WorkingTree.open_containing(u'.')[0]
430
branch_to = tree_to.branch
431
except NoWorkingTree:
433
branch_to = Branch.open_containing(u'.')[0]
436
if location is not None:
438
reader = read_bundle_from_url(location)
440
pass # Continue on considering this url a Branch
442
stored_loc = branch_to.get_parent()
444
if stored_loc is None:
445
raise BzrCommandError("No pull location known or specified.")
447
display_url = urlutils.unescape_for_display(stored_loc,
449
self.outf.write("Using saved location: %s\n" % display_url)
450
location = stored_loc
453
if reader is not None:
454
install_bundle(branch_to.repository, reader)
455
branch_from = branch_to
457
branch_from = Branch.open(location)
459
if branch_to.get_parent() is None or remember:
460
branch_to.set_parent(branch_from.base)
464
if reader is not None:
465
rev_id = reader.info.target
466
elif len(revision) == 1:
467
rev_id = revision[0].in_history(branch_from).rev_id
469
raise BzrCommandError('bzr pull --revision takes one value.')
471
old_rh = branch_to.revision_history()
472
if tree_to is not None:
473
count = tree_to.pull(branch_from, overwrite, rev_id)
475
count = branch_to.pull(branch_from, overwrite, rev_id)
476
note('%d revision(s) pulled.' % (count,))
479
new_rh = branch_to.revision_history()
482
from bzrlib.log import show_changed_revisions
483
show_changed_revisions(branch_to, old_rh, new_rh,
487
class cmd_push(Command):
488
"""Update a mirror of this branch.
490
The target branch will not have its working tree populated because this
491
is both expensive, and is not supported on remote file systems.
493
Some smart servers or protocols *may* put the working tree in place in
496
This command only works on branches that have not diverged. Branches are
497
considered diverged if the destination branch's most recent commit is one
498
that has not been merged (directly or indirectly) by the source branch.
500
If branches have diverged, you can use 'bzr push --overwrite' to replace
501
the other branch completely, discarding its unmerged changes.
503
If you want to ensure you have the different changes in the other branch,
504
do a merge (see bzr help merge) from the other branch, and commit that.
505
After that you will be able to do a push without '--overwrite'.
507
If there is no default push location set, the first push will set it.
508
After that, you can omit the location to use the default. To change the
509
default, use --remember.
512
takes_options = ['remember', 'overwrite', 'verbose',
513
Option('create-prefix',
514
help='Create the path leading up to the branch '
515
'if it does not already exist')]
516
takes_args = ['location?']
517
encoding_type = 'replace'
519
def run(self, location=None, remember=False, overwrite=False,
520
create_prefix=False, verbose=False):
521
# FIXME: Way too big! Put this into a function called from the
523
from bzrlib.transport import get_transport
525
br_from = Branch.open_containing('.')[0]
526
stored_loc = br_from.get_push_location()
528
if stored_loc is None:
529
raise BzrCommandError("No push location known or specified.")
531
display_url = urlutils.unescape_for_display(stored_loc,
533
self.outf.write("Using saved location: %s" % display_url)
534
location = stored_loc
536
transport = get_transport(location)
537
location_url = transport.base
538
if br_from.get_push_location() is None or remember:
539
br_from.set_push_location(location_url)
543
dir_to = bzrlib.bzrdir.BzrDir.open(location_url)
544
br_to = dir_to.open_branch()
545
except NotBranchError:
547
transport = transport.clone('..')
548
if not create_prefix:
550
relurl = transport.relpath(location_url)
551
mutter('creating directory %s => %s', location_url, relurl)
552
transport.mkdir(relurl)
554
raise BzrCommandError("Parent directory of %s "
555
"does not exist." % location)
557
current = transport.base
558
needed = [(transport, transport.relpath(location_url))]
561
transport, relpath = needed[-1]
562
transport.mkdir(relpath)
565
new_transport = transport.clone('..')
566
needed.append((new_transport,
567
new_transport.relpath(transport.base)))
568
if new_transport.base == transport.base:
569
raise BzrCommandError("Could not create "
571
dir_to = br_from.bzrdir.clone(location_url,
572
revision_id=br_from.last_revision())
573
br_to = dir_to.open_branch()
574
count = len(br_to.revision_history())
576
old_rh = br_to.revision_history()
579
tree_to = dir_to.open_workingtree()
580
except errors.NotLocalUrl:
581
warning('This transport does not update the working '
582
'tree of: %s' % (br_to.base,))
583
count = br_to.pull(br_from, overwrite)
584
except NoWorkingTree:
585
count = br_to.pull(br_from, overwrite)
587
count = tree_to.pull(br_from, overwrite)
588
except DivergedBranches:
589
raise BzrCommandError("These branches have diverged."
590
" Try a merge then push with overwrite.")
591
note('%d revision(s) pushed.' % (count,))
594
new_rh = br_to.revision_history()
597
from bzrlib.log import show_changed_revisions
598
show_changed_revisions(br_to, old_rh, new_rh,
602
class cmd_branch(Command):
603
"""Create a new copy of a branch.
605
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
606
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
608
To retrieve the branch as of a particular revision, supply the --revision
609
parameter, as in "branch foo/bar -r 5".
611
--basis is to speed up branching from remote branches. When specified, it
612
copies all the file-contents, inventory and revision data from the basis
613
branch before copying anything from the remote branch.
615
takes_args = ['from_location', 'to_location?']
616
takes_options = ['revision', 'basis']
617
aliases = ['get', 'clone']
619
def run(self, from_location, to_location=None, revision=None, basis=None):
620
from bzrlib.transport import get_transport
621
from bzrlib.osutils import rmtree
624
elif len(revision) > 1:
625
raise BzrCommandError(
626
'bzr branch --revision takes exactly 1 revision value')
628
br_from = Branch.open(from_location)
630
if e.errno == errno.ENOENT:
631
raise BzrCommandError('Source location "%s" does not'
632
' exist.' % to_location)
637
if basis is not None:
638
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
641
if len(revision) == 1 and revision[0] is not None:
642
revision_id = revision[0].in_history(br_from)[1]
644
# FIXME - wt.last_revision, fallback to branch, fall back to
645
# None or perhaps NULL_REVISION to mean copy nothing
647
revision_id = br_from.last_revision()
648
if to_location is None:
649
to_location = os.path.basename(from_location.rstrip("/\\"))
652
name = os.path.basename(to_location) + '\n'
654
to_transport = get_transport(to_location)
656
to_transport.mkdir('.')
657
except bzrlib.errors.FileExists:
658
raise BzrCommandError('Target directory "%s" already'
659
' exists.' % to_location)
660
except bzrlib.errors.NoSuchFile:
661
raise BzrCommandError('Parent of "%s" does not exist.' %
664
# preserve whatever source format we have.
665
dir = br_from.bzrdir.sprout(to_transport.base,
666
revision_id, basis_dir)
667
branch = dir.open_branch()
668
except bzrlib.errors.NoSuchRevision:
669
to_transport.delete_tree('.')
670
msg = "The branch %s has no revision %s." % (from_location, revision[0])
671
raise BzrCommandError(msg)
672
except bzrlib.errors.UnlistableBranch:
674
msg = "The branch %s cannot be used as a --basis" % (basis,)
675
raise BzrCommandError(msg)
677
branch.control_files.put_utf8('branch-name', name)
678
note('Branched %d revision(s).' % branch.revno())
683
class cmd_checkout(Command):
684
"""Create a new checkout of an existing branch.
686
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
687
the branch found in '.'. This is useful if you have removed the working tree
688
or if it was never created - i.e. if you pushed the branch to its current
691
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
692
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
694
To retrieve the branch as of a particular revision, supply the --revision
695
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
696
out of date [so you cannot commit] but it may be useful (i.e. to examine old
699
--basis is to speed up checking out from remote branches. When specified, it
700
uses the inventory and file contents from the basis branch in preference to the
701
branch being checked out.
703
takes_args = ['branch_location?', 'to_location?']
704
takes_options = ['revision', # , 'basis']
705
Option('lightweight',
706
help="perform a lightweight checkout. Lightweight "
707
"checkouts depend on access to the branch for "
708
"every operation. Normal checkouts can perform "
709
"common operations like diff and status without "
710
"such access, and also support local commits."
714
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
718
elif len(revision) > 1:
719
raise BzrCommandError(
720
'bzr checkout --revision takes exactly 1 revision value')
721
if branch_location is None:
722
branch_location = bzrlib.osutils.getcwd()
723
to_location = branch_location
724
source = Branch.open(branch_location)
725
if len(revision) == 1 and revision[0] is not None:
726
revision_id = revision[0].in_history(source)[1]
729
if to_location is None:
730
to_location = os.path.basename(branch_location.rstrip("/\\"))
731
# if the source and to_location are the same,
732
# and there is no working tree,
733
# then reconstitute a branch
734
if (bzrlib.osutils.abspath(to_location) ==
735
bzrlib.osutils.abspath(branch_location)):
737
source.bzrdir.open_workingtree()
738
except errors.NoWorkingTree:
739
source.bzrdir.create_workingtree()
742
os.mkdir(to_location)
744
if e.errno == errno.EEXIST:
745
raise BzrCommandError('Target directory "%s" already'
746
' exists.' % to_location)
747
if e.errno == errno.ENOENT:
748
raise BzrCommandError('Parent of "%s" does not exist.' %
752
old_format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
753
bzrlib.bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
756
checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
757
bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
759
checkout_branch = bzrlib.bzrdir.BzrDir.create_branch_convenience(
760
to_location, force_new_tree=False)
761
checkout = checkout_branch.bzrdir
762
checkout_branch.bind(source)
763
if revision_id is not None:
764
rh = checkout_branch.revision_history()
765
checkout_branch.set_revision_history(rh[:rh.index(revision_id) + 1])
766
checkout.create_workingtree(revision_id)
768
bzrlib.bzrdir.BzrDirFormat.set_default_format(old_format)
771
class cmd_renames(Command):
772
"""Show list of renamed files.
774
# TODO: Option to show renames between two historical versions.
776
# TODO: Only show renames under dir, rather than in the whole branch.
777
takes_args = ['dir?']
780
def run(self, dir=u'.'):
781
tree = WorkingTree.open_containing(dir)[0]
782
old_inv = tree.basis_tree().inventory
783
new_inv = tree.read_working_inventory()
785
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
787
for old_name, new_name in renames:
788
self.outf.write("%s => %s\n" % (old_name, new_name))
791
class cmd_update(Command):
792
"""Update a tree to have the latest code committed to its branch.
794
This will perform a merge into the working tree, and may generate
795
conflicts. If you have any local changes, you will still
796
need to commit them after the update for the update to be complete.
798
If you want to discard your local changes, you can just do a
799
'bzr revert' instead of 'bzr commit' after the update.
801
takes_args = ['dir?']
803
def run(self, dir='.'):
804
tree = WorkingTree.open_containing(dir)[0]
807
if tree.last_revision() == tree.branch.last_revision():
808
# may be up to date, check master too.
809
master = tree.branch.get_master_branch()
810
if master is None or master.last_revision == tree.last_revision():
811
note("Tree is up to date.")
813
conflicts = tree.update()
814
note('Updated to revision %d.' %
815
(tree.branch.revision_id_to_revno(tree.last_revision()),))
824
class cmd_info(Command):
825
"""Show information about a working tree, branch or repository.
827
This command will show all known locations and formats associated to the
828
tree, branch or repository. Statistical information is included with
831
Branches and working trees will also report any missing revisions.
833
takes_args = ['location?']
834
takes_options = ['verbose']
837
def run(self, location=None, verbose=False):
838
from bzrlib.info import show_bzrdir_info
839
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
843
class cmd_remove(Command):
844
"""Make a file unversioned.
846
This makes bzr stop tracking changes to a versioned file. It does
847
not delete the working copy.
849
You can specify one or more files, and/or --new. If you specify --new,
850
only 'added' files will be removed. If you specify both, then new files
851
in the specified directories will be removed. If the directories are
852
also new, they will also be removed.
854
takes_args = ['file*']
855
takes_options = ['verbose', Option('new', help='remove newly-added files')]
857
encoding_type = 'replace'
859
def run(self, file_list, verbose=False, new=False):
860
tree, file_list = tree_files(file_list)
862
if file_list is None:
863
raise BzrCommandError('Specify one or more files to remove, or'
866
from bzrlib.delta import compare_trees
867
added = [compare_trees(tree.basis_tree(), tree,
868
specific_files=file_list).added]
869
file_list = sorted([f[0] for f in added[0]], reverse=True)
870
if len(file_list) == 0:
871
raise BzrCommandError('No matching files.')
872
tree.remove(file_list, verbose=verbose, to_file=self.outf)
875
class cmd_file_id(Command):
876
"""Print file_id of a particular file or directory.
878
The file_id is assigned when the file is first added and remains the
879
same through all revisions where the file exists, even when it is
884
takes_args = ['filename']
887
def run(self, filename):
888
tree, relpath = WorkingTree.open_containing(filename)
889
i = tree.inventory.path2id(relpath)
891
raise BzrError("%r is not a versioned file" % filename)
893
self.outf.write(i + '\n')
896
class cmd_file_path(Command):
897
"""Print path of file_ids to a file or directory.
899
This prints one line for each directory down to the target,
900
starting at the branch root.
904
takes_args = ['filename']
907
def run(self, filename):
908
tree, relpath = WorkingTree.open_containing(filename)
910
fid = inv.path2id(relpath)
912
raise BzrError("%r is not a versioned file" % filename)
913
for fip in inv.get_idpath(fid):
914
self.outf.write(fip + '\n')
917
class cmd_reconcile(Command):
918
"""Reconcile bzr metadata in a branch.
920
This can correct data mismatches that may have been caused by
921
previous ghost operations or bzr upgrades. You should only
922
need to run this command if 'bzr check' or a bzr developer
923
advises you to run it.
925
If a second branch is provided, cross-branch reconciliation is
926
also attempted, which will check that data like the tree root
927
id which was not present in very early bzr versions is represented
928
correctly in both branches.
930
At the same time it is run it may recompress data resulting in
931
a potential saving in disk space or performance gain.
933
The branch *MUST* be on a listable system such as local disk or sftp.
935
takes_args = ['branch?']
937
def run(self, branch="."):
938
from bzrlib.reconcile import reconcile
939
dir = bzrlib.bzrdir.BzrDir.open(branch)
943
class cmd_revision_history(Command):
944
"""Display the list of revision ids on a branch."""
945
takes_args = ['location?']
950
def run(self, location="."):
951
branch = Branch.open_containing(location)[0]
952
for revid in branch.revision_history():
953
self.outf.write(revid)
954
self.outf.write('\n')
957
class cmd_ancestry(Command):
958
"""List all revisions merged into this branch."""
959
takes_args = ['location?']
964
def run(self, location="."):
966
wt = WorkingTree.open_containing(location)[0]
967
except errors.NoWorkingTree:
968
b = Branch.open(location)
969
last_revision = b.last_revision()
972
last_revision = wt.last_revision()
974
revision_ids = b.repository.get_ancestry(last_revision)
975
assert revision_ids[0] == None
977
for revision_id in revision_ids:
978
self.outf.write(revision_id + '\n')
981
class cmd_init(Command):
982
"""Make a directory into a versioned branch.
984
Use this to create an empty branch, or before importing an
987
If there is a repository in a parent directory of the location, then
988
the history of the branch will be stored in the repository. Otherwise
989
init creates a standalone branch which carries its own history in
992
If there is already a branch at the location but it has no working tree,
993
the tree can be populated with 'bzr checkout'.
995
Recipe for importing a tree of files:
1000
bzr commit -m 'imported project'
1002
takes_args = ['location?']
1005
help='Specify a format for this branch. Current'
1006
' formats are: default, knit, metaweave and'
1007
' weave. Default is knit; metaweave and'
1008
' weave are deprecated',
1009
type=get_format_type),
1011
def run(self, location=None, format=None):
1012
from bzrlib.branch import Branch
1014
format = get_format_type('default')
1015
if location is None:
1018
# The path has to exist to initialize a
1019
# branch inside of it.
1020
# Just using os.mkdir, since I don't
1021
# believe that we want to create a bunch of
1022
# locations if the user supplies an extended path
1023
if not os.path.exists(location):
1026
existing_bzrdir = bzrdir.BzrDir.open(location)
1027
except NotBranchError:
1028
# really a NotBzrDir error...
1029
bzrdir.BzrDir.create_branch_convenience(location, format=format)
1031
if existing_bzrdir.has_branch():
1032
if existing_bzrdir.has_workingtree():
1033
raise errors.AlreadyBranchError(location)
1035
raise errors.BranchExistsWithoutWorkingTree(location)
1037
existing_bzrdir.create_branch()
1038
existing_bzrdir.create_workingtree()
1041
class cmd_init_repository(Command):
1042
"""Create a shared repository to hold branches.
1044
New branches created under the repository directory will store their revisions
1045
in the repository, not in the branch directory, if the branch format supports
1051
bzr checkout --lightweight repo/trunk trunk-checkout
1055
takes_args = ["location"]
1056
takes_options = [Option('format',
1057
help='Specify a format for this repository.'
1058
' Current formats are: default, knit,'
1059
' metaweave and weave. Default is knit;'
1060
' metaweave and weave are deprecated',
1061
type=get_format_type),
1063
help='Allows branches in repository to have'
1065
aliases = ["init-repo"]
1066
def run(self, location, format=None, trees=False):
1067
from bzrlib.transport import get_transport
1069
format = get_format_type('default')
1070
transport = get_transport(location)
1071
if not transport.has('.'):
1073
newdir = format.initialize_on_transport(transport)
1074
repo = newdir.create_repository(shared=True)
1075
repo.set_make_working_trees(trees)
1078
class cmd_diff(Command):
1079
"""Show differences in working tree.
1081
If files are listed, only the changes in those files are listed.
1082
Otherwise, all changes for the tree are listed.
1084
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1085
produces patches suitable for "patch -p1".
1091
bzr diff --diff-prefix old/:new/
1092
bzr diff bzr.mine bzr.dev
1095
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1096
# or a graphical diff.
1098
# TODO: Python difflib is not exactly the same as unidiff; should
1099
# either fix it up or prefer to use an external diff.
1101
# TODO: Selected-file diff is inefficient and doesn't show you
1104
# TODO: This probably handles non-Unix newlines poorly.
1106
takes_args = ['file*']
1107
takes_options = ['revision', 'diff-options', 'prefix']
1108
aliases = ['di', 'dif']
1109
encoding_type = 'exact'
1112
def run(self, revision=None, file_list=None, diff_options=None,
1114
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1116
if (prefix is None) or (prefix == '0'):
1124
if not ':' in prefix:
1125
raise BzrError("--diff-prefix expects two values separated by a colon")
1126
old_label, new_label = prefix.split(":")
1129
tree1, file_list = internal_tree_files(file_list)
1133
except FileInWrongBranch:
1134
if len(file_list) != 2:
1135
raise BzrCommandError("Files are in different branches")
1137
tree1, file1 = WorkingTree.open_containing(file_list[0])
1138
tree2, file2 = WorkingTree.open_containing(file_list[1])
1139
if file1 != "" or file2 != "":
1140
# FIXME diff those two files. rbc 20051123
1141
raise BzrCommandError("Files are in different branches")
1143
if revision is not None:
1144
if tree2 is not None:
1145
raise BzrCommandError("Can't specify -r with two branches")
1146
if (len(revision) == 1) or (revision[1].spec is None):
1147
return diff_cmd_helper(tree1, file_list, diff_options,
1149
old_label=old_label, new_label=new_label)
1150
elif len(revision) == 2:
1151
return diff_cmd_helper(tree1, file_list, diff_options,
1152
revision[0], revision[1],
1153
old_label=old_label, new_label=new_label)
1155
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
1157
if tree2 is not None:
1158
return show_diff_trees(tree1, tree2, sys.stdout,
1159
specific_files=file_list,
1160
external_diff_options=diff_options,
1161
old_label=old_label, new_label=new_label)
1163
return diff_cmd_helper(tree1, file_list, diff_options,
1164
old_label=old_label, new_label=new_label)
1167
class cmd_deleted(Command):
1168
"""List files deleted in the working tree.
1170
# TODO: Show files deleted since a previous revision, or
1171
# between two revisions.
1172
# TODO: Much more efficient way to do this: read in new
1173
# directories with readdir, rather than stating each one. Same
1174
# level of effort but possibly much less IO. (Or possibly not,
1175
# if the directories are very large...)
1176
takes_options = ['show-ids']
1179
def run(self, show_ids=False):
1180
tree = WorkingTree.open_containing(u'.')[0]
1181
old = tree.basis_tree()
1182
for path, ie in old.inventory.iter_entries():
1183
if not tree.has_id(ie.file_id):
1184
self.outf.write(path)
1186
self.outf.write(' ')
1187
self.outf.write(ie.file_id)
1188
self.outf.write('\n')
1191
class cmd_modified(Command):
1192
"""List files modified in working tree."""
1196
from bzrlib.delta import compare_trees
1198
tree = WorkingTree.open_containing(u'.')[0]
1199
td = compare_trees(tree.basis_tree(), tree)
1201
for path, id, kind, text_modified, meta_modified in td.modified:
1202
self.outf.write(path + '\n')
1205
class cmd_added(Command):
1206
"""List files added in working tree."""
1210
wt = WorkingTree.open_containing(u'.')[0]
1211
basis_inv = wt.basis_tree().inventory
1214
if file_id in basis_inv:
1216
path = inv.id2path(file_id)
1217
if not os.access(bzrlib.osutils.abspath(path), os.F_OK):
1219
self.outf.write(path + '\n')
1222
class cmd_root(Command):
1223
"""Show the tree root directory.
1225
The root is the nearest enclosing directory with a .bzr control
1227
takes_args = ['filename?']
1229
def run(self, filename=None):
1230
"""Print the branch root."""
1231
tree = WorkingTree.open_containing(filename)[0]
1232
self.outf.write(tree.basedir + '\n')
1235
class cmd_log(Command):
1236
"""Show log of a branch, file, or directory.
1238
By default show the log of the branch containing the working directory.
1240
To request a range of logs, you can use the command -r begin..end
1241
-r revision requests a specific revision, -r ..end or -r begin.. are
1247
bzr log -r -10.. http://server/branch
1250
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1252
takes_args = ['location?']
1253
takes_options = [Option('forward',
1254
help='show from oldest to newest'),
1257
help='show files changed in each revision'),
1258
'show-ids', 'revision',
1262
help='show revisions whose message matches this regexp',
1266
encoding_type = 'replace'
1269
def run(self, location=None, timezone='original',
1279
from bzrlib.log import log_formatter, show_log
1280
assert message is None or isinstance(message, basestring), \
1281
"invalid message argument %r" % message
1282
direction = (forward and 'forward') or 'reverse'
1287
# find the file id to log:
1289
dir, fp = bzrdir.BzrDir.open_containing(location)
1290
b = dir.open_branch()
1294
inv = dir.open_workingtree().inventory
1295
except (errors.NotBranchError, errors.NotLocalUrl):
1296
# either no tree, or is remote.
1297
inv = b.basis_tree().inventory
1298
file_id = inv.path2id(fp)
1301
# FIXME ? log the current subdir only RBC 20060203
1302
dir, relpath = bzrdir.BzrDir.open_containing('.')
1303
b = dir.open_branch()
1305
if revision is None:
1308
elif len(revision) == 1:
1309
rev1 = rev2 = revision[0].in_history(b).revno
1310
elif len(revision) == 2:
1311
if revision[0].spec is None:
1312
# missing begin-range means first revision
1315
rev1 = revision[0].in_history(b).revno
1317
if revision[1].spec is None:
1318
# missing end-range means last known revision
1321
rev2 = revision[1].in_history(b).revno
1323
raise BzrCommandError('bzr log --revision takes one or two values.')
1325
# By this point, the revision numbers are converted to the +ve
1326
# form if they were supplied in the -ve form, so we can do
1327
# this comparison in relative safety
1329
(rev2, rev1) = (rev1, rev2)
1331
if (log_format == None):
1332
default = bzrlib.config.BranchConfig(b).log_format()
1333
log_format = get_log_format(long=long, short=short, line=line, default=default)
1334
lf = log_formatter(log_format,
1337
show_timezone=timezone)
1343
direction=direction,
1344
start_revision=rev1,
1349
def get_log_format(long=False, short=False, line=False, default='long'):
1350
log_format = default
1354
log_format = 'short'
1360
class cmd_touching_revisions(Command):
1361
"""Return revision-ids which affected a particular file.
1363
A more user-friendly interface is "bzr log FILE".
1367
takes_args = ["filename"]
1370
def run(self, filename):
1371
tree, relpath = WorkingTree.open_containing(filename)
1373
inv = tree.read_working_inventory()
1374
file_id = inv.path2id(relpath)
1375
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1376
self.outf.write("%6d %s\n" % (revno, what))
1379
class cmd_ls(Command):
1380
"""List files in a tree.
1382
# TODO: Take a revision or remote path and list that tree instead.
1384
takes_options = ['verbose', 'revision',
1385
Option('non-recursive',
1386
help='don\'t recurse into sub-directories'),
1388
help='Print all paths from the root of the branch.'),
1389
Option('unknown', help='Print unknown files'),
1390
Option('versioned', help='Print versioned files'),
1391
Option('ignored', help='Print ignored files'),
1393
Option('null', help='Null separate the files'),
1396
def run(self, revision=None, verbose=False,
1397
non_recursive=False, from_root=False,
1398
unknown=False, versioned=False, ignored=False,
1401
if verbose and null:
1402
raise BzrCommandError('Cannot set both --verbose and --null')
1403
all = not (unknown or versioned or ignored)
1405
selection = {'I':ignored, '?':unknown, 'V':versioned}
1407
tree, relpath = WorkingTree.open_containing(u'.')
1412
if revision is not None:
1413
tree = tree.branch.repository.revision_tree(
1414
revision[0].in_history(tree.branch).rev_id)
1416
for fp, fc, kind, fid, entry in tree.list_files():
1417
if fp.startswith(relpath):
1418
fp = fp[len(relpath):]
1419
if non_recursive and '/' in fp:
1421
if not all and not selection[fc]:
1424
kindch = entry.kind_character()
1425
self.outf.write('%-8s %s%s\n' % (fc, fp, kindch))
1427
self.outf.write(fp + '\0')
1430
self.outf.write(fp + '\n')
1433
class cmd_unknowns(Command):
1434
"""List unknown files."""
1437
from bzrlib.osutils import quotefn
1438
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1439
self.outf.write(quotefn(f) + '\n')
1442
class cmd_ignore(Command):
1443
"""Ignore a command or pattern.
1445
To remove patterns from the ignore list, edit the .bzrignore file.
1447
If the pattern contains a slash, it is compared to the whole path
1448
from the branch root. Otherwise, it is compared to only the last
1449
component of the path. To match a file only in the root directory,
1452
Ignore patterns are case-insensitive on case-insensitive systems.
1454
Note: wildcards must be quoted from the shell on Unix.
1457
bzr ignore ./Makefile
1458
bzr ignore '*.class'
1460
# TODO: Complain if the filename is absolute
1461
takes_args = ['name_pattern']
1463
def run(self, name_pattern):
1464
from bzrlib.atomicfile import AtomicFile
1467
tree, relpath = WorkingTree.open_containing(u'.')
1468
ifn = tree.abspath('.bzrignore')
1470
if os.path.exists(ifn):
1473
igns = f.read().decode('utf-8')
1479
# TODO: If the file already uses crlf-style termination, maybe
1480
# we should use that for the newly added lines?
1482
if igns and igns[-1] != '\n':
1484
igns += name_pattern + '\n'
1486
f = AtomicFile(ifn, 'wt')
1488
f.write(igns.encode('utf-8'))
1493
inv = tree.inventory
1494
if inv.path2id('.bzrignore'):
1495
mutter('.bzrignore is already versioned')
1497
mutter('need to make new .bzrignore file versioned')
1498
tree.add(['.bzrignore'])
1501
class cmd_ignored(Command):
1502
"""List ignored files and the patterns that matched them.
1504
See also: bzr ignore"""
1507
tree = WorkingTree.open_containing(u'.')[0]
1508
for path, file_class, kind, file_id, entry in tree.list_files():
1509
if file_class != 'I':
1511
## XXX: Slightly inefficient since this was already calculated
1512
pat = tree.is_ignored(path)
1513
print '%-50s %s' % (path, pat)
1516
class cmd_lookup_revision(Command):
1517
"""Lookup the revision-id from a revision-number
1520
bzr lookup-revision 33
1523
takes_args = ['revno']
1526
def run(self, revno):
1530
raise BzrCommandError("not a valid revision-number: %r" % revno)
1532
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1535
class cmd_export(Command):
1536
"""Export past revision to destination directory.
1538
If no revision is specified this exports the last committed revision.
1540
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1541
given, try to find the format with the extension. If no extension
1542
is found exports to a directory (equivalent to --format=dir).
1544
Root may be the top directory for tar, tgz and tbz2 formats. If none
1545
is given, the top directory will be the root name of the file.
1547
Note: export of tree with non-ascii filenames to zip is not supported.
1549
Supported formats Autodetected by extension
1550
----------------- -------------------------
1553
tbz2 .tar.bz2, .tbz2
1557
takes_args = ['dest']
1558
takes_options = ['revision', 'format', 'root']
1559
def run(self, dest, revision=None, format=None, root=None):
1561
from bzrlib.export import export
1562
tree = WorkingTree.open_containing(u'.')[0]
1564
if revision is None:
1565
# should be tree.last_revision FIXME
1566
rev_id = b.last_revision()
1568
if len(revision) != 1:
1569
raise BzrError('bzr export --revision takes exactly 1 argument')
1570
rev_id = revision[0].in_history(b).rev_id
1571
t = b.repository.revision_tree(rev_id)
1573
export(t, dest, format, root)
1574
except errors.NoSuchExportFormat, e:
1575
raise BzrCommandError('Unsupported export format: %s' % e.format)
1578
class cmd_cat(Command):
1579
"""Write a file's text from a previous revision."""
1581
takes_options = ['revision']
1582
takes_args = ['filename']
1585
def run(self, filename, revision=None):
1586
if revision is not None and len(revision) != 1:
1587
raise BzrCommandError("bzr cat --revision takes exactly one number")
1590
tree, relpath = WorkingTree.open_containing(filename)
1592
except NotBranchError:
1596
b, relpath = Branch.open_containing(filename)
1597
if revision is None:
1598
revision_id = b.last_revision()
1600
revision_id = revision[0].in_history(b).rev_id
1601
b.print_file(relpath, revision_id)
1604
class cmd_local_time_offset(Command):
1605
"""Show the offset in seconds from GMT to local time."""
1609
print bzrlib.osutils.local_time_offset()
1613
class cmd_commit(Command):
1614
"""Commit changes into a new revision.
1616
If no arguments are given, the entire tree is committed.
1618
If selected files are specified, only changes to those files are
1619
committed. If a directory is specified then the directory and everything
1620
within it is committed.
1622
A selected-file commit may fail in some cases where the committed
1623
tree would be invalid, such as trying to commit a file in a
1624
newly-added directory that is not itself committed.
1626
# TODO: Run hooks on tree to-be-committed, and after commit.
1628
# TODO: Strict commit that fails if there are deleted files.
1629
# (what does "deleted files" mean ??)
1631
# TODO: Give better message for -s, --summary, used by tla people
1633
# XXX: verbose currently does nothing
1635
takes_args = ['selected*']
1636
takes_options = ['message', 'verbose',
1638
help='commit even if nothing has changed'),
1639
Option('file', type=str,
1641
help='file containing commit message'),
1643
help="refuse to commit if there are unknown "
1644
"files in the working tree."),
1646
help="perform a local only commit in a bound "
1647
"branch. Such commits are not pushed to "
1648
"the master branch until a normal commit "
1652
aliases = ['ci', 'checkin']
1654
def run(self, message=None, file=None, verbose=True, selected_list=None,
1655
unchanged=False, strict=False, local=False):
1656
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1657
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1659
from bzrlib.msgeditor import edit_commit_message, \
1660
make_commit_message_template
1661
from tempfile import TemporaryFile
1663
# TODO: Need a blackbox test for invoking the external editor; may be
1664
# slightly problematic to run this cross-platform.
1666
# TODO: do more checks that the commit will succeed before
1667
# spending the user's valuable time typing a commit message.
1669
# TODO: if the commit *does* happen to fail, then save the commit
1670
# message to a temporary file where it can be recovered
1671
tree, selected_list = tree_files(selected_list)
1672
if selected_list == ['']:
1673
# workaround - commit of root of tree should be exactly the same
1674
# as just default commit in that tree, and succeed even though
1675
# selected-file merge commit is not done yet
1678
if local and not tree.branch.get_bound_location():
1679
raise errors.LocalRequiresBoundBranch()
1680
if message is None and not file:
1681
template = make_commit_message_template(tree, selected_list)
1682
message = edit_commit_message(template)
1684
raise BzrCommandError("please specify a commit message"
1685
" with either --message or --file")
1686
elif message and file:
1687
raise BzrCommandError("please specify either --message or --file")
1690
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1693
raise BzrCommandError("empty commit message specified")
1696
reporter = ReportCommitToLog()
1698
reporter = NullCommitReporter()
1701
tree.commit(message, specific_files=selected_list,
1702
allow_pointless=unchanged, strict=strict, local=local,
1704
except PointlessCommit:
1705
# FIXME: This should really happen before the file is read in;
1706
# perhaps prepare the commit; get the message; then actually commit
1707
raise BzrCommandError("no changes to commit",
1708
["use --unchanged to commit anyhow"])
1709
except ConflictsInTree:
1710
raise BzrCommandError("Conflicts detected in working tree. "
1711
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1712
except StrictCommitFailed:
1713
raise BzrCommandError("Commit refused because there are unknown "
1714
"files in the working tree.")
1715
except errors.BoundBranchOutOfDate, e:
1716
raise BzrCommandError(str(e)
1717
+ ' Either unbind, update, or'
1718
' pass --local to commit.')
1721
class cmd_check(Command):
1722
"""Validate consistency of branch history.
1724
This command checks various invariants about the branch storage to
1725
detect data corruption or bzr bugs.
1727
takes_args = ['branch?']
1728
takes_options = ['verbose']
1730
def run(self, branch=None, verbose=False):
1731
from bzrlib.check import check
1733
tree = WorkingTree.open_containing()[0]
1734
branch = tree.branch
1736
branch = Branch.open(branch)
1737
check(branch, verbose)
1740
class cmd_scan_cache(Command):
1743
from bzrlib.hashcache import HashCache
1749
print '%6d stats' % c.stat_count
1750
print '%6d in hashcache' % len(c._cache)
1751
print '%6d files removed from cache' % c.removed_count
1752
print '%6d hashes updated' % c.update_count
1753
print '%6d files changed too recently to cache' % c.danger_count
1759
class cmd_upgrade(Command):
1760
"""Upgrade branch storage to current format.
1762
The check command or bzr developers may sometimes advise you to run
1763
this command. When the default format has changed you may also be warned
1764
during other operations to upgrade.
1766
takes_args = ['url?']
1769
help='Upgrade to a specific format. Current formats'
1770
' are: default, knit, metaweave and weave.'
1771
' Default is knit; metaweave and weave are'
1773
type=get_format_type),
1777
def run(self, url='.', format=None):
1778
from bzrlib.upgrade import upgrade
1780
format = get_format_type('default')
1781
upgrade(url, format)
1784
class cmd_whoami(Command):
1785
"""Show bzr user id."""
1786
takes_options = ['email']
1789
def run(self, email=False):
1791
b = WorkingTree.open_containing(u'.')[0].branch
1792
config = bzrlib.config.BranchConfig(b)
1793
except NotBranchError:
1794
config = bzrlib.config.GlobalConfig()
1797
print config.user_email()
1799
print config.username()
1802
class cmd_nick(Command):
1803
"""Print or set the branch nickname.
1805
If unset, the tree root directory name is used as the nickname
1806
To print the current nickname, execute with no argument.
1808
takes_args = ['nickname?']
1809
def run(self, nickname=None):
1810
branch = Branch.open_containing(u'.')[0]
1811
if nickname is None:
1812
self.printme(branch)
1814
branch.nick = nickname
1817
def printme(self, branch):
1821
class cmd_selftest(Command):
1822
"""Run internal test suite.
1824
This creates temporary test directories in the working directory,
1825
but not existing data is affected. These directories are deleted
1826
if the tests pass, or left behind to help in debugging if they
1827
fail and --keep-output is specified.
1829
If arguments are given, they are regular expressions that say
1830
which tests should run.
1832
If the global option '--no-plugins' is given, plugins are not loaded
1833
before running the selftests. This has two effects: features provided or
1834
modified by plugins will not be tested, and tests provided by plugins will
1839
bzr --no-plugins selftest -v
1841
# TODO: --list should give a list of all available tests
1843
# NB: this is used from the class without creating an instance, which is
1844
# why it does not have a self parameter.
1845
def get_transport_type(typestring):
1846
"""Parse and return a transport specifier."""
1847
if typestring == "sftp":
1848
from bzrlib.transport.sftp import SFTPAbsoluteServer
1849
return SFTPAbsoluteServer
1850
if typestring == "memory":
1851
from bzrlib.transport.memory import MemoryServer
1853
if typestring == "fakenfs":
1854
from bzrlib.transport.fakenfs import FakeNFSServer
1855
return FakeNFSServer
1856
msg = "No known transport type %s. Supported types are: sftp\n" %\
1858
raise BzrCommandError(msg)
1861
takes_args = ['testspecs*']
1862
takes_options = ['verbose',
1863
Option('one', help='stop when one test fails'),
1864
Option('keep-output',
1865
help='keep output directories when tests fail'),
1867
help='Use a different transport by default '
1868
'throughout the test suite.',
1869
type=get_transport_type),
1870
Option('benchmark', help='run the bzr bencharks.'),
1871
Option('lsprof-timed',
1872
help='generate lsprof output for benchmarked'
1873
' sections of code.'),
1876
def run(self, testspecs_list=None, verbose=None, one=False,
1877
keep_output=False, transport=None, benchmark=None,
1880
from bzrlib.tests import selftest
1881
import bzrlib.benchmarks as benchmarks
1882
# we don't want progress meters from the tests to go to the
1883
# real output; and we don't want log messages cluttering up
1885
save_ui = bzrlib.ui.ui_factory
1886
print '%10s: %s' % ('bzr', bzrlib.osutils.realpath(sys.argv[0]))
1887
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
1889
bzrlib.trace.info('running tests...')
1891
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1892
if testspecs_list is not None:
1893
pattern = '|'.join(testspecs_list)
1897
test_suite_factory = benchmarks.test_suite
1901
test_suite_factory = None
1904
result = selftest(verbose=verbose,
1906
stop_on_failure=one,
1907
keep_output=keep_output,
1908
transport=transport,
1909
test_suite_factory=test_suite_factory,
1910
lsprof_timed=lsprof_timed)
1912
bzrlib.trace.info('tests passed')
1914
bzrlib.trace.info('tests failed')
1915
return int(not result)
1917
bzrlib.ui.ui_factory = save_ui
1920
def _get_bzr_branch():
1921
"""If bzr is run from a branch, return Branch or None"""
1922
import bzrlib.errors
1923
from bzrlib.branch import Branch
1924
from bzrlib.osutils import abspath
1925
from os.path import dirname
1928
branch = Branch.open(dirname(abspath(dirname(__file__))))
1930
except bzrlib.errors.BzrError:
1935
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1936
# is bzrlib itself in a branch?
1937
branch = _get_bzr_branch()
1939
rh = branch.revision_history()
1941
print " bzr checkout, revision %d" % (revno,)
1942
print " nick: %s" % (branch.nick,)
1944
print " revid: %s" % (rh[-1],)
1945
print "Using python interpreter:", sys.executable
1947
print "Using python standard library:", os.path.dirname(site.__file__)
1948
print "Using bzrlib:",
1949
if len(bzrlib.__path__) > 1:
1950
# print repr, which is a good enough way of making it clear it's
1951
# more than one element (eg ['/foo/bar', '/foo/bzr'])
1952
print repr(bzrlib.__path__)
1954
print bzrlib.__path__[0]
1957
print bzrlib.__copyright__
1958
print "http://bazaar-vcs.org/"
1960
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1961
print "you may use, modify and redistribute it under the terms of the GNU"
1962
print "General Public License version 2 or later."
1965
class cmd_version(Command):
1966
"""Show version of bzr."""
1971
class cmd_rocks(Command):
1972
"""Statement of optimism."""
1976
print "it sure does!"
1979
class cmd_find_merge_base(Command):
1980
"""Find and print a base revision for merging two branches.
1982
# TODO: Options to specify revisions on either side, as if
1983
# merging only part of the history.
1984
takes_args = ['branch', 'other']
1988
def run(self, branch, other):
1989
from bzrlib.revision import common_ancestor, MultipleRevisionSources
1991
branch1 = Branch.open_containing(branch)[0]
1992
branch2 = Branch.open_containing(other)[0]
1994
history_1 = branch1.revision_history()
1995
history_2 = branch2.revision_history()
1997
last1 = branch1.last_revision()
1998
last2 = branch2.last_revision()
2000
source = MultipleRevisionSources(branch1.repository,
2003
base_rev_id = common_ancestor(last1, last2, source)
2005
print 'merge base is revision %s' % base_rev_id
2009
if base_revno is None:
2010
raise bzrlib.errors.UnrelatedBranches()
2012
print ' r%-6d in %s' % (base_revno, branch)
2014
other_revno = branch2.revision_id_to_revno(base_revid)
2016
print ' r%-6d in %s' % (other_revno, other)
2020
class cmd_merge(Command):
2021
"""Perform a three-way merge.
2023
The branch is the branch you will merge from. By default, it will
2024
merge the latest revision. If you specify a revision, that
2025
revision will be merged. If you specify two revisions, the first
2026
will be used as a BASE, and the second one as OTHER. Revision
2027
numbers are always relative to the specified branch.
2029
By default, bzr will try to merge in all new work from the other
2030
branch, automatically determining an appropriate base. If this
2031
fails, you may need to give an explicit base.
2033
Merge will do its best to combine the changes in two branches, but there
2034
are some kinds of problems only a human can fix. When it encounters those,
2035
it will mark a conflict. A conflict means that you need to fix something,
2036
before you should commit.
2038
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2040
If there is no default branch set, the first merge will set it. After
2041
that, you can omit the branch to use the default. To change the
2042
default, use --remember.
2046
To merge the latest revision from bzr.dev
2047
bzr merge ../bzr.dev
2049
To merge changes up to and including revision 82 from bzr.dev
2050
bzr merge -r 82 ../bzr.dev
2052
To merge the changes introduced by 82, without previous changes:
2053
bzr merge -r 81..82 ../bzr.dev
2055
merge refuses to run if there are any uncommitted changes, unless
2058
The following merge types are available:
2060
takes_args = ['branch?']
2061
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2062
Option('show-base', help="Show base revision text in "
2066
from merge import merge_type_help
2067
from inspect import getdoc
2068
return getdoc(self) + '\n' + merge_type_help()
2070
def run(self, branch=None, revision=None, force=False, merge_type=None,
2071
show_base=False, reprocess=False, remember=False):
2072
if merge_type is None:
2073
merge_type = Merge3Merger
2075
tree = WorkingTree.open_containing(u'.')[0]
2077
if branch is not None:
2079
reader = read_bundle_from_url(branch)
2081
pass # Continue on considering this url a Branch
2083
conflicts = merge_bundle(reader, tree, not force, merge_type,
2084
reprocess, show_base)
2090
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2092
if revision is None or len(revision) < 1:
2094
other = [branch, -1]
2095
other_branch, path = Branch.open_containing(branch)
2097
if len(revision) == 1:
2099
other_branch, path = Branch.open_containing(branch)
2100
revno = revision[0].in_history(other_branch).revno
2101
other = [branch, revno]
2103
assert len(revision) == 2
2104
if None in revision:
2105
raise BzrCommandError(
2106
"Merge doesn't permit that revision specifier.")
2107
other_branch, path = Branch.open_containing(branch)
2109
base = [branch, revision[0].in_history(other_branch).revno]
2110
other = [branch, revision[1].in_history(other_branch).revno]
2112
if tree.branch.get_parent() is None or remember:
2113
tree.branch.set_parent(other_branch.base)
2116
interesting_files = [path]
2118
interesting_files = None
2119
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2122
conflict_count = merge(other, base, check_clean=(not force),
2123
merge_type=merge_type,
2124
reprocess=reprocess,
2125
show_base=show_base,
2126
pb=pb, file_list=interesting_files)
2129
if conflict_count != 0:
2133
except bzrlib.errors.AmbiguousBase, e:
2134
m = ("sorry, bzr can't determine the right merge base yet\n"
2135
"candidates are:\n "
2136
+ "\n ".join(e.bases)
2138
"please specify an explicit base with -r,\n"
2139
"and (if you want) report this to the bzr developers\n")
2142
# TODO: move up to common parent; this isn't merge-specific anymore.
2143
def _get_remembered_parent(self, tree, supplied_location, verb_string):
2144
"""Use tree.branch's parent if none was supplied.
2146
Report if the remembered location was used.
2148
if supplied_location is not None:
2149
return supplied_location
2150
stored_location = tree.branch.get_parent()
2151
mutter("%s", stored_location)
2152
if stored_location is None:
2153
raise BzrCommandError("No location specified or remembered")
2154
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2155
self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2156
return stored_location
2159
class cmd_remerge(Command):
2162
Use this if you want to try a different merge technique while resolving
2163
conflicts. Some merge techniques are better than others, and remerge
2164
lets you try different ones on different files.
2166
The options for remerge have the same meaning and defaults as the ones for
2167
merge. The difference is that remerge can (only) be run when there is a
2168
pending merge, and it lets you specify particular files.
2171
$ bzr remerge --show-base
2172
Re-do the merge of all conflicted files, and show the base text in
2173
conflict regions, in addition to the usual THIS and OTHER texts.
2175
$ bzr remerge --merge-type weave --reprocess foobar
2176
Re-do the merge of "foobar", using the weave merge algorithm, with
2177
additional processing to reduce the size of conflict regions.
2179
The following merge types are available:"""
2180
takes_args = ['file*']
2181
takes_options = ['merge-type', 'reprocess',
2182
Option('show-base', help="Show base revision text in "
2186
from merge import merge_type_help
2187
from inspect import getdoc
2188
return getdoc(self) + '\n' + merge_type_help()
2190
def run(self, file_list=None, merge_type=None, show_base=False,
2192
from bzrlib.merge import merge_inner, transform_tree
2193
if merge_type is None:
2194
merge_type = Merge3Merger
2195
tree, file_list = tree_files(file_list)
2198
pending_merges = tree.pending_merges()
2199
if len(pending_merges) != 1:
2200
raise BzrCommandError("Sorry, remerge only works after normal"
2201
+ " merges. Not cherrypicking or"
2203
repository = tree.branch.repository
2204
base_revision = common_ancestor(tree.branch.last_revision(),
2205
pending_merges[0], repository)
2206
base_tree = repository.revision_tree(base_revision)
2207
other_tree = repository.revision_tree(pending_merges[0])
2208
interesting_ids = None
2209
if file_list is not None:
2210
interesting_ids = set()
2211
for filename in file_list:
2212
file_id = tree.path2id(filename)
2214
raise NotVersionedError(filename)
2215
interesting_ids.add(file_id)
2216
if tree.kind(file_id) != "directory":
2219
for name, ie in tree.inventory.iter_entries(file_id):
2220
interesting_ids.add(ie.file_id)
2221
transform_tree(tree, tree.basis_tree(), interesting_ids)
2222
if file_list is None:
2223
restore_files = list(tree.iter_conflicts())
2225
restore_files = file_list
2226
for filename in restore_files:
2228
restore(tree.abspath(filename))
2229
except NotConflicted:
2231
conflicts = merge_inner(tree.branch, other_tree, base_tree,
2233
interesting_ids = interesting_ids,
2234
other_rev_id=pending_merges[0],
2235
merge_type=merge_type,
2236
show_base=show_base,
2237
reprocess=reprocess)
2245
class cmd_revert(Command):
2246
"""Reverse all changes since the last commit.
2248
Only versioned files are affected. Specify filenames to revert only
2249
those files. By default, any files that are changed will be backed up
2250
first. Backup files have a '~' appended to their name.
2252
takes_options = ['revision', 'no-backup']
2253
takes_args = ['file*']
2254
aliases = ['merge-revert']
2256
def run(self, revision=None, no_backup=False, file_list=None):
2257
from bzrlib.commands import parse_spec
2258
if file_list is not None:
2259
if len(file_list) == 0:
2260
raise BzrCommandError("No files specified")
2264
tree, file_list = tree_files(file_list)
2265
if revision is None:
2266
# FIXME should be tree.last_revision
2267
rev_id = tree.last_revision()
2268
elif len(revision) != 1:
2269
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
2271
rev_id = revision[0].in_history(tree.branch).rev_id
2272
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2274
tree.revert(file_list,
2275
tree.branch.repository.revision_tree(rev_id),
2281
class cmd_assert_fail(Command):
2282
"""Test reporting of assertion failures"""
2285
assert False, "always fails"
2288
class cmd_help(Command):
2289
"""Show help on a command or other topic.
2291
For a list of all available commands, say 'bzr help commands'."""
2292
takes_options = [Option('long', 'show help on all commands')]
2293
takes_args = ['topic?']
2294
aliases = ['?', '--help', '-?', '-h']
2297
def run(self, topic=None, long=False):
2299
if topic is None and long:
2304
class cmd_shell_complete(Command):
2305
"""Show appropriate completions for context.
2307
For a list of all available commands, say 'bzr shell-complete'."""
2308
takes_args = ['context?']
2313
def run(self, context=None):
2314
import shellcomplete
2315
shellcomplete.shellcomplete(context)
2318
class cmd_fetch(Command):
2319
"""Copy in history from another branch but don't merge it.
2321
This is an internal method used for pull and merge."""
2323
takes_args = ['from_branch', 'to_branch']
2324
def run(self, from_branch, to_branch):
2325
from bzrlib.fetch import Fetcher
2326
from bzrlib.branch import Branch
2327
from_b = Branch.open(from_branch)
2328
to_b = Branch.open(to_branch)
2329
Fetcher(to_b, from_b)
2332
class cmd_missing(Command):
2333
"""Show unmerged/unpulled revisions between two branches.
2335
OTHER_BRANCH may be local or remote."""
2336
takes_args = ['other_branch?']
2337
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2339
'Display changes in the local branch only'),
2340
Option('theirs-only',
2341
'Display changes in the remote branch only'),
2350
def run(self, other_branch=None, reverse=False, mine_only=False,
2351
theirs_only=False, log_format=None, long=False, short=False, line=False,
2352
show_ids=False, verbose=False):
2353
from bzrlib.missing import find_unmerged, iter_log_data
2354
from bzrlib.log import log_formatter
2355
local_branch = bzrlib.branch.Branch.open_containing(u".")[0]
2356
parent = local_branch.get_parent()
2357
if other_branch is None:
2358
other_branch = parent
2359
if other_branch is None:
2360
raise BzrCommandError("No missing location known or specified.")
2361
print "Using last location: " + local_branch.get_parent()
2362
remote_branch = bzrlib.branch.Branch.open(other_branch)
2363
if remote_branch.base == local_branch.base:
2364
remote_branch = local_branch
2365
local_branch.lock_read()
2367
remote_branch.lock_read()
2369
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2370
if (log_format == None):
2371
default = bzrlib.config.BranchConfig(local_branch).log_format()
2372
log_format = get_log_format(long=long, short=short, line=line, default=default)
2373
lf = log_formatter(log_format, sys.stdout,
2375
show_timezone='original')
2376
if reverse is False:
2377
local_extra.reverse()
2378
remote_extra.reverse()
2379
if local_extra and not theirs_only:
2380
print "You have %d extra revision(s):" % len(local_extra)
2381
for data in iter_log_data(local_extra, local_branch.repository,
2384
printed_local = True
2386
printed_local = False
2387
if remote_extra and not mine_only:
2388
if printed_local is True:
2390
print "You are missing %d revision(s):" % len(remote_extra)
2391
for data in iter_log_data(remote_extra, remote_branch.repository,
2394
if not remote_extra and not local_extra:
2396
print "Branches are up to date."
2400
remote_branch.unlock()
2402
local_branch.unlock()
2403
if not status_code and parent is None and other_branch is not None:
2404
local_branch.lock_write()
2406
# handle race conditions - a parent might be set while we run.
2407
if local_branch.get_parent() is None:
2408
local_branch.set_parent(remote_branch.base)
2410
local_branch.unlock()
2414
class cmd_plugins(Command):
2419
import bzrlib.plugin
2420
from inspect import getdoc
2421
for name, plugin in bzrlib.plugin.all_plugins().items():
2422
if hasattr(plugin, '__path__'):
2423
print plugin.__path__[0]
2424
elif hasattr(plugin, '__file__'):
2425
print plugin.__file__
2431
print '\t', d.split('\n')[0]
2434
class cmd_testament(Command):
2435
"""Show testament (signing-form) of a revision."""
2436
takes_options = ['revision', 'long']
2437
takes_args = ['branch?']
2439
def run(self, branch=u'.', revision=None, long=False):
2440
from bzrlib.testament import Testament
2441
b = WorkingTree.open_containing(branch)[0].branch
2444
if revision is None:
2445
rev_id = b.last_revision()
2447
rev_id = revision[0].in_history(b).rev_id
2448
t = Testament.from_revision(b.repository, rev_id)
2450
sys.stdout.writelines(t.as_text_lines())
2452
sys.stdout.write(t.as_short_text())
2457
class cmd_annotate(Command):
2458
"""Show the origin of each line in a file.
2460
This prints out the given file with an annotation on the left side
2461
indicating which revision, author and date introduced the change.
2463
If the origin is the same for a run of consecutive lines, it is
2464
shown only at the top, unless the --all option is given.
2466
# TODO: annotate directories; showing when each file was last changed
2467
# TODO: if the working copy is modified, show annotations on that
2468
# with new uncommitted lines marked
2469
aliases = ['blame', 'praise']
2470
takes_args = ['filename']
2471
takes_options = [Option('all', help='show annotations on all lines'),
2472
Option('long', help='show date in annotations'),
2477
def run(self, filename, all=False, long=False, revision=None):
2478
from bzrlib.annotate import annotate_file
2479
tree, relpath = WorkingTree.open_containing(filename)
2480
branch = tree.branch
2483
if revision is None:
2484
revision_id = branch.last_revision()
2485
elif len(revision) != 1:
2486
raise BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2488
revision_id = revision[0].in_history(branch).rev_id
2489
file_id = tree.inventory.path2id(relpath)
2490
tree = branch.repository.revision_tree(revision_id)
2491
file_version = tree.inventory[file_id].revision
2492
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
2497
class cmd_re_sign(Command):
2498
"""Create a digital signature for an existing revision."""
2499
# TODO be able to replace existing ones.
2501
hidden = True # is this right ?
2502
takes_args = ['revision_id*']
2503
takes_options = ['revision']
2505
def run(self, revision_id_list=None, revision=None):
2506
import bzrlib.config as config
2507
import bzrlib.gpg as gpg
2508
if revision_id_list is not None and revision is not None:
2509
raise BzrCommandError('You can only supply one of revision_id or --revision')
2510
if revision_id_list is None and revision is None:
2511
raise BzrCommandError('You must supply either --revision or a revision_id')
2512
b = WorkingTree.open_containing(u'.')[0].branch
2513
gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
2514
if revision_id_list is not None:
2515
for revision_id in revision_id_list:
2516
b.repository.sign_revision(revision_id, gpg_strategy)
2517
elif revision is not None:
2518
if len(revision) == 1:
2519
revno, rev_id = revision[0].in_history(b)
2520
b.repository.sign_revision(rev_id, gpg_strategy)
2521
elif len(revision) == 2:
2522
# are they both on rh- if so we can walk between them
2523
# might be nice to have a range helper for arbitrary
2524
# revision paths. hmm.
2525
from_revno, from_revid = revision[0].in_history(b)
2526
to_revno, to_revid = revision[1].in_history(b)
2527
if to_revid is None:
2528
to_revno = b.revno()
2529
if from_revno is None or to_revno is None:
2530
raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2531
for revno in range(from_revno, to_revno + 1):
2532
b.repository.sign_revision(b.get_rev_id(revno),
2535
raise BzrCommandError('Please supply either one revision, or a range.')
2538
class cmd_bind(Command):
2539
"""Bind the current branch to a master branch.
2541
After binding, commits must succeed on the master branch
2542
before they are executed on the local one.
2545
takes_args = ['location']
2548
def run(self, location=None):
2549
b, relpath = Branch.open_containing(u'.')
2550
b_other = Branch.open(location)
2553
except DivergedBranches:
2554
raise BzrCommandError('These branches have diverged.'
2555
' Try merging, and then bind again.')
2558
class cmd_unbind(Command):
2559
"""Unbind the current branch from its master branch.
2561
After unbinding, the local branch is considered independent.
2562
All subsequent commits will be local.
2569
b, relpath = Branch.open_containing(u'.')
2571
raise BzrCommandError('Local branch is not bound')
2574
class cmd_uncommit(bzrlib.commands.Command):
2575
"""Remove the last committed revision.
2577
--verbose will print out what is being removed.
2578
--dry-run will go through all the motions, but not actually
2581
In the future, uncommit will create a revision bundle, which can then
2585
# TODO: jam 20060108 Add an option to allow uncommit to remove
2586
# unreferenced information in 'branch-as-repository' branches.
2587
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2588
# information in shared branches as well.
2589
takes_options = ['verbose', 'revision',
2590
Option('dry-run', help='Don\'t actually make changes'),
2591
Option('force', help='Say yes to all questions.')]
2592
takes_args = ['location?']
2595
def run(self, location=None,
2596
dry_run=False, verbose=False,
2597
revision=None, force=False):
2598
from bzrlib.branch import Branch
2599
from bzrlib.log import log_formatter
2601
from bzrlib.uncommit import uncommit
2603
if location is None:
2605
control, relpath = bzrdir.BzrDir.open_containing(location)
2607
tree = control.open_workingtree()
2609
except (errors.NoWorkingTree, errors.NotLocalUrl):
2611
b = control.open_branch()
2613
if revision is None:
2615
rev_id = b.last_revision()
2617
revno, rev_id = revision[0].in_history(b)
2619
print 'No revisions to uncommit.'
2621
for r in range(revno, b.revno()+1):
2622
rev_id = b.get_rev_id(r)
2623
lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
2624
lf.show(r, b.repository.get_revision(rev_id), None)
2627
print 'Dry-run, pretending to remove the above revisions.'
2629
val = raw_input('Press <enter> to continue')
2631
print 'The above revision(s) will be removed.'
2633
val = raw_input('Are you sure [y/N]? ')
2634
if val.lower() not in ('y', 'yes'):
2638
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
2642
class cmd_break_lock(Command):
2643
"""Break a dead lock on a repository, branch or working directory.
2645
CAUTION: Locks should only be broken when you are sure that the process
2646
holding the lock has been stopped.
2648
You can get information on what locks are open via the 'bzr info' command.
2653
takes_args = ['location?']
2655
def run(self, location=None, show=False):
2656
if location is None:
2658
control, relpath = bzrdir.BzrDir.open_containing(location)
2660
control.break_lock()
2661
except NotImplementedError:
2666
# command-line interpretation helper for merge-related commands
2667
def merge(other_revision, base_revision,
2668
check_clean=True, ignore_zero=False,
2669
this_dir=None, backup_files=False, merge_type=Merge3Merger,
2670
file_list=None, show_base=False, reprocess=False,
2671
pb=DummyProgress()):
2672
"""Merge changes into a tree.
2675
list(path, revno) Base for three-way merge.
2676
If [None, None] then a base will be automatically determined.
2678
list(path, revno) Other revision for three-way merge.
2680
Directory to merge changes into; '.' by default.
2682
If true, this_dir must have no uncommitted changes before the
2684
ignore_zero - If true, suppress the "zero conflicts" message when
2685
there are no conflicts; should be set when doing something we expect
2686
to complete perfectly.
2687
file_list - If supplied, merge only changes to selected files.
2689
All available ancestors of other_revision and base_revision are
2690
automatically pulled into the branch.
2692
The revno may be -1 to indicate the last revision on the branch, which is
2695
This function is intended for use from the command line; programmatic
2696
clients might prefer to call merge.merge_inner(), which has less magic
2699
from bzrlib.merge import Merger
2700
if this_dir is None:
2702
this_tree = WorkingTree.open_containing(this_dir)[0]
2703
if show_base and not merge_type is Merge3Merger:
2704
raise BzrCommandError("Show-base is not supported for this merge"
2705
" type. %s" % merge_type)
2706
if reprocess and not merge_type.supports_reprocess:
2707
raise BzrCommandError("Conflict reduction is not supported for merge"
2708
" type %s." % merge_type)
2709
if reprocess and show_base:
2710
raise BzrCommandError("Cannot do conflict reduction and show base.")
2712
merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2713
merger.pp = ProgressPhase("Merge phase", 5, pb)
2714
merger.pp.next_phase()
2715
merger.check_basis(check_clean)
2716
merger.set_other(other_revision)
2717
merger.pp.next_phase()
2718
merger.set_base(base_revision)
2719
if merger.base_rev_id == merger.other_rev_id:
2720
note('Nothing to do.')
2722
merger.backup_files = backup_files
2723
merger.merge_type = merge_type
2724
merger.set_interesting_files(file_list)
2725
merger.show_base = show_base
2726
merger.reprocess = reprocess
2727
conflicts = merger.do_merge()
2728
if file_list is None:
2729
merger.set_pending()
2735
# these get imported and then picked up by the scan for cmd_*
2736
# TODO: Some more consistent way to split command definitions across files;
2737
# we do need to load at least some information about them to know of
2738
# aliases. ideally we would avoid loading the implementation until the
2739
# details were needed.
2740
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2741
from bzrlib.bundle.commands import cmd_bundle_revisions
2742
from bzrlib.sign_my_commits import cmd_sign_my_commits
2743
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
2744
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
