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