To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 1911.3.2
- compare with another revision
- download diff
- download tarball
- view history from revision 1911.3.2
- Committer: John Arbash Meinel
- Date: 2006-08-09 19:53:02 UTC
- mto: This revision was merged to the branch mainline in revision 1927.
- Revision ID: john@arbash-meinel.com-20060809195302-38b349ff2e1473b4
Adding the AddFromBaseAction, which tries to reuse file ids from another tree
- files added:
- .bzrignore
- bzrlib
- bzrlib/benchmarks
- bzrlib/bundle
- bzrlib/bundle/old
- bzrlib/bundle/serializer
- bzrlib/doc
- bzrlib/doc/api
- bzrlib/export
- bzrlib/plugins
- bzrlib/plugins/launchpad
- bzrlib/store
- bzrlib/store/revision
- bzrlib/store/versioned
- bzrlib/tests
- bzrlib/tests/blackbox
- bzrlib/tests/branch_implementations
- bzrlib/tests/bzrdir_implementations
- bzrlib/tests/interrepository_implementations
- bzrlib/tests/intertree_implementations
- bzrlib/tests/interversionedfile_implementations
- bzrlib/tests/repository_implementations
- bzrlib/tests/revisionstore_implementations
- bzrlib/tests/test_patches_data
- bzrlib/tests/tree_implementations
- bzrlib/tests/workingtree_implementations
- bzrlib/transport
- bzrlib/transport/http
- bzrlib/ui
- bzrlib/util
- bzrlib/util/configobj
- bzrlib/util/configobj/docs
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- bzrlib/util/urlgrabber
- contrib
- contrib/bash
- contrib/emacs
- contrib/zsh
- doc
- tools
- tools/doc_generate
- tools/win32
- files removed:
- .bzrignore
- notes
- tests
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2004, 2005, 2006 by Canonical Ltd
2
#
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.
7
#
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.
12
#
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
16
17
"""builtin bzr commands"""
18
19
20
import codecs
21
import errno
22
import os
23
import os.path
24
import sys
25
26
import bzrlib
27
from bzrlib import (
28
branch,
29
bundle,
30
bzrdir,
31
config,
32
errors,
33
ignores,
34
log,
35
osutils,
36
repository,
37
transport,
38
ui,
39
urlutils,
40
)
41
from bzrlib.branch import Branch, BranchReferenceFormat
42
from bzrlib.bundle import read_bundle_from_url
43
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
44
from bzrlib.conflicts import ConflictList
45
from bzrlib.commands import Command, display_command
46
from bzrlib.errors import (BzrError, BzrCheckError, BzrCommandError,
47
NotBranchError, DivergedBranches, NotConflicted,
48
NoSuchFile, NoWorkingTree, FileInWrongBranch,
49
NotVersionedError, NotABundle)
50
from bzrlib.merge import Merge3Merger
51
from bzrlib.option import Option
52
from bzrlib.progress import DummyProgress, ProgressPhase
53
from bzrlib.revision import common_ancestor
54
from bzrlib.revisionspec import RevisionSpec
55
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
56
from bzrlib.transport.local import LocalTransport
57
from bzrlib.workingtree import WorkingTree
58
59
60
def tree_files(file_list, default_branch=u'.'):
61
try:
62
return internal_tree_files(file_list, default_branch)
63
except FileInWrongBranch, e:
64
raise BzrCommandError("%s is not in the same branch as %s" %
65
(e.path, file_list[0]))
66
67
68
# XXX: Bad function name; should possibly also be a class method of
69
# WorkingTree rather than a function.
70
def internal_tree_files(file_list, default_branch=u'.'):
71
"""Convert command-line paths to a WorkingTree and relative paths.
72
73
This is typically used for command-line processors that take one or
74
more filenames, and infer the workingtree that contains them.
75
76
The filenames given are not required to exist.
77
78
:param file_list: Filenames to convert.
79
80
:param default_branch: Fallback tree path to use if file_list is empty or None.
81
82
:return: workingtree, [relative_paths]
83
"""
84
if file_list is None or len(file_list) == 0:
85
return WorkingTree.open_containing(default_branch)[0], file_list
86
tree = WorkingTree.open_containing(file_list[0])[0]
87
new_list = []
88
for filename in file_list:
89
try:
90
new_list.append(tree.relpath(filename))
91
except errors.PathNotChild:
92
raise FileInWrongBranch(tree.branch, filename)
93
return tree, new_list
94
95
96
def get_format_type(typestring):
97
"""Parse and return a format specifier."""
98
if typestring == "weave":
99
return bzrdir.BzrDirFormat6()
100
if typestring == "default":
101
return bzrdir.BzrDirMetaFormat1()
102
if typestring == "metaweave":
103
format = bzrdir.BzrDirMetaFormat1()
104
format.repository_format = repository.RepositoryFormat7()
105
return format
106
if typestring == "knit":
107
format = bzrdir.BzrDirMetaFormat1()
108
format.repository_format = repository.RepositoryFormatKnit1()
109
return format
110
msg = "Unknown bzr format %s. Current formats are: default, knit,\n" \
111
"metaweave and weave" % typestring
112
raise BzrCommandError(msg)
113
114
115
# TODO: Make sure no commands unconditionally use the working directory as a
116
# branch. If a filename argument is used, the first of them should be used to
117
# specify the branch. (Perhaps this can be factored out into some kind of
118
# Argument class, representing a file in a branch, where the first occurrence
119
# opens the branch?)
120
121
class cmd_status(Command):
122
"""Display status summary.
123
124
This reports on versioned and unknown files, reporting them
125
grouped by state. Possible states are:
126
127
added
128
Versioned in the working copy but not in the previous revision.
129
130
removed
131
Versioned in the previous revision but removed or deleted
132
in the working copy.
133
134
renamed
135
Path of this file changed from the previous revision;
136
the text may also have changed. This includes files whose
137
parent directory was renamed.
138
139
modified
140
Text has changed since the previous revision.
141
142
unknown
143
Not versioned and not matching an ignore pattern.
144
145
To see ignored files use 'bzr ignored'. For details in the
146
changes to file texts, use 'bzr diff'.
147
148
If no arguments are specified, the status of the entire working
149
directory is shown. Otherwise, only the status of the specified
150
files or directories is reported. If a directory is given, status
151
is reported for everything inside that directory.
152
153
If a revision argument is given, the status is calculated against
154
that revision, or between two revisions if two are provided.
155
"""
156
157
# TODO: --no-recurse, --recurse options
158
159
takes_args = ['file*']
160
takes_options = ['show-ids', 'revision']
161
aliases = ['st', 'stat']
162
163
encoding_type = 'replace'
164
165
@display_command
166
def run(self, show_ids=False, file_list=None, revision=None):
167
from bzrlib.status import show_tree_status
168
169
tree, file_list = tree_files(file_list)
170
171
show_tree_status(tree, show_ids=show_ids,
172
specific_files=file_list, revision=revision,
173
to_file=self.outf)
174
175
176
class cmd_cat_revision(Command):
177
"""Write out metadata for a revision.
178
179
The revision to print can either be specified by a specific
180
revision identifier, or you can use --revision.
181
"""
182
183
hidden = True
184
takes_args = ['revision_id?']
185
takes_options = ['revision']
186
# cat-revision is more for frontends so should be exact
187
encoding = 'strict'
188
189
@display_command
190
def run(self, revision_id=None, revision=None):
191
192
if revision_id is not None and revision is not None:
193
raise BzrCommandError('You can only supply one of revision_id or --revision')
194
if revision_id is None and revision is None:
195
raise BzrCommandError('You must supply either --revision or a revision_id')
196
b = WorkingTree.open_containing(u'.')[0].branch
197
198
# TODO: jam 20060112 should cat-revision always output utf-8?
199
if revision_id is not None:
200
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
201
elif revision is not None:
202
for rev in revision:
203
if rev is None:
204
raise BzrCommandError('You cannot specify a NULL revision.')
205
revno, rev_id = rev.in_history(b)
206
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
207
208
209
class cmd_revno(Command):
210
"""Show current revision number.
211
212
This is equal to the number of revisions on this branch.
213
"""
214
215
takes_args = ['location?']
216
217
@display_command
218
def run(self, location=u'.'):
219
self.outf.write(str(Branch.open_containing(location)[0].revno()))
220
self.outf.write('\n')
221
222
223
class cmd_revision_info(Command):
224
"""Show revision number and revision id for a given revision identifier.
225
"""
226
hidden = True
227
takes_args = ['revision_info*']
228
takes_options = ['revision']
229
230
@display_command
231
def run(self, revision=None, revision_info_list=[]):
232
233
revs = []
234
if revision is not None:
235
revs.extend(revision)
236
if revision_info_list is not None:
237
for rev in revision_info_list:
238
revs.append(RevisionSpec(rev))
239
if len(revs) == 0:
240
raise BzrCommandError('You must supply a revision identifier')
241
242
b = WorkingTree.open_containing(u'.')[0].branch
243
244
for rev in revs:
245
revinfo = rev.in_history(b)
246
if revinfo.revno is None:
247
print ' %s' % revinfo.rev_id
248
else:
249
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
250
251
252
class cmd_add(Command):
253
"""Add specified files or directories.
254
255
In non-recursive mode, all the named items are added, regardless
256
of whether they were previously ignored. A warning is given if
257
any of the named files are already versioned.
258
259
In recursive mode (the default), files are treated the same way
260
but the behaviour for directories is different. Directories that
261
are already versioned do not give a warning. All directories,
262
whether already versioned or not, are searched for files or
263
subdirectories that are neither versioned or ignored, and these
264
are added. This search proceeds recursively into versioned
265
directories. If no names are given '.' is assumed.
266
267
Therefore simply saying 'bzr add' will version all files that
268
are currently unknown.
269
270
Adding a file whose parent directory is not versioned will
271
implicitly add the parent, and so on up to the root. This means
272
you should never need to explicitly add a directory, they'll just
273
get added when you add a file in the directory.
274
275
--dry-run will show which files would be added, but not actually
276
add them.
277
278
--file-ids-from will try to use the file ids from the supplied path.
279
It looks up ids trying to find a matching parent directory with the
280
same filename, and then by pure path.
281
"""
282
takes_args = ['file*']
283
takes_options = ['no-recurse', 'dry-run', 'verbose',
284
Option('file-ids-from', type=unicode,
285
help='Lookup file ids from here')]
286
encoding_type = 'replace'
287
288
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
289
file_ids_from=None):
290
import bzrlib.add
291
292
if file_ids_from is not None:
293
try:
294
base_tree, base_path = WorkingTree.open_containing(
295
file_ids_from)
296
except errors.NoWorkingTree:
297
base_branch, base_path = branch.Branch.open_containing(
298
file_ids_from)
299
base_tree = base_branch.basis_tree()
300
301
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
302
to_file=self.outf, should_print=(not is_quiet()))
303
else:
304
action = bzrlib.add.AddAction(to_file=self.outf,
305
should_print=(not is_quiet()))
306
307
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
308
action=action, save=not dry_run)
309
if len(ignored) > 0:
310
if verbose:
311
for glob in sorted(ignored.keys()):
312
for path in ignored[glob]:
313
self.outf.write("ignored %s matching \"%s\"\n"
314
% (path, glob))
315
else:
316
match_len = 0
317
for glob, paths in ignored.items():
318
match_len += len(paths)
319
self.outf.write("ignored %d file(s).\n" % match_len)
320
self.outf.write("If you wish to add some of these files,"
321
" please add them by name.\n")
322
323
324
class cmd_mkdir(Command):
325
"""Create a new versioned directory.
326
327
This is equivalent to creating the directory and then adding it.
328
"""
329
330
takes_args = ['dir+']
331
encoding_type = 'replace'
332
333
def run(self, dir_list):
334
for d in dir_list:
335
os.mkdir(d)
336
wt, dd = WorkingTree.open_containing(d)
337
wt.add([dd])
338
self.outf.write('added %s\n' % d)
339
340
341
class cmd_relpath(Command):
342
"""Show path of a file relative to root"""
343
344
takes_args = ['filename']
345
hidden = True
346
347
@display_command
348
def run(self, filename):
349
# TODO: jam 20050106 Can relpath return a munged path if
350
# sys.stdout encoding cannot represent it?
351
tree, relpath = WorkingTree.open_containing(filename)
352
self.outf.write(relpath)
353
self.outf.write('\n')
354
355
356
class cmd_inventory(Command):
357
"""Show inventory of the current working copy or a revision.
358
359
It is possible to limit the output to a particular entry
360
type using the --kind option. For example; --kind file.
361
"""
362
363
takes_options = ['revision', 'show-ids', 'kind']
364
365
@display_command
366
def run(self, revision=None, show_ids=False, kind=None):
367
if kind and kind not in ['file', 'directory', 'symlink']:
368
raise BzrCommandError('invalid kind specified')
369
tree = WorkingTree.open_containing(u'.')[0]
370
if revision is None:
371
inv = tree.read_working_inventory()
372
else:
373
if len(revision) > 1:
374
raise BzrCommandError('bzr inventory --revision takes'
375
' exactly one revision identifier')
376
inv = tree.branch.repository.get_revision_inventory(
377
revision[0].in_history(tree.branch).rev_id)
378
379
for path, entry in inv.entries():
380
if kind and kind != entry.kind:
381
continue
382
if show_ids:
383
self.outf.write('%-50s %s\n' % (path, entry.file_id))
384
else:
385
self.outf.write(path)
386
self.outf.write('\n')
387
388
389
class cmd_mv(Command):
390
"""Move or rename a file.
391
392
usage:
393
bzr mv OLDNAME NEWNAME
394
bzr mv SOURCE... DESTINATION
395
396
If the last argument is a versioned directory, all the other names
397
are moved into it. Otherwise, there must be exactly two arguments
398
and the file is changed to a new name, which must not already exist.
399
400
Files cannot be moved between branches.
401
"""
402
403
takes_args = ['names*']
404
aliases = ['move', 'rename']
405
encoding_type = 'replace'
406
407
def run(self, names_list):
408
if names_list is None:
409
names_list = []
410
411
if len(names_list) < 2:
412
raise BzrCommandError("missing file argument")
413
tree, rel_names = tree_files(names_list)
414
415
if os.path.isdir(names_list[-1]):
416
# move into existing directory
417
for pair in tree.move(rel_names[:-1], rel_names[-1]):
418
self.outf.write("%s => %s\n" % pair)
419
else:
420
if len(names_list) != 2:
421
raise BzrCommandError('to mv multiple files the destination '
422
'must be a versioned directory')
423
tree.rename_one(rel_names[0], rel_names[1])
424
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
425
426
427
class cmd_pull(Command):
428
"""Turn this branch into a mirror of another branch.
429
430
This command only works on branches that have not diverged. Branches are
431
considered diverged if the destination branch's most recent commit is one
432
that has not been merged (directly or indirectly) into the parent.
433
434
If branches have diverged, you can use 'bzr merge' to integrate the changes
435
from one into the other. Once one branch has merged, the other should
436
be able to pull it again.
437
438
If you want to forget your local changes and just update your branch to
439
match the remote one, use pull --overwrite.
440
441
If there is no default location set, the first pull will set it. After
442
that, you can omit the location to use the default. To change the
443
default, use --remember. The value will only be saved if the remote
444
location can be accessed.
445
"""
446
447
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
448
takes_args = ['location?']
449
encoding_type = 'replace'
450
451
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
452
# FIXME: too much stuff is in the command class
453
try:
454
tree_to = WorkingTree.open_containing(u'.')[0]
455
branch_to = tree_to.branch
456
except NoWorkingTree:
457
tree_to = None
458
branch_to = Branch.open_containing(u'.')[0]
459
460
reader = None
461
if location is not None:
462
try:
463
reader = bundle.read_bundle_from_url(location)
464
except NotABundle:
465
pass # Continue on considering this url a Branch
466
467
stored_loc = branch_to.get_parent()
468
if location is None:
469
if stored_loc is None:
470
raise BzrCommandError("No pull location known or specified.")
471
else:
472
display_url = urlutils.unescape_for_display(stored_loc,
473
self.outf.encoding)
474
self.outf.write("Using saved location: %s\n" % display_url)
475
location = stored_loc
476
477
478
if reader is not None:
479
install_bundle(branch_to.repository, reader)
480
branch_from = branch_to
481
else:
482
branch_from = Branch.open(location)
483
484
if branch_to.get_parent() is None or remember:
485
branch_to.set_parent(branch_from.base)
486
487
rev_id = None
488
if revision is None:
489
if reader is not None:
490
rev_id = reader.target
491
elif len(revision) == 1:
492
rev_id = revision[0].in_history(branch_from).rev_id
493
else:
494
raise BzrCommandError('bzr pull --revision takes one value.')
495
496
old_rh = branch_to.revision_history()
497
if tree_to is not None:
498
count = tree_to.pull(branch_from, overwrite, rev_id)
499
else:
500
count = branch_to.pull(branch_from, overwrite, rev_id)
501
note('%d revision(s) pulled.' % (count,))
502
503
if verbose:
504
new_rh = branch_to.revision_history()
505
if old_rh != new_rh:
506
# Something changed
507
from bzrlib.log import show_changed_revisions
508
show_changed_revisions(branch_to, old_rh, new_rh,
509
to_file=self.outf)
510
511
512
class cmd_push(Command):
513
"""Update a mirror of this branch.
514
515
The target branch will not have its working tree populated because this
516
is both expensive, and is not supported on remote file systems.
517
518
Some smart servers or protocols *may* put the working tree in place in
519
the future.
520
521
This command only works on branches that have not diverged. Branches are
522
considered diverged if the destination branch's most recent commit is one
523
that has not been merged (directly or indirectly) by the source branch.
524
525
If branches have diverged, you can use 'bzr push --overwrite' to replace
526
the other branch completely, discarding its unmerged changes.
527
528
If you want to ensure you have the different changes in the other branch,
529
do a merge (see bzr help merge) from the other branch, and commit that.
530
After that you will be able to do a push without '--overwrite'.
531
532
If there is no default push location set, the first push will set it.
533
After that, you can omit the location to use the default. To change the
534
default, use --remember. The value will only be saved if the remote
535
location can be accessed.
536
"""
537
538
takes_options = ['remember', 'overwrite', 'verbose',
539
Option('create-prefix',
540
help='Create the path leading up to the branch '
541
'if it does not already exist')]
542
takes_args = ['location?']
543
encoding_type = 'replace'
544
545
def run(self, location=None, remember=False, overwrite=False,
546
create_prefix=False, verbose=False):
547
# FIXME: Way too big! Put this into a function called from the
548
# command.
549
550
br_from = Branch.open_containing('.')[0]
551
stored_loc = br_from.get_push_location()
552
if location is None:
553
if stored_loc is None:
554
raise BzrCommandError("No push location known or specified.")
555
else:
556
display_url = urlutils.unescape_for_display(stored_loc,
557
self.outf.encoding)
558
self.outf.write("Using saved location: %s\n" % display_url)
559
location = stored_loc
560
561
to_transport = transport.get_transport(location)
562
location_url = to_transport.base
563
564
old_rh = []
565
try:
566
dir_to = bzrdir.BzrDir.open(location_url)
567
br_to = dir_to.open_branch()
568
except NotBranchError:
569
# create a branch.
570
to_transport = to_transport.clone('..')
571
if not create_prefix:
572
try:
573
relurl = to_transport.relpath(location_url)
574
mutter('creating directory %s => %s', location_url, relurl)
575
to_transport.mkdir(relurl)
576
except NoSuchFile:
577
raise BzrCommandError("Parent directory of %s "
578
"does not exist." % location)
579
else:
580
current = to_transport.base
581
needed = [(to_transport, to_transport.relpath(location_url))]
582
while needed:
583
try:
584
to_transport, relpath = needed[-1]
585
to_transport.mkdir(relpath)
586
needed.pop()
587
except NoSuchFile:
588
new_transport = to_transport.clone('..')
589
needed.append((new_transport,
590
new_transport.relpath(to_transport.base)))
591
if new_transport.base == to_transport.base:
592
raise BzrCommandError("Could not create "
593
"path prefix.")
594
dir_to = br_from.bzrdir.clone(location_url,
595
revision_id=br_from.last_revision())
596
br_to = dir_to.open_branch()
597
count = len(br_to.revision_history())
598
# We successfully created the target, remember it
599
if br_from.get_push_location() is None or remember:
600
br_from.set_push_location(br_to.base)
601
else:
602
# We were able to connect to the remote location, so remember it
603
# we don't need to successfully push because of possible divergence.
604
if br_from.get_push_location() is None or remember:
605
br_from.set_push_location(br_to.base)
606
old_rh = br_to.revision_history()
607
try:
608
try:
609
tree_to = dir_to.open_workingtree()
610
except errors.NotLocalUrl:
611
warning('This transport does not update the working '
612
'tree of: %s' % (br_to.base,))
613
count = br_to.pull(br_from, overwrite)
614
except NoWorkingTree:
615
count = br_to.pull(br_from, overwrite)
616
else:
617
count = tree_to.pull(br_from, overwrite)
618
except DivergedBranches:
619
raise BzrCommandError("These branches have diverged."
620
" Try a merge then push with overwrite.")
621
note('%d revision(s) pushed.' % (count,))
622
623
if verbose:
624
new_rh = br_to.revision_history()
625
if old_rh != new_rh:
626
# Something changed
627
from bzrlib.log import show_changed_revisions
628
show_changed_revisions(br_to, old_rh, new_rh,
629
to_file=self.outf)
630
631
632
class cmd_branch(Command):
633
"""Create a new copy of a branch.
634
635
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
636
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
637
638
To retrieve the branch as of a particular revision, supply the --revision
639
parameter, as in "branch foo/bar -r 5".
640
641
--basis is to speed up branching from remote branches. When specified, it
642
copies all the file-contents, inventory and revision data from the basis
643
branch before copying anything from the remote branch.
644
"""
645
takes_args = ['from_location', 'to_location?']
646
takes_options = ['revision', 'basis']
647
aliases = ['get', 'clone']
648
649
def run(self, from_location, to_location=None, revision=None, basis=None):
650
if revision is None:
651
revision = [None]
652
elif len(revision) > 1:
653
raise BzrCommandError(
654
'bzr branch --revision takes exactly 1 revision value')
655
try:
656
br_from = Branch.open(from_location)
657
except OSError, e:
658
if e.errno == errno.ENOENT:
659
raise BzrCommandError('Source location "%s" does not'
660
' exist.' % to_location)
661
else:
662
raise
663
br_from.lock_read()
664
try:
665
if basis is not None:
666
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
667
else:
668
basis_dir = None
669
if len(revision) == 1 and revision[0] is not None:
670
revision_id = revision[0].in_history(br_from)[1]
671
else:
672
# FIXME - wt.last_revision, fallback to branch, fall back to
673
# None or perhaps NULL_REVISION to mean copy nothing
674
# RBC 20060209
675
revision_id = br_from.last_revision()
676
if to_location is None:
677
to_location = os.path.basename(from_location.rstrip("/\\"))
678
name = None
679
else:
680
name = os.path.basename(to_location) + '\n'
681
682
to_transport = transport.get_transport(to_location)
683
try:
684
to_transport.mkdir('.')
685
except errors.FileExists:
686
raise BzrCommandError('Target directory "%s" already'
687
' exists.' % to_location)
688
except errors.NoSuchFile:
689
raise BzrCommandError('Parent of "%s" does not exist.' %
690
to_location)
691
try:
692
# preserve whatever source format we have.
693
dir = br_from.bzrdir.sprout(to_transport.base,
694
revision_id, basis_dir)
695
branch = dir.open_branch()
696
except errors.NoSuchRevision:
697
to_transport.delete_tree('.')
698
msg = "The branch %s has no revision %s." % (from_location, revision[0])
699
raise BzrCommandError(msg)
700
except errors.UnlistableBranch:
701
osutils.rmtree(to_location)
702
msg = "The branch %s cannot be used as a --basis" % (basis,)
703
raise BzrCommandError(msg)
704
if name:
705
branch.control_files.put_utf8('branch-name', name)
706
note('Branched %d revision(s).' % branch.revno())
707
finally:
708
br_from.unlock()
709
710
711
class cmd_checkout(Command):
712
"""Create a new checkout of an existing branch.
713
714
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
715
the branch found in '.'. This is useful if you have removed the working tree
716
or if it was never created - i.e. if you pushed the branch to its current
717
location using SFTP.
718
719
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
720
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
721
722
To retrieve the branch as of a particular revision, supply the --revision
723
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
724
out of date [so you cannot commit] but it may be useful (i.e. to examine old
725
code.)
726
727
--basis is to speed up checking out from remote branches. When specified, it
728
uses the inventory and file contents from the basis branch in preference to the
729
branch being checked out.
730
"""
731
takes_args = ['branch_location?', 'to_location?']
732
takes_options = ['revision', # , 'basis']
733
Option('lightweight',
734
help="perform a lightweight checkout. Lightweight "
735
"checkouts depend on access to the branch for "
736
"every operation. Normal checkouts can perform "
737
"common operations like diff and status without "
738
"such access, and also support local commits."
739
),
740
]
741
aliases = ['co']
742
743
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
744
lightweight=False):
745
if revision is None:
746
revision = [None]
747
elif len(revision) > 1:
748
raise BzrCommandError(
749
'bzr checkout --revision takes exactly 1 revision value')
750
if branch_location is None:
751
branch_location = osutils.getcwd()
752
to_location = branch_location
753
source = Branch.open(branch_location)
754
if len(revision) == 1 and revision[0] is not None:
755
revision_id = revision[0].in_history(source)[1]
756
else:
757
revision_id = None
758
if to_location is None:
759
to_location = os.path.basename(branch_location.rstrip("/\\"))
760
# if the source and to_location are the same,
761
# and there is no working tree,
762
# then reconstitute a branch
763
if (osutils.abspath(to_location) ==
764
osutils.abspath(branch_location)):
765
try:
766
source.bzrdir.open_workingtree()
767
except errors.NoWorkingTree:
768
source.bzrdir.create_workingtree()
769
return
770
try:
771
os.mkdir(to_location)
772
except OSError, e:
773
if e.errno == errno.EEXIST:
774
raise BzrCommandError('Target directory "%s" already'
775
' exists.' % to_location)
776
if e.errno == errno.ENOENT:
777
raise BzrCommandError('Parent of "%s" does not exist.' %
778
to_location)
779
else:
780
raise
781
old_format = bzrdir.BzrDirFormat.get_default_format()
782
bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
783
try:
784
if lightweight:
785
checkout = bzrdir.BzrDirMetaFormat1().initialize(to_location)
786
branch.BranchReferenceFormat().initialize(checkout, source)
787
else:
788
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
789
to_location, force_new_tree=False)
790
checkout = checkout_branch.bzrdir
791
checkout_branch.bind(source)
792
if revision_id is not None:
793
rh = checkout_branch.revision_history()
794
checkout_branch.set_revision_history(rh[:rh.index(revision_id) + 1])
795
checkout.create_workingtree(revision_id)
796
finally:
797
bzrdir.BzrDirFormat.set_default_format(old_format)
798
799
800
class cmd_renames(Command):
801
"""Show list of renamed files.
802
"""
803
# TODO: Option to show renames between two historical versions.
804
805
# TODO: Only show renames under dir, rather than in the whole branch.
806
takes_args = ['dir?']
807
808
@display_command
809
def run(self, dir=u'.'):
810
from bzrlib.tree import find_renames
811
tree = WorkingTree.open_containing(dir)[0]
812
old_inv = tree.basis_tree().inventory
813
new_inv = tree.read_working_inventory()
814
renames = list(find_renames(old_inv, new_inv))
815
renames.sort()
816
for old_name, new_name in renames:
817
self.outf.write("%s => %s\n" % (old_name, new_name))
818
819
820
class cmd_update(Command):
821
"""Update a tree to have the latest code committed to its branch.
822
823
This will perform a merge into the working tree, and may generate
824
conflicts. If you have any local changes, you will still
825
need to commit them after the update for the update to be complete.
826
827
If you want to discard your local changes, you can just do a
828
'bzr revert' instead of 'bzr commit' after the update.
829
"""
830
takes_args = ['dir?']
831
aliases = ['up']
832
833
def run(self, dir='.'):
834
tree = WorkingTree.open_containing(dir)[0]
835
tree.lock_write()
836
existing_pending_merges = tree.pending_merges()
837
try:
838
last_rev = tree.last_revision()
839
if last_rev == tree.branch.last_revision():
840
# may be up to date, check master too.
841
master = tree.branch.get_master_branch()
842
if master is None or last_rev == master.last_revision():
843
revno = tree.branch.revision_id_to_revno(last_rev)
844
note("Tree is up to date at revision %d." % (revno,))
845
return 0
846
conflicts = tree.update()
847
revno = tree.branch.revision_id_to_revno(tree.last_revision())
848
note('Updated to revision %d.' % (revno,))
849
if tree.pending_merges() != existing_pending_merges:
850
note('Your local commits will now show as pending merges with '
851
"'bzr status', and can be committed with 'bzr commit'.")
852
if conflicts != 0:
853
return 1
854
else:
855
return 0
856
finally:
857
tree.unlock()
858
859
860
class cmd_info(Command):
861
"""Show information about a working tree, branch or repository.
862
863
This command will show all known locations and formats associated to the
864
tree, branch or repository. Statistical information is included with
865
each report.
866
867
Branches and working trees will also report any missing revisions.
868
"""
869
takes_args = ['location?']
870
takes_options = ['verbose']
871
872
@display_command
873
def run(self, location=None, verbose=False):
874
from bzrlib.info import show_bzrdir_info
875
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
876
verbose=verbose)
877
878
879
class cmd_remove(Command):
880
"""Make a file unversioned.
881
882
This makes bzr stop tracking changes to a versioned file. It does
883
not delete the working copy.
884
885
You can specify one or more files, and/or --new. If you specify --new,
886
only 'added' files will be removed. If you specify both, then new files
887
in the specified directories will be removed. If the directories are
888
also new, they will also be removed.
889
"""
890
takes_args = ['file*']
891
takes_options = ['verbose', Option('new', help='remove newly-added files')]
892
aliases = ['rm']
893
encoding_type = 'replace'
894
895
def run(self, file_list, verbose=False, new=False):
896
tree, file_list = tree_files(file_list)
897
if new is False:
898
if file_list is None:
899
raise BzrCommandError('Specify one or more files to remove, or'
900
' use --new.')
901
else:
902
added = tree.changes_from(tree.basis_tree(),
903
specific_files=file_list).added
904
file_list = sorted([f[0] for f in added], reverse=True)
905
if len(file_list) == 0:
906
raise BzrCommandError('No matching files.')
907
tree.remove(file_list, verbose=verbose, to_file=self.outf)
908
909
910
class cmd_file_id(Command):
911
"""Print file_id of a particular file or directory.
912
913
The file_id is assigned when the file is first added and remains the
914
same through all revisions where the file exists, even when it is
915
moved or renamed.
916
"""
917
918
hidden = True
919
takes_args = ['filename']
920
921
@display_command
922
def run(self, filename):
923
tree, relpath = WorkingTree.open_containing(filename)
924
i = tree.inventory.path2id(relpath)
925
if i == None:
926
raise BzrError("%r is not a versioned file" % filename)
927
else:
928
self.outf.write(i + '\n')
929
930
931
class cmd_file_path(Command):
932
"""Print path of file_ids to a file or directory.
933
934
This prints one line for each directory down to the target,
935
starting at the branch root.
936
"""
937
938
hidden = True
939
takes_args = ['filename']
940
941
@display_command
942
def run(self, filename):
943
tree, relpath = WorkingTree.open_containing(filename)
944
inv = tree.inventory
945
fid = inv.path2id(relpath)
946
if fid == None:
947
raise BzrError("%r is not a versioned file" % filename)
948
for fip in inv.get_idpath(fid):
949
self.outf.write(fip + '\n')
950
951
952
class cmd_reconcile(Command):
953
"""Reconcile bzr metadata in a branch.
954
955
This can correct data mismatches that may have been caused by
956
previous ghost operations or bzr upgrades. You should only
957
need to run this command if 'bzr check' or a bzr developer
958
advises you to run it.
959
960
If a second branch is provided, cross-branch reconciliation is
961
also attempted, which will check that data like the tree root
962
id which was not present in very early bzr versions is represented
963
correctly in both branches.
964
965
At the same time it is run it may recompress data resulting in
966
a potential saving in disk space or performance gain.
967
968
The branch *MUST* be on a listable system such as local disk or sftp.
969
"""
970
takes_args = ['branch?']
971
972
def run(self, branch="."):
973
from bzrlib.reconcile import reconcile
974
dir = bzrdir.BzrDir.open(branch)
975
reconcile(dir)
976
977
978
class cmd_revision_history(Command):
979
"""Display the list of revision ids on a branch."""
980
takes_args = ['location?']
981
982
hidden = True
983
984
@display_command
985
def run(self, location="."):
986
branch = Branch.open_containing(location)[0]
987
for revid in branch.revision_history():
988
self.outf.write(revid)
989
self.outf.write('\n')
990
991
992
class cmd_ancestry(Command):
993
"""List all revisions merged into this branch."""
994
takes_args = ['location?']
995
996
hidden = True
997
998
@display_command
999
def run(self, location="."):
1000
try:
1001
wt = WorkingTree.open_containing(location)[0]
1002
except errors.NoWorkingTree:
1003
b = Branch.open(location)
1004
last_revision = b.last_revision()
1005
else:
1006
b = wt.branch
1007
last_revision = wt.last_revision()
1008
1009
revision_ids = b.repository.get_ancestry(last_revision)
1010
assert revision_ids[0] == None
1011
revision_ids.pop(0)
1012
for revision_id in revision_ids:
1013
self.outf.write(revision_id + '\n')
1014
1015
1016
class cmd_init(Command):
1017
"""Make a directory into a versioned branch.
1018
1019
Use this to create an empty branch, or before importing an
1020
existing project.
1021
1022
If there is a repository in a parent directory of the location, then
1023
the history of the branch will be stored in the repository. Otherwise
1024
init creates a standalone branch which carries its own history in
1025
.bzr.
1026
1027
If there is already a branch at the location but it has no working tree,
1028
the tree can be populated with 'bzr checkout'.
1029
1030
Recipe for importing a tree of files:
1031
cd ~/project
1032
bzr init
1033
bzr add .
1034
bzr status
1035
bzr commit -m 'imported project'
1036
"""
1037
takes_args = ['location?']
1038
takes_options = [
1039
Option('format',
1040
help='Specify a format for this branch. Current'
1041
' formats are: default, knit, metaweave and'
1042
' weave. Default is knit; metaweave and'
1043
' weave are deprecated',
1044
type=get_format_type),
1045
]
1046
def run(self, location=None, format=None):
1047
if format is None:
1048
format = get_format_type('default')
1049
if location is None:
1050
location = u'.'
1051
1052
to_transport = transport.get_transport(location)
1053
1054
# The path has to exist to initialize a
1055
# branch inside of it.
1056
# Just using os.mkdir, since I don't
1057
# believe that we want to create a bunch of
1058
# locations if the user supplies an extended path
1059
# TODO: create-prefix
1060
try:
1061
to_transport.mkdir('.')
1062
except errors.FileExists:
1063
pass
1064
1065
try:
1066
existing_bzrdir = bzrdir.BzrDir.open(location)
1067
except NotBranchError:
1068
# really a NotBzrDir error...
1069
bzrdir.BzrDir.create_branch_convenience(location, format=format)
1070
else:
1071
if existing_bzrdir.has_branch():
1072
if (isinstance(to_transport, LocalTransport)
1073
and not existing_bzrdir.has_workingtree()):
1074
raise errors.BranchExistsWithoutWorkingTree(location)
1075
raise errors.AlreadyBranchError(location)
1076
else:
1077
existing_bzrdir.create_branch()
1078
existing_bzrdir.create_workingtree()
1079
1080
1081
class cmd_init_repository(Command):
1082
"""Create a shared repository to hold branches.
1083
1084
New branches created under the repository directory will store their revisions
1085
in the repository, not in the branch directory, if the branch format supports
1086
shared storage.
1087
1088
example:
1089
bzr init-repo repo
1090
bzr init repo/trunk
1091
bzr checkout --lightweight repo/trunk trunk-checkout
1092
cd trunk-checkout
1093
(add files here)
1094
"""
1095
takes_args = ["location"]
1096
takes_options = [Option('format',
1097
help='Specify a format for this repository.'
1098
' Current formats are: default, knit,'
1099
' metaweave and weave. Default is knit;'
1100
' metaweave and weave are deprecated',
1101
type=get_format_type),
1102
Option('trees',
1103
help='Allows branches in repository to have'
1104
' a working tree')]
1105
aliases = ["init-repo"]
1106
def run(self, location, format=None, trees=False):
1107
if format is None:
1108
format = get_format_type('default')
1109
1110
if location is None:
1111
location = '.'
1112
1113
to_transport = transport.get_transport(location)
1114
try:
1115
to_transport.mkdir('.')
1116
except errors.FileExists:
1117
pass
1118
1119
newdir = format.initialize_on_transport(to_transport)
1120
repo = newdir.create_repository(shared=True)
1121
repo.set_make_working_trees(trees)
1122
1123
1124
class cmd_diff(Command):
1125
"""Show differences in the working tree or between revisions.
1126
1127
If files are listed, only the changes in those files are listed.
1128
Otherwise, all changes for the tree are listed.
1129
1130
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1131
produces patches suitable for "patch -p1".
1132
1133
examples:
1134
bzr diff
1135
Shows the difference in the working tree versus the last commit
1136
bzr diff -r1
1137
Difference between the working tree and revision 1
1138
bzr diff -r1..2
1139
Difference between revision 2 and revision 1
1140
bzr diff --diff-prefix old/:new/
1141
Same as 'bzr diff' but prefix paths with old/ and new/
1142
bzr diff bzr.mine bzr.dev
1143
Show the differences between the two working trees
1144
bzr diff foo.c
1145
Show just the differences for 'foo.c'
1146
"""
1147
# TODO: Option to use external diff command; could be GNU diff, wdiff,
1148
# or a graphical diff.
1149
1150
# TODO: Python difflib is not exactly the same as unidiff; should
1151
# either fix it up or prefer to use an external diff.
1152
1153
# TODO: Selected-file diff is inefficient and doesn't show you
1154
# deleted files.
1155
1156
# TODO: This probably handles non-Unix newlines poorly.
1157
1158
takes_args = ['file*']
1159
takes_options = ['revision', 'diff-options', 'prefix']
1160
aliases = ['di', 'dif']
1161
encoding_type = 'exact'
1162
1163
@display_command
1164
def run(self, revision=None, file_list=None, diff_options=None,
1165
prefix=None):
1166
from bzrlib.diff import diff_cmd_helper, show_diff_trees
1167
1168
if (prefix is None) or (prefix == '0'):
1169
# diff -p0 format
1170
old_label = ''
1171
new_label = ''
1172
elif prefix == '1':
1173
old_label = 'old/'
1174
new_label = 'new/'
1175
else:
1176
if not ':' in prefix:
1177
raise BzrError("--diff-prefix expects two values separated by a colon")
1178
old_label, new_label = prefix.split(":")
1179
1180
try:
1181
tree1, file_list = internal_tree_files(file_list)
1182
tree2 = None
1183
b = None
1184
b2 = None
1185
except FileInWrongBranch:
1186
if len(file_list) != 2:
1187
raise BzrCommandError("Files are in different branches")
1188
1189
tree1, file1 = WorkingTree.open_containing(file_list[0])
1190
tree2, file2 = WorkingTree.open_containing(file_list[1])
1191
if file1 != "" or file2 != "":
1192
# FIXME diff those two files. rbc 20051123
1193
raise BzrCommandError("Files are in different branches")
1194
file_list = None
1195
except NotBranchError:
1196
if (revision is not None and len(revision) == 2
1197
and not revision[0].needs_branch()
1198
and not revision[1].needs_branch()):
1199
# If both revision specs include a branch, we can
1200
# diff them without needing a local working tree
1201
tree1, tree2 = None, None
1202
else:
1203
raise
1204
if revision is not None:
1205
if tree2 is not None:
1206
raise BzrCommandError("Can't specify -r with two branches")
1207
if (len(revision) == 1) or (revision[1].spec is None):
1208
return diff_cmd_helper(tree1, file_list, diff_options,
1209
revision[0],
1210
old_label=old_label, new_label=new_label)
1211
elif len(revision) == 2:
1212
return diff_cmd_helper(tree1, file_list, diff_options,
1213
revision[0], revision[1],
1214
old_label=old_label, new_label=new_label)
1215
else:
1216
raise BzrCommandError('bzr diff --revision takes exactly one or two revision identifiers')
1217
else:
1218
if tree2 is not None:
1219
return show_diff_trees(tree1, tree2, sys.stdout,
1220
specific_files=file_list,
1221
external_diff_options=diff_options,
1222
old_label=old_label, new_label=new_label)
1223
else:
1224
return diff_cmd_helper(tree1, file_list, diff_options,
1225
old_label=old_label, new_label=new_label)
1226
1227
1228
class cmd_deleted(Command):
1229
"""List files deleted in the working tree.
1230
"""
1231
# TODO: Show files deleted since a previous revision, or
1232
# between two revisions.
1233
# TODO: Much more efficient way to do this: read in new
1234
# directories with readdir, rather than stating each one. Same
1235
# level of effort but possibly much less IO. (Or possibly not,
1236
# if the directories are very large...)
1237
takes_options = ['show-ids']
1238
1239
@display_command
1240
def run(self, show_ids=False):
1241
tree = WorkingTree.open_containing(u'.')[0]
1242
old = tree.basis_tree()
1243
for path, ie in old.inventory.iter_entries():
1244
if not tree.has_id(ie.file_id):
1245
self.outf.write(path)
1246
if show_ids:
1247
self.outf.write(' ')
1248
self.outf.write(ie.file_id)
1249
self.outf.write('\n')
1250
1251
1252
class cmd_modified(Command):
1253
"""List files modified in working tree."""
1254
hidden = True
1255
@display_command
1256
def run(self):
1257
tree = WorkingTree.open_containing(u'.')[0]
1258
td = tree.changes_from(tree.basis_tree())
1259
for path, id, kind, text_modified, meta_modified in td.modified:
1260
self.outf.write(path + '\n')
1261
1262
1263
class cmd_added(Command):
1264
"""List files added in working tree."""
1265
hidden = True
1266
@display_command
1267
def run(self):
1268
wt = WorkingTree.open_containing(u'.')[0]
1269
basis_inv = wt.basis_tree().inventory
1270
inv = wt.inventory
1271
for file_id in inv:
1272
if file_id in basis_inv:
1273
continue
1274
path = inv.id2path(file_id)
1275
if not os.access(osutils.abspath(path), os.F_OK):
1276
continue
1277
self.outf.write(path + '\n')
1278
1279
1280
class cmd_root(Command):
1281
"""Show the tree root directory.
1282
1283
The root is the nearest enclosing directory with a .bzr control
1284
directory."""
1285
takes_args = ['filename?']
1286
@display_command
1287
def run(self, filename=None):
1288
"""Print the branch root."""
1289
tree = WorkingTree.open_containing(filename)[0]
1290
self.outf.write(tree.basedir + '\n')
1291
1292
1293
class cmd_log(Command):
1294
"""Show log of a branch, file, or directory.
1295
1296
By default show the log of the branch containing the working directory.
1297
1298
To request a range of logs, you can use the command -r begin..end
1299
-r revision requests a specific revision, -r ..end or -r begin.. are
1300
also valid.
1301
1302
examples:
1303
bzr log
1304
bzr log foo.c
1305
bzr log -r -10.. http://server/branch
1306
"""
1307
1308
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1309
1310
takes_args = ['location?']
1311
takes_options = [Option('forward',
1312
help='show from oldest to newest'),
1313
'timezone',
1314
Option('verbose',
1315
help='show files changed in each revision'),
1316
'show-ids', 'revision',
1317
'log-format',
1318
'line', 'long',
1319
Option('message',
1320
help='show revisions whose message matches this regexp',
1321
type=str),
1322
'short',
1323
]
1324
encoding_type = 'replace'
1325
1326
@display_command
1327
def run(self, location=None, timezone='original',
1328
verbose=False,
1329
show_ids=False,
1330
forward=False,
1331
revision=None,
1332
log_format=None,
1333
message=None,
1334
long=False,
1335
short=False,
1336
line=False):
1337
from bzrlib.log import log_formatter, show_log
1338
assert message is None or isinstance(message, basestring), \
1339
"invalid message argument %r" % message
1340
direction = (forward and 'forward') or 'reverse'
1341
1342
# log everything
1343
file_id = None
1344
if location:
1345
# find the file id to log:
1346
1347
dir, fp = bzrdir.BzrDir.open_containing(location)
1348
b = dir.open_branch()
1349
if fp != '':
1350
try:
1351
# might be a tree:
1352
inv = dir.open_workingtree().inventory
1353
except (errors.NotBranchError, errors.NotLocalUrl):
1354
# either no tree, or is remote.
1355
inv = b.basis_tree().inventory
1356
file_id = inv.path2id(fp)
1357
else:
1358
# local dir only
1359
# FIXME ? log the current subdir only RBC 20060203
1360
dir, relpath = bzrdir.BzrDir.open_containing('.')
1361
b = dir.open_branch()
1362
1363
if revision is None:
1364
rev1 = None
1365
rev2 = None
1366
elif len(revision) == 1:
1367
rev1 = rev2 = revision[0].in_history(b).revno
1368
elif len(revision) == 2:
1369
if revision[0].spec is None:
1370
# missing begin-range means first revision
1371
rev1 = 1
1372
else:
1373
rev1 = revision[0].in_history(b).revno
1374
1375
if revision[1].spec is None:
1376
# missing end-range means last known revision
1377
rev2 = b.revno()
1378
else:
1379
rev2 = revision[1].in_history(b).revno
1380
else:
1381
raise BzrCommandError('bzr log --revision takes one or two values.')
1382
1383
# By this point, the revision numbers are converted to the +ve
1384
# form if they were supplied in the -ve form, so we can do
1385
# this comparison in relative safety
1386
if rev1 > rev2:
1387
(rev2, rev1) = (rev1, rev2)
1388
1389
if (log_format == None):
1390
default = b.get_config().log_format()
1391
log_format = get_log_format(long=long, short=short, line=line,
1392
default=default)
1393
lf = log_formatter(log_format,
1394
show_ids=show_ids,
1395
to_file=self.outf,
1396
show_timezone=timezone)
1397
1398
show_log(b,
1399
lf,
1400
file_id,
1401
verbose=verbose,
1402
direction=direction,
1403
start_revision=rev1,
1404
end_revision=rev2,
1405
search=message)
1406
1407
1408
def get_log_format(long=False, short=False, line=False, default='long'):
1409
log_format = default
1410
if long:
1411
log_format = 'long'
1412
if short:
1413
log_format = 'short'
1414
if line:
1415
log_format = 'line'
1416
return log_format
1417
1418
1419
class cmd_touching_revisions(Command):
1420
"""Return revision-ids which affected a particular file.
1421
1422
A more user-friendly interface is "bzr log FILE".
1423
"""
1424
1425
hidden = True
1426
takes_args = ["filename"]
1427
1428
@display_command
1429
def run(self, filename):
1430
tree, relpath = WorkingTree.open_containing(filename)
1431
b = tree.branch
1432
inv = tree.read_working_inventory()
1433
file_id = inv.path2id(relpath)
1434
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1435
self.outf.write("%6d %s\n" % (revno, what))
1436
1437
1438
class cmd_ls(Command):
1439
"""List files in a tree.
1440
"""
1441
# TODO: Take a revision or remote path and list that tree instead.
1442
hidden = True
1443
takes_options = ['verbose', 'revision',
1444
Option('non-recursive',
1445
help='don\'t recurse into sub-directories'),
1446
Option('from-root',
1447
help='Print all paths from the root of the branch.'),
1448
Option('unknown', help='Print unknown files'),
1449
Option('versioned', help='Print versioned files'),
1450
Option('ignored', help='Print ignored files'),
1451
1452
Option('null', help='Null separate the files'),
1453
]
1454
@display_command
1455
def run(self, revision=None, verbose=False,
1456
non_recursive=False, from_root=False,
1457
unknown=False, versioned=False, ignored=False,
1458
null=False):
1459
1460
if verbose and null:
1461
raise BzrCommandError('Cannot set both --verbose and --null')
1462
all = not (unknown or versioned or ignored)
1463
1464
selection = {'I':ignored, '?':unknown, 'V':versioned}
1465
1466
tree, relpath = WorkingTree.open_containing(u'.')
1467
if from_root:
1468
relpath = u''
1469
elif relpath:
1470
relpath += '/'
1471
if revision is not None:
1472
tree = tree.branch.repository.revision_tree(
1473
revision[0].in_history(tree.branch).rev_id)
1474
1475
for fp, fc, kind, fid, entry in tree.list_files():
1476
if fp.startswith(relpath):
1477
fp = fp[len(relpath):]
1478
if non_recursive and '/' in fp:
1479
continue
1480
if not all and not selection[fc]:
1481
continue
1482
if verbose:
1483
kindch = entry.kind_character()
1484
self.outf.write('%-8s %s%s\n' % (fc, fp, kindch))
1485
elif null:
1486
self.outf.write(fp + '\0')
1487
self.outf.flush()
1488
else:
1489
self.outf.write(fp + '\n')
1490
1491
1492
class cmd_unknowns(Command):
1493
"""List unknown files."""
1494
@display_command
1495
def run(self):
1496
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1497
self.outf.write(osutils.quotefn(f) + '\n')
1498
1499
1500
class cmd_ignore(Command):
1501
"""Ignore a command or pattern.
1502
1503
To remove patterns from the ignore list, edit the .bzrignore file.
1504
1505
If the pattern contains a slash, it is compared to the whole path
1506
from the branch root. Otherwise, it is compared to only the last
1507
component of the path. To match a file only in the root directory,
1508
prepend './'.
1509
1510
Ignore patterns are case-insensitive on case-insensitive systems.
1511
1512
Note: wildcards must be quoted from the shell on Unix.
1513
1514
examples:
1515
bzr ignore ./Makefile
1516
bzr ignore '*.class'
1517
"""
1518
# TODO: Complain if the filename is absolute
1519
takes_args = ['name_pattern?']
1520
takes_options = [
1521
Option('old-default-rules',
1522
help='Out the ignore rules bzr < 0.9 always used.')
1523
]
1524
1525
def run(self, name_pattern=None, old_default_rules=None):
1526
from bzrlib.atomicfile import AtomicFile
1527
if old_default_rules is not None:
1528
# dump the rules and exit
1529
for pattern in ignores.OLD_DEFAULTS:
1530
print pattern
1531
return
1532
if name_pattern is None:
1533
raise BzrCommandError("ignore requires a NAME_PATTERN")
1534
tree, relpath = WorkingTree.open_containing(u'.')
1535
ifn = tree.abspath('.bzrignore')
1536
if os.path.exists(ifn):
1537
f = open(ifn, 'rt')
1538
try:
1539
igns = f.read().decode('utf-8')
1540
finally:
1541
f.close()
1542
else:
1543
igns = ''
1544
1545
# TODO: If the file already uses crlf-style termination, maybe
1546
# we should use that for the newly added lines?
1547
1548
if igns and igns[-1] != '\n':
1549
igns += '\n'
1550
igns += name_pattern + '\n'
1551
1552
f = AtomicFile(ifn, 'wt')
1553
try:
1554
f.write(igns.encode('utf-8'))
1555
f.commit()
1556
finally:
1557
f.close()
1558
1559
inv = tree.inventory
1560
if inv.path2id('.bzrignore'):
1561
mutter('.bzrignore is already versioned')
1562
else:
1563
mutter('need to make new .bzrignore file versioned')
1564
tree.add(['.bzrignore'])
1565
1566
1567
class cmd_ignored(Command):
1568
"""List ignored files and the patterns that matched them.
1569
1570
See also: bzr ignore"""
1571
@display_command
1572
def run(self):
1573
tree = WorkingTree.open_containing(u'.')[0]
1574
for path, file_class, kind, file_id, entry in tree.list_files():
1575
if file_class != 'I':
1576
continue
1577
## XXX: Slightly inefficient since this was already calculated
1578
pat = tree.is_ignored(path)
1579
print '%-50s %s' % (path, pat)
1580
1581
1582
class cmd_lookup_revision(Command):
1583
"""Lookup the revision-id from a revision-number
1584
1585
example:
1586
bzr lookup-revision 33
1587
"""
1588
hidden = True
1589
takes_args = ['revno']
1590
1591
@display_command
1592
def run(self, revno):
1593
try:
1594
revno = int(revno)
1595
except ValueError:
1596
raise BzrCommandError("not a valid revision-number: %r" % revno)
1597
1598
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
1599
1600
1601
class cmd_export(Command):
1602
"""Export past revision to destination directory.
1603
1604
If no revision is specified this exports the last committed revision.
1605
1606
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
1607
given, try to find the format with the extension. If no extension
1608
is found exports to a directory (equivalent to --format=dir).
1609
1610
Root may be the top directory for tar, tgz and tbz2 formats. If none
1611
is given, the top directory will be the root name of the file.
1612
1613
Note: export of tree with non-ascii filenames to zip is not supported.
1614
1615
Supported formats Autodetected by extension
1616
----------------- -------------------------
1617
dir -
1618
tar .tar
1619
tbz2 .tar.bz2, .tbz2
1620
tgz .tar.gz, .tgz
1621
zip .zip
1622
"""
1623
takes_args = ['dest']
1624
takes_options = ['revision', 'format', 'root']
1625
def run(self, dest, revision=None, format=None, root=None):
1626
from bzrlib.export import export
1627
tree = WorkingTree.open_containing(u'.')[0]
1628
b = tree.branch
1629
if revision is None:
1630
# should be tree.last_revision FIXME
1631
rev_id = b.last_revision()
1632
else:
1633
if len(revision) != 1:
1634
raise BzrError('bzr export --revision takes exactly 1 argument')
1635
rev_id = revision[0].in_history(b).rev_id
1636
t = b.repository.revision_tree(rev_id)
1637
try:
1638
export(t, dest, format, root)
1639
except errors.NoSuchExportFormat, e:
1640
raise BzrCommandError('Unsupported export format: %s' % e.format)
1641
1642
1643
class cmd_cat(Command):
1644
"""Write a file's text from a previous revision."""
1645
1646
takes_options = ['revision']
1647
takes_args = ['filename']
1648
1649
@display_command
1650
def run(self, filename, revision=None):
1651
if revision is not None and len(revision) != 1:
1652
raise BzrCommandError("bzr cat --revision takes exactly one number")
1653
tree = None
1654
try:
1655
tree, relpath = WorkingTree.open_containing(filename)
1656
b = tree.branch
1657
except NotBranchError:
1658
pass
1659
1660
if tree is None:
1661
b, relpath = Branch.open_containing(filename)
1662
if revision is None:
1663
revision_id = b.last_revision()
1664
else:
1665
revision_id = revision[0].in_history(b).rev_id
1666
b.print_file(relpath, revision_id)
1667
1668
1669
class cmd_local_time_offset(Command):
1670
"""Show the offset in seconds from GMT to local time."""
1671
hidden = True
1672
@display_command
1673
def run(self):
1674
print osutils.local_time_offset()
1675
1676
1677
1678
class cmd_commit(Command):
1679
"""Commit changes into a new revision.
1680
1681
If no arguments are given, the entire tree is committed.
1682
1683
If selected files are specified, only changes to those files are
1684
committed. If a directory is specified then the directory and everything
1685
within it is committed.
1686
1687
A selected-file commit may fail in some cases where the committed
1688
tree would be invalid, such as trying to commit a file in a
1689
newly-added directory that is not itself committed.
1690
"""
1691
# TODO: Run hooks on tree to-be-committed, and after commit.
1692
1693
# TODO: Strict commit that fails if there are deleted files.
1694
# (what does "deleted files" mean ??)
1695
1696
# TODO: Give better message for -s, --summary, used by tla people
1697
1698
# XXX: verbose currently does nothing
1699
1700
takes_args = ['selected*']
1701
takes_options = ['message', 'verbose',
1702
Option('unchanged',
1703
help='commit even if nothing has changed'),
1704
Option('file', type=str,
1705
argname='msgfile',
1706
help='file containing commit message'),
1707
Option('strict',
1708
help="refuse to commit if there are unknown "
1709
"files in the working tree."),
1710
Option('local',
1711
help="perform a local only commit in a bound "
1712
"branch. Such commits are not pushed to "
1713
"the master branch until a normal commit "
1714
"is performed."
1715
),
1716
]
1717
aliases = ['ci', 'checkin']
1718
1719
def run(self, message=None, file=None, verbose=True, selected_list=None,
1720
unchanged=False, strict=False, local=False):
1721
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
1722
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1723
StrictCommitFailed)
1724
from bzrlib.msgeditor import edit_commit_message, \
1725
make_commit_message_template
1726
from tempfile import TemporaryFile
1727
1728
# TODO: Need a blackbox test for invoking the external editor; may be
1729
# slightly problematic to run this cross-platform.
1730
1731
# TODO: do more checks that the commit will succeed before
1732
# spending the user's valuable time typing a commit message.
1733
#
1734
# TODO: if the commit *does* happen to fail, then save the commit
1735
# message to a temporary file where it can be recovered
1736
tree, selected_list = tree_files(selected_list)
1737
if selected_list == ['']:
1738
# workaround - commit of root of tree should be exactly the same
1739
# as just default commit in that tree, and succeed even though
1740
# selected-file merge commit is not done yet
1741
selected_list = []
1742
1743
if local and not tree.branch.get_bound_location():
1744
raise errors.LocalRequiresBoundBranch()
1745
if message is None and not file:
1746
template = make_commit_message_template(tree, selected_list)
1747
message = edit_commit_message(template)
1748
if message is None:
1749
raise BzrCommandError("please specify a commit message"
1750
" with either --message or --file")
1751
elif message and file:
1752
raise BzrCommandError("please specify either --message or --file")
1753
1754
if file:
1755
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1756
1757
if message == "":
1758
raise BzrCommandError("empty commit message specified")
1759
1760
if verbose:
1761
reporter = ReportCommitToLog()
1762
else:
1763
reporter = NullCommitReporter()
1764
1765
try:
1766
tree.commit(message, specific_files=selected_list,
1767
allow_pointless=unchanged, strict=strict, local=local,
1768
reporter=reporter)
1769
except PointlessCommit:
1770
# FIXME: This should really happen before the file is read in;
1771
# perhaps prepare the commit; get the message; then actually commit
1772
raise BzrCommandError("no changes to commit."
1773
" use --unchanged to commit anyhow")
1774
except ConflictsInTree:
1775
raise BzrCommandError("Conflicts detected in working tree. "
1776
'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1777
except StrictCommitFailed:
1778
raise BzrCommandError("Commit refused because there are unknown "
1779
"files in the working tree.")
1780
except errors.BoundBranchOutOfDate, e:
1781
raise BzrCommandError(str(e) + "\n"
1782
'To commit to master branch, run update and then commit.\n'
1783
'You can also pass --local to commit to continue working '
1784
'disconnected.')
1785
1786
class cmd_check(Command):
1787
"""Validate consistency of branch history.
1788
1789
This command checks various invariants about the branch storage to
1790
detect data corruption or bzr bugs.
1791
"""
1792
takes_args = ['branch?']
1793
takes_options = ['verbose']
1794
1795
def run(self, branch=None, verbose=False):
1796
from bzrlib.check import check
1797
if branch is None:
1798
tree = WorkingTree.open_containing()[0]
1799
branch = tree.branch
1800
else:
1801
branch = Branch.open(branch)
1802
check(branch, verbose)
1803
1804
1805
class cmd_scan_cache(Command):
1806
hidden = True
1807
def run(self):
1808
from bzrlib.hashcache import HashCache
1809
1810
c = HashCache(u'.')
1811
c.read()
1812
c.scan()
1813
1814
print '%6d stats' % c.stat_count
1815
print '%6d in hashcache' % len(c._cache)
1816
print '%6d files removed from cache' % c.removed_count
1817
print '%6d hashes updated' % c.update_count
1818
print '%6d files changed too recently to cache' % c.danger_count
1819
1820
if c.needs_write:
1821
c.write()
1822
1823
1824
class cmd_upgrade(Command):
1825
"""Upgrade branch storage to current format.
1826
1827
The check command or bzr developers may sometimes advise you to run
1828
this command. When the default format has changed you may also be warned
1829
during other operations to upgrade.
1830
"""
1831
takes_args = ['url?']
1832
takes_options = [
1833
Option('format',
1834
help='Upgrade to a specific format. Current formats'
1835
' are: default, knit, metaweave and weave.'
1836
' Default is knit; metaweave and weave are'
1837
' deprecated',
1838
type=get_format_type),
1839
]
1840
1841
1842
def run(self, url='.', format=None):
1843
from bzrlib.upgrade import upgrade
1844
if format is None:
1845
format = get_format_type('default')
1846
upgrade(url, format)
1847
1848
1849
class cmd_whoami(Command):
1850
"""Show or set bzr user id.
1851
1852
examples:
1853
bzr whoami --email
1854
bzr whoami 'Frank Chu <fchu@example.com>'
1855
"""
1856
takes_options = [ Option('email',
1857
help='display email address only'),
1858
Option('branch',
1859
help='set identity for the current branch instead of '
1860
'globally'),
1861
]
1862
takes_args = ['name?']
1863
encoding_type = 'replace'
1864
1865
@display_command
1866
def run(self, email=False, branch=False, name=None):
1867
if name is None:
1868
# use branch if we're inside one; otherwise global config
1869
try:
1870
c = Branch.open_containing('.')[0].get_config()
1871
except NotBranchError:
1872
c = config.GlobalConfig()
1873
if email:
1874
self.outf.write(c.user_email() + '\n')
1875
else:
1876
self.outf.write(c.username() + '\n')
1877
return
1878
1879
# display a warning if an email address isn't included in the given name.
1880
try:
1881
config.extract_email_address(name)
1882
except BzrError, e:
1883
warning('"%s" does not seem to contain an email address. '
1884
'This is allowed, but not recommended.', name)
1885
1886
# use global config unless --branch given
1887
if branch:
1888
c = Branch.open_containing('.')[0].get_config()
1889
else:
1890
c = config.GlobalConfig()
1891
c.set_user_option('email', name)
1892
1893
1894
class cmd_nick(Command):
1895
"""Print or set the branch nickname.
1896
1897
If unset, the tree root directory name is used as the nickname
1898
To print the current nickname, execute with no argument.
1899
"""
1900
takes_args = ['nickname?']
1901
def run(self, nickname=None):
1902
branch = Branch.open_containing(u'.')[0]
1903
if nickname is None:
1904
self.printme(branch)
1905
else:
1906
branch.nick = nickname
1907
1908
@display_command
1909
def printme(self, branch):
1910
print branch.nick
1911
1912
1913
class cmd_selftest(Command):
1914
"""Run internal test suite.
1915
1916
This creates temporary test directories in the working directory,
1917
but not existing data is affected. These directories are deleted
1918
if the tests pass, or left behind to help in debugging if they
1919
fail and --keep-output is specified.
1920
1921
If arguments are given, they are regular expressions that say
1922
which tests should run.
1923
1924
If the global option '--no-plugins' is given, plugins are not loaded
1925
before running the selftests. This has two effects: features provided or
1926
modified by plugins will not be tested, and tests provided by plugins will
1927
not be run.
1928
1929
examples:
1930
bzr selftest ignore
1931
bzr --no-plugins selftest -v
1932
"""
1933
# TODO: --list should give a list of all available tests
1934
1935
# NB: this is used from the class without creating an instance, which is
1936
# why it does not have a self parameter.
1937
def get_transport_type(typestring):
1938
"""Parse and return a transport specifier."""
1939
if typestring == "sftp":
1940
from bzrlib.transport.sftp import SFTPAbsoluteServer
1941
return SFTPAbsoluteServer
1942
if typestring == "memory":
1943
from bzrlib.transport.memory import MemoryServer
1944
return MemoryServer
1945
if typestring == "fakenfs":
1946
from bzrlib.transport.fakenfs import FakeNFSServer
1947
return FakeNFSServer
1948
msg = "No known transport type %s. Supported types are: sftp\n" %\
1949
(typestring)
1950
raise BzrCommandError(msg)
1951
1952
hidden = True
1953
takes_args = ['testspecs*']
1954
takes_options = ['verbose',
1955
Option('one', help='stop when one test fails'),
1956
Option('keep-output',
1957
help='keep output directories when tests fail'),
1958
Option('transport',
1959
help='Use a different transport by default '
1960
'throughout the test suite.',
1961
type=get_transport_type),
1962
Option('benchmark', help='run the bzr bencharks.'),
1963
Option('lsprof-timed',
1964
help='generate lsprof output for benchmarked'
1965
' sections of code.'),
1966
]
1967
1968
def run(self, testspecs_list=None, verbose=None, one=False,
1969
keep_output=False, transport=None, benchmark=None,
1970
lsprof_timed=None):
1971
import bzrlib.ui
1972
from bzrlib.tests import selftest
1973
import bzrlib.benchmarks as benchmarks
1974
# we don't want progress meters from the tests to go to the
1975
# real output; and we don't want log messages cluttering up
1976
# the real logs.
1977
save_ui = ui.ui_factory
1978
print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
1979
print '%10s: %s' % ('bzrlib', bzrlib.__path__[0])
1980
print
1981
info('running tests...')
1982
try:
1983
ui.ui_factory = ui.SilentUIFactory()
1984
if testspecs_list is not None:
1985
pattern = '|'.join(testspecs_list)
1986
else:
1987
pattern = ".*"
1988
if benchmark:
1989
test_suite_factory = benchmarks.test_suite
1990
if verbose is None:
1991
verbose = True
1992
else:
1993
test_suite_factory = None
1994
if verbose is None:
1995
verbose = False
1996
result = selftest(verbose=verbose,
1997
pattern=pattern,
1998
stop_on_failure=one,
1999
keep_output=keep_output,
2000
transport=transport,
2001
test_suite_factory=test_suite_factory,
2002
lsprof_timed=lsprof_timed)
2003
if result:
2004
info('tests passed')
2005
else:
2006
info('tests failed')
2007
return int(not result)
2008
finally:
2009
ui.ui_factory = save_ui
2010
2011
2012
def _get_bzr_branch():
2013
"""If bzr is run from a branch, return Branch or None"""
2014
from os.path import dirname
2015
2016
try:
2017
branch = Branch.open(dirname(osutils.abspath(dirname(__file__))))
2018
return branch
2019
except errors.BzrError:
2020
return None
2021
2022
2023
def show_version():
2024
import bzrlib
2025
print "Bazaar (bzr) %s" % bzrlib.__version__
2026
# is bzrlib itself in a branch?
2027
branch = _get_bzr_branch()
2028
if branch:
2029
rh = branch.revision_history()
2030
revno = len(rh)
2031
print " bzr checkout, revision %d" % (revno,)
2032
print " nick: %s" % (branch.nick,)
2033
if rh:
2034
print " revid: %s" % (rh[-1],)
2035
print "Using python interpreter:", sys.executable
2036
import site
2037
print "Using python standard library:", os.path.dirname(site.__file__)
2038
print "Using bzrlib:",
2039
if len(bzrlib.__path__) > 1:
2040
# print repr, which is a good enough way of making it clear it's
2041
# more than one element (eg ['/foo/bar', '/foo/bzr'])
2042
print repr(bzrlib.__path__)
2043
else:
2044
print bzrlib.__path__[0]
2045
2046
print
2047
print bzrlib.__copyright__
2048
print "http://bazaar-vcs.org/"
2049
print
2050
print "bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and"
2051
print "you may use, modify and redistribute it under the terms of the GNU"
2052
print "General Public License version 2 or later."
2053
2054
2055
class cmd_version(Command):
2056
"""Show version of bzr."""
2057
2058
@display_command
2059
def run(self):
2060
show_version()
2061
2062
2063
class cmd_rocks(Command):
2064
"""Statement of optimism."""
2065
2066
hidden = True
2067
2068
@display_command
2069
def run(self):
2070
print "it sure does!"
2071
2072
2073
class cmd_find_merge_base(Command):
2074
"""Find and print a base revision for merging two branches."""
2075
# TODO: Options to specify revisions on either side, as if
2076
# merging only part of the history.
2077
takes_args = ['branch', 'other']
2078
hidden = True
2079
2080
@display_command
2081
def run(self, branch, other):
2082
from bzrlib.revision import common_ancestor, MultipleRevisionSources
2083
2084
branch1 = Branch.open_containing(branch)[0]
2085
branch2 = Branch.open_containing(other)[0]
2086
2087
history_1 = branch1.revision_history()
2088
history_2 = branch2.revision_history()
2089
2090
last1 = branch1.last_revision()
2091
last2 = branch2.last_revision()
2092
2093
source = MultipleRevisionSources(branch1.repository,
2094
branch2.repository)
2095
2096
base_rev_id = common_ancestor(last1, last2, source)
2097
2098
print 'merge base is revision %s' % base_rev_id
2099
2100
2101
class cmd_merge(Command):
2102
"""Perform a three-way merge.
2103
2104
The branch is the branch you will merge from. By default, it will merge
2105
the latest revision. If you specify a revision, that revision will be
2106
merged. If you specify two revisions, the first will be used as a BASE,
2107
and the second one as OTHER. Revision numbers are always relative to the
2108
specified branch.
2109
2110
By default, bzr will try to merge in all new work from the other
2111
branch, automatically determining an appropriate base. If this
2112
fails, you may need to give an explicit base.
2113
2114
Merge will do its best to combine the changes in two branches, but there
2115
are some kinds of problems only a human can fix. When it encounters those,
2116
it will mark a conflict. A conflict means that you need to fix something,
2117
before you should commit.
2118
2119
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2120
2121
If there is no default branch set, the first merge will set it. After
2122
that, you can omit the branch to use the default. To change the
2123
default, use --remember. The value will only be saved if the remote
2124
location can be accessed.
2125
2126
Examples:
2127
2128
To merge the latest revision from bzr.dev
2129
bzr merge ../bzr.dev
2130
2131
To merge changes up to and including revision 82 from bzr.dev
2132
bzr merge -r 82 ../bzr.dev
2133
2134
To merge the changes introduced by 82, without previous changes:
2135
bzr merge -r 81..82 ../bzr.dev
2136
2137
merge refuses to run if there are any uncommitted changes, unless
2138
--force is given.
2139
2140
The following merge types are available:
2141
"""
2142
takes_args = ['branch?']
2143
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2144
Option('show-base', help="Show base revision text in "
2145
"conflicts"),
2146
Option('uncommitted', help='Apply uncommitted changes'
2147
' from a working copy, instead of branch changes')]
2148
2149
def help(self):
2150
from merge import merge_type_help
2151
from inspect import getdoc
2152
return getdoc(self) + '\n' + merge_type_help()
2153
2154
def run(self, branch=None, revision=None, force=False, merge_type=None,
2155
show_base=False, reprocess=False, remember=False,
2156
uncommitted=False):
2157
if merge_type is None:
2158
merge_type = Merge3Merger
2159
2160
tree = WorkingTree.open_containing(u'.')[0]
2161
2162
if branch is not None:
2163
try:
2164
reader = bundle.read_bundle_from_url(branch)
2165
except NotABundle:
2166
pass # Continue on considering this url a Branch
2167
else:
2168
conflicts = merge_bundle(reader, tree, not force, merge_type,
2169
reprocess, show_base)
2170
if conflicts == 0:
2171
return 0
2172
else:
2173
return 1
2174
2175
branch = self._get_remembered_parent(tree, branch, 'Merging from')
2176
2177
if revision is None or len(revision) < 1:
2178
if uncommitted:
2179
base = [branch, -1]
2180
other = [branch, None]
2181
else:
2182
base = [None, None]
2183
other = [branch, -1]
2184
other_branch, path = Branch.open_containing(branch)
2185
else:
2186
if uncommitted:
2187
raise BzrCommandError('Cannot use --uncommitted and --revision'
2188
' at the same time.')
2189
if len(revision) == 1:
2190
base = [None, None]
2191
other_branch, path = Branch.open_containing(branch)
2192
revno = revision[0].in_history(other_branch).revno
2193
other = [branch, revno]
2194
else:
2195
assert len(revision) == 2
2196
if None in revision:
2197
raise BzrCommandError(
2198
"Merge doesn't permit that revision specifier.")
2199
other_branch, path = Branch.open_containing(branch)
2200
2201
base = [branch, revision[0].in_history(other_branch).revno]
2202
other = [branch, revision[1].in_history(other_branch).revno]
2203
2204
if tree.branch.get_parent() is None or remember:
2205
tree.branch.set_parent(other_branch.base)
2206
2207
if path != "":
2208
interesting_files = [path]
2209
else:
2210
interesting_files = None
2211
pb = ui.ui_factory.nested_progress_bar()
2212
try:
2213
try:
2214
conflict_count = merge(other, base, check_clean=(not force),
2215
merge_type=merge_type,
2216
reprocess=reprocess,
2217
show_base=show_base,
2218
pb=pb, file_list=interesting_files)
2219
finally:
2220
pb.finished()
2221
if conflict_count != 0:
2222
return 1
2223
else:
2224
return 0
2225
except errors.AmbiguousBase, e:
2226
m = ("sorry, bzr can't determine the right merge base yet\n"
2227
"candidates are:\n "
2228
+ "\n ".join(e.bases)
2229
+ "\n"
2230
"please specify an explicit base with -r,\n"
2231
"and (if you want) report this to the bzr developers\n")
2232
log_error(m)
2233
2234
# TODO: move up to common parent; this isn't merge-specific anymore.
2235
def _get_remembered_parent(self, tree, supplied_location, verb_string):
2236
"""Use tree.branch's parent if none was supplied.
2237
2238
Report if the remembered location was used.
2239
"""
2240
if supplied_location is not None:
2241
return supplied_location
2242
stored_location = tree.branch.get_parent()
2243
mutter("%s", stored_location)
2244
if stored_location is None:
2245
raise BzrCommandError("No location specified or remembered")
2246
display_url = urlutils.unescape_for_display(stored_location, self.outf.encoding)
2247
self.outf.write("%s remembered location %s\n" % (verb_string, display_url))
2248
return stored_location
2249
2250
2251
class cmd_remerge(Command):
2252
"""Redo a merge.
2253
2254
Use this if you want to try a different merge technique while resolving
2255
conflicts. Some merge techniques are better than others, and remerge
2256
lets you try different ones on different files.
2257
2258
The options for remerge have the same meaning and defaults as the ones for
2259
merge. The difference is that remerge can (only) be run when there is a
2260
pending merge, and it lets you specify particular files.
2261
2262
Examples:
2263
$ bzr remerge --show-base
2264
Re-do the merge of all conflicted files, and show the base text in
2265
conflict regions, in addition to the usual THIS and OTHER texts.
2266
2267
$ bzr remerge --merge-type weave --reprocess foobar
2268
Re-do the merge of "foobar", using the weave merge algorithm, with
2269
additional processing to reduce the size of conflict regions.
2270
2271
The following merge types are available:"""
2272
takes_args = ['file*']
2273
takes_options = ['merge-type', 'reprocess',
2274
Option('show-base', help="Show base revision text in "
2275
"conflicts")]
2276
2277
def help(self):
2278
from merge import merge_type_help
2279
from inspect import getdoc
2280
return getdoc(self) + '\n' + merge_type_help()
2281
2282
def run(self, file_list=None, merge_type=None, show_base=False,
2283
reprocess=False):
2284
from bzrlib.merge import merge_inner, transform_tree
2285
if merge_type is None:
2286
merge_type = Merge3Merger
2287
tree, file_list = tree_files(file_list)
2288
tree.lock_write()
2289
try:
2290
pending_merges = tree.pending_merges()
2291
if len(pending_merges) != 1:
2292
raise BzrCommandError("Sorry, remerge only works after normal"
2293
" merges. Not cherrypicking or"
2294
" multi-merges.")
2295
repository = tree.branch.repository
2296
base_revision = common_ancestor(tree.branch.last_revision(),
2297
pending_merges[0], repository)
2298
base_tree = repository.revision_tree(base_revision)
2299
other_tree = repository.revision_tree(pending_merges[0])
2300
interesting_ids = None
2301
new_conflicts = []
2302
conflicts = tree.conflicts()
2303
if file_list is not None:
2304
interesting_ids = set()
2305
for filename in file_list:
2306
file_id = tree.path2id(filename)
2307
if file_id is None:
2308
raise NotVersionedError(filename)
2309
interesting_ids.add(file_id)
2310
if tree.kind(file_id) != "directory":
2311
continue
2312
2313
for name, ie in tree.inventory.iter_entries(file_id):
2314
interesting_ids.add(ie.file_id)
2315
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
2316
transform_tree(tree, tree.basis_tree(), interesting_ids)
2317
tree.set_conflicts(ConflictList(new_conflicts))
2318
if file_list is None:
2319
restore_files = list(tree.iter_conflicts())
2320
else:
2321
restore_files = file_list
2322
for filename in restore_files:
2323
try:
2324
restore(tree.abspath(filename))
2325
except NotConflicted:
2326
pass
2327
conflicts = merge_inner(tree.branch, other_tree, base_tree,
2328
this_tree=tree,
2329
interesting_ids=interesting_ids,
2330
other_rev_id=pending_merges[0],
2331
merge_type=merge_type,
2332
show_base=show_base,
2333
reprocess=reprocess)
2334
finally:
2335
tree.unlock()
2336
if conflicts > 0:
2337
return 1
2338
else:
2339
return 0
2340
2341
class cmd_revert(Command):
2342
"""Reverse all changes since the last commit.
2343
2344
Only versioned files are affected. Specify filenames to revert only
2345
those files. By default, any files that are changed will be backed up
2346
first. Backup files have a '~' appended to their name.
2347
"""
2348
takes_options = ['revision', 'no-backup']
2349
takes_args = ['file*']
2350
aliases = ['merge-revert']
2351
2352
def run(self, revision=None, no_backup=False, file_list=None):
2353
from bzrlib.commands import parse_spec
2354
if file_list is not None:
2355
if len(file_list) == 0:
2356
raise BzrCommandError("No files specified")
2357
else:
2358
file_list = []
2359
2360
tree, file_list = tree_files(file_list)
2361
if revision is None:
2362
# FIXME should be tree.last_revision
2363
rev_id = tree.last_revision()
2364
elif len(revision) != 1:
2365
raise BzrCommandError('bzr revert --revision takes exactly 1 argument')
2366
else:
2367
rev_id = revision[0].in_history(tree.branch).rev_id
2368
pb = ui.ui_factory.nested_progress_bar()
2369
try:
2370
tree.revert(file_list,
2371
tree.branch.repository.revision_tree(rev_id),
2372
not no_backup, pb)
2373
finally:
2374
pb.finished()
2375
2376
2377
class cmd_assert_fail(Command):
2378
"""Test reporting of assertion failures"""
2379
hidden = True
2380
def run(self):
2381
assert False, "always fails"
2382
2383
2384
class cmd_help(Command):
2385
"""Show help on a command or other topic.
2386
2387
For a list of all available commands, say 'bzr help commands'."""
2388
takes_options = [Option('long', 'show help on all commands')]
2389
takes_args = ['topic?']
2390
aliases = ['?', '--help', '-?', '-h']
2391
2392
@display_command
2393
def run(self, topic=None, long=False):
2394
import help
2395
if topic is None and long:
2396
topic = "commands"
2397
help.help(topic)
2398
2399
2400
class cmd_shell_complete(Command):
2401
"""Show appropriate completions for context.
2402
2403
For a list of all available commands, say 'bzr shell-complete'."""
2404
takes_args = ['context?']
2405
aliases = ['s-c']
2406
hidden = True
2407
2408
@display_command
2409
def run(self, context=None):
2410
import shellcomplete
2411
shellcomplete.shellcomplete(context)
2412
2413
2414
class cmd_fetch(Command):
2415
"""Copy in history from another branch but don't merge it.
2416
2417
This is an internal method used for pull and merge."""
2418
hidden = True
2419
takes_args = ['from_branch', 'to_branch']
2420
def run(self, from_branch, to_branch):
2421
from bzrlib.fetch import Fetcher
2422
from_b = Branch.open(from_branch)
2423
to_b = Branch.open(to_branch)
2424
Fetcher(to_b, from_b)
2425
2426
2427
class cmd_missing(Command):
2428
"""Show unmerged/unpulled revisions between two branches.
2429
2430
OTHER_BRANCH may be local or remote."""
2431
takes_args = ['other_branch?']
2432
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2433
Option('mine-only',
2434
'Display changes in the local branch only'),
2435
Option('theirs-only',
2436
'Display changes in the remote branch only'),
2437
'log-format',
2438
'line',
2439
'long',
2440
'short',
2441
'show-ids',
2442
'verbose'
2443
]
2444
encoding_type = 'replace'
2445
2446
@display_command
2447
def run(self, other_branch=None, reverse=False, mine_only=False,
2448
theirs_only=False, log_format=None, long=False, short=False, line=False,
2449
show_ids=False, verbose=False):
2450
from bzrlib.missing import find_unmerged, iter_log_data
2451
from bzrlib.log import log_formatter
2452
local_branch = Branch.open_containing(u".")[0]
2453
parent = local_branch.get_parent()
2454
if other_branch is None:
2455
other_branch = parent
2456
if other_branch is None:
2457
raise BzrCommandError("No peer location known or specified.")
2458
print "Using last location: " + local_branch.get_parent()
2459
remote_branch = Branch.open(other_branch)
2460
if remote_branch.base == local_branch.base:
2461
remote_branch = local_branch
2462
local_branch.lock_read()
2463
try:
2464
remote_branch.lock_read()
2465
try:
2466
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
2467
if (log_format == None):
2468
default = local_branch.get_config().log_format()
2469
log_format = get_log_format(long=long, short=short,
2470
line=line, default=default)
2471
lf = log_formatter(log_format,
2472
to_file=self.outf,
2473
show_ids=show_ids,
2474
show_timezone='original')
2475
if reverse is False:
2476
local_extra.reverse()
2477
remote_extra.reverse()
2478
if local_extra and not theirs_only:
2479
print "You have %d extra revision(s):" % len(local_extra)
2480
for data in iter_log_data(local_extra, local_branch.repository,
2481
verbose):
2482
lf.show(*data)
2483
printed_local = True
2484
else:
2485
printed_local = False
2486
if remote_extra and not mine_only:
2487
if printed_local is True:
2488
print "\n\n"
2489
print "You are missing %d revision(s):" % len(remote_extra)
2490
for data in iter_log_data(remote_extra, remote_branch.repository,
2491
verbose):
2492
lf.show(*data)
2493
if not remote_extra and not local_extra:
2494
status_code = 0
2495
print "Branches are up to date."
2496
else:
2497
status_code = 1
2498
finally:
2499
remote_branch.unlock()
2500
finally:
2501
local_branch.unlock()
2502
if not status_code and parent is None and other_branch is not None:
2503
local_branch.lock_write()
2504
try:
2505
# handle race conditions - a parent might be set while we run.
2506
if local_branch.get_parent() is None:
2507
local_branch.set_parent(remote_branch.base)
2508
finally:
2509
local_branch.unlock()
2510
return status_code
2511
2512
2513
class cmd_plugins(Command):
2514
"""List plugins"""
2515
hidden = True
2516
@display_command
2517
def run(self):
2518
import bzrlib.plugin
2519
from inspect import getdoc
2520
for name, plugin in bzrlib.plugin.all_plugins().items():
2521
if hasattr(plugin, '__path__'):
2522
print plugin.__path__[0]
2523
elif hasattr(plugin, '__file__'):
2524
print plugin.__file__
2525
else:
2526
print `plugin`
2527
2528
d = getdoc(plugin)
2529
if d:
2530
print '\t', d.split('\n')[0]
2531
2532
2533
class cmd_testament(Command):
2534
"""Show testament (signing-form) of a revision."""
2535
takes_options = ['revision', 'long',
2536
Option('strict', help='Produce a strict-format'
2537
' testament')]
2538
takes_args = ['branch?']
2539
@display_command
2540
def run(self, branch=u'.', revision=None, long=False, strict=False):
2541
from bzrlib.testament import Testament, StrictTestament
2542
if strict is True:
2543
testament_class = StrictTestament
2544
else:
2545
testament_class = Testament
2546
b = WorkingTree.open_containing(branch)[0].branch
2547
b.lock_read()
2548
try:
2549
if revision is None:
2550
rev_id = b.last_revision()
2551
else:
2552
rev_id = revision[0].in_history(b).rev_id
2553
t = testament_class.from_revision(b.repository, rev_id)
2554
if long:
2555
sys.stdout.writelines(t.as_text_lines())
2556
else:
2557
sys.stdout.write(t.as_short_text())
2558
finally:
2559
b.unlock()
2560
2561
2562
class cmd_annotate(Command):
2563
"""Show the origin of each line in a file.
2564
2565
This prints out the given file with an annotation on the left side
2566
indicating which revision, author and date introduced the change.
2567
2568
If the origin is the same for a run of consecutive lines, it is
2569
shown only at the top, unless the --all option is given.
2570
"""
2571
# TODO: annotate directories; showing when each file was last changed
2572
# TODO: if the working copy is modified, show annotations on that
2573
# with new uncommitted lines marked
2574
aliases = ['ann', 'blame', 'praise']
2575
takes_args = ['filename']
2576
takes_options = [Option('all', help='show annotations on all lines'),
2577
Option('long', help='show date in annotations'),
2578
'revision'
2579
]
2580
2581
@display_command
2582
def run(self, filename, all=False, long=False, revision=None):
2583
from bzrlib.annotate import annotate_file
2584
tree, relpath = WorkingTree.open_containing(filename)
2585
branch = tree.branch
2586
branch.lock_read()
2587
try:
2588
if revision is None:
2589
revision_id = branch.last_revision()
2590
elif len(revision) != 1:
2591
raise BzrCommandError('bzr annotate --revision takes exactly 1 argument')
2592
else:
2593
revision_id = revision[0].in_history(branch).rev_id
2594
file_id = tree.inventory.path2id(relpath)
2595
tree = branch.repository.revision_tree(revision_id)
2596
file_version = tree.inventory[file_id].revision
2597
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
2598
finally:
2599
branch.unlock()
2600
2601
2602
class cmd_re_sign(Command):
2603
"""Create a digital signature for an existing revision."""
2604
# TODO be able to replace existing ones.
2605
2606
hidden = True # is this right ?
2607
takes_args = ['revision_id*']
2608
takes_options = ['revision']
2609
2610
def run(self, revision_id_list=None, revision=None):
2611
import bzrlib.gpg as gpg
2612
if revision_id_list is not None and revision is not None:
2613
raise BzrCommandError('You can only supply one of revision_id or --revision')
2614
if revision_id_list is None and revision is None:
2615
raise BzrCommandError('You must supply either --revision or a revision_id')
2616
b = WorkingTree.open_containing(u'.')[0].branch
2617
gpg_strategy = gpg.GPGStrategy(b.get_config())
2618
if revision_id_list is not None:
2619
for revision_id in revision_id_list:
2620
b.repository.sign_revision(revision_id, gpg_strategy)
2621
elif revision is not None:
2622
if len(revision) == 1:
2623
revno, rev_id = revision[0].in_history(b)
2624
b.repository.sign_revision(rev_id, gpg_strategy)
2625
elif len(revision) == 2:
2626
# are they both on rh- if so we can walk between them
2627
# might be nice to have a range helper for arbitrary
2628
# revision paths. hmm.
2629
from_revno, from_revid = revision[0].in_history(b)
2630
to_revno, to_revid = revision[1].in_history(b)
2631
if to_revid is None:
2632
to_revno = b.revno()
2633
if from_revno is None or to_revno is None:
2634
raise BzrCommandError('Cannot sign a range of non-revision-history revisions')
2635
for revno in range(from_revno, to_revno + 1):
2636
b.repository.sign_revision(b.get_rev_id(revno),
2637
gpg_strategy)
2638
else:
2639
raise BzrCommandError('Please supply either one revision, or a range.')
2640
2641
2642
class cmd_bind(Command):
2643
"""Bind the current branch to a master branch.
2644
2645
After binding, commits must succeed on the master branch
2646
before they are executed on the local one.
2647
"""
2648
2649
takes_args = ['location']
2650
takes_options = []
2651
2652
def run(self, location=None):
2653
b, relpath = Branch.open_containing(u'.')
2654
b_other = Branch.open(location)
2655
try:
2656
b.bind(b_other)
2657
except DivergedBranches:
2658
raise BzrCommandError('These branches have diverged.'
2659
' Try merging, and then bind again.')
2660
2661
2662
class cmd_unbind(Command):
2663
"""Unbind the current branch from its master branch.
2664
2665
After unbinding, the local branch is considered independent.
2666
All subsequent commits will be local.
2667
"""
2668
2669
takes_args = []
2670
takes_options = []
2671
2672
def run(self):
2673
b, relpath = Branch.open_containing(u'.')
2674
if not b.unbind():
2675
raise BzrCommandError('Local branch is not bound')
2676
2677
2678
class cmd_uncommit(Command):
2679
"""Remove the last committed revision.
2680
2681
--verbose will print out what is being removed.
2682
--dry-run will go through all the motions, but not actually
2683
remove anything.
2684
2685
In the future, uncommit will create a revision bundle, which can then
2686
be re-applied.
2687
"""
2688
2689
# TODO: jam 20060108 Add an option to allow uncommit to remove
2690
# unreferenced information in 'branch-as-repository' branches.
2691
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
2692
# information in shared branches as well.
2693
takes_options = ['verbose', 'revision',
2694
Option('dry-run', help='Don\'t actually make changes'),
2695
Option('force', help='Say yes to all questions.')]
2696
takes_args = ['location?']
2697
aliases = []
2698
2699
def run(self, location=None,
2700
dry_run=False, verbose=False,
2701
revision=None, force=False):
2702
from bzrlib.log import log_formatter, show_log
2703
import sys
2704
from bzrlib.uncommit import uncommit
2705
2706
if location is None:
2707
location = u'.'
2708
control, relpath = bzrdir.BzrDir.open_containing(location)
2709
try:
2710
tree = control.open_workingtree()
2711
b = tree.branch
2712
except (errors.NoWorkingTree, errors.NotLocalUrl):
2713
tree = None
2714
b = control.open_branch()
2715
2716
rev_id = None
2717
if revision is None:
2718
revno = b.revno()
2719
else:
2720
# 'bzr uncommit -r 10' actually means uncommit
2721
# so that the final tree is at revno 10.
2722
# but bzrlib.uncommit.uncommit() actually uncommits
2723
# the revisions that are supplied.
2724
# So we need to offset it by one
2725
revno = revision[0].in_history(b).revno+1
2726
2727
if revno <= b.revno():
2728
rev_id = b.get_rev_id(revno)
2729
if rev_id is None:
2730
self.outf.write('No revisions to uncommit.\n')
2731
return 1
2732
2733
lf = log_formatter('short',
2734
to_file=self.outf,
2735
show_timezone='original')
2736
2737
show_log(b,
2738
lf,
2739
verbose=False,
2740
direction='forward',
2741
start_revision=revno,
2742
end_revision=b.revno())
2743
2744
if dry_run:
2745
print 'Dry-run, pretending to remove the above revisions.'
2746
if not force:
2747
val = raw_input('Press <enter> to continue')
2748
else:
2749
print 'The above revision(s) will be removed.'
2750
if not force:
2751
val = raw_input('Are you sure [y/N]? ')
2752
if val.lower() not in ('y', 'yes'):
2753
print 'Canceled'
2754
return 0
2755
2756
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
2757
revno=revno)
2758
2759
2760
class cmd_break_lock(Command):
2761
"""Break a dead lock on a repository, branch or working directory.
2762
2763
CAUTION: Locks should only be broken when you are sure that the process
2764
holding the lock has been stopped.
2765
2766
You can get information on what locks are open via the 'bzr info' command.
2767
2768
example:
2769
bzr break-lock
2770
"""
2771
takes_args = ['location?']
2772
2773
def run(self, location=None, show=False):
2774
if location is None:
2775
location = u'.'
2776
control, relpath = bzrdir.BzrDir.open_containing(location)
2777
try:
2778
control.break_lock()
2779
except NotImplementedError:
2780
pass
2781
2782
2783
2784
# command-line interpretation helper for merge-related commands
2785
def merge(other_revision, base_revision,
2786
check_clean=True, ignore_zero=False,
2787
this_dir=None, backup_files=False, merge_type=Merge3Merger,
2788
file_list=None, show_base=False, reprocess=False,
2789
pb=DummyProgress()):
2790
"""Merge changes into a tree.
2791
2792
base_revision
2793
list(path, revno) Base for three-way merge.
2794
If [None, None] then a base will be automatically determined.
2795
other_revision
2796
list(path, revno) Other revision for three-way merge.
2797
this_dir
2798
Directory to merge changes into; '.' by default.
2799
check_clean
2800
If true, this_dir must have no uncommitted changes before the
2801
merge begins.
2802
ignore_zero - If true, suppress the "zero conflicts" message when
2803
there are no conflicts; should be set when doing something we expect
2804
to complete perfectly.
2805
file_list - If supplied, merge only changes to selected files.
2806
2807
All available ancestors of other_revision and base_revision are
2808
automatically pulled into the branch.
2809
2810
The revno may be -1 to indicate the last revision on the branch, which is
2811
the typical case.
2812
2813
This function is intended for use from the command line; programmatic
2814
clients might prefer to call merge.merge_inner(), which has less magic
2815
behavior.
2816
"""
2817
from bzrlib.merge import Merger
2818
if this_dir is None:
2819
this_dir = u'.'
2820
this_tree = WorkingTree.open_containing(this_dir)[0]
2821
if show_base and not merge_type is Merge3Merger:
2822
raise BzrCommandError("Show-base is not supported for this merge"
2823
" type. %s" % merge_type)
2824
if reprocess and not merge_type.supports_reprocess:
2825
raise BzrCommandError("Conflict reduction is not supported for merge"
2826
" type %s." % merge_type)
2827
if reprocess and show_base:
2828
raise BzrCommandError("Cannot do conflict reduction and show base.")
2829
try:
2830
merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2831
merger.pp = ProgressPhase("Merge phase", 5, pb)
2832
merger.pp.next_phase()
2833
merger.check_basis(check_clean)
2834
merger.set_other(other_revision)
2835
merger.pp.next_phase()
2836
merger.set_base(base_revision)
2837
if merger.base_rev_id == merger.other_rev_id:
2838
note('Nothing to do.')
2839
return 0
2840
merger.backup_files = backup_files
2841
merger.merge_type = merge_type
2842
merger.set_interesting_files(file_list)
2843
merger.show_base = show_base
2844
merger.reprocess = reprocess
2845
conflicts = merger.do_merge()
2846
if file_list is None:
2847
merger.set_pending()
2848
finally:
2849
pb.clear()
2850
return conflicts
2851
2852
2853
# these get imported and then picked up by the scan for cmd_*
2854
# TODO: Some more consistent way to split command definitions across files;
2855
# we do need to load at least some information about them to know of
2856
# aliases. ideally we would avoid loading the implementation until the
2857
# details were needed.
2858
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
2859
from bzrlib.bundle.commands import cmd_bundle_revisions
2860
from bzrlib.sign_my_commits import cmd_sign_my_commits
2861
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
2862
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0