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, BadBundle)
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']
185
def run(self, revision_id=None, revision=None):
187
if revision_id is not None and revision is not None:
188
raise BzrCommandError('You can only supply one of revision_id or --revision')
189
if revision_id is None and revision is None:
190
raise BzrCommandError('You must supply either --revision or a revision_id')
191
b = WorkingTree.open_containing(u'.')[0].branch
193
# TODO: jam 20060112 should cat-revision always output utf-8?
194
if revision_id is not None:
195
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
196
elif revision is not None:
199
raise BzrCommandError('You cannot specify a NULL revision.')
200
revno, rev_id = rev.in_history(b)
201
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
204
class cmd_revno(Command):
205
"""Show current revision number.
207
This is equal to the number of revisions on this branch.
210
takes_args = ['location?']
213
def run(self, location=u'.'):
214
self.outf.write(str(Branch.open_containing(location)[0].revno()))
215
self.outf.write('\n')
218
class cmd_revision_info(Command):
219
"""Show revision number and revision id for a given revision identifier.
222
takes_args = ['revision_info*']
223
takes_options = ['revision']
226
def run(self, revision=None, revision_info_list=[]):
229
if revision is not None:
230
revs.extend(revision)
231
if revision_info_list is not None:
232
for rev in revision_info_list:
233
revs.append(RevisionSpec(rev))
235
raise BzrCommandError('You must supply a revision identifier')
237
b = WorkingTree.open_containing(u'.')[0].branch
240
revinfo = rev.in_history(b)
241
if revinfo.revno is None:
242
print ' %s' % revinfo.rev_id
244
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
247
class cmd_add(Command):
248
"""Add specified files or directories.
250
In non-recursive mode, all the named items are added, regardless
251
of whether they were previously ignored. A warning is given if
252
any of the named files are already versioned.
254
In recursive mode (the default), files are treated the same way
255
but the behaviour for directories is different. Directories that
256
are already versioned do not give a warning. All directories,
257
whether already versioned or not, are searched for files or
258
subdirectories that are neither versioned or ignored, and these
259
are added. This search proceeds recursively into versioned
260
directories. If no names are given '.' is assumed.
262
Therefore simply saying 'bzr add' will version all files that
263
are currently unknown.
265
Adding a file whose parent directory is not versioned will
266
implicitly add the parent, and so on up to the root. This means
267
you should never need to explictly add a directory, they'll just
268
get added when you add a file in the directory.
270
--dry-run will show which files would be added, but not actually
273
takes_args = ['file*']
274
takes_options = ['no-recurse', 'dry-run', 'verbose']
275
encoding_type = 'replace'
277
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False):
280
action = bzrlib.add.AddAction(to_file=self.outf,
281
should_add=(not dry_run), should_print=(not is_quiet()))
283
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
287
for glob in sorted(ignored.keys()):
288
for path in ignored[glob]:
289
self.outf.write("ignored %s matching \"%s\"\n"
293
for glob, paths in ignored.items():
294
match_len += len(paths)
295
self.outf.write("ignored %d file(s).\n" % match_len)
296
self.outf.write("If you wish to add some of these files,"
297
" please add them by name.\n")
300
class cmd_mkdir(Command):
301
"""Create a new versioned directory.
303
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
print >>self.outf, 'added', d
316
class cmd_relpath(Command):
317
"""Show path of a file relative to root"""
318
takes_args = ['filename']
322
def run(self, filename):
323
# TODO: jam 20050106 Can relpath return a munged path if
324
# sys.stdout encoding cannot represent it?
325
tree, relpath = WorkingTree.open_containing(filename)
326
self.outf.write(relpath)
327
self.outf.write('\n')
330
class cmd_inventory(Command):
331
"""Show inventory of the current working copy or a revision.
333
It is possible to limit the output to a particular entry
334
type using the --kind option. For example; --kind file.
336
takes_options = ['revision', 'show-ids', 'kind']
339
def run(self, revision=None, show_ids=False, kind=None):
340
if kind and kind not in ['file', 'directory', 'symlink']:
341
raise BzrCommandError('invalid kind specified')
342
tree = WorkingTree.open_containing(u'.')[0]
344
inv = tree.read_working_inventory()
346
if len(revision) > 1:
347
raise BzrCommandError('bzr inventory --revision takes'
348
' exactly one revision identifier')
349
inv = tree.branch.repository.get_revision_inventory(
350
revision[0].in_history(tree.branch).rev_id)
352
for path, entry in inv.entries():
353
if kind and kind != entry.kind:
356
self.outf.write('%-50s %s\n' % (path, entry.file_id))
358
self.outf.write(path)
359
self.outf.write('\n')
362
class cmd_mv(Command):
363
"""Move or rename a file.
366
bzr mv OLDNAME NEWNAME
367
bzr mv SOURCE... DESTINATION
369
If the last argument is a versioned directory, all the other names
370
are moved into it. Otherwise, there must be exactly two arguments
371
and the file is changed to a new name, which must not already exist.
373
Files cannot be moved between branches.
375
takes_args = ['names*']
376
aliases = ['move', 'rename']
378
encoding_type = 'replace'
380
def run(self, names_list):
381
if len(names_list) < 2:
382
raise BzrCommandError("missing file argument")
383
tree, rel_names = tree_files(names_list)
385
if os.path.isdir(names_list[-1]):
386
# move into existing directory
387
for pair in tree.move(rel_names[:-1], rel_names[-1]):
388
self.outf.write("%s => %s\n" % pair)
390
if len(names_list) != 2:
391
raise BzrCommandError('to mv multiple files the destination '
392
'must be a versioned directory')
393
tree.rename_one(rel_names[0], rel_names[1])
394
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
397
class cmd_pull(Command):
398
"""Turn this branch into a mirror of another branch.
400
This command only works on branches that have not diverged. Branches are
401
considered diverged if the destination branch's most recent commit is one
402
that has not been merged (directly or indirectly) into the parent.
404
If branches have diverged, you can use 'bzr merge' to integrate the changes
405
from one into the other. Once one branch has merged, the other should
406
be able to pull it again.
408
If branches have diverged, you can use 'bzr merge' to pull the text changes
409
from one into the other. Once one branch has merged, the other should
410
be able to pull it again.
412
If you want to forget your local changes and just update your branch to
413
match the remote one, use pull --overwrite.
415
If there is no default location set, the first pull will set it. After
416
that, you can omit the location to use the default. To change the
417
default, use --remember.
419
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
420
takes_args = ['location?']
421
encoding_type = 'replace'
423
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
424
# FIXME: too much stuff is in the command class
426
tree_to = WorkingTree.open_containing(u'.')[0]
427
branch_to = tree_to.branch
428
except NoWorkingTree:
430
branch_to = Branch.open_containing(u'.')[0]
431
stored_loc = branch_to.get_parent()
433
if stored_loc is None:
434
raise BzrCommandError("No pull location known or specified.")
436
display_url = urlutils.unescape_for_display(stored_loc,
438
self.outf.write("Using saved location: %s\n" % display_url)
439
location = stored_loc
441
branch_from = Branch.open(location)
443
if branch_to.get_parent() is None or remember:
444
branch_to.set_parent(branch_from.base)
448
elif len(revision) == 1:
449
rev_id = revision[0].in_history(branch_from).rev_id
451
raise BzrCommandError('bzr pull --revision takes one value.')
453
old_rh = branch_to.revision_history()
454
if tree_to is not None:
455
count = tree_to.pull(branch_from, overwrite, rev_id)
457
count = branch_to.pull(branch_from, overwrite, rev_id)
458
note('%d revision(s) pulled.' % (count,))
461
new_rh = branch_to.revision_history()
464
from bzrlib.log import show_changed_revisions
465
show_changed_revisions(branch_to, old_rh, new_rh,
469
class cmd_push(Command):
470
"""Update a mirror of this branch.
472
The target branch will not have its working tree populated because this
473
is both expensive, and is not supported on remote file systems.
475
Some smart servers or protocols *may* put the working tree in place in
478
This command only works on branches that have not diverged. Branches are
479
considered diverged if the destination branch's most recent commit is one
480
that has not been merged (directly or indirectly) by the source branch.
482
If branches have diverged, you can use 'bzr push --overwrite' to replace
483
the other branch completely, discarding its unmerged changes.
485
If you want to ensure you have the different changes in the other branch,
486
do a merge (see bzr help merge) from the other branch, and commit that.
487
After that you will be able to do a push without '--overwrite'.
489
If there is no default push location set, the first push will set it.
490
After that, you can omit the location to use the default. To change the
491
default, use --remember.
493
takes_options = ['remember', 'overwrite', 'verbose',
494
Option('create-prefix',
495
help='Create the path leading up to the branch '
496
'if it does not already exist')]
497
takes_args = ['location?']
498
encoding_type = 'replace'
500
def run(self, location=None, remember=False, overwrite=False,
501
create_prefix=False, verbose=False):
502
# FIXME: Way too big! Put this into a function called from the
504
from bzrlib.transport import get_transport
506
br_from = Branch.open_containing('.')[0]
507
stored_loc = br_from.get_push_location()
509
if stored_loc is None:
510
raise BzrCommandError("No push location known or specified.")
512
display_url = urlutils.unescape_for_display(stored_loc,
514
self.outf.write("Using saved location: %s" % display_url)
515
location = stored_loc
517
transport = get_transport(location)
518
location_url = transport.base
519
if br_from.get_push_location() is None or remember:
520
br_from.set_push_location(location_url)
524
dir_to = bzrlib.bzrdir.BzrDir.open(location_url)
525
br_to = dir_to.open_branch()
526
except NotBranchError:
528
transport = transport.clone('..')
529
if not create_prefix:
531
relurl = transport.relpath(location_url)
532
mutter('creating directory %s => %s', location_url, relurl)
533
transport.mkdir(relurl)
535
raise BzrCommandError("Parent directory of %s "
536
"does not exist." % location)
538
current = transport.base
539
needed = [(transport, transport.relpath(location_url))]
542
transport, relpath = needed[-1]
543
transport.mkdir(relpath)
546
new_transport = transport.clone('..')
547
needed.append((new_transport,
548
new_transport.relpath(transport.base)))
549
if new_transport.base == transport.base:
550
raise BzrCommandError("Could not create "
552
dir_to = br_from.bzrdir.clone(location_url,
553
revision_id=br_from.last_revision())
554
br_to = dir_to.open_branch()
555
count = len(br_to.revision_history())
557
old_rh = br_to.revision_history()
560
tree_to = dir_to.open_workingtree()
561
except errors.NotLocalUrl:
562
warning('This transport does not update the working '
563
'tree of: %s' % (br_to.base,))
564
count = br_to.pull(br_from, overwrite)
565
except NoWorkingTree:
566
count = br_to.pull(br_from, overwrite)
568
count = tree_to.pull(br_from, overwrite)
569
except DivergedBranches:
570
raise BzrCommandError("These branches have diverged."
571
" Try a merge then push with overwrite.")
572
note('%d revision(s) pushed.' % (count,))
575
new_rh = br_to.revision_history()
578
from bzrlib.log import show_changed_revisions
579
show_changed_revisions(br_to, old_rh, new_rh,
583
class cmd_branch(Command):
584
"""Create a new copy of a branch.
586
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
587
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
589
To retrieve the branch as of a particular revision, supply the --revision
590
parameter, as in "branch foo/bar -r 5".
592
--basis is to speed up branching from remote branches. When specified, it
593
copies all the file-contents, inventory and revision data from the basis
594
branch before copying anything from the remote branch.
596
takes_args = ['from_location', 'to_location?']
597
takes_options = ['revision', 'basis']
598
aliases = ['get', 'clone']
600
def run(self, from_location, to_location=None, revision=None, basis=None):
601
from bzrlib.transport import get_transport
602
from bzrlib.osutils import rmtree
605
elif len(revision) > 1:
606
raise BzrCommandError(
607
'bzr branch --revision takes exactly 1 revision value')
609
br_from = Branch.open(from_location)
611
if e.errno == errno.ENOENT:
612
raise BzrCommandError('Source location "%s" does not'
613
' exist.' % to_location)
618
if basis is not None:
619
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
622
if len(revision) == 1 and revision[0] is not None:
623
revision_id = revision[0].in_history(br_from)[1]
625
# FIXME - wt.last_revision, fallback to branch, fall back to
626
# None or perhaps NULL_REVISION to mean copy nothing
628
revision_id = br_from.last_revision()
629
if to_location is None:
630
to_location = os.path.basename(from_location.rstrip("/\\"))
633
name = os.path.basename(to_location) + '\n'
635
to_transport = get_transport(to_location)
637
to_transport.mkdir('.')
638
except bzrlib.errors.FileExists:
639
raise BzrCommandError('Target directory "%s" already'
640
' exists.' % to_location)
641
except bzrlib.errors.NoSuchFile:
642
raise BzrCommandError('Parent of "%s" does not exist.' %
645
# preserve whatever source format we have.
646
dir = br_from.bzrdir.sprout(to_transport.base,
647
revision_id, basis_dir)
648
branch = dir.open_branch()
649
except bzrlib.errors.NoSuchRevision:
650
# TODO: jam 20060426 This only works on local paths
651
# and it would be nice if 'bzr branch' could
652
# work on a remote path
654
msg = "The branch %s has no revision %s." % (from_location, revision[0])
655
raise BzrCommandError(msg)
656
except bzrlib.errors.UnlistableBranch:
658
msg = "The branch %s cannot be used as a --basis" % (basis,)
659
raise BzrCommandError(msg)
661
branch.control_files.put_utf8('branch-name', name)
662
note('Branched %d revision(s).' % branch.revno())
667
class cmd_checkout(Command):
668
"""Create a new checkout of an existing branch.
670
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
671
the branch found in '.'. This is useful if you have removed the working tree
672
or if it was never created - i.e. if you pushed the branch to its current
675
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
676
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
678
To retrieve the branch as of a particular revision, supply the --revision
679
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
680
out of date [so you cannot commit] but it may be useful (i.e. to examine old
683
--basis is to speed up checking out from remote branches. When specified, it
684
uses the inventory and file contents from the basis branch in preference to the
685
branch being checked out.
687
takes_args = ['branch_location?', 'to_location?']
688
takes_options = ['revision', # , 'basis']
689
Option('lightweight',
690
help="perform a lightweight checkout. Lightweight "
691
"checkouts depend on access to the branch for "
692
"every operation. Normal checkouts can perform "
693
"common operations like diff and status without "
694
"such access, and also support local commits."
698
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
702
elif len(revision) > 1:
703
raise BzrCommandError(
704
'bzr checkout --revision takes exactly 1 revision value')
705
if branch_location is None:
706
branch_location = bzrlib.osutils.getcwd()
707
to_location = branch_location
708
source = Branch.open(branch_location)
709
if len(revision) == 1 and revision[0] is not None:
710
revision_id = revision[0].in_history(source)[1]
713
if to_location is None:
714
to_location = os.path.basename(branch_location.rstrip("/\\"))
715
# if the source and to_location are the same,
716
# and there is no working tree,
717
# then reconstitute a branch
718
if (bzrlib.osutils.abspath(to_location) ==
719
bzrlib.osutils.abspath(branch_location)):
721
source.bzrdir.open_workingtree()
722
except errors.NoWorkingTree:
723
source.bzrdir.create_workingtree()
726
os.mkdir(to_location)
728
if e.errno == errno.EEXIST:
729
raise BzrCommandError('Target directory "%s" already'
730
' exists.' % to_location)
731
if e.errno == errno.ENOENT:
732
raise BzrCommandError('Parent of "%s" does not exist.' %
736
old_format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
737
bzrlib.bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
740
checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
741
bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
743
checkout_branch = bzrlib.bzrdir.BzrDir.create_branch_convenience(
744
to_location, force_new_tree=False)
745
checkout = checkout_branch.bzrdir
746
checkout_branch.bind(source)
747
if revision_id is not None:
748
rh = checkout_branch.revision_history()
749
checkout_branch.set_revision_history(rh[:rh.index(revision_id) + 1])
750
checkout.create_workingtree(revision_id)
752
bzrlib.bzrdir.BzrDirFormat.set_default_format(old_format)
755
class cmd_renames(Command):
756
"""Show list of renamed files.
758
# TODO: Option to show renames between two historical versions.
760
# TODO: Only show renames under dir, rather than in the whole branch.
761
takes_args = ['dir?']
764
def run(self, dir=u'.'):
765
tree = WorkingTree.open_containing(dir)[0]
766
old_inv = tree.basis_tree().inventory
767
new_inv = tree.read_working_inventory()
769
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
771
for old_name, new_name in renames:
772
self.outf.write("%s => %s\n" % (old_name, new_name))
775
class cmd_update(Command):
776
"""Update a tree to have the latest code committed to its branch.
778
This will perform a merge into the working tree, and may generate
779
conflicts. If you have any local changes, you will still
780
need to commit them after the update for the update to be complete.
782
If you want to discard your local changes, you can just do a
783
'bzr revert' instead of 'bzr commit' after the update.
785
takes_args = ['dir?']
787
def run(self, dir='.'):
788
tree = WorkingTree.open_containing(dir)[0]
791
if tree.last_revision() == tree.branch.last_revision():
792
# may be up to date, check master too.
793
master = tree.branch.get_master_branch()
794
if master is None or master.last_revision == tree.last_revision():
795
note("Tree is up to date.")
797
conflicts = tree.update()
798
note('Updated to revision %d.' %
799
(tree.branch.revision_id_to_revno(tree.last_revision()),))
808
class cmd_info(Command):
809
"""Show information about a working tree, branch or repository.
811
This command will show all known locations and formats associated to the
812
tree, branch or repository. Statistical information is included with
815
Branches and working trees will also report any missing revisions.
817
takes_args = ['location?']
818
takes_options = ['verbose']
821
def run(self, location=None, verbose=False):
822
from bzrlib.info import show_bzrdir_info
823
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
827
class cmd_remove(Command):
828
"""Make a file unversioned.
830
This makes bzr stop tracking changes to a versioned file. It does
831
not delete the working copy.
833
You can specify one or more files, and/or --new. If you specify --new,
834
only 'added' files will be removed. If you specify both, then new files
835
in the specified directories will be removed. If the directories are
836
also new, they will also be removed.
838
takes_args = ['file*']
839
takes_options = ['verbose', Option('new', help='remove newly-added files')]
842
def run(self, file_list, verbose=False, new=False):
843
tree, file_list = tree_files(file_list)
845
if file_list is None:
846
raise BzrCommandError('Specify one or more files to remove, or'
849
from bzrlib.delta import compare_trees
850
added = [compare_trees(tree.basis_tree(), tree,
851
specific_files=file_list).added]
852
file_list = sorted([f[0] for f in added[0]], reverse=True)
853
if len(file_list) == 0:
854
raise BzrCommandError('No matching files.')
855
tree.remove(file_list, verbose=verbose)
858
class cmd_file_id(Command):
859
"""Print file_id of a particular file or directory.
861
The file_id is assigned when the file is first added and remains the
862
same through all revisions where the file exists, even when it is
866
takes_args = ['filename']
869
def run(self, filename):
870
tree, relpath = WorkingTree.open_containing(filename)
871
i = tree.inventory.path2id(relpath)
873
raise BzrError("%r is not a versioned file" % filename)
876
self.outf.write('\n')
879
class cmd_file_path(Command):
880
"""Print path of file_ids to a file or directory.
882
This prints one line for each directory down to the target,
883
starting at the branch root.
886
takes_args = ['filename']
889
def run(self, filename):
890
tree, relpath = WorkingTree.open_containing(filename)
892
fid = inv.path2id(relpath)
894
raise BzrError("%r is not a versioned file" % filename)
895
for fip in inv.get_idpath(fid):
897
self.outf.write('\n')
900
class cmd_reconcile(Command):
901
"""Reconcile bzr metadata in a branch.
903
This can correct data mismatches that may have been caused by
904
previous ghost operations or bzr upgrades. You should only
905
need to run this command if 'bzr check' or a bzr developer
906
advises you to run it.
908
If a second branch is provided, cross-branch reconciliation is
909
also attempted, which will check that data like the tree root
910
id which was not present in very early bzr versions is represented
911
correctly in both branches.
913
At the same time it is run it may recompress data resulting in
914
a potential saving in disk space or performance gain.
916
The branch *MUST* be on a listable system such as local disk or sftp.
918
takes_args = ['branch?']
920
def run(self, branch="."):
921
from bzrlib.reconcile import reconcile
922
dir = bzrlib.bzrdir.BzrDir.open(branch)
926
class cmd_revision_history(Command):
927
"""Display list of revision ids on this branch."""
932
branch = WorkingTree.open_containing(u'.')[0].branch
933
for patchid in branch.revision_history():
934
self.outf.write(patchid)
935
self.outf.write('\n')
938
class cmd_ancestry(Command):
939
"""List all revisions merged into this branch."""
944
tree = WorkingTree.open_containing(u'.')[0]
946
# FIXME. should be tree.last_revision
947
revision_ids = b.repository.get_ancestry(b.last_revision())
948
assert revision_ids[0] == None
950
for revision_id in revision_ids:
951
self.outf.write(revision_id + '\n')
954
class cmd_init(Command):
955
"""Make a directory into a versioned branch.
957
Use this to create an empty branch, or before importing an
960
If there is a repository in a parent directory of the location, then
961
the history of the branch will be stored in the repository. Otherwise
962
init creates a standalone branch which carries its own history in
965
If there is already a branch at the location but it has no working tree,
966
the tree can be populated with 'bzr checkout'.
968
Recipe for importing a tree of files:
973
bzr commit -m 'imported project'
975
takes_args = ['location?']
978
help='Specify a format for this branch. Current'
979
' formats are: default, knit, metaweave and'
980
' weave. Default is knit; metaweave and'
981
' weave are deprecated',
982
type=get_format_type),
984
def run(self, location=None, format=None):
985
from bzrlib.branch import Branch
987
format = get_format_type('default')
991
# The path has to exist to initialize a
992
# branch inside of it.
993
# Just using os.mkdir, since I don't
994
# believe that we want to create a bunch of
995
# locations if the user supplies an extended path
996
if not os.path.exists(location):
999
existing_bzrdir = bzrdir.BzrDir.open(location)
1000
except NotBranchError:
1001
# really a NotBzrDir error...
1002
bzrdir.BzrDir.create_branch_convenience(location, format=format)
1004
if existing_bzrdir.has_branch():
1005
if existing_bzrdir.has_workingtree():
1006
raise errors.AlreadyBranchError(location)
1008
raise errors.BranchExistsWithoutWorkingTree(location)
1010
existing_bzrdir.create_branch()
1011
existing_bzrdir.create_workingtree()
1014
class cmd_init_repository(Command):
1015
"""Create a shared repository to hold branches.
1017
New branches created under the repository directory will store their revisions
1018
in the repository, not in the branch directory, if the branch format supports
1024
bzr checkout --lightweight repo/trunk trunk-checkout
1028
takes_args = ["location"]
1029
takes_options = [Option('format',
1030
help='Specify a format for this repository.'
1031
' Current formats are: default, knit,'
1032
' metaweave and weave. Default is knit;'
1033
' metaweave and weave are deprecated',
1034
type=get_format_type),
1036
help='Allows branches in repository to have'
1038
aliases = ["init-repo"]
1039
def run(self, location, format=None, trees=False):
1040
from bzrlib.transport import get_transport
1042
format = get_format_type('default')
1043
transport = get_transport(location)
1044
if not transport.has('.'):
1046
newdir = format.initialize_on_transport(transport)
1047
repo = newdir.create_repository(shared=True)
1048
repo.set_make_working_trees(trees)
1051
class cmd_diff(Command):
1052
"""Show differences in working tree.
1054
If files are listed, only the changes in those files are listed.
1055
Otherwise, all changes for the tree are listed.
1057
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1058
produces patches suitable for "patch -p1".
1064
bzr diff --diff-prefix old/:new/
1065
bzr diff bzr.mine bzr.dev
1068
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1069
# or a graphical diff.
1071
# TODO: Python difflib is not exactly the same as unidiff; should
1072
# either fix it up or prefer to use an external diff.
1074
# TODO: Selected-file diff is inefficient and doesn't show you
1077
# TODO: This probably handles non-Unix newlines poorly.
1079
takes_args = ['file*']
1080
takes_options = ['revision', 'diff-options', 'prefix']
1081
aliases = ['di', 'dif']
1082
encoding_type = 'exact'
1085
def run(self, revision=None, file_list=None, diff_options=None,
1087
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1089
if (prefix is None) or (prefix == '0'):
1097
if not ':' in prefix:
1098
raise BzrError("--diff-prefix expects two values separated by a colon")
1099
old_label, new_label = prefix.split(":")
1102
tree1, file_list = internal_tree_files(file_list)
1106
except FileInWrongBranch:
1107
if len(file_list) != 2:
1108
raise BzrCommandError("Files are in different branches")
1110
tree1, file1 = WorkingTree.open_containing(file_list[0])
1111
tree2, file2 = WorkingTree.open_containing(file_list[1])
1112
if file1 != "" or file2 != "":
1113
# FIXME diff those two files. rbc 20051123
1114
raise BzrCommandError("Files are in different branches")
1116
if revision is not None:
1117
if tree2 is not None:
1118
raise BzrCommandError("Can't specify -r with two branches")
1119
if (len(revision) == 1) or (revision[1].spec is None):
1120
return diff_cmd_helper(tree1, file_list, diff_options,
1122
old_label=old_label, new_label=new_label)
1123
elif len(revision) == 2:
1124
return diff_cmd_helper(tree1, file_list, diff_options,
1125
revision[0], revision[1],
1126
old_label=old_label, new_label=new_label)
1128
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
1130
if tree2 is not None:
1131
return show_diff_trees(tree1, tree2, sys.stdout,
1132
specific_files=file_list,
1133
external_diff_options=diff_options,
1134
old_label=old_label, new_label=new_label)
1136
return diff_cmd_helper(tree1, file_list, diff_options,
1137
old_label=old_label, new_label=new_label)
1140
class cmd_deleted(Command):
1141
"""List files deleted in the working tree.
1143
# TODO: Show files deleted since a previous revision, or
1144
# between two revisions.
1145
# TODO: Much more efficient way to do this: read in new
1146
# directories with readdir, rather than stating each one. Same
1147
# level of effort but possibly much less IO. (Or possibly not,
1148
# if the directories are very large...)
1149
takes_options = ['show-ids']
1152
def run(self, show_ids=False):
1153
tree = WorkingTree.open_containing(u'.')[0]
1154
old = tree.basis_tree()
1155
for path, ie in old.inventory.iter_entries():
1156
if not tree.has_id(ie.file_id):
1157
self.outf.write(path)
1159
self.outf.write(' ')
1160
self.outf.write(ie.file_id)
1161
self.outf.write('\n')
1164
class cmd_modified(Command):
1165
"""List files modified in working tree."""
1169
from bzrlib.delta import compare_trees
1171
tree = WorkingTree.open_containing(u'.')[0]
1172
td = compare_trees(tree.basis_tree(), tree)
1174
for path, id, kind, text_modified, meta_modified in td.modified:
1175
self.outf.write(path)
1176
self.outf.write('\n')
1179
class cmd_added(Command):
1180
"""List files added in working tree."""
1184
wt = WorkingTree.open_containing(u'.')[0]
1185
basis_inv = wt.basis_tree().inventory
1188
if file_id in basis_inv:
1190
path = inv.id2path(file_id)
1191
if not os.access(bzrlib.osutils.abspath(path), os.F_OK):
1193
self.outf.write(path)
1194
self.outf.write('\n')
1197
class cmd_root(Command):
1198
"""Show the tree root directory.
1200
The root is the nearest enclosing directory with a .bzr control
1202
takes_args = ['filename?']
1204
def run(self, filename=None):
1205
"""Print the branch root."""
1206
tree = WorkingTree.open_containing(filename)[0]
1207
self.outf.write(tree.basedir)
1208
self.outf.write('\n')
1211
class cmd_log(Command):
1212
"""Show log of a branch, file, or directory.
1214
By default show the log of the branch containing the working directory.
1216
To request a range of logs, you can use the command -r begin..end
1217
-r revision requests a specific revision, -r ..end or -r begin.. are
1223
bzr log -r -10.. http://server/branch
1226
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1228
takes_args = ['location?']
1229
takes_options = [Option('forward',
1230
help='show from oldest to newest'),
1233
help='show files changed in each revision'),
1234
'show-ids', 'revision',
1238
help='show revisions whose message matches this regexp',
1242
encoding_type = 'replace'
1245
def run(self, location=None, timezone='original',
1255
from bzrlib.log import log_formatter, show_log
1256
assert message is None or isinstance(message, basestring), \
1257
"invalid message argument %r" % message
1258
direction = (forward and 'forward') or 'reverse'
1263
# find the file id to log:
1265
dir, fp = bzrdir.BzrDir.open_containing(location)
1266
b = dir.open_branch()
1270
inv = dir.open_workingtree().inventory
1271
except (errors.NotBranchError, errors.NotLocalUrl):
1272
# either no tree, or is remote.
1273
inv = b.basis_tree().inventory
1274
file_id = inv.path2id(fp)
1277
# FIXME ? log the current subdir only RBC 20060203
1278
dir, relpath = bzrdir.BzrDir.open_containing('.')
1279
b = dir.open_branch()
1281
if revision is None:
1284
elif len(revision) == 1:
1285
rev1 = rev2 = revision[0].in_history(b).revno
1286
elif len(revision) == 2:
1287
if revision[0].spec is None:
1288
# missing begin-range means first revision
1291
rev1 = revision[0].in_history(b).revno
1293
if revision[1].spec is None:
1294
# missing end-range means last known revision
1297
rev2 = revision[1].in_history(b).revno
1299
raise BzrCommandError('bzr log --revision takes one or two values.')
1301
# By this point, the revision numbers are converted to the +ve
1302
# form if they were supplied in the -ve form, so we can do
1303
# this comparison in relative safety
1305
(rev2, rev1) = (rev1, rev2)
1307
if (log_format == None):
1308
default = bzrlib.config.BranchConfig(b).log_format()
1309
log_format = get_log_format(long=long, short=short, line=line, default=default)
1310
lf = log_formatter(log_format,
1313
show_timezone=timezone)
1319
direction=direction,
1320
start_revision=rev1,
1325
def get_log_format(long=False, short=False, line=False, default='long'):
1326
log_format = default
1330
log_format = 'short'
1336
class cmd_touching_revisions(Command):
1337
"""Return revision-ids which affected a particular file.
1339
A more user-friendly interface is "bzr log FILE"."""
1341
takes_args = ["filename"]
1342
encoding_type = 'replace'
1345
def run(self, filename):
1346
tree, relpath = WorkingTree.open_containing(filename)
1348
inv = tree.read_working_inventory()
1349
file_id = inv.path2id(relpath)
1350
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1351
self.outf.write("%6d %s\n" % (revno, what))
1354
class cmd_ls(Command):
1355
"""List files in a tree.
1357
# TODO: Take a revision or remote path and list that tree instead.
1359
takes_options = ['verbose', 'revision',
1360
Option('non-recursive',
1361
help='don\'t recurse into sub-directories'),
1363
help='Print all paths from the root of the branch.'),
1364
Option('unknown', help='Print unknown files'),
1365
Option('versioned', help='Print versioned files'),
1366
Option('ignored', help='Print ignored files'),
1368
Option('null', help='Null separate the files'),
1371
def run(self, revision=None, verbose=False,
1372
non_recursive=False, from_root=False,
1373
unknown=False, versioned=False, ignored=False,
1376
if verbose and null:
1377
raise BzrCommandError('Cannot set both --verbose and --null')
1378
all = not (unknown or versioned or ignored)
1380
selection = {'I':ignored, '?':unknown, 'V':versioned}
1382
tree, relpath = WorkingTree.open_containing(u'.')
1387
if revision is not None:
1388
tree = tree.branch.repository.revision_tree(
1389
revision[0].in_history(tree.branch).rev_id)
1391
for fp, fc, kind, fid, entry in tree.list_files():
1392
if fp.startswith(relpath):
1393
fp = fp[len(relpath):]
1394
if non_recursive and '/' in fp:
1396
if not all and not selection[fc]:
1399
kindch = entry.kind_character()
1400
self.outf.write('%-8s %s%s\n' % (fc, fp, kindch))
1403
self.outf.write('\0')
1407
self.outf.write('\n')
1410
class cmd_unknowns(Command):
1411
"""List unknown files."""
1414
from bzrlib.osutils import quotefn
1415
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1416
self.outf.write(quotefn(f))
1417
self.outf.write('\n')
1420
class cmd_ignore(Command):
1421
"""Ignore a command or pattern.
1423
To remove patterns from the ignore list, edit the .bzrignore file.
1425
If the pattern contains a slash, it is compared to the whole path
1426
from the branch root. Otherwise, it is compared to only the last
1427
component of the path. To match a file only in the root directory,
1430
Ignore patterns are case-insensitive on case-insensitive systems.
1432
Note: wildcards must be quoted from the shell on Unix.
1435
bzr ignore ./Makefile
1436
bzr ignore '*.class'
1438
# TODO: Complain if the filename is absolute
1439
takes_args = ['name_pattern']
1441
def run(self, name_pattern):
1442
from bzrlib.atomicfile import AtomicFile
1445
tree, relpath = WorkingTree.open_containing(u'.')
1446
ifn = tree.abspath('.bzrignore')
1448
if os.path.exists(ifn):
1451
igns = f.read().decode('utf-8')
1457
# TODO: If the file already uses crlf-style termination, maybe
1458
# we should use that for the newly added lines?
1460
if igns and igns[-1] != '\n':
1462
igns += name_pattern + '\n'
1464
f = AtomicFile(ifn, 'wt')
1466
f.write(igns.encode('utf-8'))
1471
inv = tree.inventory
1472
if inv.path2id('.bzrignore'):
1473
mutter('.bzrignore is already versioned')
1475
mutter('need to make new .bzrignore file versioned')
1476
tree.add(['.bzrignore'])
1479
class cmd_ignored(Command):
1480
"""List ignored files and the patterns that matched them.
1482
See also: bzr ignore"""
1485
tree = WorkingTree.open_containing(u'.')[0]
1486
for path, file_class, kind, file_id, entry in tree.list_files():
1487
if file_class != 'I':
1489
## XXX: Slightly inefficient since this was already calculated
1490
pat = tree.is_ignored(path)
1491
print '%-50s %s' % (path, pat)
1494
class cmd_lookup_revision(Command):
1495
"""Lookup the revision-id from a revision-number
1498
bzr lookup-revision 33
1501
takes_args = ['revno']
1504
def run(self, revno):
1508
raise BzrCommandError("not a valid revision-number: %r" % revno)
1510
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1513
class cmd_export(Command):
1514
"""Export past revision to destination directory.
1516
If no revision is specified this exports the last committed revision.
1518
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1519
given, try to find the format with the extension. If no extension
1520
is found exports to a directory (equivalent to --format=dir).
1522
Root may be the top directory for tar, tgz and tbz2 formats. If none
1523
is given, the top directory will be the root name of the file.
1525
Note: export of tree with non-ascii filenames to zip is not supported.
1527
Supported formats Autodetected by extension
1528
----------------- -------------------------
1531
tbz2 .tar.bz2, .tbz2
1535
takes_args = ['dest']
1536
takes_options = ['revision', 'format', 'root']
1537
def run(self, dest, revision=None, format=None, root=None):
1539
from bzrlib.export import export
1540
tree = WorkingTree.open_containing(u'.')[0]
1542
if revision is None:
1543
# should be tree.last_revision FIXME
1544
rev_id = b.last_revision()
1546
if len(revision) != 1:
1547
raise BzrError('bzr export --revision takes exactly 1 argument')
1548
rev_id = revision[0].in_history(b).rev_id
1549
t = b.repository.revision_tree(rev_id)
1551
export(t, dest, format, root)
1552
except errors.NoSuchExportFormat, e:
1553
raise BzrCommandError('Unsupported export format: %s' % e.format)
1556
class cmd_cat(Command):
1557
"""Write a file's text from a previous revision."""
1559
takes_options = ['revision']
1560
takes_args = ['filename']
1563
def run(self, filename, revision=None):
1564
if revision is not None and len(revision) != 1:
1565
raise BzrCommandError("bzr cat --revision takes exactly one number")
1568
tree, relpath = WorkingTree.open_containing(filename)
1570
except NotBranchError:
1574
b, relpath = Branch.open_containing(filename)
1575
if revision is None:
1576
revision_id = b.last_revision()
1578
revision_id = revision[0].in_history(b).rev_id
1579
b.print_file(relpath, revision_id)
1582
class cmd_local_time_offset(Command):
1583
"""Show the offset in seconds from GMT to local time."""
1587
print bzrlib.osutils.local_time_offset()
1591
class cmd_commit(Command):
1592
"""Commit changes into a new revision.
1594
If no arguments are given, the entire tree is committed.
1596
If selected files are specified, only changes to those files are
1597
committed. If a directory is specified then the directory and everything
1598
within it is committed.
1600
A selected-file commit may fail in some cases where the committed
1601
tree would be invalid, such as trying to commit a file in a
1602
newly-added directory that is not itself committed.
1604
# TODO: Run hooks on tree to-be-committed, and after commit.
1606
# TODO: Strict commit that fails if there are deleted files.
1607
# (what does "deleted files" mean ??)
1609
# TODO: Give better message for -s, --summary, used by tla people
1611
# XXX: verbose currently does nothing
1613
takes_args = ['selected*']
1614
takes_options = ['message', 'verbose',
1616
help='commit even if nothing has changed'),
1617
Option('file', type=str,
1619
help='file containing commit message'),
1621
help="refuse to commit if there are unknown "
1622
"files in the working tree."),
1624
help="perform a local only commit in a bound "
1625
"branch. Such commits are not pushed to "
1626
"the master branch until a normal commit "
1630
aliases = ['ci', 'checkin']
1632
def run(self, message=None, file=None, verbose=True, selected_list=None,
1633
unchanged=False, strict=False, local=False):
1634
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1635
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1637
from bzrlib.msgeditor import edit_commit_message, \
1638
make_commit_message_template
1639
from tempfile import TemporaryFile
1641
# TODO: Need a blackbox test for invoking the external editor; may be
1642
# slightly problematic to run this cross-platform.
1644
# TODO: do more checks that the commit will succeed before
1645
# spending the user's valuable time typing a commit message.
1647
# TODO: if the commit *does* happen to fail, then save the commit
1648
# message to a temporary file where it can be recovered
1649
tree, selected_list = tree_files(selected_list)
1650
if selected_list == ['']:
1651
# workaround - commit of root of tree should be exactly the same
1652
# as just default commit in that tree, and succeed even though
1653
# selected-file merge commit is not done yet
1656
if local and not tree.branch.get_bound_location():
1657
raise errors.LocalRequiresBoundBranch()
1658
if message is None and not file:
1659
template = make_commit_message_template(tree, selected_list)
1660
message = edit_commit_message(template)
1662
raise BzrCommandError("please specify a commit message"
1663
" with either --message or --file")
1664
elif message and file:
1665
raise BzrCommandError("please specify either --message or --file")
1668
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1671
raise BzrCommandError("empty commit message specified")
1674
reporter = ReportCommitToLog()
1676
reporter = NullCommitReporter()
1679
tree.commit(message, specific_files=selected_list,
1680
allow_pointless=unchanged, strict=strict, local=local,
1682
except PointlessCommit:
1683
# FIXME: This should really happen before the file is read in;
1684
# perhaps prepare the commit; get the message; then actually commit
1685
raise BzrCommandError("no changes to commit",
1686
["use --unchanged to commit anyhow"])
1687
except ConflictsInTree:
1688
raise BzrCommandError("Conflicts detected in working tree. "
1689
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1690
except StrictCommitFailed:
1691
raise BzrCommandError("Commit refused because there are unknown "
1692
"files in the working tree.")
1693
except errors.BoundBranchOutOfDate, e:
1694
raise BzrCommandError(str(e)
1695
+ ' Either unbind, update, or'
1696
' pass --local to commit.')
1699
class cmd_check(Command):
1700
"""Validate consistency of branch history.
1702
This command checks various invariants about the branch storage to
1703
detect data corruption or bzr bugs.
1705
takes_args = ['branch?']
1706
takes_options = ['verbose']
1708
def run(self, branch=None, verbose=False):
1709
from bzrlib.check import check
1711
tree = WorkingTree.open_containing()[0]
1712
branch = tree.branch
1714
branch = Branch.open(branch)
1715
check(branch, verbose)
1718
class cmd_scan_cache(Command):
1721
from bzrlib.hashcache import HashCache
1727
print '%6d stats' % c.stat_count
1728
print '%6d in hashcache' % len(c._cache)
1729
print '%6d files removed from cache' % c.removed_count
1730
print '%6d hashes updated' % c.update_count
1731
print '%6d files changed too recently to cache' % c.danger_count
1737
class cmd_upgrade(Command):
1738
"""Upgrade branch storage to current format.
1740
The check command or bzr developers may sometimes advise you to run
1741
this command. When the default format has changed you may also be warned
1742
during other operations to upgrade.
1744
takes_args = ['url?']
1747
help='Upgrade to a specific format. Current formats'
1748
' are: default, knit, metaweave and weave.'
1749
' Default is knit; metaweave and weave are'
1751
type=get_format_type),
1755
def run(self, url='.', format=None):
1756
from bzrlib.upgrade import upgrade
1758
format = get_format_type('default')
1759
upgrade(url, format)
1762
class cmd_whoami(Command):
1763
"""Show bzr user id."""
1764
takes_options = ['email']
1767
def run(self, email=False):
1769
b = WorkingTree.open_containing(u'.')[0].branch
1770
config = bzrlib.config.BranchConfig(b)
1771
except NotBranchError:
1772
config = bzrlib.config.GlobalConfig()
1775
print config.user_email()
1777
print config.username()
1780
class cmd_nick(Command):
1781
"""Print or set the branch nickname.
1783
If unset, the tree root directory name is used as the nickname
1784
To print the current nickname, execute with no argument.
1786
takes_args = ['nickname?']
1787
def run(self, nickname=None):
1788
branch = Branch.open_containing(u'.')[0]
1789
if nickname is None:
1790
self.printme(branch)
1792
branch.nick = nickname
1795
def printme(self, branch):
1799
class cmd_selftest(Command):
1800
"""Run internal test suite.
1802
This creates temporary test directories in the working directory,
1803
but not existing data is affected. These directories are deleted
1804
if the tests pass, or left behind to help in debugging if they
1805
fail and --keep-output is specified.
1807
If arguments are given, they are regular expressions that say
1808
which tests should run.
1810
If the global option '--no-plugins' is given, plugins are not loaded
1811
before running the selftests. This has two effects: features provided or
1812
modified by plugins will not be tested, and tests provided by plugins will
1817
bzr --no-plugins selftest -v
1819
# TODO: --list should give a list of all available tests
1821
# NB: this is used from the class without creating an instance, which is
1822
# why it does not have a self parameter.
1823
def get_transport_type(typestring):
1824
"""Parse and return a transport specifier."""
1825
if typestring == "sftp":
1826
from bzrlib.transport.sftp import SFTPAbsoluteServer
1827
return SFTPAbsoluteServer
1828
if typestring == "memory":
1829
from bzrlib.transport.memory import MemoryServer
1831
if typestring == "fakenfs":
1832
from bzrlib.transport.fakenfs import FakeNFSServer
1833
return FakeNFSServer
1834
msg = "No known transport type %s. Supported types are: sftp\n" %\
1836
raise BzrCommandError(msg)
1839
takes_args = ['testspecs*']
1840
takes_options = ['verbose',
1841
Option('one', help='stop when one test fails'),
1842
Option('keep-output',
1843
help='keep output directories when tests fail'),
1845
help='Use a different transport by default '
1846
'throughout the test suite.',
1847
type=get_transport_type),
1848
Option('benchmark', help='run the bzr bencharks.'),
1849
Option('lsprof-timed',
1850
help='generate lsprof output for benchmarked'
1851
' sections of code.'),
1854
def run(self, testspecs_list=None, verbose=None, one=False,
1855
keep_output=False, transport=None, benchmark=None,
1858
from bzrlib.tests import selftest
1859
import bzrlib.benchmarks as benchmarks
1860
# we don't want progress meters from the tests to go to the
1861
# real output; and we don't want log messages cluttering up
1863
save_ui = bzrlib.ui.ui_factory
1864
print '%10s: %s' % ('bzr', bzrlib.osutils.realpath(sys.argv[0]))
1865
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
1867
bzrlib.trace.info('running tests...')
1869
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1870
if testspecs_list is not None:
1871
pattern = '|'.join(testspecs_list)
1875
test_suite_factory = benchmarks.test_suite
1879
test_suite_factory = None
1882
result = selftest(verbose=verbose,
1884
stop_on_failure=one,
1885
keep_output=keep_output,
1886
transport=transport,
1887
test_suite_factory=test_suite_factory,
1888
lsprof_timed=lsprof_timed)
1890
bzrlib.trace.info('tests passed')
1892
bzrlib.trace.info('tests failed')
1893
return int(not result)
1895
bzrlib.ui.ui_factory = save_ui
1898
def _get_bzr_branch():
1899
"""If bzr is run from a branch, return Branch or None"""
1900
import bzrlib.errors
1901
from bzrlib.branch import Branch
1902
from bzrlib.osutils import abspath
1903
from os.path import dirname
1906
branch = Branch.open(dirname(abspath(dirname(__file__))))
1908
except bzrlib.errors.BzrError:
1913
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1914
# is bzrlib itself in a branch?
1915
branch = _get_bzr_branch()
1917
rh = branch.revision_history()
1919
print " bzr checkout, revision %d" % (revno,)
1920
print " nick: %s" % (branch.nick,)
1922
print " revid: %s" % (rh[-1],)
1923
print "Using python interpreter:", sys.executable
1925
print "Using python standard library:", os.path.dirname(site.__file__)
1926
print "Using bzrlib:",
1927
if len(bzrlib.__path__) > 1:
1928
# print repr, which is a good enough way of making it clear it's
1929
# more than one element (eg ['/foo/bar', '/foo/bzr'])
1930
print repr(bzrlib.__path__)
1932
print bzrlib.__path__[0]
1935
print bzrlib.__copyright__
1936
print "http://bazaar-vcs.org/"
1938
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1939
print "you may use, modify and redistribute it under the terms of the GNU"
1940
print "General Public License version 2 or later."
1943
class cmd_version(Command):
1944
"""Show version of bzr."""
1949
class cmd_rocks(Command):
1950
"""Statement of optimism."""
1954
print "it sure does!"
1957
class cmd_find_merge_base(Command):
1958
"""Find and print a base revision for merging two branches.
1960
# TODO: Options to specify revisions on either side, as if
1961
# merging only part of the history.
1962
takes_args = ['branch', 'other']
1966
def run(self, branch, other):
1967
from bzrlib.revision import common_ancestor, MultipleRevisionSources
1969
branch1 = Branch.open_containing(branch)[0]
1970
branch2 = Branch.open_containing(other)[0]
1972
history_1 = branch1.revision_history()
1973
history_2 = branch2.revision_history()
1975
last1 = branch1.last_revision()
1976
last2 = branch2.last_revision()
1978
source = MultipleRevisionSources(branch1.repository,
1981
base_rev_id = common_ancestor(last1, last2, source)
1983
print 'merge base is revision %s' % base_rev_id
1987
if base_revno is None:
1988
raise bzrlib.errors.UnrelatedBranches()
1990
print ' r%-6d in %s' % (base_revno, branch)
1992
other_revno = branch2.revision_id_to_revno(base_revid)
1994
print ' r%-6d in %s' % (other_revno, other)
1998
class cmd_merge(Command):
1999
"""Perform a three-way merge.
2001
The branch is the branch you will merge from. By default, it will
2002
merge the latest revision. If you specify a revision, that
2003
revision will be merged. If you specify two revisions, the first
2004
will be used as a BASE, and the second one as OTHER. Revision
2005
numbers are always relative to the specified branch.
2007
By default, bzr will try to merge in all new work from the other
2008
branch, automatically determining an appropriate base. If this
2009
fails, you may need to give an explicit base.
2011
Merge will do its best to combine the changes in two branches, but there
2012
are some kinds of problems only a human can fix. When it encounters those,
2013
it will mark a conflict. A conflict means that you need to fix something,
2014
before you should commit.
2016
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2018
If there is no default branch set, the first merge will set it. After
2019
that, you can omit the branch to use the default. To change the
2020
default, use --remember.
2024
To merge the latest revision from bzr.dev
2025
bzr merge ../bzr.dev
2027
To merge changes up to and including revision 82 from bzr.dev
2028
bzr merge -r 82 ../bzr.dev
2030
To merge the changes introduced by 82, without previous changes:
2031
bzr merge -r 81..82 ../bzr.dev
2033
merge refuses to run if there are any uncommitted changes, unless
2036
The following merge types are available:
2038
takes_args = ['branch?']
2039
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2040
Option('show-base', help="Show base revision text in "
2044
from merge import merge_type_help
2045
from inspect import getdoc
2046
return getdoc(self) + '\n' + merge_type_help()
2048
def run(self, branch=None, revision=None, force=False, merge_type=None,
2049
show_base=False, reprocess=False, remember=False):
2050
if merge_type is None:
2051
merge_type = Merge3Merger
2053
tree = WorkingTree.open_containing(u'.')[0]
2056
if branch is not None:
2057
reader = BundleReader(file(branch, 'rb'))
2061
if e.errno not in (errno.ENOENT, errno.EISDIR):
2066
if reader is not None:
2067
conflicts = merge_bundle(reader, tree, not force, merge_type,
2068
reprocess, show_base)
2074
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2076
if revision is None or len(revision) < 1:
2078
other = [branch, -1]
2079
other_branch, path = Branch.open_containing(branch)
2081
if len(revision) == 1:
2083
other_branch, path = Branch.open_containing(branch)
2084
revno = revision[0].in_history(other_branch).revno
2085
other = [branch, revno]
2087
assert len(revision) == 2
2088
if None in revision:
2089
raise BzrCommandError(
2090
"Merge doesn't permit that revision specifier.")
2091
other_branch, path = Branch.open_containing(branch)
2093
base = [branch, revision[0].in_history(other_branch).revno]
2094
other = [branch, revision[1].in_history(other_branch).revno]
2096
if tree.branch.get_parent() is None or remember:
2097
tree.branch.set_parent(other_branch.base)
2100
interesting_files = [path]
2102
interesting_files = None
2103
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2106
conflict_count = merge(other, base, check_clean=(not force),
2107
merge_type=merge_type,
2108
reprocess=reprocess,
2109
show_base=show_base,
2110
pb=pb, file_list=interesting_files)
2113
if conflict_count != 0:
2117
except bzrlib.errors.AmbiguousBase, e:
2118
m = ("sorry, bzr can't determine the right merge base yet\n"
2119
"candidates are:\n "
2120
+ "\n ".join(e.bases)
2122
"please specify an explicit base with -r,\n"
2123
"and (if you want) report this to the bzr developers\n")
2126
# TODO: move up to common parent; this isn't merge-specific anymore.
2127
def _get_remembered_parent(self, tree, supplied_location, verb_string):
2128
"""Use tree.branch's parent if none was supplied.
2130
Report if the remembered location was used.
2132
if supplied_location is not None:
2133
return supplied_location
2134
stored_location = tree.branch.get_parent()
2135
mutter("%s", stored_location)
2136
if stored_location is None:
2137
raise BzrCommandError("No location specified or remembered")
2138
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2139
self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2140
return stored_location
2143
class cmd_remerge(Command):
2146
Use this if you want to try a different merge technique while resolving
2147
conflicts. Some merge techniques are better than others, and remerge
2148
lets you try different ones on different files.
2150
The options for remerge have the same meaning and defaults as the ones for
2151
merge. The difference is that remerge can (only) be run when there is a
2152
pending merge, and it lets you specify particular files.
2155
$ bzr remerge --show-base
2156
Re-do the merge of all conflicted files, and show the base text in
2157
conflict regions, in addition to the usual THIS and OTHER texts.
2159
$ bzr remerge --merge-type weave --reprocess foobar
2160
Re-do the merge of "foobar", using the weave merge algorithm, with
2161
additional processing to reduce the size of conflict regions.
2163
The following merge types are available:"""
2164
takes_args = ['file*']
2165
takes_options = ['merge-type', 'reprocess',
2166
Option('show-base', help="Show base revision text in "
2170
from merge import merge_type_help
2171
from inspect import getdoc
2172
return getdoc(self) + '\n' + merge_type_help()
2174
def run(self, file_list=None, merge_type=None, show_base=False,
2176
from bzrlib.merge import merge_inner, transform_tree
2177
if merge_type is None:
2178
merge_type = Merge3Merger
2179
tree, file_list = tree_files(file_list)
2182
pending_merges = tree.pending_merges()
2183
if len(pending_merges) != 1:
2184
raise BzrCommandError("Sorry, remerge only works after normal"
2185
+ " merges. Not cherrypicking or"
2187
repository = tree.branch.repository
2188
base_revision = common_ancestor(tree.branch.last_revision(),
2189
pending_merges[0], repository)
2190
base_tree = repository.revision_tree(base_revision)
2191
other_tree = repository.revision_tree(pending_merges[0])
2192
interesting_ids = None
2193
if file_list is not None:
2194
interesting_ids = set()
2195
for filename in file_list:
2196
file_id = tree.path2id(filename)
2198
raise NotVersionedError(filename)
2199
interesting_ids.add(file_id)
2200
if tree.kind(file_id) != "directory":
2203
for name, ie in tree.inventory.iter_entries(file_id):
2204
interesting_ids.add(ie.file_id)
2205
transform_tree(tree, tree.basis_tree(), interesting_ids)
2206
if file_list is None:
2207
restore_files = list(tree.iter_conflicts())
2209
restore_files = file_list
2210
for filename in restore_files:
2212
restore(tree.abspath(filename))
2213
except NotConflicted:
2215
conflicts = merge_inner(tree.branch, other_tree, base_tree,
2217
interesting_ids = interesting_ids,
2218
other_rev_id=pending_merges[0],
2219
merge_type=merge_type,
2220
show_base=show_base,
2221
reprocess=reprocess)
2229
class cmd_revert(Command):
2230
"""Reverse all changes since the last commit.
2232
Only versioned files are affected. Specify filenames to revert only
2233
those files. By default, any files that are changed will be backed up
2234
first. Backup files have a '~' appended to their name.
2236
takes_options = ['revision', 'no-backup']
2237
takes_args = ['file*']
2238
aliases = ['merge-revert']
2240
def run(self, revision=None, no_backup=False, file_list=None):
2241
from bzrlib.commands import parse_spec
2242
if file_list is not None:
2243
if len(file_list) == 0:
2244
raise BzrCommandError("No files specified")
2248
tree, file_list = tree_files(file_list)
2249
if revision is None:
2250
# FIXME should be tree.last_revision
2251
rev_id = tree.last_revision()
2252
elif len(revision) != 1:
2253
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
2255
rev_id = revision[0].in_history(tree.branch).rev_id
2256
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2258
tree.revert(file_list,
2259
tree.branch.repository.revision_tree(rev_id),
2265
class cmd_assert_fail(Command):
2266
"""Test reporting of assertion failures"""
2269
assert False, "always fails"
2272
class cmd_help(Command):
2273
"""Show help on a command or other topic.
2275
For a list of all available commands, say 'bzr help commands'."""
2276
takes_options = [Option('long', 'show help on all commands')]
2277
takes_args = ['topic?']
2278
aliases = ['?', '--help', '-?', '-h']
2281
def run(self, topic=None, long=False):
2283
if topic is None and long:
2288
class cmd_shell_complete(Command):
2289
"""Show appropriate completions for context.
2291
For a list of all available commands, say 'bzr shell-complete'."""
2292
takes_args = ['context?']
2297
def run(self, context=None):
2298
import shellcomplete
2299
shellcomplete.shellcomplete(context)
2302
class cmd_fetch(Command):
2303
"""Copy in history from another branch but don't merge it.
2305
This is an internal method used for pull and merge."""
2307
takes_args = ['from_branch', 'to_branch']
2308
def run(self, from_branch, to_branch):
2309
from bzrlib.fetch import Fetcher
2310
from bzrlib.branch import Branch
2311
from_b = Branch.open(from_branch)
2312
to_b = Branch.open(to_branch)
2313
Fetcher(to_b, from_b)
2316
class cmd_missing(Command):
2317
"""Show unmerged/unpulled revisions between two branches.
2319
OTHER_BRANCH may be local or remote."""
2320
takes_args = ['other_branch?']
2321
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2323
'Display changes in the local branch only'),
2324
Option('theirs-only',
2325
'Display changes in the remote branch only'),
2334
def run(self, other_branch=None, reverse=False, mine_only=False,
2335
theirs_only=False, log_format=None, long=False, short=False, line=False,
2336
show_ids=False, verbose=False):
2337
from bzrlib.missing import find_unmerged, iter_log_data
2338
from bzrlib.log import log_formatter
2339
local_branch = bzrlib.branch.Branch.open_containing(u".")[0]
2340
parent = local_branch.get_parent()
2341
if other_branch is None:
2342
other_branch = parent
2343
if other_branch is None:
2344
raise BzrCommandError("No missing location known or specified.")
2345
print "Using last location: " + local_branch.get_parent()
2346
remote_branch = bzrlib.branch.Branch.open(other_branch)
2347
if remote_branch.base == local_branch.base:
2348
remote_branch = local_branch
2349
local_branch.lock_read()
2351
remote_branch.lock_read()
2353
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2354
if (log_format == None):
2355
default = bzrlib.config.BranchConfig(local_branch).log_format()
2356
log_format = get_log_format(long=long, short=short, line=line, default=default)
2357
lf = log_formatter(log_format, sys.stdout,
2359
show_timezone='original')
2360
if reverse is False:
2361
local_extra.reverse()
2362
remote_extra.reverse()
2363
if local_extra and not theirs_only:
2364
print "You have %d extra revision(s):" % len(local_extra)
2365
for data in iter_log_data(local_extra, local_branch.repository,
2368
printed_local = True
2370
printed_local = False
2371
if remote_extra and not mine_only:
2372
if printed_local is True:
2374
print "You are missing %d revision(s):" % len(remote_extra)
2375
for data in iter_log_data(remote_extra, remote_branch.repository,
2378
if not remote_extra and not local_extra:
2380
print "Branches are up to date."
2384
remote_branch.unlock()
2386
local_branch.unlock()
2387
if not status_code and parent is None and other_branch is not None:
2388
local_branch.lock_write()
2390
# handle race conditions - a parent might be set while we run.
2391
if local_branch.get_parent() is None:
2392
local_branch.set_parent(remote_branch.base)
2394
local_branch.unlock()
2398
class cmd_plugins(Command):
2403
import bzrlib.plugin
2404
from inspect import getdoc
2405
for name, plugin in bzrlib.plugin.all_plugins().items():
2406
if hasattr(plugin, '__path__'):
2407
print plugin.__path__[0]
2408
elif hasattr(plugin, '__file__'):
2409
print plugin.__file__
2415
print '\t', d.split('\n')[0]
2418
class cmd_testament(Command):
2419
"""Show testament (signing-form) of a revision."""
2420
takes_options = ['revision', 'long']
2421
takes_args = ['branch?']
2423
def run(self, branch=u'.', revision=None, long=False):
2424
from bzrlib.testament import Testament
2425
b = WorkingTree.open_containing(branch)[0].branch
2428
if revision is None:
2429
rev_id = b.last_revision()
2431
rev_id = revision[0].in_history(b).rev_id
2432
t = Testament.from_revision(b.repository, rev_id)
2434
sys.stdout.writelines(t.as_text_lines())
2436
sys.stdout.write(t.as_short_text())
2441
class cmd_annotate(Command):
2442
"""Show the origin of each line in a file.
2444
This prints out the given file with an annotation on the left side
2445
indicating which revision, author and date introduced the change.
2447
If the origin is the same for a run of consecutive lines, it is
2448
shown only at the top, unless the --all option is given.
2450
# TODO: annotate directories; showing when each file was last changed
2451
# TODO: if the working copy is modified, show annotations on that
2452
# with new uncommitted lines marked
2453
aliases = ['blame', 'praise']
2454
takes_args = ['filename']
2455
takes_options = [Option('all', help='show annotations on all lines'),
2456
Option('long', help='show date in annotations'),
2461
def run(self, filename, all=False, long=False, revision=None):
2462
from bzrlib.annotate import annotate_file
2463
tree, relpath = WorkingTree.open_containing(filename)
2464
branch = tree.branch
2467
if revision is None:
2468
revision_id = branch.last_revision()
2469
elif len(revision) != 1:
2470
raise BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2472
revision_id = revision[0].in_history(branch).rev_id
2473
file_id = tree.inventory.path2id(relpath)
2474
tree = branch.repository.revision_tree(revision_id)
2475
file_version = tree.inventory[file_id].revision
2476
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
2481
class cmd_re_sign(Command):
2482
"""Create a digital signature for an existing revision."""
2483
# TODO be able to replace existing ones.
2485
hidden = True # is this right ?
2486
takes_args = ['revision_id*']
2487
takes_options = ['revision']
2489
def run(self, revision_id_list=None, revision=None):
2490
import bzrlib.config as config
2491
import bzrlib.gpg as gpg
2492
if revision_id_list is not None and revision is not None:
2493
raise BzrCommandError('You can only supply one of revision_id or --revision')
2494
if revision_id_list is None and revision is None:
2495
raise BzrCommandError('You must supply either --revision or a revision_id')
2496
b = WorkingTree.open_containing(u'.')[0].branch
2497
gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
2498
if revision_id_list is not None:
2499
for revision_id in revision_id_list:
2500
b.repository.sign_revision(revision_id, gpg_strategy)
2501
elif revision is not None:
2502
if len(revision) == 1:
2503
revno, rev_id = revision[0].in_history(b)
2504
b.repository.sign_revision(rev_id, gpg_strategy)
2505
elif len(revision) == 2:
2506
# are they both on rh- if so we can walk between them
2507
# might be nice to have a range helper for arbitrary
2508
# revision paths. hmm.
2509
from_revno, from_revid = revision[0].in_history(b)
2510
to_revno, to_revid = revision[1].in_history(b)
2511
if to_revid is None:
2512
to_revno = b.revno()
2513
if from_revno is None or to_revno is None:
2514
raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2515
for revno in range(from_revno, to_revno + 1):
2516
b.repository.sign_revision(b.get_rev_id(revno),
2519
raise BzrCommandError('Please supply either one revision, or a range.')
2522
class cmd_bind(Command):
2523
"""Bind the current branch to a master branch.
2525
After binding, commits must succeed on the master branch
2526
before they are executed on the local one.
2529
takes_args = ['location']
2532
def run(self, location=None):
2533
b, relpath = Branch.open_containing(u'.')
2534
b_other = Branch.open(location)
2537
except DivergedBranches:
2538
raise BzrCommandError('These branches have diverged.'
2539
' Try merging, and then bind again.')
2542
class cmd_unbind(Command):
2543
"""Unbind the current branch from its master branch.
2545
After unbinding, the local branch is considered independent.
2546
All subsequent commits will be local.
2553
b, relpath = Branch.open_containing(u'.')
2555
raise BzrCommandError('Local branch is not bound')
2558
class cmd_uncommit(bzrlib.commands.Command):
2559
"""Remove the last committed revision.
2561
--verbose will print out what is being removed.
2562
--dry-run will go through all the motions, but not actually
2565
In the future, uncommit will create a revision bundle, which can then
2569
# TODO: jam 20060108 Add an option to allow uncommit to remove
2570
# unreferenced information in 'branch-as-repostory' branches.
2571
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2572
# information in shared branches as well.
2573
takes_options = ['verbose', 'revision',
2574
Option('dry-run', help='Don\'t actually make changes'),
2575
Option('force', help='Say yes to all questions.')]
2576
takes_args = ['location?']
2579
def run(self, location=None,
2580
dry_run=False, verbose=False,
2581
revision=None, force=False):
2582
from bzrlib.branch import Branch
2583
from bzrlib.log import log_formatter
2585
from bzrlib.uncommit import uncommit
2587
if location is None:
2589
control, relpath = bzrdir.BzrDir.open_containing(location)
2591
tree = control.open_workingtree()
2593
except (errors.NoWorkingTree, errors.NotLocalUrl):
2595
b = control.open_branch()
2597
if revision is None:
2599
rev_id = b.last_revision()
2601
revno, rev_id = revision[0].in_history(b)
2603
print 'No revisions to uncommit.'
2605
for r in range(revno, b.revno()+1):
2606
rev_id = b.get_rev_id(r)
2607
lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
2608
lf.show(r, b.repository.get_revision(rev_id), None)
2611
print 'Dry-run, pretending to remove the above revisions.'
2613
val = raw_input('Press <enter> to continue')
2615
print 'The above revision(s) will be removed.'
2617
val = raw_input('Are you sure [y/N]? ')
2618
if val.lower() not in ('y', 'yes'):
2622
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
2626
class cmd_break_lock(Command):
2627
"""Break a dead lock on a repository, branch or working directory.
2629
CAUTION: Locks should only be broken when you are sure that the process
2630
holding the lock has been stopped.
2632
You can get information on what locks are open via the 'bzr info' command.
2637
takes_args = ['location?']
2639
def run(self, location=None, show=False):
2640
if location is None:
2642
control, relpath = bzrdir.BzrDir.open_containing(location)
2644
control.break_lock()
2645
except NotImplementedError:
2650
# command-line interpretation helper for merge-related commands
2651
def merge(other_revision, base_revision,
2652
check_clean=True, ignore_zero=False,
2653
this_dir=None, backup_files=False, merge_type=Merge3Merger,
2654
file_list=None, show_base=False, reprocess=False,
2655
pb=DummyProgress()):
2656
"""Merge changes into a tree.
2659
list(path, revno) Base for three-way merge.
2660
If [None, None] then a base will be automatically determined.
2662
list(path, revno) Other revision for three-way merge.
2664
Directory to merge changes into; '.' by default.
2666
If true, this_dir must have no uncommitted changes before the
2668
ignore_zero - If true, suppress the "zero conflicts" message when
2669
there are no conflicts; should be set when doing something we expect
2670
to complete perfectly.
2671
file_list - If supplied, merge only changes to selected files.
2673
All available ancestors of other_revision and base_revision are
2674
automatically pulled into the branch.
2676
The revno may be -1 to indicate the last revision on the branch, which is
2679
This function is intended for use from the command line; programmatic
2680
clients might prefer to call merge.merge_inner(), which has less magic
2683
from bzrlib.merge import Merger
2684
if this_dir is None:
2686
this_tree = WorkingTree.open_containing(this_dir)[0]
2687
if show_base and not merge_type is Merge3Merger:
2688
raise BzrCommandError("Show-base is not supported for this merge"
2689
" type. %s" % merge_type)
2690
if reprocess and not merge_type.supports_reprocess:
2691
raise BzrCommandError("Conflict reduction is not supported for merge"
2692
" type %s." % merge_type)
2693
if reprocess and show_base:
2694
raise BzrCommandError("Cannot do conflict reduction and show base.")
2696
merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2697
merger.pp = ProgressPhase("Merge phase", 5, pb)
2698
merger.pp.next_phase()
2699
merger.check_basis(check_clean)
2700
merger.set_other(other_revision)
2701
merger.pp.next_phase()
2702
merger.set_base(base_revision)
2703
if merger.base_rev_id == merger.other_rev_id:
2704
note('Nothing to do.')
2706
merger.backup_files = backup_files
2707
merger.merge_type = merge_type
2708
merger.set_interesting_files(file_list)
2709
merger.show_base = show_base
2710
merger.reprocess = reprocess
2711
conflicts = merger.do_merge()
2712
if file_list is None:
2713
merger.set_pending()
2719
# these get imported and then picked up by the scan for cmd_*
2720
# TODO: Some more consistent way to split command definitions across files;
2721
# we do need to load at least some information about them to know of
2722
# aliases. ideally we would avoid loading the implementation until the
2723
# details were needed.
2724
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2725
from bzrlib.bundle.commands import cmd_bundle_revisions
2726
from bzrlib.sign_my_commits import cmd_sign_my_commits
2727
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
2728
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
