31
31
import bzrlib.errors as errors
32
32
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
33
33
NotBranchError, DivergedBranches, NotConflicted,
34
NoSuchFile, NoWorkingTree, FileInWrongBranch)
34
NoSuchFile, NoWorkingTree, FileInWrongBranch,
35
36
from bzrlib.log import show_one_log
36
37
from bzrlib.merge import Merge3Merger
37
38
from bzrlib.option import Option
603
605
raise BzrCommandError(msg)
604
606
except bzrlib.errors.UnlistableBranch:
605
607
rmtree(to_location)
606
msg = "The branch %s cannot be used as a --basis"
608
msg = "The branch %s cannot be used as a --basis" % (basis,)
607
609
raise BzrCommandError(msg)
609
611
branch.control_files.put_utf8('branch-name', name)
629
631
branch being checked out. [Not implemented yet.]
631
633
takes_args = ['branch_location', 'to_location?']
632
takes_options = ['revision'] # , 'basis']
634
takes_options = ['revision', # , 'basis']
635
Option('lightweight',
636
help="perform a lightweight checkout. Lightweight "
637
"checkouts depend on access to the branch for "
638
"every operation. Normal checkouts can perform "
639
"common operations like diff and status without "
640
"such access, and also support local commits."
634
def run(self, branch_location, to_location=None, revision=None, basis=None):
644
def run(self, branch_location, to_location=None, revision=None, basis=None,
635
646
if revision is None:
636
647
revision = [None]
637
648
elif len(revision) > 1:
658
checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
659
bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
660
checkout.create_workingtree(revision_id)
669
old_format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
670
bzrlib.bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
673
checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
674
bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
676
checkout_branch = bzrlib.bzrdir.BzrDir.create_branch_convenience(
677
to_location, force_new_tree=False)
678
checkout = checkout_branch.bzrdir
679
checkout_branch.bind(source)
680
if revision_id is not None:
681
rh = checkout_branch.revision_history()
682
checkout_branch.set_revision_history(rh[:rh.index(revision_id) + 1])
683
checkout.create_workingtree(revision_id)
685
bzrlib.bzrdir.BzrDirFormat.set_default_format(old_format)
663
688
class cmd_renames(Command):
684
709
"""Update a tree to have the latest code committed to its branch.
686
711
This will perform a merge into the working tree, and may generate
687
conflicts. If you have any uncommitted changes, you will still
688
need to commit them after the update.
712
conflicts. If you have any local changes, you will still
713
need to commit them after the update for the update to be complete.
715
If you want to discard your local changes, you can just do a
716
'bzr revert' instead of 'bzr commit' after the update.
690
718
takes_args = ['dir?']
694
722
tree.lock_write()
696
724
if tree.last_revision() == tree.branch.last_revision():
697
note("Tree is up to date.")
725
# may be up to date, check master too.
726
master = tree.branch.get_master_branch()
727
if master is None or master.last_revision == tree.last_revision():
728
note("Tree is up to date.")
699
730
conflicts = tree.update()
700
731
note('Updated to revision %d.' %
701
732
(tree.branch.revision_id_to_revno(tree.last_revision()),))
803
class cmd_reconcile(Command):
804
"""Reconcile bzr metadata in a branch.
806
This can correct data mismatches that may have been caused by
807
previous ghost operations or bzr upgrades. You should only
808
need to run this command if 'bzr check' or a bzr developer
809
advises you to run it.
811
If a second branch is provided, cross-branch reconciliation is
812
also attempted, which will check that data like the tree root
813
id which was not present in very early bzr versions is represented
814
correctly in both branches.
816
At the same time it is run it may recompress data resulting in
817
a potential saving in disk space or performance gain.
819
The branch *MUST* be on a listable system such as local disk or sftp.
821
takes_args = ['branch?']
823
def run(self, branch="."):
824
from bzrlib.reconcile import reconcile
825
dir = bzrlib.bzrdir.BzrDir.open(branch)
772
829
class cmd_revision_history(Command):
773
830
"""Display list of revision ids on this branch."""
853
910
def run(self, revision=None, file_list=None, diff_options=None):
854
from bzrlib.diff import show_diff
911
from bzrlib.diff import diff_cmd_helper, show_diff_trees
856
tree, file_list = internal_tree_files(file_list)
913
tree1, file_list = internal_tree_files(file_list)
859
917
except FileInWrongBranch:
860
918
if len(file_list) != 2:
861
919
raise BzrCommandError("Files are in different branches")
863
b, file1 = Branch.open_containing(file_list[0])
864
b2, file2 = Branch.open_containing(file_list[1])
921
tree1, file1 = WorkingTree.open_containing(file_list[0])
922
tree2, file2 = WorkingTree.open_containing(file_list[1])
865
923
if file1 != "" or file2 != "":
866
924
# FIXME diff those two files. rbc 20051123
867
925
raise BzrCommandError("Files are in different branches")
869
927
if revision is not None:
928
if tree2 is not None:
871
929
raise BzrCommandError("Can't specify -r with two branches")
872
930
if (len(revision) == 1) or (revision[1].spec is None):
873
return show_diff(tree.branch, revision[0], specific_files=file_list,
874
external_diff_options=diff_options)
931
return diff_cmd_helper(tree1, file_list, diff_options,
875
933
elif len(revision) == 2:
876
return show_diff(tree.branch, revision[0], specific_files=file_list,
877
external_diff_options=diff_options,
878
revision2=revision[1])
934
return diff_cmd_helper(tree1, file_list, diff_options,
935
revision[0], revision[1])
880
937
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
883
return show_diff(b, None, specific_files=file_list,
884
external_diff_options=diff_options, b2=b2)
939
if tree2 is not None:
940
return show_diff_trees(tree1, tree2, sys.stdout,
941
specific_files=file_list,
942
external_diff_options=diff_options)
886
return show_diff(tree.branch, None, specific_files=file_list,
887
external_diff_options=diff_options)
944
return diff_cmd_helper(tree1, file_list, diff_options)
890
947
class cmd_deleted(Command):
1358
1415
Option('strict',
1359
1416
help="refuse to commit if there are unknown "
1360
1417
"files in the working tree."),
1419
help="perform a local only commit in a bound "
1420
"branch. Such commits are not pushed to "
1421
"the master branch until a normal commit "
1362
1425
aliases = ['ci', 'checkin']
1364
1427
def run(self, message=None, file=None, verbose=True, selected_list=None,
1365
unchanged=False, strict=False):
1428
unchanged=False, strict=False, local=False):
1366
1429
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1367
1430
StrictCommitFailed)
1368
1431
from bzrlib.msgeditor import edit_commit_message, \
1379
1442
# TODO: if the commit *does* happen to fail, then save the commit
1380
1443
# message to a temporary file where it can be recovered
1381
1444
tree, selected_list = tree_files(selected_list)
1445
if local and not tree.branch.get_bound_location():
1446
raise errors.LocalRequiresBoundBranch()
1382
1447
if message is None and not file:
1383
1448
template = make_commit_message_template(tree, selected_list)
1384
1449
message = edit_commit_message(template)
1399
1464
tree.commit(message, specific_files=selected_list,
1400
allow_pointless=unchanged, strict=strict)
1465
allow_pointless=unchanged, strict=strict, local=local)
1401
1466
except PointlessCommit:
1402
1467
# FIXME: This should really happen before the file is read in;
1403
1468
# perhaps prepare the commit; get the message; then actually commit
1409
1474
except StrictCommitFailed:
1410
1475
raise BzrCommandError("Commit refused because there are unknown "
1411
1476
"files in the working tree.")
1477
except errors.BoundBranchOutOfDate, e:
1478
raise BzrCommandError(str(e)
1479
+ ' Either unbind, update, or'
1480
' pass --local to commit.')
1412
1482
note('Committed revision %d.' % (tree.branch.revno(),))
2093
2165
raise BzrCommandError('Please supply either one revision, or a range.')
2168
class cmd_bind(Command):
2169
"""Bind the current branch to a master branch.
2171
After binding, commits must succeed on the master branch
2172
before they are executed on the local one.
2175
takes_args = ['location']
2178
def run(self, location=None):
2179
b, relpath = Branch.open_containing(u'.')
2180
b_other = Branch.open(location)
2183
except DivergedBranches:
2184
raise BzrCommandError('These branches have diverged.'
2185
' Try merging, and then bind again.')
2188
class cmd_unbind(Command):
2189
"""Bind the current branch to its parent.
2191
After unbinding, the local branch is considered independent.
2198
b, relpath = Branch.open_containing(u'.')
2200
raise BzrCommandError('Local branch is not bound')
2096
2203
class cmd_uncommit(bzrlib.commands.Command):
2097
2204
"""Remove the last committed revision.
2107
2214
In the future, uncommit will create a changeset, which can then
2110
TODO: jam 20060108 Add an option to allow uncommit to remove unreferenced
2111
information in 'branch-as-repostory' branches.
2112
TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2113
information in shared branches as well.
2218
# TODO: jam 20060108 Add an option to allow uncommit to remove
2219
# unreferenced information in 'branch-as-repostory' branches.
2220
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2221
# information in shared branches as well.
2115
2222
takes_options = ['verbose', 'revision',
2116
2223
Option('dry-run', help='Don\'t actually make changes'),
2117
2224
Option('force', help='Say yes to all questions.')]
2274
class cmd_break_lock(Command):
2275
"""Break a dead lock on a repository, branch or working directory.
2277
CAUTION: Locks should only be broken when you are sure that the process
2278
holding the lock has been stopped.
2283
takes_args = ['location']
2284
takes_options = [Option('show',
2285
help="just show information on the lock, " \
2288
def run(self, location, show=False):
2289
d = bzrdir.BzrDir.open(location)
2290
repo = d.open_repository()
2291
if not repo.is_locked():
2292
raise errors.ObjectNotLocked(repo)
2295
# command-line interpretation helper for merge-related commands
2167
2296
def merge(other_revision, base_revision,
2168
2297
check_clean=True, ignore_zero=False,
2169
2298
this_dir=None, backup_files=False, merge_type=Merge3Merger,
2170
file_list=None, show_base=False, reprocess=False,
2299
file_list=None, show_base=False, reprocess=False,
2171
2300
pb=DummyProgress()):
2172
2301
"""Merge changes into a tree.
added
removed
bzrlib/builtins.py
