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"""
26
from bzrlib.branch import Branch
27
import bzrlib.bzrdir as bzrdir
28
from bzrlib.commands import Command, display_command
29
import bzrlib.errors as errors
30
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
31
NotBranchError, DivergedBranches, NotConflicted,
32
NoSuchFile, NoWorkingTree, FileInWrongBranch,
34
from bzrlib.log import show_one_log
35
from bzrlib.merge import Merge3Merger
36
from bzrlib.option import Option
37
from bzrlib.progress import DummyProgress, ProgressPhase
38
from bzrlib.revision import common_ancestor
39
from bzrlib.revisionspec import RevisionSpec
41
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
42
from bzrlib.transport.local import LocalTransport
44
from bzrlib.workingtree import WorkingTree
47
def tree_files(file_list, default_branch=u'.'):
49
return internal_tree_files(file_list, default_branch)
50
except FileInWrongBranch, e:
51
raise BzrCommandError("%s is not in the same branch as %s" %
52
(e.path, file_list[0]))
55
# XXX: Bad function name; should possibly also be a class method of
56
# WorkingTree rather than a function.
57
def internal_tree_files(file_list, default_branch=u'.'):
58
"""Convert command-line paths to a WorkingTree and relative paths.
60
This is typically used for command-line processors that take one or
61
more filenames, and infer the workingtree that contains them.
63
The filenames given are not required to exist.
65
:param file_list: Filenames to convert.
67
:param default_branch: Fallback tree path to use if file_list is empty or None.
69
:return: workingtree, [relative_paths]
71
if file_list is None or len(file_list) == 0:
72
return WorkingTree.open_containing(default_branch)[0], file_list
73
tree = WorkingTree.open_containing(file_list[0])[0]
75
for filename in file_list:
77
new_list.append(tree.relpath(filename))
78
except errors.PathNotChild:
79
raise FileInWrongBranch(tree.branch, filename)
83
def get_format_type(typestring):
84
"""Parse and return a format specifier."""
85
if typestring == "weave":
86
return bzrdir.BzrDirFormat6()
87
if typestring == "default":
88
return bzrdir.BzrDirMetaFormat1()
89
if typestring == "metaweave":
90
format = bzrdir.BzrDirMetaFormat1()
91
format.repository_format = bzrlib.repository.RepositoryFormat7()
93
if typestring == "knit":
94
format = bzrdir.BzrDirMetaFormat1()
95
format.repository_format = bzrlib.repository.RepositoryFormatKnit1()
97
msg = "Unknown bzr format %s. Current formats are: default, knit,\n" \
98
"metaweave and weave" % typestring
99
raise BzrCommandError(msg)
102
# TODO: Make sure no commands unconditionally use the working directory as a
103
# branch. If a filename argument is used, the first of them should be used to
104
# specify the branch. (Perhaps this can be factored out into some kind of
105
# Argument class, representing a file in a branch, where the first occurrence
108
class cmd_status(Command):
109
"""Display status summary.
111
This reports on versioned and unknown files, reporting them
112
grouped by state. Possible states are:
115
Versioned in the working copy but not in the previous revision.
118
Versioned in the previous revision but removed or deleted
122
Path of this file changed from the previous revision;
123
the text may also have changed. This includes files whose
124
parent directory was renamed.
127
Text has changed since the previous revision.
130
Nothing about this file has changed since the previous revision.
131
Only shown with --all.
134
Not versioned and not matching an ignore pattern.
136
To see ignored files use 'bzr ignored'. For details in the
137
changes to file texts, use 'bzr diff'.
139
If no arguments are specified, the status of the entire working
140
directory is shown. Otherwise, only the status of the specified
141
files or directories is reported. If a directory is given, status
142
is reported for everything inside that directory.
144
If a revision argument is given, the status is calculated against
145
that revision, or between two revisions if two are provided.
148
# TODO: --no-recurse, --recurse options
150
takes_args = ['file*']
151
takes_options = ['all', 'show-ids', 'revision']
152
aliases = ['st', 'stat']
155
def run(self, all=False, show_ids=False, file_list=None, revision=None):
156
tree, file_list = tree_files(file_list)
158
from bzrlib.status import show_tree_status
159
show_tree_status(tree, show_unchanged=all, show_ids=show_ids,
160
specific_files=file_list, revision=revision)
163
class cmd_cat_revision(Command):
164
"""Write out metadata for a revision.
166
The revision to print can either be specified by a specific
167
revision identifier, or you can use --revision.
171
takes_args = ['revision_id?']
172
takes_options = ['revision']
175
def run(self, revision_id=None, revision=None):
177
if revision_id is not None and revision is not None:
178
raise BzrCommandError('You can only supply one of revision_id or --revision')
179
if revision_id is None and revision is None:
180
raise BzrCommandError('You must supply either --revision or a revision_id')
181
b = WorkingTree.open_containing(u'.')[0].branch
182
if revision_id is not None:
183
sys.stdout.write(b.repository.get_revision_xml(revision_id))
184
elif revision is not None:
187
raise BzrCommandError('You cannot specify a NULL revision.')
188
revno, rev_id = rev.in_history(b)
189
sys.stdout.write(b.repository.get_revision_xml(rev_id))
192
class cmd_revno(Command):
193
"""Show current revision number.
195
This is equal to the number of revisions on this branch."""
196
takes_args = ['location?']
198
def run(self, location=u'.'):
199
print Branch.open_containing(location)[0].revno()
202
class cmd_revision_info(Command):
203
"""Show revision number and revision id for a given revision identifier.
206
takes_args = ['revision_info*']
207
takes_options = ['revision']
209
def run(self, revision=None, revision_info_list=[]):
212
if revision is not None:
213
revs.extend(revision)
214
if revision_info_list is not None:
215
for rev in revision_info_list:
216
revs.append(RevisionSpec(rev))
218
raise BzrCommandError('You must supply a revision identifier')
220
b = WorkingTree.open_containing(u'.')[0].branch
223
revinfo = rev.in_history(b)
224
if revinfo.revno is None:
225
print ' %s' % revinfo.rev_id
227
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
230
class cmd_add(Command):
231
"""Add specified files or directories.
233
In non-recursive mode, all the named items are added, regardless
234
of whether they were previously ignored. A warning is given if
235
any of the named files are already versioned.
237
In recursive mode (the default), files are treated the same way
238
but the behaviour for directories is different. Directories that
239
are already versioned do not give a warning. All directories,
240
whether already versioned or not, are searched for files or
241
subdirectories that are neither versioned or ignored, and these
242
are added. This search proceeds recursively into versioned
243
directories. If no names are given '.' is assumed.
245
Therefore simply saying 'bzr add' will version all files that
246
are currently unknown.
248
Adding a file whose parent directory is not versioned will
249
implicitly add the parent, and so on up to the root. This means
250
you should never need to explictly add a directory, they'll just
251
get added when you add a file in the directory.
253
--dry-run will show which files would be added, but not actually
256
takes_args = ['file*']
257
takes_options = ['no-recurse', 'dry-run', 'verbose']
259
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False):
264
# This is pointless, but I'd rather not raise an error
265
action = bzrlib.add.add_action_null
267
action = bzrlib.add.add_action_print
269
action = bzrlib.add.add_action_add
271
action = bzrlib.add.add_action_add_and_print
273
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
277
for glob in sorted(ignored.keys()):
278
for path in ignored[glob]:
279
print "ignored %s matching \"%s\"" % (path, glob)
282
for glob, paths in ignored.items():
283
match_len += len(paths)
284
print "ignored %d file(s)." % match_len
285
print "If you wish to add some of these files, please add them"\
289
class cmd_mkdir(Command):
290
"""Create a new versioned directory.
292
This is equivalent to creating the directory and then adding it.
294
takes_args = ['dir+']
296
def run(self, dir_list):
299
wt, dd = WorkingTree.open_containing(d)
304
class cmd_relpath(Command):
305
"""Show path of a file relative to root"""
306
takes_args = ['filename']
310
def run(self, filename):
311
tree, relpath = WorkingTree.open_containing(filename)
315
class cmd_inventory(Command):
316
"""Show inventory of the current working copy or a revision.
318
It is possible to limit the output to a particular entry
319
type using the --kind option. For example; --kind file.
321
takes_options = ['revision', 'show-ids', 'kind']
324
def run(self, revision=None, show_ids=False, kind=None):
325
if kind and kind not in ['file', 'directory', 'symlink']:
326
raise BzrCommandError('invalid kind specified')
327
tree = WorkingTree.open_containing(u'.')[0]
329
inv = tree.read_working_inventory()
331
if len(revision) > 1:
332
raise BzrCommandError('bzr inventory --revision takes'
333
' exactly one revision identifier')
334
inv = tree.branch.repository.get_revision_inventory(
335
revision[0].in_history(tree.branch).rev_id)
337
for path, entry in inv.entries():
338
if kind and kind != entry.kind:
341
print '%-50s %s' % (path, entry.file_id)
346
class cmd_mv(Command):
347
"""Move or rename a file.
350
bzr mv OLDNAME NEWNAME
351
bzr mv SOURCE... DESTINATION
353
If the last argument is a versioned directory, all the other names
354
are moved into it. Otherwise, there must be exactly two arguments
355
and the file is changed to a new name, which must not already exist.
357
Files cannot be moved between branches.
359
takes_args = ['names*']
360
aliases = ['move', 'rename']
362
def run(self, names_list):
363
if len(names_list) < 2:
364
raise BzrCommandError("missing file argument")
365
tree, rel_names = tree_files(names_list)
367
if os.path.isdir(names_list[-1]):
368
# move into existing directory
369
for pair in tree.move(rel_names[:-1], rel_names[-1]):
370
print "%s => %s" % pair
372
if len(names_list) != 2:
373
raise BzrCommandError('to mv multiple files the destination '
374
'must be a versioned directory')
375
tree.rename_one(rel_names[0], rel_names[1])
376
print "%s => %s" % (rel_names[0], rel_names[1])
379
class cmd_pull(Command):
380
"""Turn this branch into a mirror of another branch.
382
This command only works on branches that have not diverged. Branches are
383
considered diverged if the destination branch's most recent commit is one
384
that has not been merged (directly or indirectly) into the parent.
386
If branches have diverged, you can use 'bzr merge' to integrate the changes
387
from one into the other. Once one branch has merged, the other should
388
be able to pull it again.
390
If branches have diverged, you can use 'bzr merge' to pull the text changes
391
from one into the other. Once one branch has merged, the other should
392
be able to pull it again.
394
If you want to forget your local changes and just update your branch to
395
match the remote one, use pull --overwrite.
397
If there is no default location set, the first pull will set it. After
398
that, you can omit the location to use the default. To change the
399
default, use --remember.
401
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
402
takes_args = ['location?']
404
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
405
# FIXME: too much stuff is in the command class
407
tree_to = WorkingTree.open_containing(u'.')[0]
408
branch_to = tree_to.branch
409
except NoWorkingTree:
411
branch_to = Branch.open_containing(u'.')[0]
412
stored_loc = branch_to.get_parent()
414
if stored_loc is None:
415
raise BzrCommandError("No pull location known or specified.")
417
print "Using saved location: %s" % stored_loc
418
location = stored_loc
420
if branch_to.get_parent() is None or remember:
421
branch_to.set_parent(location)
423
branch_from = Branch.open(location)
427
elif len(revision) == 1:
428
rev_id = revision[0].in_history(branch_from).rev_id
430
raise BzrCommandError('bzr pull --revision takes one value.')
432
old_rh = branch_to.revision_history()
433
if tree_to is not None:
434
count = tree_to.pull(branch_from, overwrite, rev_id)
436
count = branch_to.pull(branch_from, overwrite, rev_id)
437
note('%d revision(s) pulled.' % (count,))
440
new_rh = branch_to.revision_history()
443
from bzrlib.log import show_changed_revisions
444
show_changed_revisions(branch_to, old_rh, new_rh)
447
class cmd_push(Command):
448
"""Update a mirror of this branch.
450
The target branch will not have its working tree populated because this
451
is both expensive, and is not supported on remote file systems.
453
Some smart servers or protocols *may* put the working tree in place in
456
This command only works on branches that have not diverged. Branches are
457
considered diverged if the destination branch's most recent commit is one
458
that has not been merged (directly or indirectly) by the source branch.
460
If branches have diverged, you can use 'bzr push --overwrite' to replace
461
the other branch completely, discarding its unmerged changes.
463
If you want to ensure you have the different changes in the other branch,
464
do a merge (see bzr help merge) from the other branch, and commit that.
465
After that you will be able to do a push without '--overwrite'.
467
If there is no default push location set, the first push will set it.
468
After that, you can omit the location to use the default. To change the
469
default, use --remember.
471
takes_options = ['remember', 'overwrite',
472
Option('create-prefix',
473
help='Create the path leading up to the branch '
474
'if it does not already exist')]
475
takes_args = ['location?']
477
def run(self, location=None, remember=False, overwrite=False,
478
create_prefix=False, verbose=False):
479
# FIXME: Way too big! Put this into a function called from the
481
from bzrlib.transport import get_transport
483
br_from = Branch.open_containing('.')[0]
484
stored_loc = br_from.get_push_location()
486
if stored_loc is None:
487
raise BzrCommandError("No push location known or specified.")
489
print "Using saved location: %s" % stored_loc
490
location = stored_loc
491
if br_from.get_push_location() is None or remember:
492
br_from.set_push_location(location)
494
dir_to = bzrlib.bzrdir.BzrDir.open(location)
495
br_to = dir_to.open_branch()
496
except NotBranchError:
498
transport = get_transport(location).clone('..')
499
if not create_prefix:
501
transport.mkdir(transport.relpath(location))
503
raise BzrCommandError("Parent directory of %s "
504
"does not exist." % location)
506
current = transport.base
507
needed = [(transport, transport.relpath(location))]
510
transport, relpath = needed[-1]
511
transport.mkdir(relpath)
514
new_transport = transport.clone('..')
515
needed.append((new_transport,
516
new_transport.relpath(transport.base)))
517
if new_transport.base == transport.base:
518
raise BzrCommandError("Could not create "
520
dir_to = br_from.bzrdir.clone(location,
521
revision_id=br_from.last_revision())
522
br_to = dir_to.open_branch()
523
count = len(br_to.revision_history())
525
old_rh = br_to.revision_history()
528
tree_to = dir_to.open_workingtree()
529
except errors.NotLocalUrl:
530
warning('This transport does not update the working '
531
'tree of: %s' % (br_to.base,))
532
count = br_to.pull(br_from, overwrite)
533
except NoWorkingTree:
534
count = br_to.pull(br_from, overwrite)
536
count = tree_to.pull(br_from, overwrite)
537
except DivergedBranches:
538
raise BzrCommandError("These branches have diverged."
539
" Try a merge then push with overwrite.")
540
note('%d revision(s) pushed.' % (count,))
543
new_rh = br_to.revision_history()
546
from bzrlib.log import show_changed_revisions
547
show_changed_revisions(br_to, old_rh, new_rh)
550
class cmd_branch(Command):
551
"""Create a new copy of a branch.
553
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
554
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
556
To retrieve the branch as of a particular revision, supply the --revision
557
parameter, as in "branch foo/bar -r 5".
559
--basis is to speed up branching from remote branches. When specified, it
560
copies all the file-contents, inventory and revision data from the basis
561
branch before copying anything from the remote branch.
563
takes_args = ['from_location', 'to_location?']
564
takes_options = ['revision', 'basis']
565
aliases = ['get', 'clone']
567
def run(self, from_location, to_location=None, revision=None, basis=None):
568
from bzrlib.osutils import rmtree
571
elif len(revision) > 1:
572
raise BzrCommandError(
573
'bzr branch --revision takes exactly 1 revision value')
575
br_from = Branch.open(from_location)
577
if e.errno == errno.ENOENT:
578
raise BzrCommandError('Source location "%s" does not'
579
' exist.' % to_location)
584
if basis is not None:
585
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
588
if len(revision) == 1 and revision[0] is not None:
589
revision_id = revision[0].in_history(br_from)[1]
591
# FIXME - wt.last_revision, fallback to branch, fall back to
592
# None or perhaps NULL_REVISION to mean copy nothing
594
revision_id = br_from.last_revision()
595
if to_location is None:
596
to_location = os.path.basename(from_location.rstrip("/\\"))
599
name = os.path.basename(to_location) + '\n'
601
os.mkdir(to_location)
603
if e.errno == errno.EEXIST:
604
raise BzrCommandError('Target directory "%s" already'
605
' exists.' % to_location)
606
if e.errno == errno.ENOENT:
607
raise BzrCommandError('Parent of "%s" does not exist.' %
612
# preserve whatever source format we have.
613
dir = br_from.bzrdir.sprout(to_location, revision_id, basis_dir)
614
branch = dir.open_branch()
615
except bzrlib.errors.NoSuchRevision:
617
msg = "The branch %s has no revision %s." % (from_location, revision[0])
618
raise BzrCommandError(msg)
619
except bzrlib.errors.UnlistableBranch:
621
msg = "The branch %s cannot be used as a --basis" % (basis,)
622
raise BzrCommandError(msg)
624
branch.control_files.put_utf8('branch-name', name)
626
note('Branched %d revision(s).' % branch.revno())
631
class cmd_checkout(Command):
632
"""Create a new checkout of an existing branch.
634
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
635
the branch found in '.'. This is useful if you have removed the working tree
636
or if it was never created - i.e. if you pushed the branch to its current
639
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
640
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
642
To retrieve the branch as of a particular revision, supply the --revision
643
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
644
out of date [so you cannot commit] but it may be useful (i.e. to examine old
647
--basis is to speed up checking out from remote branches. When specified, it
648
uses the inventory and file contents from the basis branch in preference to the
649
branch being checked out.
651
takes_args = ['branch_location?', 'to_location?']
652
takes_options = ['revision', # , 'basis']
653
Option('lightweight',
654
help="perform a lightweight checkout. Lightweight "
655
"checkouts depend on access to the branch for "
656
"every operation. Normal checkouts can perform "
657
"common operations like diff and status without "
658
"such access, and also support local commits."
662
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
666
elif len(revision) > 1:
667
raise BzrCommandError(
668
'bzr checkout --revision takes exactly 1 revision value')
669
if branch_location is None:
670
branch_location = bzrlib.osutils.getcwd()
671
to_location = branch_location
672
source = Branch.open(branch_location)
673
if len(revision) == 1 and revision[0] is not None:
674
revision_id = revision[0].in_history(source)[1]
677
if to_location is None:
678
to_location = os.path.basename(branch_location.rstrip("/\\"))
679
# if the source and to_location are the same,
680
# and there is no working tree,
681
# then reconstitute a branch
682
if (bzrlib.osutils.abspath(to_location) ==
683
bzrlib.osutils.abspath(branch_location)):
685
source.bzrdir.open_workingtree()
686
except errors.NoWorkingTree:
687
source.bzrdir.create_workingtree()
690
os.mkdir(to_location)
692
if e.errno == errno.EEXIST:
693
raise BzrCommandError('Target directory "%s" already'
694
' exists.' % to_location)
695
if e.errno == errno.ENOENT:
696
raise BzrCommandError('Parent of "%s" does not exist.' %
700
old_format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
701
bzrlib.bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
704
checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
705
bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
707
checkout_branch = bzrlib.bzrdir.BzrDir.create_branch_convenience(
708
to_location, force_new_tree=False)
709
checkout = checkout_branch.bzrdir
710
checkout_branch.bind(source)
711
if revision_id is not None:
712
rh = checkout_branch.revision_history()
713
checkout_branch.set_revision_history(rh[:rh.index(revision_id) + 1])
714
checkout.create_workingtree(revision_id)
716
bzrlib.bzrdir.BzrDirFormat.set_default_format(old_format)
719
class cmd_renames(Command):
720
"""Show list of renamed files.
722
# TODO: Option to show renames between two historical versions.
724
# TODO: Only show renames under dir, rather than in the whole branch.
725
takes_args = ['dir?']
728
def run(self, dir=u'.'):
729
tree = WorkingTree.open_containing(dir)[0]
730
old_inv = tree.basis_tree().inventory
731
new_inv = tree.read_working_inventory()
733
renames = list(bzrlib.tree.find_renames(old_inv, new_inv))
735
for old_name, new_name in renames:
736
print "%s => %s" % (old_name, new_name)
739
class cmd_update(Command):
740
"""Update a tree to have the latest code committed to its branch.
742
This will perform a merge into the working tree, and may generate
743
conflicts. If you have any local changes, you will still
744
need to commit them after the update for the update to be complete.
746
If you want to discard your local changes, you can just do a
747
'bzr revert' instead of 'bzr commit' after the update.
749
takes_args = ['dir?']
751
def run(self, dir='.'):
752
tree = WorkingTree.open_containing(dir)[0]
755
if tree.last_revision() == tree.branch.last_revision():
756
# may be up to date, check master too.
757
master = tree.branch.get_master_branch()
758
if master is None or master.last_revision == tree.last_revision():
759
note("Tree is up to date.")
761
conflicts = tree.update()
762
note('Updated to revision %d.' %
763
(tree.branch.revision_id_to_revno(tree.last_revision()),))
772
class cmd_info(Command):
773
"""Show information about a working tree, branch or repository.
775
This command will show all known locations and formats associated to the
776
tree, branch or repository. Statistical information is included with
779
Branches and working trees will also report any missing revisions.
781
takes_args = ['location?']
782
takes_options = ['verbose']
785
def run(self, location=None, verbose=False):
786
from bzrlib.info import show_bzrdir_info
787
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
791
class cmd_remove(Command):
792
"""Make a file unversioned.
794
This makes bzr stop tracking changes to a versioned file. It does
795
not delete the working copy.
797
You can specify one or more files, and/or --new. If you specify --new,
798
only 'added' files will be removed. If you specify both, then new files
799
in the specified directories will be removed. If the directories are
800
also new, they will also be removed.
802
takes_args = ['file*']
803
takes_options = ['verbose', Option('new', help='remove newly-added files')]
806
def run(self, file_list, verbose=False, new=False):
807
tree, file_list = tree_files(file_list)
809
if file_list is None:
810
raise BzrCommandError('Specify one or more files to remove, or'
813
from bzrlib.delta import compare_trees
814
added = [compare_trees(tree.basis_tree(), tree,
815
specific_files=file_list).added]
816
file_list = sorted([f[0] for f in added[0]], reverse=True)
817
if len(file_list) == 0:
818
raise BzrCommandError('No matching files.')
819
tree.remove(file_list, verbose=verbose)
822
class cmd_file_id(Command):
823
"""Print file_id of a particular file or directory.
825
The file_id is assigned when the file is first added and remains the
826
same through all revisions where the file exists, even when it is
830
takes_args = ['filename']
832
def run(self, filename):
833
tree, relpath = WorkingTree.open_containing(filename)
834
i = tree.inventory.path2id(relpath)
836
raise BzrError("%r is not a versioned file" % filename)
841
class cmd_file_path(Command):
842
"""Print path of file_ids to a file or directory.
844
This prints one line for each directory down to the target,
845
starting at the branch root."""
847
takes_args = ['filename']
849
def run(self, filename):
850
tree, relpath = WorkingTree.open_containing(filename)
852
fid = inv.path2id(relpath)
854
raise BzrError("%r is not a versioned file" % filename)
855
for fip in inv.get_idpath(fid):
859
class cmd_reconcile(Command):
860
"""Reconcile bzr metadata in a branch.
862
This can correct data mismatches that may have been caused by
863
previous ghost operations or bzr upgrades. You should only
864
need to run this command if 'bzr check' or a bzr developer
865
advises you to run it.
867
If a second branch is provided, cross-branch reconciliation is
868
also attempted, which will check that data like the tree root
869
id which was not present in very early bzr versions is represented
870
correctly in both branches.
872
At the same time it is run it may recompress data resulting in
873
a potential saving in disk space or performance gain.
875
The branch *MUST* be on a listable system such as local disk or sftp.
877
takes_args = ['branch?']
879
def run(self, branch="."):
880
from bzrlib.reconcile import reconcile
881
dir = bzrlib.bzrdir.BzrDir.open(branch)
885
class cmd_revision_history(Command):
886
"""Display list of revision ids on this branch."""
890
branch = WorkingTree.open_containing(u'.')[0].branch
891
for patchid in branch.revision_history():
895
class cmd_ancestry(Command):
896
"""List all revisions merged into this branch."""
900
tree = WorkingTree.open_containing(u'.')[0]
902
# FIXME. should be tree.last_revision
903
revision_ids = b.repository.get_ancestry(b.last_revision())
904
assert revision_ids[0] == None
906
for revision_id in revision_ids:
910
class cmd_init(Command):
911
"""Make a directory into a versioned branch.
913
Use this to create an empty branch, or before importing an
916
If there is a repository in a parent directory of the location, then
917
the history of the branch will be stored in the repository. Otherwise
918
init creates a standalone branch which carries its own history in
921
If there is already a branch at the location but it has no working tree,
922
the tree can be populated with 'bzr checkout'.
924
Recipe for importing a tree of files:
929
bzr commit -m 'imported project'
931
takes_args = ['location?']
934
help='Specify a format for this branch. Current'
935
' formats are: default, knit, metaweave and'
936
' weave. Default is knit; metaweave and'
937
' weave are deprecated',
938
type=get_format_type),
940
def run(self, location=None, format=None):
941
from bzrlib.branch import Branch
943
format = get_format_type('default')
947
# The path has to exist to initialize a
948
# branch inside of it.
949
# Just using os.mkdir, since I don't
950
# believe that we want to create a bunch of
951
# locations if the user supplies an extended path
952
if not os.path.exists(location):
955
existing_bzrdir = bzrdir.BzrDir.open(location)
956
except NotBranchError:
957
# really a NotBzrDir error...
958
bzrdir.BzrDir.create_branch_convenience(location, format=format)
960
if existing_bzrdir.has_branch():
961
if existing_bzrdir.has_workingtree():
962
raise errors.AlreadyBranchError(location)
964
raise errors.BranchExistsWithoutWorkingTree(location)
966
existing_bzrdir.create_branch()
967
existing_bzrdir.create_workingtree()
970
class cmd_init_repository(Command):
971
"""Create a shared repository to hold branches.
973
New branches created under the repository directory will store their revisions
974
in the repository, not in the branch directory, if the branch format supports
980
bzr checkout --lightweight repo/trunk trunk-checkout
984
takes_args = ["location"]
985
takes_options = [Option('format',
986
help='Specify a format for this repository.'
987
' Current formats are: default, knit,'
988
' metaweave and weave. Default is knit;'
989
' metaweave and weave are deprecated',
990
type=get_format_type),
992
help='Allows branches in repository to have'
994
aliases = ["init-repo"]
995
def run(self, location, format=None, trees=False):
996
from bzrlib.transport import get_transport
998
format = get_format_type('default')
999
transport = get_transport(location)
1000
if not transport.has('.'):
1002
newdir = format.initialize_on_transport(transport)
1003
repo = newdir.create_repository(shared=True)
1004
repo.set_make_working_trees(trees)
1007
class cmd_diff(Command):
1008
"""Show differences in working tree.
1010
If files are listed, only the changes in those files are listed.
1011
Otherwise, all changes for the tree are listed.
1013
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1014
produces patches suitable for "patch -p1".
1020
bzr diff --diff-prefix old/:new/
1021
bzr diff bzr.mine bzr.dev
1024
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1025
# or a graphical diff.
1027
# TODO: Python difflib is not exactly the same as unidiff; should
1028
# either fix it up or prefer to use an external diff.
1030
# TODO: Selected-file diff is inefficient and doesn't show you
1033
# TODO: This probably handles non-Unix newlines poorly.
1035
takes_args = ['file*']
1036
takes_options = ['revision', 'diff-options', 'prefix']
1037
aliases = ['di', 'dif']
1040
def run(self, revision=None, file_list=None, diff_options=None,
1042
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1044
if (prefix is None) or (prefix == '0'):
1052
if not ':' in prefix:
1053
raise BzrError("--diff-prefix expects two values separated by a colon")
1054
old_label, new_label = prefix.split(":")
1057
tree1, file_list = internal_tree_files(file_list)
1061
except FileInWrongBranch:
1062
if len(file_list) != 2:
1063
raise BzrCommandError("Files are in different branches")
1065
tree1, file1 = WorkingTree.open_containing(file_list[0])
1066
tree2, file2 = WorkingTree.open_containing(file_list[1])
1067
if file1 != "" or file2 != "":
1068
# FIXME diff those two files. rbc 20051123
1069
raise BzrCommandError("Files are in different branches")
1071
if revision is not None:
1072
if tree2 is not None:
1073
raise BzrCommandError("Can't specify -r with two branches")
1074
if (len(revision) == 1) or (revision[1].spec is None):
1075
return diff_cmd_helper(tree1, file_list, diff_options,
1077
old_label=old_label, new_label=new_label)
1078
elif len(revision) == 2:
1079
return diff_cmd_helper(tree1, file_list, diff_options,
1080
revision[0], revision[1],
1081
old_label=old_label, new_label=new_label)
1083
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
1085
if tree2 is not None:
1086
return show_diff_trees(tree1, tree2, sys.stdout,
1087
specific_files=file_list,
1088
external_diff_options=diff_options,
1089
old_label=old_label, new_label=new_label)
1091
return diff_cmd_helper(tree1, file_list, diff_options,
1092
old_label=old_label, new_label=new_label)
1095
class cmd_deleted(Command):
1096
"""List files deleted in the working tree.
1098
# TODO: Show files deleted since a previous revision, or
1099
# between two revisions.
1100
# TODO: Much more efficient way to do this: read in new
1101
# directories with readdir, rather than stating each one. Same
1102
# level of effort but possibly much less IO. (Or possibly not,
1103
# if the directories are very large...)
1105
def run(self, show_ids=False):
1106
tree = WorkingTree.open_containing(u'.')[0]
1107
old = tree.basis_tree()
1108
for path, ie in old.inventory.iter_entries():
1109
if not tree.has_id(ie.file_id):
1111
print '%-50s %s' % (path, ie.file_id)
1116
class cmd_modified(Command):
1117
"""List files modified in working tree."""
1121
from bzrlib.delta import compare_trees
1123
tree = WorkingTree.open_containing(u'.')[0]
1124
td = compare_trees(tree.basis_tree(), tree)
1126
for path, id, kind, text_modified, meta_modified in td.modified:
1131
class cmd_added(Command):
1132
"""List files added in working tree."""
1136
wt = WorkingTree.open_containing(u'.')[0]
1137
basis_inv = wt.basis_tree().inventory
1140
if file_id in basis_inv:
1142
path = inv.id2path(file_id)
1143
if not os.access(bzrlib.osutils.abspath(path), os.F_OK):
1149
class cmd_root(Command):
1150
"""Show the tree root directory.
1152
The root is the nearest enclosing directory with a .bzr control
1154
takes_args = ['filename?']
1156
def run(self, filename=None):
1157
"""Print the branch root."""
1158
tree = WorkingTree.open_containing(filename)[0]
1162
class cmd_log(Command):
1163
"""Show log of a branch, file, or directory.
1165
By default show the log of the branch containing the working directory.
1167
To request a range of logs, you can use the command -r begin..end
1168
-r revision requests a specific revision, -r ..end or -r begin.. are
1174
bzr log -r -10.. http://server/branch
1177
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1179
takes_args = ['location?']
1180
takes_options = [Option('forward',
1181
help='show from oldest to newest'),
1184
help='show files changed in each revision'),
1185
'show-ids', 'revision',
1189
help='show revisions whose message matches this regexp',
1194
def run(self, location=None, timezone='original',
1204
from bzrlib.log import log_formatter, show_log
1206
assert message is None or isinstance(message, basestring), \
1207
"invalid message argument %r" % message
1208
direction = (forward and 'forward') or 'reverse'
1213
# find the file id to log:
1215
dir, fp = bzrdir.BzrDir.open_containing(location)
1216
b = dir.open_branch()
1220
inv = dir.open_workingtree().inventory
1221
except (errors.NotBranchError, errors.NotLocalUrl):
1222
# either no tree, or is remote.
1223
inv = b.basis_tree().inventory
1224
file_id = inv.path2id(fp)
1227
# FIXME ? log the current subdir only RBC 20060203
1228
dir, relpath = bzrdir.BzrDir.open_containing('.')
1229
b = dir.open_branch()
1231
if revision is None:
1234
elif len(revision) == 1:
1235
rev1 = rev2 = revision[0].in_history(b).revno
1236
elif len(revision) == 2:
1237
if revision[0].spec is None:
1238
# missing begin-range means first revision
1241
rev1 = revision[0].in_history(b).revno
1243
if revision[1].spec is None:
1244
# missing end-range means last known revision
1247
rev2 = revision[1].in_history(b).revno
1249
raise BzrCommandError('bzr log --revision takes one or two values.')
1251
# By this point, the revision numbers are converted to the +ve
1252
# form if they were supplied in the -ve form, so we can do
1253
# this comparison in relative safety
1255
(rev2, rev1) = (rev1, rev2)
1257
mutter('encoding log as %r', bzrlib.user_encoding)
1259
# use 'replace' so that we don't abort if trying to write out
1260
# in e.g. the default C locale.
1261
outf = codecs.getwriter(bzrlib.user_encoding)(sys.stdout, errors='replace')
1263
if (log_format == None):
1264
default = bzrlib.config.BranchConfig(b).log_format()
1265
log_format = get_log_format(long=long, short=short, line=line, default=default)
1267
lf = log_formatter(log_format,
1270
show_timezone=timezone)
1276
direction=direction,
1277
start_revision=rev1,
1282
def get_log_format(long=False, short=False, line=False, default='long'):
1283
log_format = default
1287
log_format = 'short'
1293
class cmd_touching_revisions(Command):
1294
"""Return revision-ids which affected a particular file.
1296
A more user-friendly interface is "bzr log FILE"."""
1298
takes_args = ["filename"]
1300
def run(self, filename):
1301
tree, relpath = WorkingTree.open_containing(filename)
1303
inv = tree.read_working_inventory()
1304
file_id = inv.path2id(relpath)
1305
for revno, revision_id, what in bzrlib.log.find_touching_revisions(b, file_id):
1306
print "%6d %s" % (revno, what)
1309
class cmd_ls(Command):
1310
"""List files in a tree.
1312
# TODO: Take a revision or remote path and list that tree instead.
1314
takes_options = ['verbose', 'revision',
1315
Option('non-recursive',
1316
help='don\'t recurse into sub-directories'),
1318
help='Print all paths from the root of the branch.'),
1319
Option('unknown', help='Print unknown files'),
1320
Option('versioned', help='Print versioned files'),
1321
Option('ignored', help='Print ignored files'),
1323
Option('null', help='Null separate the files'),
1326
def run(self, revision=None, verbose=False,
1327
non_recursive=False, from_root=False,
1328
unknown=False, versioned=False, ignored=False,
1331
if verbose and null:
1332
raise BzrCommandError('Cannot set both --verbose and --null')
1333
all = not (unknown or versioned or ignored)
1335
selection = {'I':ignored, '?':unknown, 'V':versioned}
1337
tree, relpath = WorkingTree.open_containing(u'.')
1342
if revision is not None:
1343
tree = tree.branch.repository.revision_tree(
1344
revision[0].in_history(tree.branch).rev_id)
1345
for fp, fc, kind, fid, entry in tree.list_files():
1346
if fp.startswith(relpath):
1347
fp = fp[len(relpath):]
1348
if non_recursive and '/' in fp:
1350
if not all and not selection[fc]:
1353
kindch = entry.kind_character()
1354
print '%-8s %s%s' % (fc, fp, kindch)
1356
sys.stdout.write(fp)
1357
sys.stdout.write('\0')
1363
class cmd_unknowns(Command):
1364
"""List unknown files."""
1367
from bzrlib.osutils import quotefn
1368
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1372
class cmd_ignore(Command):
1373
"""Ignore a command or pattern.
1375
To remove patterns from the ignore list, edit the .bzrignore file.
1377
If the pattern contains a slash, it is compared to the whole path
1378
from the branch root. Otherwise, it is compared to only the last
1379
component of the path. To match a file only in the root directory,
1382
Ignore patterns are case-insensitive on case-insensitive systems.
1384
Note: wildcards must be quoted from the shell on Unix.
1387
bzr ignore ./Makefile
1388
bzr ignore '*.class'
1390
# TODO: Complain if the filename is absolute
1391
takes_args = ['name_pattern']
1393
def run(self, name_pattern):
1394
from bzrlib.atomicfile import AtomicFile
1397
tree, relpath = WorkingTree.open_containing(u'.')
1398
ifn = tree.abspath('.bzrignore')
1400
if os.path.exists(ifn):
1403
igns = f.read().decode('utf-8')
1409
# TODO: If the file already uses crlf-style termination, maybe
1410
# we should use that for the newly added lines?
1412
if igns and igns[-1] != '\n':
1414
igns += name_pattern + '\n'
1416
f = AtomicFile(ifn, 'wt')
1418
f.write(igns.encode('utf-8'))
1423
inv = tree.inventory
1424
if inv.path2id('.bzrignore'):
1425
mutter('.bzrignore is already versioned')
1427
mutter('need to make new .bzrignore file versioned')
1428
tree.add(['.bzrignore'])
1431
class cmd_ignored(Command):
1432
"""List ignored files and the patterns that matched them.
1434
See also: bzr ignore"""
1437
tree = WorkingTree.open_containing(u'.')[0]
1438
for path, file_class, kind, file_id, entry in tree.list_files():
1439
if file_class != 'I':
1441
## XXX: Slightly inefficient since this was already calculated
1442
pat = tree.is_ignored(path)
1443
print '%-50s %s' % (path, pat)
1446
class cmd_lookup_revision(Command):
1447
"""Lookup the revision-id from a revision-number
1450
bzr lookup-revision 33
1453
takes_args = ['revno']
1456
def run(self, revno):
1460
raise BzrCommandError("not a valid revision-number: %r" % revno)
1462
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1465
class cmd_export(Command):
1466
"""Export past revision to destination directory.
1468
If no revision is specified this exports the last committed revision.
1470
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1471
given, try to find the format with the extension. If no extension
1472
is found exports to a directory (equivalent to --format=dir).
1474
Root may be the top directory for tar, tgz and tbz2 formats. If none
1475
is given, the top directory will be the root name of the file.
1477
Note: export of tree with non-ascii filenames to zip is not supported.
1479
Supported formats Autodetected by extension
1480
----------------- -------------------------
1483
tbz2 .tar.bz2, .tbz2
1487
takes_args = ['dest']
1488
takes_options = ['revision', 'format', 'root']
1489
def run(self, dest, revision=None, format=None, root=None):
1491
from bzrlib.export import export
1492
tree = WorkingTree.open_containing(u'.')[0]
1494
if revision is None:
1495
# should be tree.last_revision FIXME
1496
rev_id = b.last_revision()
1498
if len(revision) != 1:
1499
raise BzrError('bzr export --revision takes exactly 1 argument')
1500
rev_id = revision[0].in_history(b).rev_id
1501
t = b.repository.revision_tree(rev_id)
1503
export(t, dest, format, root)
1504
except errors.NoSuchExportFormat, e:
1505
raise BzrCommandError('Unsupported export format: %s' % e.format)
1508
class cmd_cat(Command):
1509
"""Write a file's text from a previous revision."""
1511
takes_options = ['revision']
1512
takes_args = ['filename']
1515
def run(self, filename, revision=None):
1516
if revision is not None and len(revision) != 1:
1517
raise BzrCommandError("bzr cat --revision takes exactly one number")
1520
tree, relpath = WorkingTree.open_containing(filename)
1522
except NotBranchError:
1526
b, relpath = Branch.open_containing(filename)
1527
if revision is None:
1528
revision_id = b.last_revision()
1530
revision_id = revision[0].in_history(b).rev_id
1531
b.print_file(relpath, revision_id)
1534
class cmd_local_time_offset(Command):
1535
"""Show the offset in seconds from GMT to local time."""
1539
print bzrlib.osutils.local_time_offset()
1543
class cmd_commit(Command):
1544
"""Commit changes into a new revision.
1546
If no arguments are given, the entire tree is committed.
1548
If selected files are specified, only changes to those files are
1549
committed. If a directory is specified then the directory and everything
1550
within it is committed.
1552
A selected-file commit may fail in some cases where the committed
1553
tree would be invalid, such as trying to commit a file in a
1554
newly-added directory that is not itself committed.
1556
# TODO: Run hooks on tree to-be-committed, and after commit.
1558
# TODO: Strict commit that fails if there are deleted files.
1559
# (what does "deleted files" mean ??)
1561
# TODO: Give better message for -s, --summary, used by tla people
1563
# XXX: verbose currently does nothing
1565
takes_args = ['selected*']
1566
takes_options = ['message', 'verbose',
1568
help='commit even if nothing has changed'),
1569
Option('file', type=str,
1571
help='file containing commit message'),
1573
help="refuse to commit if there are unknown "
1574
"files in the working tree."),
1576
help="perform a local only commit in a bound "
1577
"branch. Such commits are not pushed to "
1578
"the master branch until a normal commit "
1582
aliases = ['ci', 'checkin']
1584
def run(self, message=None, file=None, verbose=True, selected_list=None,
1585
unchanged=False, strict=False, local=False):
1586
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1587
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1589
from bzrlib.msgeditor import edit_commit_message, \
1590
make_commit_message_template
1591
from tempfile import TemporaryFile
1594
# TODO: Need a blackbox test for invoking the external editor; may be
1595
# slightly problematic to run this cross-platform.
1597
# TODO: do more checks that the commit will succeed before
1598
# spending the user's valuable time typing a commit message.
1600
# TODO: if the commit *does* happen to fail, then save the commit
1601
# message to a temporary file where it can be recovered
1602
tree, selected_list = tree_files(selected_list)
1603
if selected_list == ['']:
1604
# workaround - commit of root of tree should be exactly the same
1605
# as just default commit in that tree, and succeed even though
1606
# selected-file merge commit is not done yet
1609
if local and not tree.branch.get_bound_location():
1610
raise errors.LocalRequiresBoundBranch()
1611
if message is None and not file:
1612
template = make_commit_message_template(tree, selected_list)
1613
message = edit_commit_message(template)
1615
raise BzrCommandError("please specify a commit message"
1616
" with either --message or --file")
1617
elif message and file:
1618
raise BzrCommandError("please specify either --message or --file")
1622
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1625
raise BzrCommandError("empty commit message specified")
1628
reporter = ReportCommitToLog()
1630
reporter = NullCommitReporter()
1633
tree.commit(message, specific_files=selected_list,
1634
allow_pointless=unchanged, strict=strict, local=local,
1636
except PointlessCommit:
1637
# FIXME: This should really happen before the file is read in;
1638
# perhaps prepare the commit; get the message; then actually commit
1639
raise BzrCommandError("no changes to commit",
1640
["use --unchanged to commit anyhow"])
1641
except ConflictsInTree:
1642
raise BzrCommandError("Conflicts detected in working tree. "
1643
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1644
except StrictCommitFailed:
1645
raise BzrCommandError("Commit refused because there are unknown "
1646
"files in the working tree.")
1647
except errors.BoundBranchOutOfDate, e:
1648
raise BzrCommandError(str(e)
1649
+ ' Either unbind, update, or'
1650
' pass --local to commit.')
1653
class cmd_check(Command):
1654
"""Validate consistency of branch history.
1656
This command checks various invariants about the branch storage to
1657
detect data corruption or bzr bugs.
1659
takes_args = ['branch?']
1660
takes_options = ['verbose']
1662
def run(self, branch=None, verbose=False):
1663
from bzrlib.check import check
1665
tree = WorkingTree.open_containing()[0]
1666
branch = tree.branch
1668
branch = Branch.open(branch)
1669
check(branch, verbose)
1672
class cmd_scan_cache(Command):
1675
from bzrlib.hashcache import HashCache
1681
print '%6d stats' % c.stat_count
1682
print '%6d in hashcache' % len(c._cache)
1683
print '%6d files removed from cache' % c.removed_count
1684
print '%6d hashes updated' % c.update_count
1685
print '%6d files changed too recently to cache' % c.danger_count
1691
class cmd_upgrade(Command):
1692
"""Upgrade branch storage to current format.
1694
The check command or bzr developers may sometimes advise you to run
1695
this command. When the default format has changed you may also be warned
1696
during other operations to upgrade.
1698
takes_args = ['url?']
1701
help='Upgrade to a specific format. Current formats'
1702
' are: default, knit, metaweave and weave.'
1703
' Default is knit; metaweave and weave are'
1705
type=get_format_type),
1709
def run(self, url='.', format=None):
1710
from bzrlib.upgrade import upgrade
1712
format = get_format_type('default')
1713
upgrade(url, format)
1716
class cmd_whoami(Command):
1717
"""Show bzr user id."""
1718
takes_options = ['email']
1721
def run(self, email=False):
1723
b = WorkingTree.open_containing(u'.')[0].branch
1724
config = bzrlib.config.BranchConfig(b)
1725
except NotBranchError:
1726
config = bzrlib.config.GlobalConfig()
1729
print config.user_email()
1731
print config.username()
1734
class cmd_nick(Command):
1735
"""Print or set the branch nickname.
1737
If unset, the tree root directory name is used as the nickname
1738
To print the current nickname, execute with no argument.
1740
takes_args = ['nickname?']
1741
def run(self, nickname=None):
1742
branch = Branch.open_containing(u'.')[0]
1743
if nickname is None:
1744
self.printme(branch)
1746
branch.nick = nickname
1749
def printme(self, branch):
1753
class cmd_selftest(Command):
1754
"""Run internal test suite.
1756
This creates temporary test directories in the working directory,
1757
but not existing data is affected. These directories are deleted
1758
if the tests pass, or left behind to help in debugging if they
1759
fail and --keep-output is specified.
1761
If arguments are given, they are regular expressions that say
1762
which tests should run.
1764
If the global option '--no-plugins' is given, plugins are not loaded
1765
before running the selftests. This has two effects: features provided or
1766
modified by plugins will not be tested, and tests provided by plugins will
1771
bzr --no-plugins selftest -v
1773
# TODO: --list should give a list of all available tests
1775
# NB: this is used from the class without creating an instance, which is
1776
# why it does not have a self parameter.
1777
def get_transport_type(typestring):
1778
"""Parse and return a transport specifier."""
1779
if typestring == "sftp":
1780
from bzrlib.transport.sftp import SFTPAbsoluteServer
1781
return SFTPAbsoluteServer
1782
if typestring == "memory":
1783
from bzrlib.transport.memory import MemoryServer
1785
if typestring == "fakenfs":
1786
from bzrlib.transport.fakenfs import FakeNFSServer
1787
return FakeNFSServer
1788
msg = "No known transport type %s. Supported types are: sftp\n" %\
1790
raise BzrCommandError(msg)
1793
takes_args = ['testspecs*']
1794
takes_options = ['verbose',
1795
Option('one', help='stop when one test fails'),
1796
Option('keep-output',
1797
help='keep output directories when tests fail'),
1799
help='Use a different transport by default '
1800
'throughout the test suite.',
1801
type=get_transport_type),
1802
Option('benchmark', help='run the bzr bencharks.'),
1803
Option('lsprof-timed',
1804
help='generate lsprof output for benchmarked'
1805
' sections of code.'),
1808
def run(self, testspecs_list=None, verbose=None, one=False,
1809
keep_output=False, transport=None, benchmark=None,
1812
from bzrlib.tests import selftest
1813
import bzrlib.benchmarks as benchmarks
1814
# we don't want progress meters from the tests to go to the
1815
# real output; and we don't want log messages cluttering up
1817
save_ui = bzrlib.ui.ui_factory
1818
print '%10s: %s' % ('bzr', bzrlib.osutils.realpath(sys.argv[0]))
1819
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
1821
bzrlib.trace.info('running tests...')
1823
bzrlib.ui.ui_factory = bzrlib.ui.SilentUIFactory()
1824
if testspecs_list is not None:
1825
pattern = '|'.join(testspecs_list)
1829
test_suite_factory = benchmarks.test_suite
1833
test_suite_factory = None
1836
result = selftest(verbose=verbose,
1838
stop_on_failure=one,
1839
keep_output=keep_output,
1840
transport=transport,
1841
test_suite_factory=test_suite_factory,
1842
lsprof_timed=lsprof_timed)
1844
bzrlib.trace.info('tests passed')
1846
bzrlib.trace.info('tests failed')
1847
return int(not result)
1849
bzrlib.ui.ui_factory = save_ui
1852
def _get_bzr_branch():
1853
"""If bzr is run from a branch, return Branch or None"""
1854
import bzrlib.errors
1855
from bzrlib.branch import Branch
1856
from bzrlib.osutils import abspath
1857
from os.path import dirname
1860
branch = Branch.open(dirname(abspath(dirname(__file__))))
1862
except bzrlib.errors.BzrError:
1867
print "bzr (bazaar-ng) %s" % bzrlib.__version__
1868
# is bzrlib itself in a branch?
1869
branch = _get_bzr_branch()
1871
rh = branch.revision_history()
1873
print " bzr checkout, revision %d" % (revno,)
1874
print " nick: %s" % (branch.nick,)
1876
print " revid: %s" % (rh[-1],)
1877
print "Using python interpreter:", sys.executable
1879
print "Using python standard library:", os.path.dirname(site.__file__)
1880
print "Using bzrlib:",
1881
if len(bzrlib.__path__) > 1:
1882
# print repr, which is a good enough way of making it clear it's
1883
# more than one element (eg ['/foo/bar', '/foo/bzr'])
1884
print repr(bzrlib.__path__)
1886
print bzrlib.__path__[0]
1889
print bzrlib.__copyright__
1890
print "http://bazaar-vcs.org/"
1892
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
1893
print "you may use, modify and redistribute it under the terms of the GNU"
1894
print "General Public License version 2 or later."
1897
class cmd_version(Command):
1898
"""Show version of bzr."""
1903
class cmd_rocks(Command):
1904
"""Statement of optimism."""
1908
print "it sure does!"
1911
class cmd_find_merge_base(Command):
1912
"""Find and print a base revision for merging two branches.
1914
# TODO: Options to specify revisions on either side, as if
1915
# merging only part of the history.
1916
takes_args = ['branch', 'other']
1920
def run(self, branch, other):
1921
from bzrlib.revision import common_ancestor, MultipleRevisionSources
1923
branch1 = Branch.open_containing(branch)[0]
1924
branch2 = Branch.open_containing(other)[0]
1926
history_1 = branch1.revision_history()
1927
history_2 = branch2.revision_history()
1929
last1 = branch1.last_revision()
1930
last2 = branch2.last_revision()
1932
source = MultipleRevisionSources(branch1.repository,
1935
base_rev_id = common_ancestor(last1, last2, source)
1937
print 'merge base is revision %s' % base_rev_id
1941
if base_revno is None:
1942
raise bzrlib.errors.UnrelatedBranches()
1944
print ' r%-6d in %s' % (base_revno, branch)
1946
other_revno = branch2.revision_id_to_revno(base_revid)
1948
print ' r%-6d in %s' % (other_revno, other)
1952
class cmd_merge(Command):
1953
"""Perform a three-way merge.
1955
The branch is the branch you will merge from. By default, it will
1956
merge the latest revision. If you specify a revision, that
1957
revision will be merged. If you specify two revisions, the first
1958
will be used as a BASE, and the second one as OTHER. Revision
1959
numbers are always relative to the specified branch.
1961
By default, bzr will try to merge in all new work from the other
1962
branch, automatically determining an appropriate base. If this
1963
fails, you may need to give an explicit base.
1965
Merge will do its best to combine the changes in two branches, but there
1966
are some kinds of problems only a human can fix. When it encounters those,
1967
it will mark a conflict. A conflict means that you need to fix something,
1968
before you should commit.
1970
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
1972
If there is no default branch set, the first merge will set it. After
1973
that, you can omit the branch to use the default. To change the
1974
default, use --remember.
1978
To merge the latest revision from bzr.dev
1979
bzr merge ../bzr.dev
1981
To merge changes up to and including revision 82 from bzr.dev
1982
bzr merge -r 82 ../bzr.dev
1984
To merge the changes introduced by 82, without previous changes:
1985
bzr merge -r 81..82 ../bzr.dev
1987
merge refuses to run if there are any uncommitted changes, unless
1990
The following merge types are available:
1992
takes_args = ['branch?']
1993
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
1994
Option('show-base', help="Show base revision text in "
1998
from merge import merge_type_help
1999
from inspect import getdoc
2000
return getdoc(self) + '\n' + merge_type_help()
2002
def run(self, branch=None, revision=None, force=False, merge_type=None,
2003
show_base=False, reprocess=False, remember=False):
2004
if merge_type is None:
2005
merge_type = Merge3Merger
2007
tree = WorkingTree.open_containing(u'.')[0]
2008
stored_loc = tree.branch.get_parent()
2010
if stored_loc is None:
2011
raise BzrCommandError("No merge branch known or specified.")
2013
print "Using saved branch: %s" % stored_loc
2016
if tree.branch.get_parent() is None or remember:
2017
tree.branch.set_parent(branch)
2019
if revision is None or len(revision) < 1:
2021
other = [branch, -1]
2022
other_branch, path = Branch.open_containing(branch)
2024
if len(revision) == 1:
2026
other_branch, path = Branch.open_containing(branch)
2027
revno = revision[0].in_history(other_branch).revno
2028
other = [branch, revno]
2030
assert len(revision) == 2
2031
if None in revision:
2032
raise BzrCommandError(
2033
"Merge doesn't permit that revision specifier.")
2034
b, path = Branch.open_containing(branch)
2036
base = [branch, revision[0].in_history(b).revno]
2037
other = [branch, revision[1].in_history(b).revno]
2039
interesting_files = [path]
2041
interesting_files = None
2042
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2045
conflict_count = merge(other, base, check_clean=(not force),
2046
merge_type=merge_type,
2047
reprocess=reprocess,
2048
show_base=show_base,
2049
pb=pb, file_list=interesting_files)
2052
if conflict_count != 0:
2056
except bzrlib.errors.AmbiguousBase, e:
2057
m = ("sorry, bzr can't determine the right merge base yet\n"
2058
"candidates are:\n "
2059
+ "\n ".join(e.bases)
2061
"please specify an explicit base with -r,\n"
2062
"and (if you want) report this to the bzr developers\n")
2066
class cmd_remerge(Command):
2069
Use this if you want to try a different merge technique while resolving
2070
conflicts. Some merge techniques are better than others, and remerge
2071
lets you try different ones on different files.
2073
The options for remerge have the same meaning and defaults as the ones for
2074
merge. The difference is that remerge can (only) be run when there is a
2075
pending merge, and it lets you specify particular files.
2078
$ bzr remerge --show-base
2079
Re-do the merge of all conflicted files, and show the base text in
2080
conflict regions, in addition to the usual THIS and OTHER texts.
2082
$ bzr remerge --merge-type weave --reprocess foobar
2083
Re-do the merge of "foobar", using the weave merge algorithm, with
2084
additional processing to reduce the size of conflict regions.
2086
The following merge types are available:"""
2087
takes_args = ['file*']
2088
takes_options = ['merge-type', 'reprocess',
2089
Option('show-base', help="Show base revision text in "
2093
from merge import merge_type_help
2094
from inspect import getdoc
2095
return getdoc(self) + '\n' + merge_type_help()
2097
def run(self, file_list=None, merge_type=None, show_base=False,
2099
from bzrlib.merge import merge_inner, transform_tree
2100
if merge_type is None:
2101
merge_type = Merge3Merger
2102
tree, file_list = tree_files(file_list)
2105
pending_merges = tree.pending_merges()
2106
if len(pending_merges) != 1:
2107
raise BzrCommandError("Sorry, remerge only works after normal"
2108
+ " merges. Not cherrypicking or"
2110
repository = tree.branch.repository
2111
base_revision = common_ancestor(tree.branch.last_revision(),
2112
pending_merges[0], repository)
2113
base_tree = repository.revision_tree(base_revision)
2114
other_tree = repository.revision_tree(pending_merges[0])
2115
interesting_ids = None
2116
if file_list is not None:
2117
interesting_ids = set()
2118
for filename in file_list:
2119
file_id = tree.path2id(filename)
2121
raise NotVersionedError(filename)
2122
interesting_ids.add(file_id)
2123
if tree.kind(file_id) != "directory":
2126
for name, ie in tree.inventory.iter_entries(file_id):
2127
interesting_ids.add(ie.file_id)
2128
transform_tree(tree, tree.basis_tree(), interesting_ids)
2129
if file_list is None:
2130
restore_files = list(tree.iter_conflicts())
2132
restore_files = file_list
2133
for filename in restore_files:
2135
restore(tree.abspath(filename))
2136
except NotConflicted:
2138
conflicts = merge_inner(tree.branch, other_tree, base_tree,
2140
interesting_ids = interesting_ids,
2141
other_rev_id=pending_merges[0],
2142
merge_type=merge_type,
2143
show_base=show_base,
2144
reprocess=reprocess)
2152
class cmd_revert(Command):
2153
"""Reverse all changes since the last commit.
2155
Only versioned files are affected. Specify filenames to revert only
2156
those files. By default, any files that are changed will be backed up
2157
first. Backup files have a '~' appended to their name.
2159
takes_options = ['revision', 'no-backup']
2160
takes_args = ['file*']
2161
aliases = ['merge-revert']
2163
def run(self, revision=None, no_backup=False, file_list=None):
2164
from bzrlib.commands import parse_spec
2165
if file_list is not None:
2166
if len(file_list) == 0:
2167
raise BzrCommandError("No files specified")
2171
tree, file_list = tree_files(file_list)
2172
if revision is None:
2173
# FIXME should be tree.last_revision
2174
rev_id = tree.last_revision()
2175
elif len(revision) != 1:
2176
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
2178
rev_id = revision[0].in_history(tree.branch).rev_id
2179
pb = bzrlib.ui.ui_factory.nested_progress_bar()
2181
tree.revert(file_list,
2182
tree.branch.repository.revision_tree(rev_id),
2188
class cmd_assert_fail(Command):
2189
"""Test reporting of assertion failures"""
2192
assert False, "always fails"
2195
class cmd_help(Command):
2196
"""Show help on a command or other topic.
2198
For a list of all available commands, say 'bzr help commands'."""
2199
takes_options = [Option('long', 'show help on all commands')]
2200
takes_args = ['topic?']
2201
aliases = ['?', '--help', '-?', '-h']
2204
def run(self, topic=None, long=False):
2206
if topic is None and long:
2211
class cmd_shell_complete(Command):
2212
"""Show appropriate completions for context.
2214
For a list of all available commands, say 'bzr shell-complete'."""
2215
takes_args = ['context?']
2220
def run(self, context=None):
2221
import shellcomplete
2222
shellcomplete.shellcomplete(context)
2225
class cmd_fetch(Command):
2226
"""Copy in history from another branch but don't merge it.
2228
This is an internal method used for pull and merge."""
2230
takes_args = ['from_branch', 'to_branch']
2231
def run(self, from_branch, to_branch):
2232
from bzrlib.fetch import Fetcher
2233
from bzrlib.branch import Branch
2234
from_b = Branch.open(from_branch)
2235
to_b = Branch.open(to_branch)
2236
Fetcher(to_b, from_b)
2239
class cmd_missing(Command):
2240
"""Show unmerged/unpulled revisions between two branches.
2242
OTHER_BRANCH may be local or remote."""
2243
takes_args = ['other_branch?']
2244
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2246
'Display changes in the local branch only'),
2247
Option('theirs-only',
2248
'Display changes in the remote branch only'),
2257
def run(self, other_branch=None, reverse=False, mine_only=False,
2258
theirs_only=False, log_format=None, long=False, short=False, line=False,
2259
show_ids=False, verbose=False):
2260
from bzrlib.missing import find_unmerged, iter_log_data
2261
from bzrlib.log import log_formatter
2262
local_branch = bzrlib.branch.Branch.open_containing(u".")[0]
2263
parent = local_branch.get_parent()
2264
if other_branch is None:
2265
other_branch = parent
2266
if other_branch is None:
2267
raise BzrCommandError("No missing location known or specified.")
2268
print "Using last location: " + local_branch.get_parent()
2269
remote_branch = bzrlib.branch.Branch.open(other_branch)
2270
if remote_branch.base == local_branch.base:
2271
remote_branch = local_branch
2272
local_branch.lock_read()
2274
remote_branch.lock_read()
2276
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2277
if (log_format == None):
2278
default = bzrlib.config.BranchConfig(local_branch).log_format()
2279
log_format = get_log_format(long=long, short=short, line=line, default=default)
2280
lf = log_formatter(log_format, sys.stdout,
2282
show_timezone='original')
2283
if reverse is False:
2284
local_extra.reverse()
2285
remote_extra.reverse()
2286
if local_extra and not theirs_only:
2287
print "You have %d extra revision(s):" % len(local_extra)
2288
for data in iter_log_data(local_extra, local_branch.repository,
2291
printed_local = True
2293
printed_local = False
2294
if remote_extra and not mine_only:
2295
if printed_local is True:
2297
print "You are missing %d revision(s):" % len(remote_extra)
2298
for data in iter_log_data(remote_extra, remote_branch.repository,
2301
if not remote_extra and not local_extra:
2303
print "Branches are up to date."
2307
remote_branch.unlock()
2309
local_branch.unlock()
2310
if not status_code and parent is None and other_branch is not None:
2311
local_branch.lock_write()
2313
# handle race conditions - a parent might be set while we run.
2314
if local_branch.get_parent() is None:
2315
local_branch.set_parent(other_branch)
2317
local_branch.unlock()
2321
class cmd_plugins(Command):
2326
import bzrlib.plugin
2327
from inspect import getdoc
2328
for name, plugin in bzrlib.plugin.all_plugins().items():
2329
if hasattr(plugin, '__path__'):
2330
print plugin.__path__[0]
2331
elif hasattr(plugin, '__file__'):
2332
print plugin.__file__
2338
print '\t', d.split('\n')[0]
2341
class cmd_testament(Command):
2342
"""Show testament (signing-form) of a revision."""
2343
takes_options = ['revision', 'long']
2344
takes_args = ['branch?']
2346
def run(self, branch=u'.', revision=None, long=False):
2347
from bzrlib.testament import Testament
2348
b = WorkingTree.open_containing(branch)[0].branch
2351
if revision is None:
2352
rev_id = b.last_revision()
2354
rev_id = revision[0].in_history(b).rev_id
2355
t = Testament.from_revision(b.repository, rev_id)
2357
sys.stdout.writelines(t.as_text_lines())
2359
sys.stdout.write(t.as_short_text())
2364
class cmd_annotate(Command):
2365
"""Show the origin of each line in a file.
2367
This prints out the given file with an annotation on the left side
2368
indicating which revision, author and date introduced the change.
2370
If the origin is the same for a run of consecutive lines, it is
2371
shown only at the top, unless the --all option is given.
2373
# TODO: annotate directories; showing when each file was last changed
2374
# TODO: if the working copy is modified, show annotations on that
2375
# with new uncommitted lines marked
2376
aliases = ['blame', 'praise']
2377
takes_args = ['filename']
2378
takes_options = [Option('all', help='show annotations on all lines'),
2379
Option('long', help='show date in annotations'),
2384
def run(self, filename, all=False, long=False, revision=None):
2385
from bzrlib.annotate import annotate_file
2386
tree, relpath = WorkingTree.open_containing(filename)
2387
branch = tree.branch
2390
if revision is None:
2391
revision_id = branch.last_revision()
2392
elif len(revision) != 1:
2393
raise BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2395
revision_id = revision[0].in_history(branch).rev_id
2396
file_id = tree.inventory.path2id(relpath)
2397
tree = branch.repository.revision_tree(revision_id)
2398
file_version = tree.inventory[file_id].revision
2399
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
2404
class cmd_re_sign(Command):
2405
"""Create a digital signature for an existing revision."""
2406
# TODO be able to replace existing ones.
2408
hidden = True # is this right ?
2409
takes_args = ['revision_id*']
2410
takes_options = ['revision']
2412
def run(self, revision_id_list=None, revision=None):
2413
import bzrlib.config as config
2414
import bzrlib.gpg as gpg
2415
if revision_id_list is not None and revision is not None:
2416
raise BzrCommandError('You can only supply one of revision_id or --revision')
2417
if revision_id_list is None and revision is None:
2418
raise BzrCommandError('You must supply either --revision or a revision_id')
2419
b = WorkingTree.open_containing(u'.')[0].branch
2420
gpg_strategy = gpg.GPGStrategy(config.BranchConfig(b))
2421
if revision_id_list is not None:
2422
for revision_id in revision_id_list:
2423
b.repository.sign_revision(revision_id, gpg_strategy)
2424
elif revision is not None:
2425
if len(revision) == 1:
2426
revno, rev_id = revision[0].in_history(b)
2427
b.repository.sign_revision(rev_id, gpg_strategy)
2428
elif len(revision) == 2:
2429
# are they both on rh- if so we can walk between them
2430
# might be nice to have a range helper for arbitrary
2431
# revision paths. hmm.
2432
from_revno, from_revid = revision[0].in_history(b)
2433
to_revno, to_revid = revision[1].in_history(b)
2434
if to_revid is None:
2435
to_revno = b.revno()
2436
if from_revno is None or to_revno is None:
2437
raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2438
for revno in range(from_revno, to_revno + 1):
2439
b.repository.sign_revision(b.get_rev_id(revno),
2442
raise BzrCommandError('Please supply either one revision, or a range.')
2445
class cmd_bind(Command):
2446
"""Bind the current branch to a master branch.
2448
After binding, commits must succeed on the master branch
2449
before they are executed on the local one.
2452
takes_args = ['location']
2455
def run(self, location=None):
2456
b, relpath = Branch.open_containing(u'.')
2457
b_other = Branch.open(location)
2460
except DivergedBranches:
2461
raise BzrCommandError('These branches have diverged.'
2462
' Try merging, and then bind again.')
2465
class cmd_unbind(Command):
2466
"""Unbind the current branch from its master branch.
2468
After unbinding, the local branch is considered independent.
2469
All subsequent commits will be local.
2476
b, relpath = Branch.open_containing(u'.')
2478
raise BzrCommandError('Local branch is not bound')
2481
class cmd_uncommit(bzrlib.commands.Command):
2482
"""Remove the last committed revision.
2484
--verbose will print out what is being removed.
2485
--dry-run will go through all the motions, but not actually
2488
In the future, uncommit will create a changeset, which can then
2492
# TODO: jam 20060108 Add an option to allow uncommit to remove
2493
# unreferenced information in 'branch-as-repostory' branches.
2494
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2495
# information in shared branches as well.
2496
takes_options = ['verbose', 'revision',
2497
Option('dry-run', help='Don\'t actually make changes'),
2498
Option('force', help='Say yes to all questions.')]
2499
takes_args = ['location?']
2502
def run(self, location=None,
2503
dry_run=False, verbose=False,
2504
revision=None, force=False):
2505
from bzrlib.branch import Branch
2506
from bzrlib.log import log_formatter
2508
from bzrlib.uncommit import uncommit
2510
if location is None:
2512
control, relpath = bzrdir.BzrDir.open_containing(location)
2514
tree = control.open_workingtree()
2516
except (errors.NoWorkingTree, errors.NotLocalUrl):
2518
b = control.open_branch()
2520
if revision is None:
2522
rev_id = b.last_revision()
2524
revno, rev_id = revision[0].in_history(b)
2526
print 'No revisions to uncommit.'
2528
for r in range(revno, b.revno()+1):
2529
rev_id = b.get_rev_id(r)
2530
lf = log_formatter('short', to_file=sys.stdout,show_timezone='original')
2531
lf.show(r, b.repository.get_revision(rev_id), None)
2534
print 'Dry-run, pretending to remove the above revisions.'
2536
val = raw_input('Press <enter> to continue')
2538
print 'The above revision(s) will be removed.'
2540
val = raw_input('Are you sure [y/N]? ')
2541
if val.lower() not in ('y', 'yes'):
2545
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
2549
class cmd_break_lock(Command):
2550
"""Break a dead lock on a repository, branch or working directory.
2552
CAUTION: Locks should only be broken when you are sure that the process
2553
holding the lock has been stopped.
2555
You can get information on what locks are open via the 'bzr info' command.
2560
takes_args = ['location?']
2562
def run(self, location=None, show=False):
2563
if location is None:
2565
control, relpath = bzrdir.BzrDir.open_containing(location)
2567
control.break_lock()
2568
except NotImplementedError:
2573
# command-line interpretation helper for merge-related commands
2574
def merge(other_revision, base_revision,
2575
check_clean=True, ignore_zero=False,
2576
this_dir=None, backup_files=False, merge_type=Merge3Merger,
2577
file_list=None, show_base=False, reprocess=False,
2578
pb=DummyProgress()):
2579
"""Merge changes into a tree.
2582
list(path, revno) Base for three-way merge.
2583
If [None, None] then a base will be automatically determined.
2585
list(path, revno) Other revision for three-way merge.
2587
Directory to merge changes into; '.' by default.
2589
If true, this_dir must have no uncommitted changes before the
2591
ignore_zero - If true, suppress the "zero conflicts" message when
2592
there are no conflicts; should be set when doing something we expect
2593
to complete perfectly.
2594
file_list - If supplied, merge only changes to selected files.
2596
All available ancestors of other_revision and base_revision are
2597
automatically pulled into the branch.
2599
The revno may be -1 to indicate the last revision on the branch, which is
2602
This function is intended for use from the command line; programmatic
2603
clients might prefer to call merge.merge_inner(), which has less magic
2606
from bzrlib.merge import Merger
2607
if this_dir is None:
2609
this_tree = WorkingTree.open_containing(this_dir)[0]
2610
if show_base and not merge_type is Merge3Merger:
2611
raise BzrCommandError("Show-base is not supported for this merge"
2612
" type. %s" % merge_type)
2613
if reprocess and not merge_type.supports_reprocess:
2614
raise BzrCommandError("Conflict reduction is not supported for merge"
2615
" type %s." % merge_type)
2616
if reprocess and show_base:
2617
raise BzrCommandError("Cannot do conflict reduction and show base.")
2619
merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2620
merger.pp = ProgressPhase("Merge phase", 5, pb)
2621
merger.pp.next_phase()
2622
merger.check_basis(check_clean)
2623
merger.set_other(other_revision)
2624
merger.pp.next_phase()
2625
merger.set_base(base_revision)
2626
if merger.base_rev_id == merger.other_rev_id:
2627
note('Nothing to do.')
2629
merger.backup_files = backup_files
2630
merger.merge_type = merge_type
2631
merger.set_interesting_files(file_list)
2632
merger.show_base = show_base
2633
merger.reprocess = reprocess
2634
conflicts = merger.do_merge()
2635
if file_list is None:
2636
merger.set_pending()
2642
# these get imported and then picked up by the scan for cmd_*
2643
# TODO: Some more consistent way to split command definitions across files;
2644
# we do need to load at least some information about them to know of
2645
# aliases. ideally we would avoid loading the implementation until the
2646
# details were needed.
2647
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2648
from bzrlib.sign_my_commits import cmd_sign_my_commits
2649
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
2650
cmd_weave_plan_merge, cmd_weave_merge_text
added
removed
bzrlib/builtins.py
