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