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"""
27
from bzrlib.branch import Branch, BranchReferenceFormat
28
from bzrlib import (bundle, branch, bzrdir, errors, osutils, ui, config,
30
from bzrlib.bundle import read_bundle_from_url
31
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
32
from bzrlib.conflicts import ConflictList
33
from bzrlib.commands import Command, display_command
34
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
35
NotBranchError, DivergedBranches, NotConflicted,
36
NoSuchFile, NoWorkingTree, FileInWrongBranch,
37
NotVersionedError, NotABundle)
38
from bzrlib.merge import Merge3Merger
39
from bzrlib.option import Option
40
from bzrlib.progress import DummyProgress, ProgressPhase
41
from bzrlib.revision import common_ancestor
42
from bzrlib.revisionspec import RevisionSpec
43
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
44
from bzrlib.transport.local import LocalTransport
45
import bzrlib.urlutils as urlutils
46
from bzrlib.workingtree import WorkingTree
49
def tree_files(file_list, default_branch=u'.'):
51
return internal_tree_files(file_list, default_branch)
52
except FileInWrongBranch, e:
53
raise BzrCommandError("%s is not in the same branch as %s" %
54
(e.path, file_list[0]))
57
# XXX: Bad function name; should possibly also be a class method of
58
# WorkingTree rather than a function.
59
def internal_tree_files(file_list, default_branch=u'.'):
60
"""Convert command-line paths to a WorkingTree and relative paths.
62
This is typically used for command-line processors that take one or
63
more filenames, and infer the workingtree that contains them.
65
The filenames given are not required to exist.
67
:param file_list: Filenames to convert.
69
:param default_branch: Fallback tree path to use if file_list is empty or None.
71
:return: workingtree, [relative_paths]
73
if file_list is None or len(file_list) == 0:
74
return WorkingTree.open_containing(default_branch)[0], file_list
75
tree = WorkingTree.open_containing(file_list[0])[0]
77
for filename in file_list:
79
new_list.append(tree.relpath(filename))
80
except errors.PathNotChild:
81
raise FileInWrongBranch(tree.branch, filename)
85
def get_format_type(typestring):
86
"""Parse and return a format specifier."""
87
if typestring == "weave":
88
return bzrdir.BzrDirFormat6()
89
if typestring == "default":
90
return bzrdir.BzrDirMetaFormat1()
91
if typestring == "metaweave":
92
format = bzrdir.BzrDirMetaFormat1()
93
format.repository_format = repository.RepositoryFormat7()
95
if typestring == "knit":
96
format = bzrdir.BzrDirMetaFormat1()
97
format.repository_format = repository.RepositoryFormatKnit1()
99
msg = "Unknown bzr format %s. Current formats are: default, knit,\n" \
100
"metaweave and weave" % typestring
101
raise BzrCommandError(msg)
104
# TODO: Make sure no commands unconditionally use the working directory as a
105
# branch. If a filename argument is used, the first of them should be used to
106
# specify the branch. (Perhaps this can be factored out into some kind of
107
# Argument class, representing a file in a branch, where the first occurrence
110
class cmd_status(Command):
111
"""Display status summary.
113
This reports on versioned and unknown files, reporting them
114
grouped by state. Possible states are:
117
Versioned in the working copy but not in the previous revision.
120
Versioned in the previous revision but removed or deleted
124
Path of this file changed from the previous revision;
125
the text may also have changed. This includes files whose
126
parent directory was renamed.
129
Text has changed since the previous revision.
132
Not versioned and not matching an ignore pattern.
134
To see ignored files use 'bzr ignored'. For details in the
135
changes to file texts, use 'bzr diff'.
137
If no arguments are specified, the status of the entire working
138
directory is shown. Otherwise, only the status of the specified
139
files or directories is reported. If a directory is given, status
140
is reported for everything inside that directory.
142
If a revision argument is given, the status is calculated against
143
that revision, or between two revisions if two are provided.
146
# TODO: --no-recurse, --recurse options
148
takes_args = ['file*']
149
takes_options = ['show-ids', 'revision']
150
aliases = ['st', 'stat']
152
encoding_type = 'replace'
155
def run(self, show_ids=False, file_list=None, revision=None):
156
from bzrlib.status import show_tree_status
158
tree, file_list = tree_files(file_list)
160
show_tree_status(tree, show_ids=show_ids,
161
specific_files=file_list, revision=revision,
165
class cmd_cat_revision(Command):
166
"""Write out metadata for a revision.
168
The revision to print can either be specified by a specific
169
revision identifier, or you can use --revision.
173
takes_args = ['revision_id?']
174
takes_options = ['revision']
175
# cat-revision is more for frontends so should be exact
179
def run(self, revision_id=None, revision=None):
181
if revision_id is not None and revision is not None:
182
raise BzrCommandError('You can only supply one of revision_id or --revision')
183
if revision_id is None and revision is None:
184
raise BzrCommandError('You must supply either --revision or a revision_id')
185
b = WorkingTree.open_containing(u'.')[0].branch
187
# TODO: jam 20060112 should cat-revision always output utf-8?
188
if revision_id is not None:
189
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
190
elif revision is not None:
193
raise BzrCommandError('You cannot specify a NULL revision.')
194
revno, rev_id = rev.in_history(b)
195
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
198
class cmd_revno(Command):
199
"""Show current revision number.
201
This is equal to the number of revisions on this branch.
204
takes_args = ['location?']
207
def run(self, location=u'.'):
208
self.outf.write(str(Branch.open_containing(location)[0].revno()))
209
self.outf.write('\n')
212
class cmd_revision_info(Command):
213
"""Show revision number and revision id for a given revision identifier.
216
takes_args = ['revision_info*']
217
takes_options = ['revision']
220
def run(self, revision=None, revision_info_list=[]):
223
if revision is not None:
224
revs.extend(revision)
225
if revision_info_list is not None:
226
for rev in revision_info_list:
227
revs.append(RevisionSpec(rev))
229
raise BzrCommandError('You must supply a revision identifier')
231
b = WorkingTree.open_containing(u'.')[0].branch
234
revinfo = rev.in_history(b)
235
if revinfo.revno is None:
236
print ' %s' % revinfo.rev_id
238
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
241
class cmd_add(Command):
242
"""Add specified files or directories.
244
In non-recursive mode, all the named items are added, regardless
245
of whether they were previously ignored. A warning is given if
246
any of the named files are already versioned.
248
In recursive mode (the default), files are treated the same way
249
but the behaviour for directories is different. Directories that
250
are already versioned do not give a warning. All directories,
251
whether already versioned or not, are searched for files or
252
subdirectories that are neither versioned or ignored, and these
253
are added. This search proceeds recursively into versioned
254
directories. If no names are given '.' is assumed.
256
Therefore simply saying 'bzr add' will version all files that
257
are currently unknown.
259
Adding a file whose parent directory is not versioned will
260
implicitly add the parent, and so on up to the root. This means
261
you should never need to explicitly add a directory, they'll just
262
get added when you add a file in the directory.
264
--dry-run will show which files would be added, but not actually
267
takes_args = ['file*']
268
takes_options = ['no-recurse', 'dry-run', 'verbose']
269
encoding_type = 'replace'
271
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False):
274
action = bzrlib.add.AddAction(to_file=self.outf,
275
should_print=(not is_quiet()))
277
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
278
action=action, save=not dry_run)
281
for glob in sorted(ignored.keys()):
282
for path in ignored[glob]:
283
self.outf.write("ignored %s matching \"%s\"\n"
287
for glob, paths in ignored.items():
288
match_len += len(paths)
289
self.outf.write("ignored %d file(s).\n" % match_len)
290
self.outf.write("If you wish to add some of these files,"
291
" please add them by name.\n")
294
class cmd_mkdir(Command):
295
"""Create a new versioned directory.
297
This is equivalent to creating the directory and then adding it.
300
takes_args = ['dir+']
301
encoding_type = 'replace'
303
def run(self, dir_list):
306
wt, dd = WorkingTree.open_containing(d)
308
self.outf.write('added %s\n' % d)
311
class cmd_relpath(Command):
312
"""Show path of a file relative to root"""
314
takes_args = ['filename']
318
def run(self, filename):
319
# TODO: jam 20050106 Can relpath return a munged path if
320
# sys.stdout encoding cannot represent it?
321
tree, relpath = WorkingTree.open_containing(filename)
322
self.outf.write(relpath)
323
self.outf.write('\n')
326
class cmd_inventory(Command):
327
"""Show inventory of the current working copy or a revision.
329
It is possible to limit the output to a particular entry
330
type using the --kind option. For example; --kind file.
333
takes_options = ['revision', 'show-ids', 'kind']
336
def run(self, revision=None, show_ids=False, kind=None):
337
if kind and kind not in ['file', 'directory', 'symlink']:
338
raise BzrCommandError('invalid kind specified')
339
tree = WorkingTree.open_containing(u'.')[0]
341
inv = tree.read_working_inventory()
343
if len(revision) > 1:
344
raise BzrCommandError('bzr inventory --revision takes'
345
' exactly one revision identifier')
346
inv = tree.branch.repository.get_revision_inventory(
347
revision[0].in_history(tree.branch).rev_id)
349
for path, entry in inv.entries():
350
if kind and kind != entry.kind:
353
self.outf.write('%-50s %s\n' % (path, entry.file_id))
355
self.outf.write(path)
356
self.outf.write('\n')
359
class cmd_mv(Command):
360
"""Move or rename a file.
363
bzr mv OLDNAME NEWNAME
364
bzr mv SOURCE... DESTINATION
366
If the last argument is a versioned directory, all the other names
367
are moved into it. Otherwise, there must be exactly two arguments
368
and the file is changed to a new name, which must not already exist.
370
Files cannot be moved between branches.
373
takes_args = ['names*']
374
aliases = ['move', 'rename']
375
encoding_type = 'replace'
377
def run(self, names_list):
378
if len(names_list) < 2:
379
raise BzrCommandError("missing file argument")
380
tree, rel_names = tree_files(names_list)
382
if os.path.isdir(names_list[-1]):
383
# move into existing directory
384
for pair in tree.move(rel_names[:-1], rel_names[-1]):
385
self.outf.write("%s => %s\n" % pair)
387
if len(names_list) != 2:
388
raise BzrCommandError('to mv multiple files the destination '
389
'must be a versioned directory')
390
tree.rename_one(rel_names[0], rel_names[1])
391
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
394
class cmd_pull(Command):
395
"""Turn this branch into a mirror of another branch.
397
This command only works on branches that have not diverged. Branches are
398
considered diverged if the destination branch's most recent commit is one
399
that has not been merged (directly or indirectly) into the parent.
401
If branches have diverged, you can use 'bzr merge' to integrate the changes
402
from one into the other. Once one branch has merged, the other should
403
be able to pull it again.
405
If you want to forget your local changes and just update your branch to
406
match the remote one, use pull --overwrite.
408
If there is no default location set, the first pull will set it. After
409
that, you can omit the location to use the default. To change the
410
default, use --remember. The value will only be saved if the remote
411
location can be accessed.
414
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
415
takes_args = ['location?']
416
encoding_type = 'replace'
418
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
419
# FIXME: too much stuff is in the command class
421
tree_to = WorkingTree.open_containing(u'.')[0]
422
branch_to = tree_to.branch
423
except NoWorkingTree:
425
branch_to = Branch.open_containing(u'.')[0]
428
if location is not None:
430
reader = bundle.read_bundle_from_url(location)
432
pass # Continue on considering this url a Branch
434
stored_loc = branch_to.get_parent()
436
if stored_loc is None:
437
raise BzrCommandError("No pull location known or specified.")
439
display_url = urlutils.unescape_for_display(stored_loc,
441
self.outf.write("Using saved location: %s\n" % display_url)
442
location = stored_loc
445
if reader is not None:
446
install_bundle(branch_to.repository, reader)
447
branch_from = branch_to
449
branch_from = Branch.open(location)
451
if branch_to.get_parent() is None or remember:
452
branch_to.set_parent(branch_from.base)
456
if reader is not None:
457
rev_id = reader.target
458
elif len(revision) == 1:
459
rev_id = revision[0].in_history(branch_from).rev_id
461
raise BzrCommandError('bzr pull --revision takes one value.')
463
old_rh = branch_to.revision_history()
464
if tree_to is not None:
465
count = tree_to.pull(branch_from, overwrite, rev_id)
467
count = branch_to.pull(branch_from, overwrite, rev_id)
468
note('%d revision(s) pulled.' % (count,))
471
new_rh = branch_to.revision_history()
474
from bzrlib.log import show_changed_revisions
475
show_changed_revisions(branch_to, old_rh, new_rh,
479
class cmd_push(Command):
480
"""Update a mirror of this branch.
482
The target branch will not have its working tree populated because this
483
is both expensive, and is not supported on remote file systems.
485
Some smart servers or protocols *may* put the working tree in place in
488
This command only works on branches that have not diverged. Branches are
489
considered diverged if the destination branch's most recent commit is one
490
that has not been merged (directly or indirectly) by the source branch.
492
If branches have diverged, you can use 'bzr push --overwrite' to replace
493
the other branch completely, discarding its unmerged changes.
495
If you want to ensure you have the different changes in the other branch,
496
do a merge (see bzr help merge) from the other branch, and commit that.
497
After that you will be able to do a push without '--overwrite'.
499
If there is no default push location set, the first push will set it.
500
After that, you can omit the location to use the default. To change the
501
default, use --remember. The value will only be saved if the remote
502
location can be accessed.
505
takes_options = ['remember', 'overwrite', 'verbose',
506
Option('create-prefix',
507
help='Create the path leading up to the branch '
508
'if it does not already exist')]
509
takes_args = ['location?']
510
encoding_type = 'replace'
512
def run(self, location=None, remember=False, overwrite=False,
513
create_prefix=False, verbose=False):
514
# FIXME: Way too big! Put this into a function called from the
516
from bzrlib.transport import get_transport
518
br_from = Branch.open_containing('.')[0]
519
stored_loc = br_from.get_push_location()
521
if stored_loc is None:
522
raise BzrCommandError("No push location known or specified.")
524
display_url = urlutils.unescape_for_display(stored_loc,
526
self.outf.write("Using saved location: %s\n" % display_url)
527
location = stored_loc
529
transport = get_transport(location)
530
location_url = transport.base
534
dir_to = bzrdir.BzrDir.open(location_url)
535
br_to = dir_to.open_branch()
536
except NotBranchError:
538
transport = transport.clone('..')
539
if not create_prefix:
541
relurl = transport.relpath(location_url)
542
mutter('creating directory %s => %s', location_url, relurl)
543
transport.mkdir(relurl)
545
raise BzrCommandError("Parent directory of %s "
546
"does not exist." % location)
548
current = transport.base
549
needed = [(transport, transport.relpath(location_url))]
552
transport, relpath = needed[-1]
553
transport.mkdir(relpath)
556
new_transport = transport.clone('..')
557
needed.append((new_transport,
558
new_transport.relpath(transport.base)))
559
if new_transport.base == transport.base:
560
raise BzrCommandError("Could not create "
562
dir_to = br_from.bzrdir.clone(location_url,
563
revision_id=br_from.last_revision())
564
br_to = dir_to.open_branch()
565
count = len(br_to.revision_history())
566
# We successfully created the target, remember it
567
if br_from.get_push_location() is None or remember:
568
br_from.set_push_location(br_to.base)
570
# We were able to connect to the remote location, so remember it
571
# we don't need to successfully push because of possible divergence.
572
if br_from.get_push_location() is None or remember:
573
br_from.set_push_location(br_to.base)
574
old_rh = br_to.revision_history()
577
tree_to = dir_to.open_workingtree()
578
except errors.NotLocalUrl:
579
warning('This transport does not update the working '
580
'tree of: %s' % (br_to.base,))
581
count = br_to.pull(br_from, overwrite)
582
except NoWorkingTree:
583
count = br_to.pull(br_from, overwrite)
585
count = tree_to.pull(br_from, overwrite)
586
except DivergedBranches:
587
raise BzrCommandError("These branches have diverged."
588
" Try a merge then push with overwrite.")
589
note('%d revision(s) pushed.' % (count,))
592
new_rh = br_to.revision_history()
595
from bzrlib.log import show_changed_revisions
596
show_changed_revisions(br_to, old_rh, new_rh,
600
class cmd_branch(Command):
601
"""Create a new copy of a branch.
603
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
604
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
606
To retrieve the branch as of a particular revision, supply the --revision
607
parameter, as in "branch foo/bar -r 5".
609
--basis is to speed up branching from remote branches. When specified, it
610
copies all the file-contents, inventory and revision data from the basis
611
branch before copying anything from the remote branch.
613
takes_args = ['from_location', 'to_location?']
614
takes_options = ['revision', 'basis']
615
aliases = ['get', 'clone']
617
def run(self, from_location, to_location=None, revision=None, basis=None):
618
from bzrlib.transport import get_transport
621
elif len(revision) > 1:
622
raise BzrCommandError(
623
'bzr branch --revision takes exactly 1 revision value')
625
br_from = Branch.open(from_location)
627
if e.errno == errno.ENOENT:
628
raise BzrCommandError('Source location "%s" does not'
629
' exist.' % to_location)
634
if basis is not None:
635
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
638
if len(revision) == 1 and revision[0] is not None:
639
revision_id = revision[0].in_history(br_from)[1]
641
# FIXME - wt.last_revision, fallback to branch, fall back to
642
# None or perhaps NULL_REVISION to mean copy nothing
644
revision_id = br_from.last_revision()
645
if to_location is None:
646
to_location = os.path.basename(from_location.rstrip("/\\"))
649
name = os.path.basename(to_location) + '\n'
651
to_transport = get_transport(to_location)
653
to_transport.mkdir('.')
654
except errors.FileExists:
655
raise BzrCommandError('Target directory "%s" already'
656
' exists.' % to_location)
657
except errors.NoSuchFile:
658
raise BzrCommandError('Parent of "%s" does not exist.' %
661
# preserve whatever source format we have.
662
dir = br_from.bzrdir.sprout(to_transport.base,
663
revision_id, basis_dir)
664
branch = dir.open_branch()
665
except errors.NoSuchRevision:
666
to_transport.delete_tree('.')
667
msg = "The branch %s has no revision %s." % (from_location, revision[0])
668
raise BzrCommandError(msg)
669
except errors.UnlistableBranch:
670
osutils.rmtree(to_location)
671
msg = "The branch %s cannot be used as a --basis" % (basis,)
672
raise BzrCommandError(msg)
674
branch.control_files.put_utf8('branch-name', name)
675
note('Branched %d revision(s).' % branch.revno())
680
class cmd_checkout(Command):
681
"""Create a new checkout of an existing branch.
683
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
684
the branch found in '.'. This is useful if you have removed the working tree
685
or if it was never created - i.e. if you pushed the branch to its current
688
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
689
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
691
To retrieve the branch as of a particular revision, supply the --revision
692
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
693
out of date [so you cannot commit] but it may be useful (i.e. to examine old
696
--basis is to speed up checking out from remote branches. When specified, it
697
uses the inventory and file contents from the basis branch in preference to the
698
branch being checked out.
700
takes_args = ['branch_location?', 'to_location?']
701
takes_options = ['revision', # , 'basis']
702
Option('lightweight',
703
help="perform a lightweight checkout. Lightweight "
704
"checkouts depend on access to the branch for "
705
"every operation. Normal checkouts can perform "
706
"common operations like diff and status without "
707
"such access, and also support local commits."
712
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
716
elif len(revision) > 1:
717
raise BzrCommandError(
718
'bzr checkout --revision takes exactly 1 revision value')
719
if branch_location is None:
720
branch_location = osutils.getcwd()
721
to_location = branch_location
722
source = Branch.open(branch_location)
723
if len(revision) == 1 and revision[0] is not None:
724
revision_id = revision[0].in_history(source)[1]
727
if to_location is None:
728
to_location = os.path.basename(branch_location.rstrip("/\\"))
729
# if the source and to_location are the same,
730
# and there is no working tree,
731
# then reconstitute a branch
732
if (osutils.abspath(to_location) ==
733
osutils.abspath(branch_location)):
735
source.bzrdir.open_workingtree()
736
except errors.NoWorkingTree:
737
source.bzrdir.create_workingtree()
740
os.mkdir(to_location)
742
if e.errno == errno.EEXIST:
743
raise BzrCommandError('Target directory "%s" already'
744
' exists.' % to_location)
745
if e.errno == errno.ENOENT:
746
raise BzrCommandError('Parent of "%s" does not exist.' %
750
old_format = bzrdir.BzrDirFormat.get_default_format()
751
bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
754
checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
755
branch.BranchReferenceFormat().initialize(checkout, source)
757
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
758
to_location, force_new_tree=False)
759
checkout = checkout_branch.bzrdir
760
checkout_branch.bind(source)
761
if revision_id is not None:
762
rh = checkout_branch.revision_history()
763
checkout_branch.set_revision_history(rh[:rh.index(revision_id) + 1])
764
checkout.create_workingtree(revision_id)
766
bzrdir.BzrDirFormat.set_default_format(old_format)
769
class cmd_renames(Command):
770
"""Show list of renamed files.
772
# TODO: Option to show renames between two historical versions.
774
# TODO: Only show renames under dir, rather than in the whole branch.
775
takes_args = ['dir?']
778
def run(self, dir=u'.'):
779
from bzrlib.tree import find_renames
780
tree = WorkingTree.open_containing(dir)[0]
781
old_inv = tree.basis_tree().inventory
782
new_inv = tree.read_working_inventory()
783
renames = list(find_renames(old_inv, new_inv))
785
for old_name, new_name in renames:
786
self.outf.write("%s => %s\n" % (old_name, new_name))
789
class cmd_update(Command):
790
"""Update a tree to have the latest code committed to its branch.
792
This will perform a merge into the working tree, and may generate
793
conflicts. If you have any local changes, you will still
794
need to commit them after the update for the update to be complete.
796
If you want to discard your local changes, you can just do a
797
'bzr revert' instead of 'bzr commit' after the update.
799
takes_args = ['dir?']
801
def run(self, dir='.'):
802
tree = WorkingTree.open_containing(dir)[0]
805
last_rev = tree.last_revision()
806
if last_rev == tree.branch.last_revision():
807
# may be up to date, check master too.
808
master = tree.branch.get_master_branch()
809
if master is None or last_rev == master.last_revision():
810
revno = tree.branch.revision_id_to_revno(last_rev)
811
note("Tree is up to date at revision %d." % (revno,))
813
conflicts = tree.update()
814
revno = tree.branch.revision_id_to_revno(tree.last_revision())
815
note('Updated to revision %d.' % (revno,))
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 = 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):
1013
format = get_format_type('default')
1014
if location is None:
1017
# The path has to exist to initialize a
1018
# branch inside of it.
1019
# Just using os.mkdir, since I don't
1020
# believe that we want to create a bunch of
1021
# locations if the user supplies an extended path
1022
if not os.path.exists(location):
1025
existing_bzrdir = bzrdir.BzrDir.open(location)
1026
except NotBranchError:
1027
# really a NotBzrDir error...
1028
bzrdir.BzrDir.create_branch_convenience(location, format=format)
1030
if existing_bzrdir.has_branch():
1031
if existing_bzrdir.has_workingtree():
1032
raise errors.AlreadyBranchError(location)
1034
raise errors.BranchExistsWithoutWorkingTree(location)
1036
existing_bzrdir.create_branch()
1037
existing_bzrdir.create_workingtree()
1040
class cmd_init_repository(Command):
1041
"""Create a shared repository to hold branches.
1043
New branches created under the repository directory will store their revisions
1044
in the repository, not in the branch directory, if the branch format supports
1050
bzr checkout --lightweight repo/trunk trunk-checkout
1054
takes_args = ["location"]
1055
takes_options = [Option('format',
1056
help='Specify a format for this repository.'
1057
' Current formats are: default, knit,'
1058
' metaweave and weave. Default is knit;'
1059
' metaweave and weave are deprecated',
1060
type=get_format_type),
1062
help='Allows branches in repository to have'
1064
aliases = ["init-repo"]
1065
def run(self, location, format=None, trees=False):
1066
from bzrlib.transport import get_transport
1068
format = get_format_type('default')
1069
transport = get_transport(location)
1070
if not transport.has('.'):
1072
newdir = format.initialize_on_transport(transport)
1073
repo = newdir.create_repository(shared=True)
1074
repo.set_make_working_trees(trees)
1077
class cmd_diff(Command):
1078
"""Show differences in working tree.
1080
If files are listed, only the changes in those files are listed.
1081
Otherwise, all changes for the tree are listed.
1083
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1084
produces patches suitable for "patch -p1".
1090
bzr diff --diff-prefix old/:new/
1091
bzr diff bzr.mine bzr.dev
1094
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1095
# or a graphical diff.
1097
# TODO: Python difflib is not exactly the same as unidiff; should
1098
# either fix it up or prefer to use an external diff.
1100
# TODO: Selected-file diff is inefficient and doesn't show you
1103
# TODO: This probably handles non-Unix newlines poorly.
1105
takes_args = ['file*']
1106
takes_options = ['revision', 'diff-options', 'prefix']
1107
aliases = ['di', 'dif']
1108
encoding_type = 'exact'
1111
def run(self, revision=None, file_list=None, diff_options=None,
1113
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1115
if (prefix is None) or (prefix == '0'):
1123
if not ':' in prefix:
1124
raise BzrError("--diff-prefix expects two values separated by a colon")
1125
old_label, new_label = prefix.split(":")
1128
tree1, file_list = internal_tree_files(file_list)
1132
except FileInWrongBranch:
1133
if len(file_list) != 2:
1134
raise BzrCommandError("Files are in different branches")
1136
tree1, file1 = WorkingTree.open_containing(file_list[0])
1137
tree2, file2 = WorkingTree.open_containing(file_list[1])
1138
if file1 != "" or file2 != "":
1139
# FIXME diff those two files. rbc 20051123
1140
raise BzrCommandError("Files are in different branches")
1142
if revision is not None:
1143
if tree2 is not None:
1144
raise BzrCommandError("Can't specify -r with two branches")
1145
if (len(revision) == 1) or (revision[1].spec is None):
1146
return diff_cmd_helper(tree1, file_list, diff_options,
1148
old_label=old_label, new_label=new_label)
1149
elif len(revision) == 2:
1150
return diff_cmd_helper(tree1, file_list, diff_options,
1151
revision[0], revision[1],
1152
old_label=old_label, new_label=new_label)
1154
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
1156
if tree2 is not None:
1157
return show_diff_trees(tree1, tree2, sys.stdout,
1158
specific_files=file_list,
1159
external_diff_options=diff_options,
1160
old_label=old_label, new_label=new_label)
1162
return diff_cmd_helper(tree1, file_list, diff_options,
1163
old_label=old_label, new_label=new_label)
1166
class cmd_deleted(Command):
1167
"""List files deleted in the working tree.
1169
# TODO: Show files deleted since a previous revision, or
1170
# between two revisions.
1171
# TODO: Much more efficient way to do this: read in new
1172
# directories with readdir, rather than stating each one. Same
1173
# level of effort but possibly much less IO. (Or possibly not,
1174
# if the directories are very large...)
1175
takes_options = ['show-ids']
1178
def run(self, show_ids=False):
1179
tree = WorkingTree.open_containing(u'.')[0]
1180
old = tree.basis_tree()
1181
for path, ie in old.inventory.iter_entries():
1182
if not tree.has_id(ie.file_id):
1183
self.outf.write(path)
1185
self.outf.write(' ')
1186
self.outf.write(ie.file_id)
1187
self.outf.write('\n')
1190
class cmd_modified(Command):
1191
"""List files modified in working tree."""
1195
from bzrlib.delta import compare_trees
1197
tree = WorkingTree.open_containing(u'.')[0]
1198
td = compare_trees(tree.basis_tree(), tree)
1200
for path, id, kind, text_modified, meta_modified in td.modified:
1201
self.outf.write(path + '\n')
1204
class cmd_added(Command):
1205
"""List files added in working tree."""
1209
wt = WorkingTree.open_containing(u'.')[0]
1210
basis_inv = wt.basis_tree().inventory
1213
if file_id in basis_inv:
1215
path = inv.id2path(file_id)
1216
if not os.access(osutils.abspath(path), os.F_OK):
1218
self.outf.write(path + '\n')
1221
class cmd_root(Command):
1222
"""Show the tree root directory.
1224
The root is the nearest enclosing directory with a .bzr control
1226
takes_args = ['filename?']
1228
def run(self, filename=None):
1229
"""Print the branch root."""
1230
tree = WorkingTree.open_containing(filename)[0]
1231
self.outf.write(tree.basedir + '\n')
1234
class cmd_log(Command):
1235
"""Show log of a branch, file, or directory.
1237
By default show the log of the branch containing the working directory.
1239
To request a range of logs, you can use the command -r begin..end
1240
-r revision requests a specific revision, -r ..end or -r begin.. are
1246
bzr log -r -10.. http://server/branch
1249
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1251
takes_args = ['location?']
1252
takes_options = [Option('forward',
1253
help='show from oldest to newest'),
1256
help='show files changed in each revision'),
1257
'show-ids', 'revision',
1261
help='show revisions whose message matches this regexp',
1265
encoding_type = 'replace'
1268
def run(self, location=None, timezone='original',
1278
from bzrlib.log import log_formatter, show_log
1279
assert message is None or isinstance(message, basestring), \
1280
"invalid message argument %r" % message
1281
direction = (forward and 'forward') or 'reverse'
1286
# find the file id to log:
1288
dir, fp = bzrdir.BzrDir.open_containing(location)
1289
b = dir.open_branch()
1293
inv = dir.open_workingtree().inventory
1294
except (errors.NotBranchError, errors.NotLocalUrl):
1295
# either no tree, or is remote.
1296
inv = b.basis_tree().inventory
1297
file_id = inv.path2id(fp)
1300
# FIXME ? log the current subdir only RBC 20060203
1301
dir, relpath = bzrdir.BzrDir.open_containing('.')
1302
b = dir.open_branch()
1304
if revision is None:
1307
elif len(revision) == 1:
1308
rev1 = rev2 = revision[0].in_history(b).revno
1309
elif len(revision) == 2:
1310
if revision[0].spec is None:
1311
# missing begin-range means first revision
1314
rev1 = revision[0].in_history(b).revno
1316
if revision[1].spec is None:
1317
# missing end-range means last known revision
1320
rev2 = revision[1].in_history(b).revno
1322
raise BzrCommandError('bzr log --revision takes one or two values.')
1324
# By this point, the revision numbers are converted to the +ve
1325
# form if they were supplied in the -ve form, so we can do
1326
# this comparison in relative safety
1328
(rev2, rev1) = (rev1, rev2)
1330
if (log_format == None):
1331
default = b.get_config().log_format()
1332
log_format = get_log_format(long=long, short=short, line=line,
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 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
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1438
self.outf.write(osutils.quotefn(f) + '\n')
1441
class cmd_ignore(Command):
1442
"""Ignore a command or pattern.
1444
To remove patterns from the ignore list, edit the .bzrignore file.
1446
If the pattern contains a slash, it is compared to the whole path
1447
from the branch root. Otherwise, it is compared to only the last
1448
component of the path. To match a file only in the root directory,
1451
Ignore patterns are case-insensitive on case-insensitive systems.
1453
Note: wildcards must be quoted from the shell on Unix.
1456
bzr ignore ./Makefile
1457
bzr ignore '*.class'
1459
# TODO: Complain if the filename is absolute
1460
takes_args = ['name_pattern?']
1462
Option('old-default-rules',
1463
help='Out the ignore rules bzr < 0.9 always used.')
1466
def run(self, name_pattern=None, old_default_rules=None):
1467
from bzrlib.atomicfile import AtomicFile
1468
if old_default_rules is not None:
1469
# dump the rules and exit
1470
for pattern in bzrlib.DEFAULT_IGNORE:
1473
if name_pattern is None:
1474
raise BzrCommandError("ignore requires a NAME_PATTERN")
1475
tree, relpath = WorkingTree.open_containing(u'.')
1476
ifn = tree.abspath('.bzrignore')
1477
if os.path.exists(ifn):
1480
igns = f.read().decode('utf-8')
1486
# TODO: If the file already uses crlf-style termination, maybe
1487
# we should use that for the newly added lines?
1489
if igns and igns[-1] != '\n':
1491
igns += name_pattern + '\n'
1493
f = AtomicFile(ifn, 'wt')
1495
f.write(igns.encode('utf-8'))
1500
inv = tree.inventory
1501
if inv.path2id('.bzrignore'):
1502
mutter('.bzrignore is already versioned')
1504
mutter('need to make new .bzrignore file versioned')
1505
tree.add(['.bzrignore'])
1508
class cmd_ignored(Command):
1509
"""List ignored files and the patterns that matched them.
1511
See also: bzr ignore"""
1514
tree = WorkingTree.open_containing(u'.')[0]
1515
for path, file_class, kind, file_id, entry in tree.list_files():
1516
if file_class != 'I':
1518
## XXX: Slightly inefficient since this was already calculated
1519
pat = tree.is_ignored(path)
1520
print '%-50s %s' % (path, pat)
1523
class cmd_lookup_revision(Command):
1524
"""Lookup the revision-id from a revision-number
1527
bzr lookup-revision 33
1530
takes_args = ['revno']
1533
def run(self, revno):
1537
raise BzrCommandError("not a valid revision-number: %r" % revno)
1539
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1542
class cmd_export(Command):
1543
"""Export past revision to destination directory.
1545
If no revision is specified this exports the last committed revision.
1547
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1548
given, try to find the format with the extension. If no extension
1549
is found exports to a directory (equivalent to --format=dir).
1551
Root may be the top directory for tar, tgz and tbz2 formats. If none
1552
is given, the top directory will be the root name of the file.
1554
Note: export of tree with non-ascii filenames to zip is not supported.
1556
Supported formats Autodetected by extension
1557
----------------- -------------------------
1560
tbz2 .tar.bz2, .tbz2
1564
takes_args = ['dest']
1565
takes_options = ['revision', 'format', 'root']
1566
def run(self, dest, revision=None, format=None, root=None):
1567
from bzrlib.export import export
1568
tree = WorkingTree.open_containing(u'.')[0]
1570
if revision is None:
1571
# should be tree.last_revision FIXME
1572
rev_id = b.last_revision()
1574
if len(revision) != 1:
1575
raise BzrError('bzr export --revision takes exactly 1 argument')
1576
rev_id = revision[0].in_history(b).rev_id
1577
t = b.repository.revision_tree(rev_id)
1579
export(t, dest, format, root)
1580
except errors.NoSuchExportFormat, e:
1581
raise BzrCommandError('Unsupported export format: %s' % e.format)
1584
class cmd_cat(Command):
1585
"""Write a file's text from a previous revision."""
1587
takes_options = ['revision']
1588
takes_args = ['filename']
1591
def run(self, filename, revision=None):
1592
if revision is not None and len(revision) != 1:
1593
raise BzrCommandError("bzr cat --revision takes exactly one number")
1596
tree, relpath = WorkingTree.open_containing(filename)
1598
except NotBranchError:
1602
b, relpath = Branch.open_containing(filename)
1603
if revision is None:
1604
revision_id = b.last_revision()
1606
revision_id = revision[0].in_history(b).rev_id
1607
b.print_file(relpath, revision_id)
1610
class cmd_local_time_offset(Command):
1611
"""Show the offset in seconds from GMT to local time."""
1615
print osutils.local_time_offset()
1619
class cmd_commit(Command):
1620
"""Commit changes into a new revision.
1622
If no arguments are given, the entire tree is committed.
1624
If selected files are specified, only changes to those files are
1625
committed. If a directory is specified then the directory and everything
1626
within it is committed.
1628
A selected-file commit may fail in some cases where the committed
1629
tree would be invalid, such as trying to commit a file in a
1630
newly-added directory that is not itself committed.
1632
# TODO: Run hooks on tree to-be-committed, and after commit.
1634
# TODO: Strict commit that fails if there are deleted files.
1635
# (what does "deleted files" mean ??)
1637
# TODO: Give better message for -s, --summary, used by tla people
1639
# XXX: verbose currently does nothing
1641
takes_args = ['selected*']
1642
takes_options = ['message', 'verbose',
1644
help='commit even if nothing has changed'),
1645
Option('file', type=str,
1647
help='file containing commit message'),
1649
help="refuse to commit if there are unknown "
1650
"files in the working tree."),
1652
help="perform a local only commit in a bound "
1653
"branch. Such commits are not pushed to "
1654
"the master branch until a normal commit "
1658
aliases = ['ci', 'checkin']
1660
def run(self, message=None, file=None, verbose=True, selected_list=None,
1661
unchanged=False, strict=False, local=False):
1662
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1663
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1665
from bzrlib.msgeditor import edit_commit_message, \
1666
make_commit_message_template
1667
from tempfile import TemporaryFile
1669
# TODO: Need a blackbox test for invoking the external editor; may be
1670
# slightly problematic to run this cross-platform.
1672
# TODO: do more checks that the commit will succeed before
1673
# spending the user's valuable time typing a commit message.
1675
# TODO: if the commit *does* happen to fail, then save the commit
1676
# message to a temporary file where it can be recovered
1677
tree, selected_list = tree_files(selected_list)
1678
if selected_list == ['']:
1679
# workaround - commit of root of tree should be exactly the same
1680
# as just default commit in that tree, and succeed even though
1681
# selected-file merge commit is not done yet
1684
if local and not tree.branch.get_bound_location():
1685
raise errors.LocalRequiresBoundBranch()
1686
if message is None and not file:
1687
template = make_commit_message_template(tree, selected_list)
1688
message = edit_commit_message(template)
1690
raise BzrCommandError("please specify a commit message"
1691
" with either --message or --file")
1692
elif message and file:
1693
raise BzrCommandError("please specify either --message or --file")
1696
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1699
raise BzrCommandError("empty commit message specified")
1702
reporter = ReportCommitToLog()
1704
reporter = NullCommitReporter()
1707
tree.commit(message, specific_files=selected_list,
1708
allow_pointless=unchanged, strict=strict, local=local,
1710
except PointlessCommit:
1711
# FIXME: This should really happen before the file is read in;
1712
# perhaps prepare the commit; get the message; then actually commit
1713
raise BzrCommandError("no changes to commit."
1714
" use --unchanged to commit anyhow")
1715
except ConflictsInTree:
1716
raise BzrCommandError("Conflicts detected in working tree. "
1717
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1718
except StrictCommitFailed:
1719
raise BzrCommandError("Commit refused because there are unknown "
1720
"files in the working tree.")
1721
except errors.BoundBranchOutOfDate, e:
1722
raise BzrCommandError(str(e)
1723
+ ' Either unbind, update, or'
1724
' pass --local to commit.')
1727
class cmd_check(Command):
1728
"""Validate consistency of branch history.
1730
This command checks various invariants about the branch storage to
1731
detect data corruption or bzr bugs.
1733
takes_args = ['branch?']
1734
takes_options = ['verbose']
1736
def run(self, branch=None, verbose=False):
1737
from bzrlib.check import check
1739
tree = WorkingTree.open_containing()[0]
1740
branch = tree.branch
1742
branch = Branch.open(branch)
1743
check(branch, verbose)
1746
class cmd_scan_cache(Command):
1749
from bzrlib.hashcache import HashCache
1755
print '%6d stats' % c.stat_count
1756
print '%6d in hashcache' % len(c._cache)
1757
print '%6d files removed from cache' % c.removed_count
1758
print '%6d hashes updated' % c.update_count
1759
print '%6d files changed too recently to cache' % c.danger_count
1765
class cmd_upgrade(Command):
1766
"""Upgrade branch storage to current format.
1768
The check command or bzr developers may sometimes advise you to run
1769
this command. When the default format has changed you may also be warned
1770
during other operations to upgrade.
1772
takes_args = ['url?']
1775
help='Upgrade to a specific format. Current formats'
1776
' are: default, knit, metaweave and weave.'
1777
' Default is knit; metaweave and weave are'
1779
type=get_format_type),
1783
def run(self, url='.', format=None):
1784
from bzrlib.upgrade import upgrade
1786
format = get_format_type('default')
1787
upgrade(url, format)
1790
class cmd_whoami(Command):
1791
"""Show or set bzr user id.
1795
bzr whoami 'Frank Chu <fchu@example.com>'
1797
takes_options = [ Option('email',
1798
help='display email address only'),
1800
help='set identity for the current branch instead of '
1803
takes_args = ['name?']
1804
encoding_type = 'replace'
1807
def run(self, email=False, branch=False, name=None):
1809
# use branch if we're inside one; otherwise global config
1811
c = Branch.open_containing('.')[0].get_config()
1812
except NotBranchError:
1813
c = config.GlobalConfig()
1815
self.outf.write(c.user_email() + '\n')
1817
self.outf.write(c.username() + '\n')
1820
# use global config unless --branch given
1822
c = Branch.open_containing('.')[0].get_config()
1824
c = config.GlobalConfig()
1825
c.set_user_option('email', name)
1828
class cmd_nick(Command):
1829
"""Print or set the branch nickname.
1831
If unset, the tree root directory name is used as the nickname
1832
To print the current nickname, execute with no argument.
1834
takes_args = ['nickname?']
1835
def run(self, nickname=None):
1836
branch = Branch.open_containing(u'.')[0]
1837
if nickname is None:
1838
self.printme(branch)
1840
branch.nick = nickname
1843
def printme(self, branch):
1847
class cmd_selftest(Command):
1848
"""Run internal test suite.
1850
This creates temporary test directories in the working directory,
1851
but not existing data is affected. These directories are deleted
1852
if the tests pass, or left behind to help in debugging if they
1853
fail and --keep-output is specified.
1855
If arguments are given, they are regular expressions that say
1856
which tests should run.
1858
If the global option '--no-plugins' is given, plugins are not loaded
1859
before running the selftests. This has two effects: features provided or
1860
modified by plugins will not be tested, and tests provided by plugins will
1865
bzr --no-plugins selftest -v
1867
# TODO: --list should give a list of all available tests
1869
# NB: this is used from the class without creating an instance, which is
1870
# why it does not have a self parameter.
1871
def get_transport_type(typestring):
1872
"""Parse and return a transport specifier."""
1873
if typestring == "sftp":
1874
from bzrlib.transport.sftp import SFTPAbsoluteServer
1875
return SFTPAbsoluteServer
1876
if typestring == "memory":
1877
from bzrlib.transport.memory import MemoryServer
1879
if typestring == "fakenfs":
1880
from bzrlib.transport.fakenfs import FakeNFSServer
1881
return FakeNFSServer
1882
msg = "No known transport type %s. Supported types are: sftp\n" %\
1884
raise BzrCommandError(msg)
1887
takes_args = ['testspecs*']
1888
takes_options = ['verbose',
1889
Option('one', help='stop when one test fails'),
1890
Option('keep-output',
1891
help='keep output directories when tests fail'),
1893
help='Use a different transport by default '
1894
'throughout the test suite.',
1895
type=get_transport_type),
1896
Option('benchmark', help='run the bzr bencharks.'),
1897
Option('lsprof-timed',
1898
help='generate lsprof output for benchmarked'
1899
' sections of code.'),
1902
def run(self, testspecs_list=None, verbose=None, one=False,
1903
keep_output=False, transport=None, benchmark=None,
1906
from bzrlib.tests import selftest
1907
import bzrlib.benchmarks as benchmarks
1908
# we don't want progress meters from the tests to go to the
1909
# real output; and we don't want log messages cluttering up
1911
save_ui = ui.ui_factory
1912
print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
1913
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
1915
info('running tests...')
1917
ui.ui_factory = ui.SilentUIFactory()
1918
if testspecs_list is not None:
1919
pattern = '|'.join(testspecs_list)
1923
test_suite_factory = benchmarks.test_suite
1927
test_suite_factory = None
1930
result = selftest(verbose=verbose,
1932
stop_on_failure=one,
1933
keep_output=keep_output,
1934
transport=transport,
1935
test_suite_factory=test_suite_factory,
1936
lsprof_timed=lsprof_timed)
1938
info('tests passed')
1940
info('tests failed')
1941
return int(not result)
1943
ui.ui_factory = save_ui
1946
class cmd_setup_default_ignores(Command):
1947
"""Setup the default list of ignored files.
1949
bzr 0.8 had a builtin list of files that were ignored by default.
1950
Version 0.9 removed this list, but switched to having a per-user
1951
default ignore list.
1953
After running this command the user default ignore list is filled
1954
with the old default list.
1956
This command will fail if the user default ignore list already exists.
1962
encoding_type = 'replace'
1965
user_ignore_filename = config.user_ignore_config_filename()
1967
helpful_filename = '~/.bazaar/ignore'
1968
if sys.platform == 'win32':
1969
helpful_filename = user_ignore_filename
1971
if os.path.exists(user_ignore_filename):
1972
raise BzrCommandError('%s already exists. Not overriding'
1973
% (helpful_filename,))
1975
config.ensure_config_dir_exists()
1976
# The extra '' ensures we have a trailing newline
1977
out_patterns = u'\n'.join(bzrlib.DEFAULT_IGNORE + [''])
1978
f = open(user_ignore_filename, 'wb')
1980
f.write(out_patterns.encode('utf8'))
1984
self.outf.write('Wrote %d patterns to %s\n'
1985
% (len(bzrlib.DEFAULT_IGNORE), helpful_filename))
1988
def _get_bzr_branch():
1989
"""If bzr is run from a branch, return Branch or None"""
1990
from os.path import dirname
1993
branch = Branch.open(dirname(osutils.abspath(dirname(__file__))))
1995
except errors.BzrError:
2001
print "bzr (bazaar-ng) %s" % bzrlib.__version__
2002
# is bzrlib itself in a branch?
2003
branch = _get_bzr_branch()
2005
rh = branch.revision_history()
2007
print " bzr checkout, revision %d" % (revno,)
2008
print " nick: %s" % (branch.nick,)
2010
print " revid: %s" % (rh[-1],)
2011
print "Using python interpreter:", sys.executable
2013
print "Using python standard library:", os.path.dirname(site.__file__)
2014
print "Using bzrlib:",
2015
if len(bzrlib.__path__) > 1:
2016
# print repr, which is a good enough way of making it clear it's
2017
# more than one element (eg ['/foo/bar', '/foo/bzr'])
2018
print repr(bzrlib.__path__)
2020
print bzrlib.__path__[0]
2023
print bzrlib.__copyright__
2024
print "http://bazaar-vcs.org/"
2026
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
2027
print "you may use, modify and redistribute it under the terms of the GNU"
2028
print "General Public License version 2 or later."
2031
class cmd_version(Command):
2032
"""Show version of bzr."""
2037
class cmd_rocks(Command):
2038
"""Statement of optimism."""
2042
print "it sure does!"
2045
class cmd_find_merge_base(Command):
2046
"""Find and print a base revision for merging two branches.
2048
# TODO: Options to specify revisions on either side, as if
2049
# merging only part of the history.
2050
takes_args = ['branch', 'other']
2054
def run(self, branch, other):
2055
from bzrlib.revision import common_ancestor, MultipleRevisionSources
2057
branch1 = Branch.open_containing(branch)[0]
2058
branch2 = Branch.open_containing(other)[0]
2060
history_1 = branch1.revision_history()
2061
history_2 = branch2.revision_history()
2063
last1 = branch1.last_revision()
2064
last2 = branch2.last_revision()
2066
source = MultipleRevisionSources(branch1.repository,
2069
base_rev_id = common_ancestor(last1, last2, source)
2071
print 'merge base is revision %s' % base_rev_id
2074
class cmd_merge(Command):
2075
"""Perform a three-way merge.
2077
The branch is the branch you will merge from. By default, it will merge
2078
the latest revision. If you specify a revision, that revision will be
2079
merged. If you specify two revisions, the first will be used as a BASE,
2080
and the second one as OTHER. Revision numbers are always relative to the
2083
By default, bzr will try to merge in all new work from the other
2084
branch, automatically determining an appropriate base. If this
2085
fails, you may need to give an explicit base.
2087
Merge will do its best to combine the changes in two branches, but there
2088
are some kinds of problems only a human can fix. When it encounters those,
2089
it will mark a conflict. A conflict means that you need to fix something,
2090
before you should commit.
2092
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2094
If there is no default branch set, the first merge will set it. After
2095
that, you can omit the branch to use the default. To change the
2096
default, use --remember. The value will only be saved if the remote
2097
location can be accessed.
2101
To merge the latest revision from bzr.dev
2102
bzr merge ../bzr.dev
2104
To merge changes up to and including revision 82 from bzr.dev
2105
bzr merge -r 82 ../bzr.dev
2107
To merge the changes introduced by 82, without previous changes:
2108
bzr merge -r 81..82 ../bzr.dev
2110
merge refuses to run if there are any uncommitted changes, unless
2113
The following merge types are available:
2115
takes_args = ['branch?']
2116
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2117
Option('show-base', help="Show base revision text in "
2121
from merge import merge_type_help
2122
from inspect import getdoc
2123
return getdoc(self) + '\n' + merge_type_help()
2125
def run(self, branch=None, revision=None, force=False, merge_type=None,
2126
show_base=False, reprocess=False, remember=False):
2127
if merge_type is None:
2128
merge_type = Merge3Merger
2130
tree = WorkingTree.open_containing(u'.')[0]
2132
if branch is not None:
2134
reader = bundle.read_bundle_from_url(branch)
2136
pass # Continue on considering this url a Branch
2138
conflicts = merge_bundle(reader, tree, not force, merge_type,
2139
reprocess, show_base)
2145
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2147
if revision is None or len(revision) < 1:
2149
other = [branch, -1]
2150
other_branch, path = Branch.open_containing(branch)
2152
if len(revision) == 1:
2154
other_branch, path = Branch.open_containing(branch)
2155
revno = revision[0].in_history(other_branch).revno
2156
other = [branch, revno]
2158
assert len(revision) == 2
2159
if None in revision:
2160
raise BzrCommandError(
2161
"Merge doesn't permit that revision specifier.")
2162
other_branch, path = Branch.open_containing(branch)
2164
base = [branch, revision[0].in_history(other_branch).revno]
2165
other = [branch, revision[1].in_history(other_branch).revno]
2167
if tree.branch.get_parent() is None or remember:
2168
tree.branch.set_parent(other_branch.base)
2171
interesting_files = [path]
2173
interesting_files = None
2174
pb = ui.ui_factory.nested_progress_bar()
2177
conflict_count = merge(other, base, check_clean=(not force),
2178
merge_type=merge_type,
2179
reprocess=reprocess,
2180
show_base=show_base,
2181
pb=pb, file_list=interesting_files)
2184
if conflict_count != 0:
2188
except errors.AmbiguousBase, e:
2189
m = ("sorry, bzr can't determine the right merge base yet\n"
2190
"candidates are:\n "
2191
+ "\n ".join(e.bases)
2193
"please specify an explicit base with -r,\n"
2194
"and (if you want) report this to the bzr developers\n")
2197
# TODO: move up to common parent; this isn't merge-specific anymore.
2198
def _get_remembered_parent(self, tree, supplied_location, verb_string):
2199
"""Use tree.branch's parent if none was supplied.
2201
Report if the remembered location was used.
2203
if supplied_location is not None:
2204
return supplied_location
2205
stored_location = tree.branch.get_parent()
2206
mutter("%s", stored_location)
2207
if stored_location is None:
2208
raise BzrCommandError("No location specified or remembered")
2209
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2210
self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2211
return stored_location
2214
class cmd_remerge(Command):
2217
Use this if you want to try a different merge technique while resolving
2218
conflicts. Some merge techniques are better than others, and remerge
2219
lets you try different ones on different files.
2221
The options for remerge have the same meaning and defaults as the ones for
2222
merge. The difference is that remerge can (only) be run when there is a
2223
pending merge, and it lets you specify particular files.
2226
$ bzr remerge --show-base
2227
Re-do the merge of all conflicted files, and show the base text in
2228
conflict regions, in addition to the usual THIS and OTHER texts.
2230
$ bzr remerge --merge-type weave --reprocess foobar
2231
Re-do the merge of "foobar", using the weave merge algorithm, with
2232
additional processing to reduce the size of conflict regions.
2234
The following merge types are available:"""
2235
takes_args = ['file*']
2236
takes_options = ['merge-type', 'reprocess',
2237
Option('show-base', help="Show base revision text in "
2241
from merge import merge_type_help
2242
from inspect import getdoc
2243
return getdoc(self) + '\n' + merge_type_help()
2245
def run(self, file_list=None, merge_type=None, show_base=False,
2247
from bzrlib.merge import merge_inner, transform_tree
2248
if merge_type is None:
2249
merge_type = Merge3Merger
2250
tree, file_list = tree_files(file_list)
2253
pending_merges = tree.pending_merges()
2254
if len(pending_merges) != 1:
2255
raise BzrCommandError("Sorry, remerge only works after normal"
2256
" merges. Not cherrypicking or"
2258
repository = tree.branch.repository
2259
base_revision = common_ancestor(tree.branch.last_revision(),
2260
pending_merges[0], repository)
2261
base_tree = repository.revision_tree(base_revision)
2262
other_tree = repository.revision_tree(pending_merges[0])
2263
interesting_ids = None
2265
conflicts = tree.conflicts()
2266
if file_list is not None:
2267
interesting_ids = set()
2268
for filename in file_list:
2269
file_id = tree.path2id(filename)
2271
raise NotVersionedError(filename)
2272
interesting_ids.add(file_id)
2273
if tree.kind(file_id) != "directory":
2276
for name, ie in tree.inventory.iter_entries(file_id):
2277
interesting_ids.add(ie.file_id)
2278
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
2279
transform_tree(tree, tree.basis_tree(), interesting_ids)
2280
tree.set_conflicts(ConflictList(new_conflicts))
2281
if file_list is None:
2282
restore_files = list(tree.iter_conflicts())
2284
restore_files = file_list
2285
for filename in restore_files:
2287
restore(tree.abspath(filename))
2288
except NotConflicted:
2290
conflicts = merge_inner(tree.branch, other_tree, base_tree,
2292
interesting_ids=interesting_ids,
2293
other_rev_id=pending_merges[0],
2294
merge_type=merge_type,
2295
show_base=show_base,
2296
reprocess=reprocess)
2304
class cmd_revert(Command):
2305
"""Reverse all changes since the last commit.
2307
Only versioned files are affected. Specify filenames to revert only
2308
those files. By default, any files that are changed will be backed up
2309
first. Backup files have a '~' appended to their name.
2311
takes_options = ['revision', 'no-backup']
2312
takes_args = ['file*']
2313
aliases = ['merge-revert']
2315
def run(self, revision=None, no_backup=False, file_list=None):
2316
from bzrlib.commands import parse_spec
2317
if file_list is not None:
2318
if len(file_list) == 0:
2319
raise BzrCommandError("No files specified")
2323
tree, file_list = tree_files(file_list)
2324
if revision is None:
2325
# FIXME should be tree.last_revision
2326
rev_id = tree.last_revision()
2327
elif len(revision) != 1:
2328
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
2330
rev_id = revision[0].in_history(tree.branch).rev_id
2331
pb = ui.ui_factory.nested_progress_bar()
2333
tree.revert(file_list,
2334
tree.branch.repository.revision_tree(rev_id),
2340
class cmd_assert_fail(Command):
2341
"""Test reporting of assertion failures"""
2344
assert False, "always fails"
2347
class cmd_help(Command):
2348
"""Show help on a command or other topic.
2350
For a list of all available commands, say 'bzr help commands'."""
2351
takes_options = [Option('long', 'show help on all commands')]
2352
takes_args = ['topic?']
2353
aliases = ['?', '--help', '-?', '-h']
2356
def run(self, topic=None, long=False):
2358
if topic is None and long:
2363
class cmd_shell_complete(Command):
2364
"""Show appropriate completions for context.
2366
For a list of all available commands, say 'bzr shell-complete'."""
2367
takes_args = ['context?']
2372
def run(self, context=None):
2373
import shellcomplete
2374
shellcomplete.shellcomplete(context)
2377
class cmd_fetch(Command):
2378
"""Copy in history from another branch but don't merge it.
2380
This is an internal method used for pull and merge."""
2382
takes_args = ['from_branch', 'to_branch']
2383
def run(self, from_branch, to_branch):
2384
from bzrlib.fetch import Fetcher
2385
from_b = Branch.open(from_branch)
2386
to_b = Branch.open(to_branch)
2387
Fetcher(to_b, from_b)
2390
class cmd_missing(Command):
2391
"""Show unmerged/unpulled revisions between two branches.
2393
OTHER_BRANCH may be local or remote."""
2394
takes_args = ['other_branch?']
2395
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2397
'Display changes in the local branch only'),
2398
Option('theirs-only',
2399
'Display changes in the remote branch only'),
2407
encoding_type = 'replace'
2410
def run(self, other_branch=None, reverse=False, mine_only=False,
2411
theirs_only=False, log_format=None, long=False, short=False, line=False,
2412
show_ids=False, verbose=False):
2413
from bzrlib.missing import find_unmerged, iter_log_data
2414
from bzrlib.log import log_formatter
2415
local_branch = Branch.open_containing(u".")[0]
2416
parent = local_branch.get_parent()
2417
if other_branch is None:
2418
other_branch = parent
2419
if other_branch is None:
2420
raise BzrCommandError("No missing location known or specified.")
2421
print "Using last location: " + local_branch.get_parent()
2422
remote_branch = Branch.open(other_branch)
2423
if remote_branch.base == local_branch.base:
2424
remote_branch = local_branch
2425
local_branch.lock_read()
2427
remote_branch.lock_read()
2429
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2430
if (log_format == None):
2431
default = local_branch.get_config().log_format()
2432
log_format = get_log_format(long=long, short=short,
2433
line=line, default=default)
2434
lf = log_formatter(log_format,
2437
show_timezone='original')
2438
if reverse is False:
2439
local_extra.reverse()
2440
remote_extra.reverse()
2441
if local_extra and not theirs_only:
2442
print "You have %d extra revision(s):" % len(local_extra)
2443
for data in iter_log_data(local_extra, local_branch.repository,
2446
printed_local = True
2448
printed_local = False
2449
if remote_extra and not mine_only:
2450
if printed_local is True:
2452
print "You are missing %d revision(s):" % len(remote_extra)
2453
for data in iter_log_data(remote_extra, remote_branch.repository,
2456
if not remote_extra and not local_extra:
2458
print "Branches are up to date."
2462
remote_branch.unlock()
2464
local_branch.unlock()
2465
if not status_code and parent is None and other_branch is not None:
2466
local_branch.lock_write()
2468
# handle race conditions - a parent might be set while we run.
2469
if local_branch.get_parent() is None:
2470
local_branch.set_parent(remote_branch.base)
2472
local_branch.unlock()
2476
class cmd_plugins(Command):
2481
import bzrlib.plugin
2482
from inspect import getdoc
2483
for name, plugin in bzrlib.plugin.all_plugins().items():
2484
if hasattr(plugin, '__path__'):
2485
print plugin.__path__[0]
2486
elif hasattr(plugin, '__file__'):
2487
print plugin.__file__
2493
print '\t', d.split('\n')[0]
2496
class cmd_testament(Command):
2497
"""Show testament (signing-form) of a revision."""
2498
takes_options = ['revision', 'long',
2499
Option('strict', help='Produce a strict-format'
2501
takes_args = ['branch?']
2503
def run(self, branch=u'.', revision=None, long=False, strict=False):
2504
from bzrlib.testament import Testament, StrictTestament
2506
testament_class = StrictTestament
2508
testament_class = Testament
2509
b = WorkingTree.open_containing(branch)[0].branch
2512
if revision is None:
2513
rev_id = b.last_revision()
2515
rev_id = revision[0].in_history(b).rev_id
2516
t = testament_class.from_revision(b.repository, rev_id)
2518
sys.stdout.writelines(t.as_text_lines())
2520
sys.stdout.write(t.as_short_text())
2525
class cmd_annotate(Command):
2526
"""Show the origin of each line in a file.
2528
This prints out the given file with an annotation on the left side
2529
indicating which revision, author and date introduced the change.
2531
If the origin is the same for a run of consecutive lines, it is
2532
shown only at the top, unless the --all option is given.
2534
# TODO: annotate directories; showing when each file was last changed
2535
# TODO: if the working copy is modified, show annotations on that
2536
# with new uncommitted lines marked
2537
aliases = ['ann', 'blame', 'praise']
2538
takes_args = ['filename']
2539
takes_options = [Option('all', help='show annotations on all lines'),
2540
Option('long', help='show date in annotations'),
2545
def run(self, filename, all=False, long=False, revision=None):
2546
from bzrlib.annotate import annotate_file
2547
tree, relpath = WorkingTree.open_containing(filename)
2548
branch = tree.branch
2551
if revision is None:
2552
revision_id = branch.last_revision()
2553
elif len(revision) != 1:
2554
raise BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2556
revision_id = revision[0].in_history(branch).rev_id
2557
file_id = tree.inventory.path2id(relpath)
2558
tree = branch.repository.revision_tree(revision_id)
2559
file_version = tree.inventory[file_id].revision
2560
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
2565
class cmd_re_sign(Command):
2566
"""Create a digital signature for an existing revision."""
2567
# TODO be able to replace existing ones.
2569
hidden = True # is this right ?
2570
takes_args = ['revision_id*']
2571
takes_options = ['revision']
2573
def run(self, revision_id_list=None, revision=None):
2574
import bzrlib.gpg as gpg
2575
if revision_id_list is not None and revision is not None:
2576
raise BzrCommandError('You can only supply one of revision_id or --revision')
2577
if revision_id_list is None and revision is None:
2578
raise BzrCommandError('You must supply either --revision or a revision_id')
2579
b = WorkingTree.open_containing(u'.')[0].branch
2580
gpg_strategy = gpg.GPGStrategy(b.get_config())
2581
if revision_id_list is not None:
2582
for revision_id in revision_id_list:
2583
b.repository.sign_revision(revision_id, gpg_strategy)
2584
elif revision is not None:
2585
if len(revision) == 1:
2586
revno, rev_id = revision[0].in_history(b)
2587
b.repository.sign_revision(rev_id, gpg_strategy)
2588
elif len(revision) == 2:
2589
# are they both on rh- if so we can walk between them
2590
# might be nice to have a range helper for arbitrary
2591
# revision paths. hmm.
2592
from_revno, from_revid = revision[0].in_history(b)
2593
to_revno, to_revid = revision[1].in_history(b)
2594
if to_revid is None:
2595
to_revno = b.revno()
2596
if from_revno is None or to_revno is None:
2597
raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2598
for revno in range(from_revno, to_revno + 1):
2599
b.repository.sign_revision(b.get_rev_id(revno),
2602
raise BzrCommandError('Please supply either one revision, or a range.')
2605
class cmd_bind(Command):
2606
"""Bind the current branch to a master branch.
2608
After binding, commits must succeed on the master branch
2609
before they are executed on the local one.
2612
takes_args = ['location']
2615
def run(self, location=None):
2616
b, relpath = Branch.open_containing(u'.')
2617
b_other = Branch.open(location)
2620
except DivergedBranches:
2621
raise BzrCommandError('These branches have diverged.'
2622
' Try merging, and then bind again.')
2625
class cmd_unbind(Command):
2626
"""Unbind the current branch from its master branch.
2628
After unbinding, the local branch is considered independent.
2629
All subsequent commits will be local.
2636
b, relpath = Branch.open_containing(u'.')
2638
raise BzrCommandError('Local branch is not bound')
2641
class cmd_uncommit(Command):
2642
"""Remove the last committed revision.
2644
--verbose will print out what is being removed.
2645
--dry-run will go through all the motions, but not actually
2648
In the future, uncommit will create a revision bundle, which can then
2652
# TODO: jam 20060108 Add an option to allow uncommit to remove
2653
# unreferenced information in 'branch-as-repository' branches.
2654
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2655
# information in shared branches as well.
2656
takes_options = ['verbose', 'revision',
2657
Option('dry-run', help='Don\'t actually make changes'),
2658
Option('force', help='Say yes to all questions.')]
2659
takes_args = ['location?']
2662
def run(self, location=None,
2663
dry_run=False, verbose=False,
2664
revision=None, force=False):
2665
from bzrlib.log import log_formatter
2667
from bzrlib.uncommit import uncommit
2669
if location is None:
2671
control, relpath = bzrdir.BzrDir.open_containing(location)
2673
tree = control.open_workingtree()
2675
except (errors.NoWorkingTree, errors.NotLocalUrl):
2677
b = control.open_branch()
2679
if revision is None:
2681
rev_id = b.last_revision()
2683
revno, rev_id = revision[0].in_history(b)
2685
print 'No revisions to uncommit.'
2687
for r in range(revno, b.revno()+1):
2688
rev_id = b.get_rev_id(r)
2689
lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
2690
lf.show(r, b.repository.get_revision(rev_id), None)
2693
print 'Dry-run, pretending to remove the above revisions.'
2695
val = raw_input('Press <enter> to continue')
2697
print 'The above revision(s) will be removed.'
2699
val = raw_input('Are you sure [y/N]? ')
2700
if val.lower() not in ('y', 'yes'):
2704
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
2708
class cmd_break_lock(Command):
2709
"""Break a dead lock on a repository, branch or working directory.
2711
CAUTION: Locks should only be broken when you are sure that the process
2712
holding the lock has been stopped.
2714
You can get information on what locks are open via the 'bzr info' command.
2719
takes_args = ['location?']
2721
def run(self, location=None, show=False):
2722
if location is None:
2724
control, relpath = bzrdir.BzrDir.open_containing(location)
2726
control.break_lock()
2727
except NotImplementedError:
2732
# command-line interpretation helper for merge-related commands
2733
def merge(other_revision, base_revision,
2734
check_clean=True, ignore_zero=False,
2735
this_dir=None, backup_files=False, merge_type=Merge3Merger,
2736
file_list=None, show_base=False, reprocess=False,
2737
pb=DummyProgress()):
2738
"""Merge changes into a tree.
2741
list(path, revno) Base for three-way merge.
2742
If [None, None] then a base will be automatically determined.
2744
list(path, revno) Other revision for three-way merge.
2746
Directory to merge changes into; '.' by default.
2748
If true, this_dir must have no uncommitted changes before the
2750
ignore_zero - If true, suppress the "zero conflicts" message when
2751
there are no conflicts; should be set when doing something we expect
2752
to complete perfectly.
2753
file_list - If supplied, merge only changes to selected files.
2755
All available ancestors of other_revision and base_revision are
2756
automatically pulled into the branch.
2758
The revno may be -1 to indicate the last revision on the branch, which is
2761
This function is intended for use from the command line; programmatic
2762
clients might prefer to call merge.merge_inner(), which has less magic
2765
from bzrlib.merge import Merger
2766
if this_dir is None:
2768
this_tree = WorkingTree.open_containing(this_dir)[0]
2769
if show_base and not merge_type is Merge3Merger:
2770
raise BzrCommandError("Show-base is not supported for this merge"
2771
" type. %s" % merge_type)
2772
if reprocess and not merge_type.supports_reprocess:
2773
raise BzrCommandError("Conflict reduction is not supported for merge"
2774
" type %s." % merge_type)
2775
if reprocess and show_base:
2776
raise BzrCommandError("Cannot do conflict reduction and show base.")
2778
merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2779
merger.pp = ProgressPhase("Merge phase", 5, pb)
2780
merger.pp.next_phase()
2781
merger.check_basis(check_clean)
2782
merger.set_other(other_revision)
2783
merger.pp.next_phase()
2784
merger.set_base(base_revision)
2785
if merger.base_rev_id == merger.other_rev_id:
2786
note('Nothing to do.')
2788
merger.backup_files = backup_files
2789
merger.merge_type = merge_type
2790
merger.set_interesting_files(file_list)
2791
merger.show_base = show_base
2792
merger.reprocess = reprocess
2793
conflicts = merger.do_merge()
2794
if file_list is None:
2795
merger.set_pending()
2801
# these get imported and then picked up by the scan for cmd_*
2802
# TODO: Some more consistent way to split command definitions across files;
2803
# we do need to load at least some information about them to know of
2804
# aliases. ideally we would avoid loading the implementation until the
2805
# details were needed.
2806
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2807
from bzrlib.bundle.commands import cmd_bundle_revisions
2808
from bzrlib.sign_my_commits import cmd_sign_my_commits
2809
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
2810
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
