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 3346.2.5
- compare with another revision
- download diff
- download tarball
- view history from revision 3346.2.5
- Committer: Martin Pool
- Date: 2008-04-09 03:48:48 UTC
- mto: (3360.2.3 prepare-1.4)
- mto: This revision was merged to the branch mainline in revision 3385.
- Revision ID: mbp@sourcefrog.net-20080409034848-sm47wz1fg12h57db
Add check-dist-tarball to run tests from the packaged source
- files added:
- .bzrignore
- bzrlib
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- bzrlib/bundle
- bzrlib/bundle/serializer
- bzrlib/doc
- bzrlib/doc/api
- bzrlib/export
- bzrlib/help_topics
- bzrlib/help_topics/en
- bzrlib/plugins
- bzrlib/plugins/launchpad
- bzrlib/repofmt
- bzrlib/smart
- bzrlib/store
- bzrlib/store/revision
- bzrlib/store/versioned
- bzrlib/tests
- bzrlib/tests/blackbox
- bzrlib/tests/branch_implementations
- bzrlib/tests/bzrdir_implementations
- bzrlib/tests/commands
- bzrlib/tests/interrepository_implementations
- bzrlib/tests/intertree_implementations
- bzrlib/tests/interversionedfile_implementations
- bzrlib/tests/inventory_implementations
- bzrlib/tests/per_lock
- bzrlib/tests/repository_implementations
- bzrlib/tests/revisionstore_implementations
- bzrlib/tests/test_patches_data
- bzrlib/tests/tree_implementations
- bzrlib/tests/workingtree_implementations
- bzrlib/transport
- bzrlib/transport/http
- bzrlib/ui
- bzrlib/util
- bzrlib/util/configobj
- bzrlib/util/configobj/docs
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- bzrlib/util/tests
- bzrlib/version_info_formats
- contrib
- contrib/bash
- contrib/emacs
- contrib/zsh
- doc
- doc/developers
- doc/en
- doc/en/admin-guide
- doc/en/developer-guide
- doc/en/mini-tutorial
- doc/en/quick-reference
- doc/en/release-notes
- doc/en/tutorials
- doc/en/user-guide
- doc/en/user-guide/images
- doc/en/user-reference
- man1
- tools
- tools/doc_generate
- tools/win32
- files removed:
- .bzrignore
- notes
- tests
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2004, 2005, 2006, 2007 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
from StringIO import StringIO
21
22
from bzrlib.lazy_import import lazy_import
23
lazy_import(globals(), """
24
import codecs
25
import sys
26
import time
27
28
import bzrlib
29
from bzrlib import (
30
bugtracker,
31
bundle,
32
bzrdir,
33
delta,
34
config,
35
errors,
36
globbing,
37
ignores,
38
log,
39
merge as _mod_merge,
40
merge_directive,
41
osutils,
42
reconfigure,
43
revision as _mod_revision,
44
symbol_versioning,
45
transport,
46
tree as _mod_tree,
47
ui,
48
urlutils,
49
)
50
from bzrlib.branch import Branch
51
from bzrlib.conflicts import ConflictList
52
from bzrlib.revisionspec import RevisionSpec
53
from bzrlib.smtp_connection import SMTPConnection
54
from bzrlib.workingtree import WorkingTree
55
""")
56
57
from bzrlib.commands import Command, display_command
58
from bzrlib.option import ListOption, Option, RegistryOption, custom_help
59
from bzrlib.trace import mutter, note, warning, is_quiet, info
60
61
62
def tree_files(file_list, default_branch=u'.'):
63
try:
64
return internal_tree_files(file_list, default_branch)
65
except errors.FileInWrongBranch, e:
66
raise errors.BzrCommandError("%s is not in the same branch as %s" %
67
(e.path, file_list[0]))
68
69
70
# XXX: Bad function name; should possibly also be a class method of
71
# WorkingTree rather than a function.
72
def internal_tree_files(file_list, default_branch=u'.'):
73
"""Convert command-line paths to a WorkingTree and relative paths.
74
75
This is typically used for command-line processors that take one or
76
more filenames, and infer the workingtree that contains them.
77
78
The filenames given are not required to exist.
79
80
:param file_list: Filenames to convert.
81
82
:param default_branch: Fallback tree path to use if file_list is empty or
83
None.
84
85
:return: workingtree, [relative_paths]
86
"""
87
if file_list is None or len(file_list) == 0:
88
return WorkingTree.open_containing(default_branch)[0], file_list
89
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
90
new_list = []
91
for filename in file_list:
92
try:
93
new_list.append(tree.relpath(osutils.dereference_path(filename)))
94
except errors.PathNotChild:
95
raise errors.FileInWrongBranch(tree.branch, filename)
96
return tree, new_list
97
98
99
@symbol_versioning.deprecated_function(symbol_versioning.zero_fifteen)
100
def get_format_type(typestring):
101
"""Parse and return a format specifier."""
102
# Have to use BzrDirMetaFormat1 directly, so that
103
# RepositoryFormat.set_default_format works
104
if typestring == "default":
105
return bzrdir.BzrDirMetaFormat1()
106
try:
107
return bzrdir.format_registry.make_bzrdir(typestring)
108
except KeyError:
109
msg = 'Unknown bzr format "%s". See "bzr help formats".' % typestring
110
raise errors.BzrCommandError(msg)
111
112
113
# TODO: Make sure no commands unconditionally use the working directory as a
114
# branch. If a filename argument is used, the first of them should be used to
115
# specify the branch. (Perhaps this can be factored out into some kind of
116
# Argument class, representing a file in a branch, where the first occurrence
117
# opens the branch?)
118
119
class cmd_status(Command):
120
"""Display status summary.
121
122
This reports on versioned and unknown files, reporting them
123
grouped by state. Possible states are:
124
125
added
126
Versioned in the working copy but not in the previous revision.
127
128
removed
129
Versioned in the previous revision but removed or deleted
130
in the working copy.
131
132
renamed
133
Path of this file changed from the previous revision;
134
the text may also have changed. This includes files whose
135
parent directory was renamed.
136
137
modified
138
Text has changed since the previous revision.
139
140
kind changed
141
File kind has been changed (e.g. from file to directory).
142
143
unknown
144
Not versioned and not matching an ignore pattern.
145
146
To see ignored files use 'bzr ignored'. For details on the
147
changes to file texts, use 'bzr diff'.
148
149
Note that --short or -S gives status flags for each item, similar
150
to Subversion's status command. To get output similar to svn -q,
151
use bzr -SV.
152
153
If no arguments are specified, the status of the entire working
154
directory is shown. Otherwise, only the status of the specified
155
files or directories is reported. If a directory is given, status
156
is reported for everything inside that directory.
157
158
If a revision argument is given, the status is calculated against
159
that revision, or between two revisions if two are provided.
160
"""
161
162
# TODO: --no-recurse, --recurse options
163
164
takes_args = ['file*']
165
takes_options = ['show-ids', 'revision', 'change',
166
Option('short', help='Use short status indicators.',
167
short_name='S'),
168
Option('versioned', help='Only show versioned files.',
169
short_name='V')
170
]
171
aliases = ['st', 'stat']
172
173
encoding_type = 'replace'
174
_see_also = ['diff', 'revert', 'status-flags']
175
176
@display_command
177
def run(self, show_ids=False, file_list=None, revision=None, short=False,
178
versioned=False):
179
from bzrlib.status import show_tree_status
180
181
if revision and len(revision) > 2:
182
raise errors.BzrCommandError('bzr status --revision takes exactly'
183
' one or two revision specifiers')
184
185
tree, file_list = tree_files(file_list)
186
187
show_tree_status(tree, show_ids=show_ids,
188
specific_files=file_list, revision=revision,
189
to_file=self.outf, short=short, versioned=versioned)
190
191
192
class cmd_cat_revision(Command):
193
"""Write out metadata for a revision.
194
195
The revision to print can either be specified by a specific
196
revision identifier, or you can use --revision.
197
"""
198
199
hidden = True
200
takes_args = ['revision_id?']
201
takes_options = ['revision']
202
# cat-revision is more for frontends so should be exact
203
encoding = 'strict'
204
205
@display_command
206
def run(self, revision_id=None, revision=None):
207
if revision_id is not None and revision is not None:
208
raise errors.BzrCommandError('You can only supply one of'
209
' revision_id or --revision')
210
if revision_id is None and revision is None:
211
raise errors.BzrCommandError('You must supply either'
212
' --revision or a revision_id')
213
b = WorkingTree.open_containing(u'.')[0].branch
214
215
# TODO: jam 20060112 should cat-revision always output utf-8?
216
if revision_id is not None:
217
revision_id = osutils.safe_revision_id(revision_id, warn=False)
218
self.outf.write(b.repository.get_revision_xml(revision_id).decode('utf-8'))
219
elif revision is not None:
220
for rev in revision:
221
if rev is None:
222
raise errors.BzrCommandError('You cannot specify a NULL'
223
' revision.')
224
rev_id = rev.as_revision_id(b)
225
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
226
227
228
class cmd_remove_tree(Command):
229
"""Remove the working tree from a given branch/checkout.
230
231
Since a lightweight checkout is little more than a working tree
232
this will refuse to run against one.
233
234
To re-create the working tree, use "bzr checkout".
235
"""
236
_see_also = ['checkout', 'working-trees']
237
238
takes_args = ['location?']
239
240
def run(self, location='.'):
241
d = bzrdir.BzrDir.open(location)
242
243
try:
244
working = d.open_workingtree()
245
except errors.NoWorkingTree:
246
raise errors.BzrCommandError("No working tree to remove")
247
except errors.NotLocalUrl:
248
raise errors.BzrCommandError("You cannot remove the working tree of a "
249
"remote path")
250
251
working_path = working.bzrdir.root_transport.base
252
branch_path = working.branch.bzrdir.root_transport.base
253
if working_path != branch_path:
254
raise errors.BzrCommandError("You cannot remove the working tree from "
255
"a lightweight checkout")
256
257
d.destroy_workingtree()
258
259
260
class cmd_revno(Command):
261
"""Show current revision number.
262
263
This is equal to the number of revisions on this branch.
264
"""
265
266
_see_also = ['info']
267
takes_args = ['location?']
268
269
@display_command
270
def run(self, location=u'.'):
271
self.outf.write(str(Branch.open_containing(location)[0].revno()))
272
self.outf.write('\n')
273
274
275
class cmd_revision_info(Command):
276
"""Show revision number and revision id for a given revision identifier.
277
"""
278
hidden = True
279
takes_args = ['revision_info*']
280
takes_options = ['revision']
281
282
@display_command
283
def run(self, revision=None, revision_info_list=[]):
284
285
revs = []
286
if revision is not None:
287
revs.extend(revision)
288
if revision_info_list is not None:
289
for rev in revision_info_list:
290
revs.append(RevisionSpec.from_string(rev))
291
292
b = Branch.open_containing(u'.')[0]
293
294
if len(revs) == 0:
295
revs.append(RevisionSpec.from_string('-1'))
296
297
for rev in revs:
298
revision_id = rev.as_revision_id(b)
299
try:
300
revno = '%4d' % (b.revision_id_to_revno(revision_id))
301
except errors.NoSuchRevision:
302
dotted_map = b.get_revision_id_to_revno_map()
303
revno = '.'.join(str(i) for i in dotted_map[revision_id])
304
print '%s %s' % (revno, revision_id)
305
306
307
class cmd_add(Command):
308
"""Add specified files or directories.
309
310
In non-recursive mode, all the named items are added, regardless
311
of whether they were previously ignored. A warning is given if
312
any of the named files are already versioned.
313
314
In recursive mode (the default), files are treated the same way
315
but the behaviour for directories is different. Directories that
316
are already versioned do not give a warning. All directories,
317
whether already versioned or not, are searched for files or
318
subdirectories that are neither versioned or ignored, and these
319
are added. This search proceeds recursively into versioned
320
directories. If no names are given '.' is assumed.
321
322
Therefore simply saying 'bzr add' will version all files that
323
are currently unknown.
324
325
Adding a file whose parent directory is not versioned will
326
implicitly add the parent, and so on up to the root. This means
327
you should never need to explicitly add a directory, they'll just
328
get added when you add a file in the directory.
329
330
--dry-run will show which files would be added, but not actually
331
add them.
332
333
--file-ids-from will try to use the file ids from the supplied path.
334
It looks up ids trying to find a matching parent directory with the
335
same filename, and then by pure path. This option is rarely needed
336
but can be useful when adding the same logical file into two
337
branches that will be merged later (without showing the two different
338
adds as a conflict). It is also useful when merging another project
339
into a subdirectory of this one.
340
"""
341
takes_args = ['file*']
342
takes_options = [
343
Option('no-recurse',
344
help="Don't recursively add the contents of directories."),
345
Option('dry-run',
346
help="Show what would be done, but don't actually do anything."),
347
'verbose',
348
Option('file-ids-from',
349
type=unicode,
350
help='Lookup file ids from this tree.'),
351
]
352
encoding_type = 'replace'
353
_see_also = ['remove']
354
355
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
356
file_ids_from=None):
357
import bzrlib.add
358
359
base_tree = None
360
if file_ids_from is not None:
361
try:
362
base_tree, base_path = WorkingTree.open_containing(
363
file_ids_from)
364
except errors.NoWorkingTree:
365
base_branch, base_path = Branch.open_containing(
366
file_ids_from)
367
base_tree = base_branch.basis_tree()
368
369
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
370
to_file=self.outf, should_print=(not is_quiet()))
371
else:
372
action = bzrlib.add.AddAction(to_file=self.outf,
373
should_print=(not is_quiet()))
374
375
if base_tree:
376
base_tree.lock_read()
377
try:
378
file_list = self._maybe_expand_globs(file_list)
379
if file_list:
380
tree = WorkingTree.open_containing(file_list[0])[0]
381
else:
382
tree = WorkingTree.open_containing(u'.')[0]
383
added, ignored = tree.smart_add(file_list, not
384
no_recurse, action=action, save=not dry_run)
385
finally:
386
if base_tree is not None:
387
base_tree.unlock()
388
if len(ignored) > 0:
389
if verbose:
390
for glob in sorted(ignored.keys()):
391
for path in ignored[glob]:
392
self.outf.write("ignored %s matching \"%s\"\n"
393
% (path, glob))
394
else:
395
match_len = 0
396
for glob, paths in ignored.items():
397
match_len += len(paths)
398
self.outf.write("ignored %d file(s).\n" % match_len)
399
self.outf.write("If you wish to add some of these files,"
400
" please add them by name.\n")
401
402
403
class cmd_mkdir(Command):
404
"""Create a new versioned directory.
405
406
This is equivalent to creating the directory and then adding it.
407
"""
408
409
takes_args = ['dir+']
410
encoding_type = 'replace'
411
412
def run(self, dir_list):
413
for d in dir_list:
414
os.mkdir(d)
415
wt, dd = WorkingTree.open_containing(d)
416
wt.add([dd])
417
self.outf.write('added %s\n' % d)
418
419
420
class cmd_relpath(Command):
421
"""Show path of a file relative to root"""
422
423
takes_args = ['filename']
424
hidden = True
425
426
@display_command
427
def run(self, filename):
428
# TODO: jam 20050106 Can relpath return a munged path if
429
# sys.stdout encoding cannot represent it?
430
tree, relpath = WorkingTree.open_containing(filename)
431
self.outf.write(relpath)
432
self.outf.write('\n')
433
434
435
class cmd_inventory(Command):
436
"""Show inventory of the current working copy or a revision.
437
438
It is possible to limit the output to a particular entry
439
type using the --kind option. For example: --kind file.
440
441
It is also possible to restrict the list of files to a specific
442
set. For example: bzr inventory --show-ids this/file
443
"""
444
445
hidden = True
446
_see_also = ['ls']
447
takes_options = [
448
'revision',
449
'show-ids',
450
Option('kind',
451
help='List entries of a particular kind: file, directory, symlink.',
452
type=unicode),
453
]
454
takes_args = ['file*']
455
456
@display_command
457
def run(self, revision=None, show_ids=False, kind=None, file_list=None):
458
if kind and kind not in ['file', 'directory', 'symlink']:
459
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
460
461
work_tree, file_list = tree_files(file_list)
462
work_tree.lock_read()
463
try:
464
if revision is not None:
465
if len(revision) > 1:
466
raise errors.BzrCommandError(
467
'bzr inventory --revision takes exactly one revision'
468
' identifier')
469
revision_id = revision[0].as_revision_id(work_tree.branch)
470
tree = work_tree.branch.repository.revision_tree(revision_id)
471
472
extra_trees = [work_tree]
473
tree.lock_read()
474
else:
475
tree = work_tree
476
extra_trees = []
477
478
if file_list is not None:
479
file_ids = tree.paths2ids(file_list, trees=extra_trees,
480
require_versioned=True)
481
# find_ids_across_trees may include some paths that don't
482
# exist in 'tree'.
483
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
484
for file_id in file_ids if file_id in tree)
485
else:
486
entries = tree.inventory.entries()
487
finally:
488
tree.unlock()
489
if tree is not work_tree:
490
work_tree.unlock()
491
492
for path, entry in entries:
493
if kind and kind != entry.kind:
494
continue
495
if show_ids:
496
self.outf.write('%-50s %s\n' % (path, entry.file_id))
497
else:
498
self.outf.write(path)
499
self.outf.write('\n')
500
501
502
class cmd_mv(Command):
503
"""Move or rename a file.
504
505
:Usage:
506
bzr mv OLDNAME NEWNAME
507
508
bzr mv SOURCE... DESTINATION
509
510
If the last argument is a versioned directory, all the other names
511
are moved into it. Otherwise, there must be exactly two arguments
512
and the file is changed to a new name.
513
514
If OLDNAME does not exist on the filesystem but is versioned and
515
NEWNAME does exist on the filesystem but is not versioned, mv
516
assumes that the file has been manually moved and only updates
517
its internal inventory to reflect that change.
518
The same is valid when moving many SOURCE files to a DESTINATION.
519
520
Files cannot be moved between branches.
521
"""
522
523
takes_args = ['names*']
524
takes_options = [Option("after", help="Move only the bzr identifier"
525
" of the file, because the file has already been moved."),
526
]
527
aliases = ['move', 'rename']
528
encoding_type = 'replace'
529
530
def run(self, names_list, after=False):
531
if names_list is None:
532
names_list = []
533
534
if len(names_list) < 2:
535
raise errors.BzrCommandError("missing file argument")
536
tree, rel_names = tree_files(names_list)
537
tree.lock_write()
538
try:
539
self._run(tree, names_list, rel_names, after)
540
finally:
541
tree.unlock()
542
543
def _run(self, tree, names_list, rel_names, after):
544
into_existing = osutils.isdir(names_list[-1])
545
if into_existing and len(names_list) == 2:
546
# special cases:
547
# a. case-insensitive filesystem and change case of dir
548
# b. move directory after the fact (if the source used to be
549
# a directory, but now doesn't exist in the working tree
550
# and the target is an existing directory, just rename it)
551
if (not tree.case_sensitive
552
and rel_names[0].lower() == rel_names[1].lower()):
553
into_existing = False
554
else:
555
inv = tree.inventory
556
from_id = tree.path2id(rel_names[0])
557
if (not osutils.lexists(names_list[0]) and
558
from_id and inv.get_file_kind(from_id) == "directory"):
559
into_existing = False
560
# move/rename
561
if into_existing:
562
# move into existing directory
563
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
564
self.outf.write("%s => %s\n" % pair)
565
else:
566
if len(names_list) != 2:
567
raise errors.BzrCommandError('to mv multiple files the'
568
' destination must be a versioned'
569
' directory')
570
tree.rename_one(rel_names[0], rel_names[1], after=after)
571
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
572
573
574
class cmd_pull(Command):
575
"""Turn this branch into a mirror of another branch.
576
577
This command only works on branches that have not diverged. Branches are
578
considered diverged if the destination branch's most recent commit is one
579
that has not been merged (directly or indirectly) into the parent.
580
581
If branches have diverged, you can use 'bzr merge' to integrate the changes
582
from one into the other. Once one branch has merged, the other should
583
be able to pull it again.
584
585
If you want to forget your local changes and just update your branch to
586
match the remote one, use pull --overwrite.
587
588
If there is no default location set, the first pull will set it. After
589
that, you can omit the location to use the default. To change the
590
default, use --remember. The value will only be saved if the remote
591
location can be accessed.
592
593
Note: The location can be specified either in the form of a branch,
594
or in the form of a path to a file containing a merge directive generated
595
with bzr send.
596
"""
597
598
_see_also = ['push', 'update', 'status-flags']
599
takes_options = ['remember', 'overwrite', 'revision',
600
custom_help('verbose',
601
help='Show logs of pulled revisions.'),
602
Option('directory',
603
help='Branch to pull into, '
604
'rather than the one containing the working directory.',
605
short_name='d',
606
type=unicode,
607
),
608
]
609
takes_args = ['location?']
610
encoding_type = 'replace'
611
612
def run(self, location=None, remember=False, overwrite=False,
613
revision=None, verbose=False,
614
directory=None):
615
# FIXME: too much stuff is in the command class
616
revision_id = None
617
mergeable = None
618
if directory is None:
619
directory = u'.'
620
try:
621
tree_to = WorkingTree.open_containing(directory)[0]
622
branch_to = tree_to.branch
623
except errors.NoWorkingTree:
624
tree_to = None
625
branch_to = Branch.open_containing(directory)[0]
626
627
possible_transports = []
628
if location is not None:
629
try:
630
mergeable = bundle.read_mergeable_from_url(location,
631
possible_transports=possible_transports)
632
except errors.NotABundle:
633
mergeable = None
634
635
stored_loc = branch_to.get_parent()
636
if location is None:
637
if stored_loc is None:
638
raise errors.BzrCommandError("No pull location known or"
639
" specified.")
640
else:
641
display_url = urlutils.unescape_for_display(stored_loc,
642
self.outf.encoding)
643
if not is_quiet():
644
self.outf.write("Using saved location: %s\n" % display_url)
645
location = stored_loc
646
647
if mergeable is not None:
648
if revision is not None:
649
raise errors.BzrCommandError(
650
'Cannot use -r with merge directives or bundles')
651
mergeable.install_revisions(branch_to.repository)
652
base_revision_id, revision_id, verified = \
653
mergeable.get_merge_request(branch_to.repository)
654
branch_from = branch_to
655
else:
656
branch_from = Branch.open(location,
657
possible_transports=possible_transports)
658
659
if branch_to.get_parent() is None or remember:
660
branch_to.set_parent(branch_from.base)
661
662
if revision is not None:
663
if len(revision) == 1:
664
revision_id = revision[0].as_revision_id(branch_from)
665
else:
666
raise errors.BzrCommandError(
667
'bzr pull --revision takes one value.')
668
669
if verbose:
670
old_rh = branch_to.revision_history()
671
if tree_to is not None:
672
change_reporter = delta._ChangeReporter(
673
unversioned_filter=tree_to.is_ignored)
674
result = tree_to.pull(branch_from, overwrite, revision_id,
675
change_reporter,
676
possible_transports=possible_transports)
677
else:
678
result = branch_to.pull(branch_from, overwrite, revision_id)
679
680
result.report(self.outf)
681
if verbose:
682
new_rh = branch_to.revision_history()
683
log.show_changed_revisions(branch_to, old_rh, new_rh,
684
to_file=self.outf)
685
686
687
class cmd_push(Command):
688
"""Update a mirror of this branch.
689
690
The target branch will not have its working tree populated because this
691
is both expensive, and is not supported on remote file systems.
692
693
Some smart servers or protocols *may* put the working tree in place in
694
the future.
695
696
This command only works on branches that have not diverged. Branches are
697
considered diverged if the destination branch's most recent commit is one
698
that has not been merged (directly or indirectly) by the source branch.
699
700
If branches have diverged, you can use 'bzr push --overwrite' to replace
701
the other branch completely, discarding its unmerged changes.
702
703
If you want to ensure you have the different changes in the other branch,
704
do a merge (see bzr help merge) from the other branch, and commit that.
705
After that you will be able to do a push without '--overwrite'.
706
707
If there is no default push location set, the first push will set it.
708
After that, you can omit the location to use the default. To change the
709
default, use --remember. The value will only be saved if the remote
710
location can be accessed.
711
"""
712
713
_see_also = ['pull', 'update', 'working-trees']
714
takes_options = ['remember', 'overwrite', 'verbose', 'revision',
715
Option('create-prefix',
716
help='Create the path leading up to the branch '
717
'if it does not already exist.'),
718
Option('directory',
719
help='Branch to push from, '
720
'rather than the one containing the working directory.',
721
short_name='d',
722
type=unicode,
723
),
724
Option('use-existing-dir',
725
help='By default push will fail if the target'
726
' directory exists, but does not already'
727
' have a control directory. This flag will'
728
' allow push to proceed.'),
729
]
730
takes_args = ['location?']
731
encoding_type = 'replace'
732
733
def run(self, location=None, remember=False, overwrite=False,
734
create_prefix=False, verbose=False, revision=None,
735
use_existing_dir=False,
736
directory=None):
737
# FIXME: Way too big! Put this into a function called from the
738
# command.
739
if directory is None:
740
directory = '.'
741
br_from = Branch.open_containing(directory)[0]
742
stored_loc = br_from.get_push_location()
743
if location is None:
744
if stored_loc is None:
745
raise errors.BzrCommandError("No push location known or specified.")
746
else:
747
display_url = urlutils.unescape_for_display(stored_loc,
748
self.outf.encoding)
749
self.outf.write("Using saved location: %s\n" % display_url)
750
location = stored_loc
751
752
to_transport = transport.get_transport(location)
753
754
br_to = repository_to = dir_to = None
755
try:
756
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
757
except errors.NotBranchError:
758
pass # Didn't find anything
759
else:
760
# If we can open a branch, use its direct repository, otherwise see
761
# if there is a repository without a branch.
762
try:
763
br_to = dir_to.open_branch()
764
except errors.NotBranchError:
765
# Didn't find a branch, can we find a repository?
766
try:
767
repository_to = dir_to.find_repository()
768
except errors.NoRepositoryPresent:
769
pass
770
else:
771
# Found a branch, so we must have found a repository
772
repository_to = br_to.repository
773
774
if revision is not None:
775
if len(revision) == 1:
776
revision_id = revision[0].in_history(br_from).rev_id
777
else:
778
raise errors.BzrCommandError(
779
'bzr push --revision takes one value.')
780
else:
781
revision_id = br_from.last_revision()
782
783
push_result = None
784
if verbose:
785
old_rh = []
786
if dir_to is None:
787
# The destination doesn't exist; create it.
788
# XXX: Refactor the create_prefix/no_create_prefix code into a
789
# common helper function
790
791
def make_directory(transport):
792
transport.mkdir('.')
793
return transport
794
795
def redirected(redirected_transport, e, redirection_notice):
796
return transport.get_transport(e.get_target_url())
797
798
try:
799
to_transport = transport.do_catching_redirections(
800
make_directory, to_transport, redirected)
801
except errors.FileExists:
802
if not use_existing_dir:
803
raise errors.BzrCommandError("Target directory %s"
804
" already exists, but does not have a valid .bzr"
805
" directory. Supply --use-existing-dir to push"
806
" there anyway." % location)
807
except errors.NoSuchFile:
808
if not create_prefix:
809
raise errors.BzrCommandError("Parent directory of %s"
810
" does not exist."
811
"\nYou may supply --create-prefix to create all"
812
" leading parent directories."
813
% location)
814
_create_prefix(to_transport)
815
except errors.TooManyRedirections:
816
raise errors.BzrCommandError("Too many redirections trying "
817
"to make %s." % location)
818
819
# Now the target directory exists, but doesn't have a .bzr
820
# directory. So we need to create it, along with any work to create
821
# all of the dependent branches, etc.
822
dir_to = br_from.bzrdir.clone_on_transport(to_transport,
823
revision_id=revision_id)
824
br_to = dir_to.open_branch()
825
# TODO: Some more useful message about what was copied
826
note('Created new branch.')
827
# We successfully created the target, remember it
828
if br_from.get_push_location() is None or remember:
829
br_from.set_push_location(br_to.base)
830
elif repository_to is None:
831
# we have a bzrdir but no branch or repository
832
# XXX: Figure out what to do other than complain.
833
raise errors.BzrCommandError("At %s you have a valid .bzr control"
834
" directory, but not a branch or repository. This is an"
835
" unsupported configuration. Please move the target directory"
836
" out of the way and try again."
837
% location)
838
elif br_to is None:
839
# We have a repository but no branch, copy the revisions, and then
840
# create a branch.
841
repository_to.fetch(br_from.repository, revision_id=revision_id)
842
br_to = br_from.clone(dir_to, revision_id=revision_id)
843
note('Created new branch.')
844
if br_from.get_push_location() is None or remember:
845
br_from.set_push_location(br_to.base)
846
else: # We have a valid to branch
847
# We were able to connect to the remote location, so remember it
848
# we don't need to successfully push because of possible divergence.
849
if br_from.get_push_location() is None or remember:
850
br_from.set_push_location(br_to.base)
851
if verbose:
852
old_rh = br_to.revision_history()
853
try:
854
try:
855
tree_to = dir_to.open_workingtree()
856
except errors.NotLocalUrl:
857
warning("This transport does not update the working "
858
"tree of: %s. See 'bzr help working-trees' for "
859
"more information." % br_to.base)
860
push_result = br_from.push(br_to, overwrite,
861
stop_revision=revision_id)
862
except errors.NoWorkingTree:
863
push_result = br_from.push(br_to, overwrite,
864
stop_revision=revision_id)
865
else:
866
tree_to.lock_write()
867
try:
868
push_result = br_from.push(tree_to.branch, overwrite,
869
stop_revision=revision_id)
870
tree_to.update()
871
finally:
872
tree_to.unlock()
873
except errors.DivergedBranches:
874
raise errors.BzrCommandError('These branches have diverged.'
875
' Try using "merge" and then "push".')
876
if push_result is not None:
877
push_result.report(self.outf)
878
elif verbose:
879
new_rh = br_to.revision_history()
880
if old_rh != new_rh:
881
# Something changed
882
from bzrlib.log import show_changed_revisions
883
show_changed_revisions(br_to, old_rh, new_rh,
884
to_file=self.outf)
885
else:
886
# we probably did a clone rather than a push, so a message was
887
# emitted above
888
pass
889
890
891
class cmd_branch(Command):
892
"""Create a new copy of a branch.
893
894
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
895
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
896
If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION
897
is derived from the FROM_LOCATION by stripping a leading scheme or drive
898
identifier, if any. For example, "branch lp:foo-bar" will attempt to
899
create ./foo-bar.
900
901
To retrieve the branch as of a particular revision, supply the --revision
902
parameter, as in "branch foo/bar -r 5".
903
"""
904
905
_see_also = ['checkout']
906
takes_args = ['from_location', 'to_location?']
907
takes_options = ['revision', Option('hardlink',
908
help='Hard-link working tree files where possible.')]
909
aliases = ['get', 'clone']
910
911
def run(self, from_location, to_location=None, revision=None,
912
hardlink=False):
913
from bzrlib.tag import _merge_tags_if_possible
914
if revision is None:
915
revision = [None]
916
elif len(revision) > 1:
917
raise errors.BzrCommandError(
918
'bzr branch --revision takes exactly 1 revision value')
919
920
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
921
from_location)
922
br_from.lock_read()
923
try:
924
if len(revision) == 1 and revision[0] is not None:
925
revision_id = revision[0].as_revision_id(br_from)
926
else:
927
# FIXME - wt.last_revision, fallback to branch, fall back to
928
# None or perhaps NULL_REVISION to mean copy nothing
929
# RBC 20060209
930
revision_id = br_from.last_revision()
931
if to_location is None:
932
to_location = urlutils.derive_to_location(from_location)
933
name = None
934
else:
935
name = os.path.basename(to_location) + '\n'
936
937
to_transport = transport.get_transport(to_location)
938
try:
939
to_transport.mkdir('.')
940
except errors.FileExists:
941
raise errors.BzrCommandError('Target directory "%s" already'
942
' exists.' % to_location)
943
except errors.NoSuchFile:
944
raise errors.BzrCommandError('Parent of "%s" does not exist.'
945
% to_location)
946
try:
947
# preserve whatever source format we have.
948
dir = br_from.bzrdir.sprout(to_transport.base, revision_id,
949
possible_transports=[to_transport],
950
accelerator_tree=accelerator_tree,
951
hardlink=hardlink)
952
branch = dir.open_branch()
953
except errors.NoSuchRevision:
954
to_transport.delete_tree('.')
955
msg = "The branch %s has no revision %s." % (from_location, revision[0])
956
raise errors.BzrCommandError(msg)
957
if name:
958
branch.control_files.put_utf8('branch-name', name)
959
_merge_tags_if_possible(br_from, branch)
960
note('Branched %d revision(s).' % branch.revno())
961
finally:
962
br_from.unlock()
963
964
965
class cmd_checkout(Command):
966
"""Create a new checkout of an existing branch.
967
968
If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree for
969
the branch found in '.'. This is useful if you have removed the working tree
970
or if it was never created - i.e. if you pushed the branch to its current
971
location using SFTP.
972
973
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
974
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
975
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
976
is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
977
identifier, if any. For example, "checkout lp:foo-bar" will attempt to
978
create ./foo-bar.
979
980
To retrieve the branch as of a particular revision, supply the --revision
981
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
982
out of date [so you cannot commit] but it may be useful (i.e. to examine old
983
code.)
984
"""
985
986
_see_also = ['checkouts', 'branch']
987
takes_args = ['branch_location?', 'to_location?']
988
takes_options = ['revision',
989
Option('lightweight',
990
help="Perform a lightweight checkout. Lightweight "
991
"checkouts depend on access to the branch for "
992
"every operation. Normal checkouts can perform "
993
"common operations like diff and status without "
994
"such access, and also support local commits."
995
),
996
Option('files-from', type=str,
997
help="Get file contents from this tree."),
998
Option('hardlink',
999
help='Hard-link working tree files where possible.'
1000
),
1001
]
1002
aliases = ['co']
1003
1004
def run(self, branch_location=None, to_location=None, revision=None,
1005
lightweight=False, files_from=None, hardlink=False):
1006
if revision is None:
1007
revision = [None]
1008
elif len(revision) > 1:
1009
raise errors.BzrCommandError(
1010
'bzr checkout --revision takes exactly 1 revision value')
1011
if branch_location is None:
1012
branch_location = osutils.getcwd()
1013
to_location = branch_location
1014
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1015
branch_location)
1016
if files_from is not None:
1017
accelerator_tree = WorkingTree.open(files_from)
1018
if len(revision) == 1 and revision[0] is not None:
1019
revision_id = revision[0].as_revision_id(source)
1020
else:
1021
revision_id = None
1022
if to_location is None:
1023
to_location = urlutils.derive_to_location(branch_location)
1024
# if the source and to_location are the same,
1025
# and there is no working tree,
1026
# then reconstitute a branch
1027
if (osutils.abspath(to_location) ==
1028
osutils.abspath(branch_location)):
1029
try:
1030
source.bzrdir.open_workingtree()
1031
except errors.NoWorkingTree:
1032
source.bzrdir.create_workingtree(revision_id)
1033
return
1034
source.create_checkout(to_location, revision_id, lightweight,
1035
accelerator_tree, hardlink)
1036
1037
1038
class cmd_renames(Command):
1039
"""Show list of renamed files.
1040
"""
1041
# TODO: Option to show renames between two historical versions.
1042
1043
# TODO: Only show renames under dir, rather than in the whole branch.
1044
_see_also = ['status']
1045
takes_args = ['dir?']
1046
1047
@display_command
1048
def run(self, dir=u'.'):
1049
tree = WorkingTree.open_containing(dir)[0]
1050
tree.lock_read()
1051
try:
1052
new_inv = tree.inventory
1053
old_tree = tree.basis_tree()
1054
old_tree.lock_read()
1055
try:
1056
old_inv = old_tree.inventory
1057
renames = list(_mod_tree.find_renames(old_inv, new_inv))
1058
renames.sort()
1059
for old_name, new_name in renames:
1060
self.outf.write("%s => %s\n" % (old_name, new_name))
1061
finally:
1062
old_tree.unlock()
1063
finally:
1064
tree.unlock()
1065
1066
1067
class cmd_update(Command):
1068
"""Update a tree to have the latest code committed to its branch.
1069
1070
This will perform a merge into the working tree, and may generate
1071
conflicts. If you have any local changes, you will still
1072
need to commit them after the update for the update to be complete.
1073
1074
If you want to discard your local changes, you can just do a
1075
'bzr revert' instead of 'bzr commit' after the update.
1076
"""
1077
1078
_see_also = ['pull', 'working-trees', 'status-flags']
1079
takes_args = ['dir?']
1080
aliases = ['up']
1081
1082
def run(self, dir='.'):
1083
tree = WorkingTree.open_containing(dir)[0]
1084
possible_transports = []
1085
master = tree.branch.get_master_branch(
1086
possible_transports=possible_transports)
1087
if master is not None:
1088
tree.lock_write()
1089
else:
1090
tree.lock_tree_write()
1091
try:
1092
existing_pending_merges = tree.get_parent_ids()[1:]
1093
last_rev = _mod_revision.ensure_null(tree.last_revision())
1094
if last_rev == _mod_revision.ensure_null(
1095
tree.branch.last_revision()):
1096
# may be up to date, check master too.
1097
if master is None or last_rev == _mod_revision.ensure_null(
1098
master.last_revision()):
1099
revno = tree.branch.revision_id_to_revno(last_rev)
1100
note("Tree is up to date at revision %d." % (revno,))
1101
return 0
1102
conflicts = tree.update(
1103
delta._ChangeReporter(unversioned_filter=tree.is_ignored),
1104
possible_transports=possible_transports)
1105
revno = tree.branch.revision_id_to_revno(
1106
_mod_revision.ensure_null(tree.last_revision()))
1107
note('Updated to revision %d.' % (revno,))
1108
if tree.get_parent_ids()[1:] != existing_pending_merges:
1109
note('Your local commits will now show as pending merges with '
1110
"'bzr status', and can be committed with 'bzr commit'.")
1111
if conflicts != 0:
1112
return 1
1113
else:
1114
return 0
1115
finally:
1116
tree.unlock()
1117
1118
1119
class cmd_info(Command):
1120
"""Show information about a working tree, branch or repository.
1121
1122
This command will show all known locations and formats associated to the
1123
tree, branch or repository. Statistical information is included with
1124
each report.
1125
1126
Branches and working trees will also report any missing revisions.
1127
"""
1128
_see_also = ['revno', 'working-trees', 'repositories']
1129
takes_args = ['location?']
1130
takes_options = ['verbose']
1131
encoding_type = 'replace'
1132
1133
@display_command
1134
def run(self, location=None, verbose=False):
1135
if verbose:
1136
noise_level = 2
1137
else:
1138
noise_level = 0
1139
from bzrlib.info import show_bzrdir_info
1140
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1141
verbose=noise_level, outfile=self.outf)
1142
1143
1144
class cmd_remove(Command):
1145
"""Remove files or directories.
1146
1147
This makes bzr stop tracking changes to the specified files and
1148
delete them if they can easily be recovered using revert.
1149
1150
You can specify one or more files, and/or --new. If you specify --new,
1151
only 'added' files will be removed. If you specify both, then new files
1152
in the specified directories will be removed. If the directories are
1153
also new, they will also be removed.
1154
"""
1155
takes_args = ['file*']
1156
takes_options = ['verbose',
1157
Option('new', help='Remove newly-added files.'),
1158
RegistryOption.from_kwargs('file-deletion-strategy',
1159
'The file deletion mode to be used.',
1160
title='Deletion Strategy', value_switches=True, enum_switch=False,
1161
safe='Only delete files if they can be'
1162
' safely recovered (default).',
1163
keep="Don't delete any files.",
1164
force='Delete all the specified files, even if they can not be '
1165
'recovered and even if they are non-empty directories.')]
1166
aliases = ['rm']
1167
encoding_type = 'replace'
1168
1169
def run(self, file_list, verbose=False, new=False,
1170
file_deletion_strategy='safe'):
1171
tree, file_list = tree_files(file_list)
1172
1173
if file_list is not None:
1174
file_list = [f for f in file_list]
1175
elif not new:
1176
raise errors.BzrCommandError('Specify one or more files to'
1177
' remove, or use --new.')
1178
1179
if new:
1180
added = tree.changes_from(tree.basis_tree(),
1181
specific_files=file_list).added
1182
file_list = sorted([f[0] for f in added], reverse=True)
1183
if len(file_list) == 0:
1184
raise errors.BzrCommandError('No matching files.')
1185
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1186
keep_files=file_deletion_strategy=='keep',
1187
force=file_deletion_strategy=='force')
1188
1189
1190
class cmd_file_id(Command):
1191
"""Print file_id of a particular file or directory.
1192
1193
The file_id is assigned when the file is first added and remains the
1194
same through all revisions where the file exists, even when it is
1195
moved or renamed.
1196
"""
1197
1198
hidden = True
1199
_see_also = ['inventory', 'ls']
1200
takes_args = ['filename']
1201
1202
@display_command
1203
def run(self, filename):
1204
tree, relpath = WorkingTree.open_containing(filename)
1205
i = tree.path2id(relpath)
1206
if i is None:
1207
raise errors.NotVersionedError(filename)
1208
else:
1209
self.outf.write(i + '\n')
1210
1211
1212
class cmd_file_path(Command):
1213
"""Print path of file_ids to a file or directory.
1214
1215
This prints one line for each directory down to the target,
1216
starting at the branch root.
1217
"""
1218
1219
hidden = True
1220
takes_args = ['filename']
1221
1222
@display_command
1223
def run(self, filename):
1224
tree, relpath = WorkingTree.open_containing(filename)
1225
fid = tree.path2id(relpath)
1226
if fid is None:
1227
raise errors.NotVersionedError(filename)
1228
segments = osutils.splitpath(relpath)
1229
for pos in range(1, len(segments) + 1):
1230
path = osutils.joinpath(segments[:pos])
1231
self.outf.write("%s\n" % tree.path2id(path))
1232
1233
1234
class cmd_reconcile(Command):
1235
"""Reconcile bzr metadata in a branch.
1236
1237
This can correct data mismatches that may have been caused by
1238
previous ghost operations or bzr upgrades. You should only
1239
need to run this command if 'bzr check' or a bzr developer
1240
advises you to run it.
1241
1242
If a second branch is provided, cross-branch reconciliation is
1243
also attempted, which will check that data like the tree root
1244
id which was not present in very early bzr versions is represented
1245
correctly in both branches.
1246
1247
At the same time it is run it may recompress data resulting in
1248
a potential saving in disk space or performance gain.
1249
1250
The branch *MUST* be on a listable system such as local disk or sftp.
1251
"""
1252
1253
_see_also = ['check']
1254
takes_args = ['branch?']
1255
1256
def run(self, branch="."):
1257
from bzrlib.reconcile import reconcile
1258
dir = bzrdir.BzrDir.open(branch)
1259
reconcile(dir)
1260
1261
1262
class cmd_revision_history(Command):
1263
"""Display the list of revision ids on a branch."""
1264
1265
_see_also = ['log']
1266
takes_args = ['location?']
1267
1268
hidden = True
1269
1270
@display_command
1271
def run(self, location="."):
1272
branch = Branch.open_containing(location)[0]
1273
for revid in branch.revision_history():
1274
self.outf.write(revid)
1275
self.outf.write('\n')
1276
1277
1278
class cmd_ancestry(Command):
1279
"""List all revisions merged into this branch."""
1280
1281
_see_also = ['log', 'revision-history']
1282
takes_args = ['location?']
1283
1284
hidden = True
1285
1286
@display_command
1287
def run(self, location="."):
1288
try:
1289
wt = WorkingTree.open_containing(location)[0]
1290
except errors.NoWorkingTree:
1291
b = Branch.open(location)
1292
last_revision = b.last_revision()
1293
else:
1294
b = wt.branch
1295
last_revision = wt.last_revision()
1296
1297
revision_ids = b.repository.get_ancestry(last_revision)
1298
assert revision_ids[0] is None
1299
revision_ids.pop(0)
1300
for revision_id in revision_ids:
1301
self.outf.write(revision_id + '\n')
1302
1303
1304
class cmd_init(Command):
1305
"""Make a directory into a versioned branch.
1306
1307
Use this to create an empty branch, or before importing an
1308
existing project.
1309
1310
If there is a repository in a parent directory of the location, then
1311
the history of the branch will be stored in the repository. Otherwise
1312
init creates a standalone branch which carries its own history
1313
in the .bzr directory.
1314
1315
If there is already a branch at the location but it has no working tree,
1316
the tree can be populated with 'bzr checkout'.
1317
1318
Recipe for importing a tree of files::
1319
1320
cd ~/project
1321
bzr init
1322
bzr add .
1323
bzr status
1324
bzr commit -m "imported project"
1325
"""
1326
1327
_see_also = ['init-repository', 'branch', 'checkout']
1328
takes_args = ['location?']
1329
takes_options = [
1330
Option('create-prefix',
1331
help='Create the path leading up to the branch '
1332
'if it does not already exist.'),
1333
RegistryOption('format',
1334
help='Specify a format for this branch. '
1335
'See "help formats".',
1336
registry=bzrdir.format_registry,
1337
converter=bzrdir.format_registry.make_bzrdir,
1338
value_switches=True,
1339
title="Branch Format",
1340
),
1341
Option('append-revisions-only',
1342
help='Never change revnos or the existing log.'
1343
' Append revisions to it only.')
1344
]
1345
def run(self, location=None, format=None, append_revisions_only=False,
1346
create_prefix=False):
1347
if format is None:
1348
format = bzrdir.format_registry.make_bzrdir('default')
1349
if location is None:
1350
location = u'.'
1351
1352
to_transport = transport.get_transport(location)
1353
1354
# The path has to exist to initialize a
1355
# branch inside of it.
1356
# Just using os.mkdir, since I don't
1357
# believe that we want to create a bunch of
1358
# locations if the user supplies an extended path
1359
try:
1360
to_transport.ensure_base()
1361
except errors.NoSuchFile:
1362
if not create_prefix:
1363
raise errors.BzrCommandError("Parent directory of %s"
1364
" does not exist."
1365
"\nYou may supply --create-prefix to create all"
1366
" leading parent directories."
1367
% location)
1368
_create_prefix(to_transport)
1369
1370
try:
1371
existing_bzrdir = bzrdir.BzrDir.open_from_transport(to_transport)
1372
except errors.NotBranchError:
1373
# really a NotBzrDir error...
1374
create_branch = bzrdir.BzrDir.create_branch_convenience
1375
branch = create_branch(to_transport.base, format=format,
1376
possible_transports=[to_transport])
1377
else:
1378
from bzrlib.transport.local import LocalTransport
1379
if existing_bzrdir.has_branch():
1380
if (isinstance(to_transport, LocalTransport)
1381
and not existing_bzrdir.has_workingtree()):
1382
raise errors.BranchExistsWithoutWorkingTree(location)
1383
raise errors.AlreadyBranchError(location)
1384
else:
1385
branch = existing_bzrdir.create_branch()
1386
existing_bzrdir.create_workingtree()
1387
if append_revisions_only:
1388
try:
1389
branch.set_append_revisions_only(True)
1390
except errors.UpgradeRequired:
1391
raise errors.BzrCommandError('This branch format cannot be set'
1392
' to append-revisions-only. Try --experimental-branch6')
1393
1394
1395
class cmd_init_repository(Command):
1396
"""Create a shared repository to hold branches.
1397
1398
New branches created under the repository directory will store their
1399
revisions in the repository, not in the branch directory.
1400
1401
If the --no-trees option is used then the branches in the repository
1402
will not have working trees by default.
1403
1404
:Examples:
1405
Create a shared repositories holding just branches::
1406
1407
bzr init-repo --no-trees repo
1408
bzr init repo/trunk
1409
1410
Make a lightweight checkout elsewhere::
1411
1412
bzr checkout --lightweight repo/trunk trunk-checkout
1413
cd trunk-checkout
1414
(add files here)
1415
"""
1416
1417
_see_also = ['init', 'branch', 'checkout', 'repositories']
1418
takes_args = ["location"]
1419
takes_options = [RegistryOption('format',
1420
help='Specify a format for this repository. See'
1421
' "bzr help formats" for details.',
1422
registry=bzrdir.format_registry,
1423
converter=bzrdir.format_registry.make_bzrdir,
1424
value_switches=True, title='Repository format'),
1425
Option('no-trees',
1426
help='Branches in the repository will default to'
1427
' not having a working tree.'),
1428
]
1429
aliases = ["init-repo"]
1430
1431
def run(self, location, format=None, no_trees=False):
1432
if format is None:
1433
format = bzrdir.format_registry.make_bzrdir('default')
1434
1435
if location is None:
1436
location = '.'
1437
1438
to_transport = transport.get_transport(location)
1439
to_transport.ensure_base()
1440
1441
newdir = format.initialize_on_transport(to_transport)
1442
repo = newdir.create_repository(shared=True)
1443
repo.set_make_working_trees(not no_trees)
1444
1445
1446
class cmd_diff(Command):
1447
"""Show differences in the working tree, between revisions or branches.
1448
1449
If no arguments are given, all changes for the current tree are listed.
1450
If files are given, only the changes in those files are listed.
1451
Remote and multiple branches can be compared by using the --old and
1452
--new options. If not provided, the default for both is derived from
1453
the first argument, if any, or the current tree if no arguments are
1454
given.
1455
1456
"bzr diff -p1" is equivalent to "bzr diff --prefix old/:new/", and
1457
produces patches suitable for "patch -p1".
1458
1459
:Exit values:
1460
1 - changed
1461
2 - unrepresentable changes
1462
3 - error
1463
0 - no change
1464
1465
:Examples:
1466
Shows the difference in the working tree versus the last commit::
1467
1468
bzr diff
1469
1470
Difference between the working tree and revision 1::
1471
1472
bzr diff -r1
1473
1474
Difference between revision 2 and revision 1::
1475
1476
bzr diff -r1..2
1477
1478
Difference between revision 2 and revision 1 for branch xxx::
1479
1480
bzr diff -r1..2 xxx
1481
1482
Show just the differences for file NEWS::
1483
1484
bzr diff NEWS
1485
1486
Show the differences in working tree xxx for file NEWS::
1487
1488
bzr diff xxx/NEWS
1489
1490
Show the differences from branch xxx to this working tree:
1491
1492
bzr diff --old xxx
1493
1494
Show the differences between two branches for file NEWS::
1495
1496
bzr diff --old xxx --new yyy NEWS
1497
1498
Same as 'bzr diff' but prefix paths with old/ and new/::
1499
1500
bzr diff --prefix old/:new/
1501
"""
1502
_see_also = ['status']
1503
takes_args = ['file*']
1504
takes_options = [
1505
Option('diff-options', type=str,
1506
help='Pass these options to the external diff program.'),
1507
Option('prefix', type=str,
1508
short_name='p',
1509
help='Set prefixes added to old and new filenames, as '
1510
'two values separated by a colon. (eg "old/:new/").'),
1511
Option('old',
1512
help='Branch/tree to compare from.',
1513
type=unicode,
1514
),
1515
Option('new',
1516
help='Branch/tree to compare to.',
1517
type=unicode,
1518
),
1519
'revision',
1520
'change',
1521
Option('using',
1522
help='Use this command to compare files.',
1523
type=unicode,
1524
),
1525
]
1526
aliases = ['di', 'dif']
1527
encoding_type = 'exact'
1528
1529
@display_command
1530
def run(self, revision=None, file_list=None, diff_options=None,
1531
prefix=None, old=None, new=None, using=None):
1532
from bzrlib.diff import _get_trees_to_diff, show_diff_trees
1533
1534
if (prefix is None) or (prefix == '0'):
1535
# diff -p0 format
1536
old_label = ''
1537
new_label = ''
1538
elif prefix == '1':
1539
old_label = 'old/'
1540
new_label = 'new/'
1541
elif ':' in prefix:
1542
old_label, new_label = prefix.split(":")
1543
else:
1544
raise errors.BzrCommandError(
1545
'--prefix expects two values separated by a colon'
1546
' (eg "old/:new/")')
1547
1548
if revision and len(revision) > 2:
1549
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1550
' one or two revision specifiers')
1551
1552
old_tree, new_tree, specific_files, extra_trees = \
1553
_get_trees_to_diff(file_list, revision, old, new)
1554
return show_diff_trees(old_tree, new_tree, sys.stdout,
1555
specific_files=specific_files,
1556
external_diff_options=diff_options,
1557
old_label=old_label, new_label=new_label,
1558
extra_trees=extra_trees, using=using)
1559
1560
1561
class cmd_deleted(Command):
1562
"""List files deleted in the working tree.
1563
"""
1564
# TODO: Show files deleted since a previous revision, or
1565
# between two revisions.
1566
# TODO: Much more efficient way to do this: read in new
1567
# directories with readdir, rather than stating each one. Same
1568
# level of effort but possibly much less IO. (Or possibly not,
1569
# if the directories are very large...)
1570
_see_also = ['status', 'ls']
1571
takes_options = ['show-ids']
1572
1573
@display_command
1574
def run(self, show_ids=False):
1575
tree = WorkingTree.open_containing(u'.')[0]
1576
tree.lock_read()
1577
try:
1578
old = tree.basis_tree()
1579
old.lock_read()
1580
try:
1581
for path, ie in old.inventory.iter_entries():
1582
if not tree.has_id(ie.file_id):
1583
self.outf.write(path)
1584
if show_ids:
1585
self.outf.write(' ')
1586
self.outf.write(ie.file_id)
1587
self.outf.write('\n')
1588
finally:
1589
old.unlock()
1590
finally:
1591
tree.unlock()
1592
1593
1594
class cmd_modified(Command):
1595
"""List files modified in working tree.
1596
"""
1597
1598
hidden = True
1599
_see_also = ['status', 'ls']
1600
1601
@display_command
1602
def run(self):
1603
tree = WorkingTree.open_containing(u'.')[0]
1604
td = tree.changes_from(tree.basis_tree())
1605
for path, id, kind, text_modified, meta_modified in td.modified:
1606
self.outf.write(path + '\n')
1607
1608
1609
class cmd_added(Command):
1610
"""List files added in working tree.
1611
"""
1612
1613
hidden = True
1614
_see_also = ['status', 'ls']
1615
1616
@display_command
1617
def run(self):
1618
wt = WorkingTree.open_containing(u'.')[0]
1619
wt.lock_read()
1620
try:
1621
basis = wt.basis_tree()
1622
basis.lock_read()
1623
try:
1624
basis_inv = basis.inventory
1625
inv = wt.inventory
1626
for file_id in inv:
1627
if file_id in basis_inv:
1628
continue
1629
if inv.is_root(file_id) and len(basis_inv) == 0:
1630
continue
1631
path = inv.id2path(file_id)
1632
if not os.access(osutils.abspath(path), os.F_OK):
1633
continue
1634
self.outf.write(path + '\n')
1635
finally:
1636
basis.unlock()
1637
finally:
1638
wt.unlock()
1639
1640
1641
class cmd_root(Command):
1642
"""Show the tree root directory.
1643
1644
The root is the nearest enclosing directory with a .bzr control
1645
directory."""
1646
1647
takes_args = ['filename?']
1648
@display_command
1649
def run(self, filename=None):
1650
"""Print the branch root."""
1651
tree = WorkingTree.open_containing(filename)[0]
1652
self.outf.write(tree.basedir + '\n')
1653
1654
1655
def _parse_limit(limitstring):
1656
try:
1657
return int(limitstring)
1658
except ValueError:
1659
msg = "The limit argument must be an integer."
1660
raise errors.BzrCommandError(msg)
1661
1662
1663
class cmd_log(Command):
1664
"""Show log of a branch, file, or directory.
1665
1666
By default show the log of the branch containing the working directory.
1667
1668
To request a range of logs, you can use the command -r begin..end
1669
-r revision requests a specific revision, -r ..end or -r begin.. are
1670
also valid.
1671
1672
:Examples:
1673
Log the current branch::
1674
1675
bzr log
1676
1677
Log a file::
1678
1679
bzr log foo.c
1680
1681
Log the last 10 revisions of a branch::
1682
1683
bzr log -r -10.. http://server/branch
1684
"""
1685
1686
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1687
1688
takes_args = ['location?']
1689
takes_options = [
1690
Option('forward',
1691
help='Show from oldest to newest.'),
1692
Option('timezone',
1693
type=str,
1694
help='Display timezone as local, original, or utc.'),
1695
custom_help('verbose',
1696
help='Show files changed in each revision.'),
1697
'show-ids',
1698
'revision',
1699
'log-format',
1700
Option('message',
1701
short_name='m',
1702
help='Show revisions whose message matches this '
1703
'regular expression.',
1704
type=str),
1705
Option('limit',
1706
short_name='l',
1707
help='Limit the output to the first N revisions.',
1708
argname='N',
1709
type=_parse_limit),
1710
]
1711
encoding_type = 'replace'
1712
1713
@display_command
1714
def run(self, location=None, timezone='original',
1715
verbose=False,
1716
show_ids=False,
1717
forward=False,
1718
revision=None,
1719
log_format=None,
1720
message=None,
1721
limit=None):
1722
from bzrlib.log import show_log
1723
assert message is None or isinstance(message, basestring), \
1724
"invalid message argument %r" % message
1725
direction = (forward and 'forward') or 'reverse'
1726
1727
# log everything
1728
file_id = None
1729
if location:
1730
# find the file id to log:
1731
1732
tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1733
location)
1734
if fp != '':
1735
if tree is None:
1736
tree = b.basis_tree()
1737
file_id = tree.path2id(fp)
1738
if file_id is None:
1739
raise errors.BzrCommandError(
1740
"Path does not have any revision history: %s" %
1741
location)
1742
else:
1743
# local dir only
1744
# FIXME ? log the current subdir only RBC 20060203
1745
if revision is not None \
1746
and len(revision) > 0 and revision[0].get_branch():
1747
location = revision[0].get_branch()
1748
else:
1749
location = '.'
1750
dir, relpath = bzrdir.BzrDir.open_containing(location)
1751
b = dir.open_branch()
1752
1753
b.lock_read()
1754
try:
1755
if revision is None:
1756
rev1 = None
1757
rev2 = None
1758
elif len(revision) == 1:
1759
rev1 = rev2 = revision[0].in_history(b)
1760
elif len(revision) == 2:
1761
if revision[1].get_branch() != revision[0].get_branch():
1762
# b is taken from revision[0].get_branch(), and
1763
# show_log will use its revision_history. Having
1764
# different branches will lead to weird behaviors.
1765
raise errors.BzrCommandError(
1766
"Log doesn't accept two revisions in different"
1767
" branches.")
1768
rev1 = revision[0].in_history(b)
1769
rev2 = revision[1].in_history(b)
1770
else:
1771
raise errors.BzrCommandError(
1772
'bzr log --revision takes one or two values.')
1773
1774
if log_format is None:
1775
log_format = log.log_formatter_registry.get_default(b)
1776
1777
lf = log_format(show_ids=show_ids, to_file=self.outf,
1778
show_timezone=timezone)
1779
1780
show_log(b,
1781
lf,
1782
file_id,
1783
verbose=verbose,
1784
direction=direction,
1785
start_revision=rev1,
1786
end_revision=rev2,
1787
search=message,
1788
limit=limit)
1789
finally:
1790
b.unlock()
1791
1792
1793
def get_log_format(long=False, short=False, line=False, default='long'):
1794
log_format = default
1795
if long:
1796
log_format = 'long'
1797
if short:
1798
log_format = 'short'
1799
if line:
1800
log_format = 'line'
1801
return log_format
1802
1803
1804
class cmd_touching_revisions(Command):
1805
"""Return revision-ids which affected a particular file.
1806
1807
A more user-friendly interface is "bzr log FILE".
1808
"""
1809
1810
hidden = True
1811
takes_args = ["filename"]
1812
1813
@display_command
1814
def run(self, filename):
1815
tree, relpath = WorkingTree.open_containing(filename)
1816
b = tree.branch
1817
file_id = tree.path2id(relpath)
1818
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1819
self.outf.write("%6d %s\n" % (revno, what))
1820
1821
1822
class cmd_ls(Command):
1823
"""List files in a tree.
1824
"""
1825
1826
_see_also = ['status', 'cat']
1827
takes_args = ['path?']
1828
# TODO: Take a revision or remote path and list that tree instead.
1829
takes_options = [
1830
'verbose',
1831
'revision',
1832
Option('non-recursive',
1833
help='Don\'t recurse into subdirectories.'),
1834
Option('from-root',
1835
help='Print paths relative to the root of the branch.'),
1836
Option('unknown', help='Print unknown files.'),
1837
Option('versioned', help='Print versioned files.'),
1838
Option('ignored', help='Print ignored files.'),
1839
Option('null',
1840
help='Write an ascii NUL (\\0) separator '
1841
'between files rather than a newline.'),
1842
Option('kind',
1843
help='List entries of a particular kind: file, directory, symlink.',
1844
type=unicode),
1845
'show-ids',
1846
]
1847
@display_command
1848
def run(self, revision=None, verbose=False,
1849
non_recursive=False, from_root=False,
1850
unknown=False, versioned=False, ignored=False,
1851
null=False, kind=None, show_ids=False, path=None):
1852
1853
if kind and kind not in ('file', 'directory', 'symlink'):
1854
raise errors.BzrCommandError('invalid kind specified')
1855
1856
if verbose and null:
1857
raise errors.BzrCommandError('Cannot set both --verbose and --null')
1858
all = not (unknown or versioned or ignored)
1859
1860
selection = {'I':ignored, '?':unknown, 'V':versioned}
1861
1862
if path is None:
1863
fs_path = '.'
1864
prefix = ''
1865
else:
1866
if from_root:
1867
raise errors.BzrCommandError('cannot specify both --from-root'
1868
' and PATH')
1869
fs_path = path
1870
prefix = path
1871
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1872
fs_path)
1873
if from_root:
1874
relpath = u''
1875
elif relpath:
1876
relpath += '/'
1877
if revision is not None:
1878
tree = branch.repository.revision_tree(
1879
revision[0].as_revision_id(branch))
1880
elif tree is None:
1881
tree = branch.basis_tree()
1882
1883
tree.lock_read()
1884
try:
1885
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1886
if fp.startswith(relpath):
1887
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1888
if non_recursive and '/' in fp:
1889
continue
1890
if not all and not selection[fc]:
1891
continue
1892
if kind is not None and fkind != kind:
1893
continue
1894
if verbose:
1895
kindch = entry.kind_character()
1896
outstring = '%-8s %s%s' % (fc, fp, kindch)
1897
if show_ids and fid is not None:
1898
outstring = "%-50s %s" % (outstring, fid)
1899
self.outf.write(outstring + '\n')
1900
elif null:
1901
self.outf.write(fp + '\0')
1902
if show_ids:
1903
if fid is not None:
1904
self.outf.write(fid)
1905
self.outf.write('\0')
1906
self.outf.flush()
1907
else:
1908
if fid is not None:
1909
my_id = fid
1910
else:
1911
my_id = ''
1912
if show_ids:
1913
self.outf.write('%-50s %s\n' % (fp, my_id))
1914
else:
1915
self.outf.write(fp + '\n')
1916
finally:
1917
tree.unlock()
1918
1919
1920
class cmd_unknowns(Command):
1921
"""List unknown files.
1922
"""
1923
1924
hidden = True
1925
_see_also = ['ls']
1926
1927
@display_command
1928
def run(self):
1929
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1930
self.outf.write(osutils.quotefn(f) + '\n')
1931
1932
1933
class cmd_ignore(Command):
1934
"""Ignore specified files or patterns.
1935
1936
To remove patterns from the ignore list, edit the .bzrignore file.
1937
1938
Trailing slashes on patterns are ignored.
1939
If the pattern contains a slash or is a regular expression, it is compared
1940
to the whole path from the branch root. Otherwise, it is compared to only
1941
the last component of the path. To match a file only in the root
1942
directory, prepend './'.
1943
1944
Ignore patterns specifying absolute paths are not allowed.
1945
1946
Ignore patterns may include globbing wildcards such as::
1947
1948
? - Matches any single character except '/'
1949
* - Matches 0 or more characters except '/'
1950
/**/ - Matches 0 or more directories in a path
1951
[a-z] - Matches a single character from within a group of characters
1952
1953
Ignore patterns may also be Python regular expressions.
1954
Regular expression ignore patterns are identified by a 'RE:' prefix
1955
followed by the regular expression. Regular expression ignore patterns
1956
may not include named or numbered groups.
1957
1958
Note: ignore patterns containing shell wildcards must be quoted from
1959
the shell on Unix.
1960
1961
:Examples:
1962
Ignore the top level Makefile::
1963
1964
bzr ignore ./Makefile
1965
1966
Ignore class files in all directories::
1967
1968
bzr ignore "*.class"
1969
1970
Ignore .o files under the lib directory::
1971
1972
bzr ignore "lib/**/*.o"
1973
1974
Ignore .o files under the lib directory::
1975
1976
bzr ignore "RE:lib/.*\.o"
1977
1978
Ignore everything but the "debian" toplevel directory::
1979
1980
bzr ignore "RE:(?!debian/).*"
1981
"""
1982
1983
_see_also = ['status', 'ignored']
1984
takes_args = ['name_pattern*']
1985
takes_options = [
1986
Option('old-default-rules',
1987
help='Write out the ignore rules bzr < 0.9 always used.')
1988
]
1989
1990
def run(self, name_pattern_list=None, old_default_rules=None):
1991
from bzrlib.atomicfile import AtomicFile
1992
if old_default_rules is not None:
1993
# dump the rules and exit
1994
for pattern in ignores.OLD_DEFAULTS:
1995
print pattern
1996
return
1997
if not name_pattern_list:
1998
raise errors.BzrCommandError("ignore requires at least one "
1999
"NAME_PATTERN or --old-default-rules")
2000
name_pattern_list = [globbing.normalize_pattern(p)
2001
for p in name_pattern_list]
2002
for name_pattern in name_pattern_list:
2003
if (name_pattern[0] == '/' or
2004
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2005
raise errors.BzrCommandError(
2006
"NAME_PATTERN should not be an absolute path")
2007
tree, relpath = WorkingTree.open_containing(u'.')
2008
ifn = tree.abspath('.bzrignore')
2009
if os.path.exists(ifn):
2010
f = open(ifn, 'rt')
2011
try:
2012
igns = f.read().decode('utf-8')
2013
finally:
2014
f.close()
2015
else:
2016
igns = ''
2017
2018
# TODO: If the file already uses crlf-style termination, maybe
2019
# we should use that for the newly added lines?
2020
2021
if igns and igns[-1] != '\n':
2022
igns += '\n'
2023
for name_pattern in name_pattern_list:
2024
igns += name_pattern + '\n'
2025
2026
f = AtomicFile(ifn, 'wb')
2027
try:
2028
f.write(igns.encode('utf-8'))
2029
f.commit()
2030
finally:
2031
f.close()
2032
2033
if not tree.path2id('.bzrignore'):
2034
tree.add(['.bzrignore'])
2035
2036
ignored = globbing.Globster(name_pattern_list)
2037
matches = []
2038
tree.lock_read()
2039
for entry in tree.list_files():
2040
id = entry[3]
2041
if id is not None:
2042
filename = entry[0]
2043
if ignored.match(filename):
2044
matches.append(filename.encode('utf-8'))
2045
tree.unlock()
2046
if len(matches) > 0:
2047
print "Warning: the following files are version controlled and" \
2048
" match your ignore pattern:\n%s" % ("\n".join(matches),)
2049
2050
class cmd_ignored(Command):
2051
"""List ignored files and the patterns that matched them.
2052
"""
2053
2054
encoding_type = 'replace'
2055
_see_also = ['ignore']
2056
2057
@display_command
2058
def run(self):
2059
tree = WorkingTree.open_containing(u'.')[0]
2060
tree.lock_read()
2061
try:
2062
for path, file_class, kind, file_id, entry in tree.list_files():
2063
if file_class != 'I':
2064
continue
2065
## XXX: Slightly inefficient since this was already calculated
2066
pat = tree.is_ignored(path)
2067
self.outf.write('%-50s %s\n' % (path, pat))
2068
finally:
2069
tree.unlock()
2070
2071
2072
class cmd_lookup_revision(Command):
2073
"""Lookup the revision-id from a revision-number
2074
2075
:Examples:
2076
bzr lookup-revision 33
2077
"""
2078
hidden = True
2079
takes_args = ['revno']
2080
2081
@display_command
2082
def run(self, revno):
2083
try:
2084
revno = int(revno)
2085
except ValueError:
2086
raise errors.BzrCommandError("not a valid revision-number: %r" % revno)
2087
2088
print WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2089
2090
2091
class cmd_export(Command):
2092
"""Export current or past revision to a destination directory or archive.
2093
2094
If no revision is specified this exports the last committed revision.
2095
2096
Format may be an "exporter" name, such as tar, tgz, tbz2. If none is
2097
given, try to find the format with the extension. If no extension
2098
is found exports to a directory (equivalent to --format=dir).
2099
2100
If root is supplied, it will be used as the root directory inside
2101
container formats (tar, zip, etc). If it is not supplied it will default
2102
to the exported filename. The root option has no effect for 'dir' format.
2103
2104
If branch is omitted then the branch containing the current working
2105
directory will be used.
2106
2107
Note: Export of tree with non-ASCII filenames to zip is not supported.
2108
2109
================= =========================
2110
Supported formats Autodetected by extension
2111
================= =========================
2112
dir (none)
2113
tar .tar
2114
tbz2 .tar.bz2, .tbz2
2115
tgz .tar.gz, .tgz
2116
zip .zip
2117
================= =========================
2118
"""
2119
takes_args = ['dest', 'branch?']
2120
takes_options = [
2121
Option('format',
2122
help="Type of file to export to.",
2123
type=unicode),
2124
'revision',
2125
Option('root',
2126
type=str,
2127
help="Name of the root directory inside the exported file."),
2128
]
2129
def run(self, dest, branch=None, revision=None, format=None, root=None):
2130
from bzrlib.export import export
2131
2132
if branch is None:
2133
tree = WorkingTree.open_containing(u'.')[0]
2134
b = tree.branch
2135
else:
2136
b = Branch.open(branch)
2137
2138
if revision is None:
2139
# should be tree.last_revision FIXME
2140
rev_id = b.last_revision()
2141
else:
2142
if len(revision) != 1:
2143
raise errors.BzrCommandError('bzr export --revision takes exactly 1 argument')
2144
rev_id = revision[0].as_revision_id(b)
2145
t = b.repository.revision_tree(rev_id)
2146
try:
2147
export(t, dest, format, root)
2148
except errors.NoSuchExportFormat, e:
2149
raise errors.BzrCommandError('Unsupported export format: %s' % e.format)
2150
2151
2152
class cmd_cat(Command):
2153
"""Write the contents of a file as of a given revision to standard output.
2154
2155
If no revision is nominated, the last revision is used.
2156
2157
Note: Take care to redirect standard output when using this command on a
2158
binary file.
2159
"""
2160
2161
_see_also = ['ls']
2162
takes_options = [
2163
Option('name-from-revision', help='The path name in the old tree.'),
2164
'revision',
2165
]
2166
takes_args = ['filename']
2167
encoding_type = 'exact'
2168
2169
@display_command
2170
def run(self, filename, revision=None, name_from_revision=False):
2171
if revision is not None and len(revision) != 1:
2172
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2173
" one revision specifier")
2174
tree, branch, relpath = \
2175
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2176
branch.lock_read()
2177
try:
2178
return self._run(tree, branch, relpath, filename, revision,
2179
name_from_revision)
2180
finally:
2181
branch.unlock()
2182
2183
def _run(self, tree, b, relpath, filename, revision, name_from_revision):
2184
if tree is None:
2185
tree = b.basis_tree()
2186
if revision is None:
2187
revision_id = b.last_revision()
2188
else:
2189
revision_id = revision[0].as_revision_id(b)
2190
2191
cur_file_id = tree.path2id(relpath)
2192
rev_tree = b.repository.revision_tree(revision_id)
2193
old_file_id = rev_tree.path2id(relpath)
2194
2195
if name_from_revision:
2196
if old_file_id is None:
2197
raise errors.BzrCommandError("%r is not present in revision %s"
2198
% (filename, revision_id))
2199
else:
2200
rev_tree.print_file(old_file_id)
2201
elif cur_file_id is not None:
2202
rev_tree.print_file(cur_file_id)
2203
elif old_file_id is not None:
2204
rev_tree.print_file(old_file_id)
2205
else:
2206
raise errors.BzrCommandError("%r is not present in revision %s" %
2207
(filename, revision_id))
2208
2209
2210
class cmd_local_time_offset(Command):
2211
"""Show the offset in seconds from GMT to local time."""
2212
hidden = True
2213
@display_command
2214
def run(self):
2215
print osutils.local_time_offset()
2216
2217
2218
2219
class cmd_commit(Command):
2220
"""Commit changes into a new revision.
2221
2222
If no arguments are given, the entire tree is committed.
2223
2224
If selected files are specified, only changes to those files are
2225
committed. If a directory is specified then the directory and everything
2226
within it is committed.
2227
2228
If author of the change is not the same person as the committer, you can
2229
specify the author's name using the --author option. The name should be
2230
in the same format as a committer-id, e.g. "John Doe <jdoe@example.com>".
2231
2232
A selected-file commit may fail in some cases where the committed
2233
tree would be invalid. Consider::
2234
2235
bzr init foo
2236
mkdir foo/bar
2237
bzr add foo/bar
2238
bzr commit foo -m "committing foo"
2239
bzr mv foo/bar foo/baz
2240
mkdir foo/bar
2241
bzr add foo/bar
2242
bzr commit foo/bar -m "committing bar but not baz"
2243
2244
In the example above, the last commit will fail by design. This gives
2245
the user the opportunity to decide whether they want to commit the
2246
rename at the same time, separately first, or not at all. (As a general
2247
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2248
2249
Note: A selected-file commit after a merge is not yet supported.
2250
"""
2251
# TODO: Run hooks on tree to-be-committed, and after commit.
2252
2253
# TODO: Strict commit that fails if there are deleted files.
2254
# (what does "deleted files" mean ??)
2255
2256
# TODO: Give better message for -s, --summary, used by tla people
2257
2258
# XXX: verbose currently does nothing
2259
2260
_see_also = ['bugs', 'uncommit']
2261
takes_args = ['selected*']
2262
takes_options = [
2263
Option('message', type=unicode,
2264
short_name='m',
2265
help="Description of the new revision."),
2266
'verbose',
2267
Option('unchanged',
2268
help='Commit even if nothing has changed.'),
2269
Option('file', type=str,
2270
short_name='F',
2271
argname='msgfile',
2272
help='Take commit message from this file.'),
2273
Option('strict',
2274
help="Refuse to commit if there are unknown "
2275
"files in the working tree."),
2276
ListOption('fixes', type=str,
2277
help="Mark a bug as being fixed by this revision."),
2278
Option('author', type=unicode,
2279
help="Set the author's name, if it's different "
2280
"from the committer."),
2281
Option('local',
2282
help="Perform a local commit in a bound "
2283
"branch. Local commits are not pushed to "
2284
"the master branch until a normal commit "
2285
"is performed."
2286
),
2287
Option('show-diff',
2288
help='When no message is supplied, show the diff along'
2289
' with the status summary in the message editor.'),
2290
]
2291
aliases = ['ci', 'checkin']
2292
2293
def _get_bug_fix_properties(self, fixes, branch):
2294
properties = []
2295
# Configure the properties for bug fixing attributes.
2296
for fixed_bug in fixes:
2297
tokens = fixed_bug.split(':')
2298
if len(tokens) != 2:
2299
raise errors.BzrCommandError(
2300
"Invalid bug %s. Must be in the form of 'tag:id'. "
2301
"Commit refused." % fixed_bug)
2302
tag, bug_id = tokens
2303
try:
2304
bug_url = bugtracker.get_bug_url(tag, branch, bug_id)
2305
except errors.UnknownBugTrackerAbbreviation:
2306
raise errors.BzrCommandError(
2307
'Unrecognized bug %s. Commit refused.' % fixed_bug)
2308
except errors.MalformedBugIdentifier:
2309
raise errors.BzrCommandError(
2310
"Invalid bug identifier for %s. Commit refused."
2311
% fixed_bug)
2312
properties.append('%s fixed' % bug_url)
2313
return '\n'.join(properties)
2314
2315
def run(self, message=None, file=None, verbose=False, selected_list=None,
2316
unchanged=False, strict=False, local=False, fixes=None,
2317
author=None, show_diff=False):
2318
from bzrlib.errors import (
2319
PointlessCommit,
2320
ConflictsInTree,
2321
StrictCommitFailed
2322
)
2323
from bzrlib.msgeditor import (
2324
edit_commit_message_encoded,
2325
make_commit_message_template_encoded
2326
)
2327
2328
# TODO: Need a blackbox test for invoking the external editor; may be
2329
# slightly problematic to run this cross-platform.
2330
2331
# TODO: do more checks that the commit will succeed before
2332
# spending the user's valuable time typing a commit message.
2333
2334
properties = {}
2335
2336
tree, selected_list = tree_files(selected_list)
2337
if selected_list == ['']:
2338
# workaround - commit of root of tree should be exactly the same
2339
# as just default commit in that tree, and succeed even though
2340
# selected-file merge commit is not done yet
2341
selected_list = []
2342
2343
if fixes is None:
2344
fixes = []
2345
bug_property = self._get_bug_fix_properties(fixes, tree.branch)
2346
if bug_property:
2347
properties['bugs'] = bug_property
2348
2349
if local and not tree.branch.get_bound_location():
2350
raise errors.LocalRequiresBoundBranch()
2351
2352
def get_message(commit_obj):
2353
"""Callback to get commit message"""
2354
my_message = message
2355
if my_message is None and not file:
2356
t = make_commit_message_template_encoded(tree,
2357
selected_list, diff=show_diff,
2358
output_encoding=bzrlib.user_encoding)
2359
my_message = edit_commit_message_encoded(t)
2360
if my_message is None:
2361
raise errors.BzrCommandError("please specify a commit"
2362
" message with either --message or --file")
2363
elif my_message and file:
2364
raise errors.BzrCommandError(
2365
"please specify either --message or --file")
2366
if file:
2367
my_message = codecs.open(file, 'rt',
2368
bzrlib.user_encoding).read()
2369
if my_message == "":
2370
raise errors.BzrCommandError("empty commit message specified")
2371
return my_message
2372
2373
try:
2374
tree.commit(message_callback=get_message,
2375
specific_files=selected_list,
2376
allow_pointless=unchanged, strict=strict, local=local,
2377
reporter=None, verbose=verbose, revprops=properties,
2378
author=author)
2379
except PointlessCommit:
2380
# FIXME: This should really happen before the file is read in;
2381
# perhaps prepare the commit; get the message; then actually commit
2382
raise errors.BzrCommandError("no changes to commit."
2383
" use --unchanged to commit anyhow")
2384
except ConflictsInTree:
2385
raise errors.BzrCommandError('Conflicts detected in working '
2386
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
2387
' resolve.')
2388
except StrictCommitFailed:
2389
raise errors.BzrCommandError("Commit refused because there are"
2390
" unknown files in the working tree.")
2391
except errors.BoundBranchOutOfDate, e:
2392
raise errors.BzrCommandError(str(e) + "\n"
2393
'To commit to master branch, run update and then commit.\n'
2394
'You can also pass --local to commit to continue working '
2395
'disconnected.')
2396
2397
2398
class cmd_check(Command):
2399
"""Validate consistency of branch history.
2400
2401
This command checks various invariants about the branch storage to
2402
detect data corruption or bzr bugs.
2403
2404
Output fields:
2405
2406
revisions: This is just the number of revisions checked. It doesn't
2407
indicate a problem.
2408
versionedfiles: This is just the number of versionedfiles checked. It
2409
doesn't indicate a problem.
2410
unreferenced ancestors: Texts that are ancestors of other texts, but
2411
are not properly referenced by the revision ancestry. This is a
2412
subtle problem that Bazaar can work around.
2413
unique file texts: This is the total number of unique file contents
2414
seen in the checked revisions. It does not indicate a problem.
2415
repeated file texts: This is the total number of repeated texts seen
2416
in the checked revisions. Texts can be repeated when their file
2417
entries are modified, but the file contents are not. It does not
2418
indicate a problem.
2419
"""
2420
2421
_see_also = ['reconcile']
2422
takes_args = ['branch?']
2423
takes_options = ['verbose']
2424
2425
def run(self, branch=None, verbose=False):
2426
from bzrlib.check import check
2427
if branch is None:
2428
branch_obj = Branch.open_containing('.')[0]
2429
else:
2430
branch_obj = Branch.open(branch)
2431
check(branch_obj, verbose)
2432
# bit hacky, check the tree parent is accurate
2433
try:
2434
if branch is None:
2435
tree = WorkingTree.open_containing('.')[0]
2436
else:
2437
tree = WorkingTree.open(branch)
2438
except (errors.NoWorkingTree, errors.NotLocalUrl):
2439
pass
2440
else:
2441
# This is a primitive 'check' for tree state. Currently this is not
2442
# integrated into the main check logic as yet.
2443
tree.lock_read()
2444
try:
2445
tree_basis = tree.basis_tree()
2446
tree_basis.lock_read()
2447
try:
2448
repo_basis = tree.branch.repository.revision_tree(
2449
tree.last_revision())
2450
if len(list(repo_basis.iter_changes(tree_basis))):
2451
raise errors.BzrCheckError(
2452
"Mismatched basis inventory content.")
2453
tree._validate()
2454
finally:
2455
tree_basis.unlock()
2456
finally:
2457
tree.unlock()
2458
2459
2460
class cmd_upgrade(Command):
2461
"""Upgrade branch storage to current format.
2462
2463
The check command or bzr developers may sometimes advise you to run
2464
this command. When the default format has changed you may also be warned
2465
during other operations to upgrade.
2466
"""
2467
2468
_see_also = ['check']
2469
takes_args = ['url?']
2470
takes_options = [
2471
RegistryOption('format',
2472
help='Upgrade to a specific format. See "bzr help'
2473
' formats" for details.',
2474
registry=bzrdir.format_registry,
2475
converter=bzrdir.format_registry.make_bzrdir,
2476
value_switches=True, title='Branch format'),
2477
]
2478
2479
def run(self, url='.', format=None):
2480
from bzrlib.upgrade import upgrade
2481
if format is None:
2482
format = bzrdir.format_registry.make_bzrdir('default')
2483
upgrade(url, format)
2484
2485
2486
class cmd_whoami(Command):
2487
"""Show or set bzr user id.
2488
2489
:Examples:
2490
Show the email of the current user::
2491
2492
bzr whoami --email
2493
2494
Set the current user::
2495
2496
bzr whoami "Frank Chu <fchu@example.com>"
2497
"""
2498
takes_options = [ Option('email',
2499
help='Display email address only.'),
2500
Option('branch',
2501
help='Set identity for the current branch instead of '
2502
'globally.'),
2503
]
2504
takes_args = ['name?']
2505
encoding_type = 'replace'
2506
2507
@display_command
2508
def run(self, email=False, branch=False, name=None):
2509
if name is None:
2510
# use branch if we're inside one; otherwise global config
2511
try:
2512
c = Branch.open_containing('.')[0].get_config()
2513
except errors.NotBranchError:
2514
c = config.GlobalConfig()
2515
if email:
2516
self.outf.write(c.user_email() + '\n')
2517
else:
2518
self.outf.write(c.username() + '\n')
2519
return
2520
2521
# display a warning if an email address isn't included in the given name.
2522
try:
2523
config.extract_email_address(name)
2524
except errors.NoEmailInUsername, e:
2525
warning('"%s" does not seem to contain an email address. '
2526
'This is allowed, but not recommended.', name)
2527
2528
# use global config unless --branch given
2529
if branch:
2530
c = Branch.open_containing('.')[0].get_config()
2531
else:
2532
c = config.GlobalConfig()
2533
c.set_user_option('email', name)
2534
2535
2536
class cmd_nick(Command):
2537
"""Print or set the branch nickname.
2538
2539
If unset, the tree root directory name is used as the nickname
2540
To print the current nickname, execute with no argument.
2541
"""
2542
2543
_see_also = ['info']
2544
takes_args = ['nickname?']
2545
def run(self, nickname=None):
2546
branch = Branch.open_containing(u'.')[0]
2547
if nickname is None:
2548
self.printme(branch)
2549
else:
2550
branch.nick = nickname
2551
2552
@display_command
2553
def printme(self, branch):
2554
print branch.nick
2555
2556
2557
class cmd_selftest(Command):
2558
"""Run internal test suite.
2559
2560
If arguments are given, they are regular expressions that say which tests
2561
should run. Tests matching any expression are run, and other tests are
2562
not run.
2563
2564
Alternatively if --first is given, matching tests are run first and then
2565
all other tests are run. This is useful if you have been working in a
2566
particular area, but want to make sure nothing else was broken.
2567
2568
If --exclude is given, tests that match that regular expression are
2569
excluded, regardless of whether they match --first or not.
2570
2571
To help catch accidential dependencies between tests, the --randomize
2572
option is useful. In most cases, the argument used is the word 'now'.
2573
Note that the seed used for the random number generator is displayed
2574
when this option is used. The seed can be explicitly passed as the
2575
argument to this option if required. This enables reproduction of the
2576
actual ordering used if and when an order sensitive problem is encountered.
2577
2578
If --list-only is given, the tests that would be run are listed. This is
2579
useful when combined with --first, --exclude and/or --randomize to
2580
understand their impact. The test harness reports "Listed nn tests in ..."
2581
instead of "Ran nn tests in ..." when list mode is enabled.
2582
2583
If the global option '--no-plugins' is given, plugins are not loaded
2584
before running the selftests. This has two effects: features provided or
2585
modified by plugins will not be tested, and tests provided by plugins will
2586
not be run.
2587
2588
Tests that need working space on disk use a common temporary directory,
2589
typically inside $TMPDIR or /tmp.
2590
2591
:Examples:
2592
Run only tests relating to 'ignore'::
2593
2594
bzr selftest ignore
2595
2596
Disable plugins and list tests as they're run::
2597
2598
bzr --no-plugins selftest -v
2599
"""
2600
# NB: this is used from the class without creating an instance, which is
2601
# why it does not have a self parameter.
2602
def get_transport_type(typestring):
2603
"""Parse and return a transport specifier."""
2604
if typestring == "sftp":
2605
from bzrlib.transport.sftp import SFTPAbsoluteServer
2606
return SFTPAbsoluteServer
2607
if typestring == "memory":
2608
from bzrlib.transport.memory import MemoryServer
2609
return MemoryServer
2610
if typestring == "fakenfs":
2611
from bzrlib.transport.fakenfs import FakeNFSServer
2612
return FakeNFSServer
2613
msg = "No known transport type %s. Supported types are: sftp\n" %\
2614
(typestring)
2615
raise errors.BzrCommandError(msg)
2616
2617
hidden = True
2618
takes_args = ['testspecs*']
2619
takes_options = ['verbose',
2620
Option('one',
2621
help='Stop when one test fails.',
2622
short_name='1',
2623
),
2624
Option('transport',
2625
help='Use a different transport by default '
2626
'throughout the test suite.',
2627
type=get_transport_type),
2628
Option('benchmark',
2629
help='Run the benchmarks rather than selftests.'),
2630
Option('lsprof-timed',
2631
help='Generate lsprof output for benchmarked'
2632
' sections of code.'),
2633
Option('cache-dir', type=str,
2634
help='Cache intermediate benchmark output in this '
2635
'directory.'),
2636
Option('first',
2637
help='Run all tests, but run specified tests first.',
2638
short_name='f',
2639
),
2640
Option('list-only',
2641
help='List the tests instead of running them.'),
2642
Option('randomize', type=str, argname="SEED",
2643
help='Randomize the order of tests using the given'
2644
' seed or "now" for the current time.'),
2645
Option('exclude', type=str, argname="PATTERN",
2646
short_name='x',
2647
help='Exclude tests that match this regular'
2648
' expression.'),
2649
Option('strict', help='Fail on missing dependencies or '
2650
'known failures.'),
2651
Option('load-list', type=str, argname='TESTLISTFILE',
2652
help='Load a test id list from a text file.'),
2653
]
2654
encoding_type = 'replace'
2655
2656
def run(self, testspecs_list=None, verbose=False, one=False,
2657
transport=None, benchmark=None,
2658
lsprof_timed=None, cache_dir=None,
2659
first=False, list_only=False,
2660
randomize=None, exclude=None, strict=False,
2661
load_list=None):
2662
import bzrlib.ui
2663
from bzrlib.tests import selftest
2664
import bzrlib.benchmarks as benchmarks
2665
from bzrlib.benchmarks import tree_creator
2666
2667
if cache_dir is not None:
2668
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2669
if not list_only:
2670
print 'testing: %s' % (osutils.realpath(sys.argv[0]),)
2671
print ' %s (%s python%s)' % (
2672
bzrlib.__path__[0],
2673
bzrlib.version_string,
2674
bzrlib._format_version_tuple(sys.version_info),
2675
)
2676
print
2677
if testspecs_list is not None:
2678
pattern = '|'.join(testspecs_list)
2679
else:
2680
pattern = ".*"
2681
if benchmark:
2682
test_suite_factory = benchmarks.test_suite
2683
# Unless user explicitly asks for quiet, be verbose in benchmarks
2684
verbose = not is_quiet()
2685
# TODO: should possibly lock the history file...
2686
benchfile = open(".perf_history", "at", buffering=1)
2687
else:
2688
test_suite_factory = None
2689
benchfile = None
2690
try:
2691
result = selftest(verbose=verbose,
2692
pattern=pattern,
2693
stop_on_failure=one,
2694
transport=transport,
2695
test_suite_factory=test_suite_factory,
2696
lsprof_timed=lsprof_timed,
2697
bench_history=benchfile,
2698
matching_tests_first=first,
2699
list_only=list_only,
2700
random_seed=randomize,
2701
exclude_pattern=exclude,
2702
strict=strict,
2703
load_list=load_list,
2704
)
2705
finally:
2706
if benchfile is not None:
2707
benchfile.close()
2708
if result:
2709
note('tests passed')
2710
else:
2711
note('tests failed')
2712
return int(not result)
2713
2714
2715
class cmd_version(Command):
2716
"""Show version of bzr."""
2717
2718
encoding_type = 'replace'
2719
takes_options = [
2720
Option("short", help="Print just the version number."),
2721
]
2722
2723
@display_command
2724
def run(self, short=False):
2725
from bzrlib.version import show_version
2726
if short:
2727
print(bzrlib.version_string)
2728
else:
2729
show_version(to_file=self.outf)
2730
2731
2732
class cmd_rocks(Command):
2733
"""Statement of optimism."""
2734
2735
hidden = True
2736
2737
@display_command
2738
def run(self):
2739
print "It sure does!"
2740
2741
2742
class cmd_find_merge_base(Command):
2743
"""Find and print a base revision for merging two branches."""
2744
# TODO: Options to specify revisions on either side, as if
2745
# merging only part of the history.
2746
takes_args = ['branch', 'other']
2747
hidden = True
2748
2749
@display_command
2750
def run(self, branch, other):
2751
from bzrlib.revision import ensure_null
2752
2753
branch1 = Branch.open_containing(branch)[0]
2754
branch2 = Branch.open_containing(other)[0]
2755
branch1.lock_read()
2756
try:
2757
branch2.lock_read()
2758
try:
2759
last1 = ensure_null(branch1.last_revision())
2760
last2 = ensure_null(branch2.last_revision())
2761
2762
graph = branch1.repository.get_graph(branch2.repository)
2763
base_rev_id = graph.find_unique_lca(last1, last2)
2764
2765
print 'merge base is revision %s' % base_rev_id
2766
finally:
2767
branch2.unlock()
2768
finally:
2769
branch1.unlock()
2770
2771
2772
class cmd_merge(Command):
2773
"""Perform a three-way merge.
2774
2775
The source of the merge can be specified either in the form of a branch,
2776
or in the form of a path to a file containing a merge directive generated
2777
with bzr send. If neither is specified, the default is the upstream branch
2778
or the branch most recently merged using --remember.
2779
2780
When merging a branch, by default the tip will be merged. To pick a different
2781
revision, pass --revision. If you specify two values, the first will be used as
2782
BASE and the second one as OTHER. Merging individual revisions, or a subset of
2783
available revisions, like this is commonly referred to as "cherrypicking".
2784
2785
Revision numbers are always relative to the branch being merged.
2786
2787
By default, bzr will try to merge in all new work from the other
2788
branch, automatically determining an appropriate base. If this
2789
fails, you may need to give an explicit base.
2790
2791
Merge will do its best to combine the changes in two branches, but there
2792
are some kinds of problems only a human can fix. When it encounters those,
2793
it will mark a conflict. A conflict means that you need to fix something,
2794
before you should commit.
2795
2796
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
2797
2798
If there is no default branch set, the first merge will set it. After
2799
that, you can omit the branch to use the default. To change the
2800
default, use --remember. The value will only be saved if the remote
2801
location can be accessed.
2802
2803
The results of the merge are placed into the destination working
2804
directory, where they can be reviewed (with bzr diff), tested, and then
2805
committed to record the result of the merge.
2806
2807
merge refuses to run if there are any uncommitted changes, unless
2808
--force is given.
2809
2810
:Examples:
2811
To merge the latest revision from bzr.dev::
2812
2813
bzr merge ../bzr.dev
2814
2815
To merge changes up to and including revision 82 from bzr.dev::
2816
2817
bzr merge -r 82 ../bzr.dev
2818
2819
To merge the changes introduced by 82, without previous changes::
2820
2821
bzr merge -r 81..82 ../bzr.dev
2822
2823
To apply a merge directive contained in in /tmp/merge:
2824
2825
bzr merge /tmp/merge
2826
"""
2827
2828
encoding_type = 'exact'
2829
_see_also = ['update', 'remerge', 'status-flags']
2830
takes_args = ['location?']
2831
takes_options = [
2832
'change',
2833
'revision',
2834
Option('force',
2835
help='Merge even if the destination tree has uncommitted changes.'),
2836
'merge-type',
2837
'reprocess',
2838
'remember',
2839
Option('show-base', help="Show base revision text in "
2840
"conflicts."),
2841
Option('uncommitted', help='Apply uncommitted changes'
2842
' from a working copy, instead of branch changes.'),
2843
Option('pull', help='If the destination is already'
2844
' completely merged into the source, pull from the'
2845
' source rather than merging. When this happens,'
2846
' you do not need to commit the result.'),
2847
Option('directory',
2848
help='Branch to merge into, '
2849
'rather than the one containing the working directory.',
2850
short_name='d',
2851
type=unicode,
2852
),
2853
Option('preview', help='Instead of merging, show a diff of the merge.')
2854
]
2855
2856
def run(self, location=None, revision=None, force=False,
2857
merge_type=None, show_base=False, reprocess=False, remember=False,
2858
uncommitted=False, pull=False,
2859
directory=None,
2860
preview=False,
2861
):
2862
if merge_type is None:
2863
merge_type = _mod_merge.Merge3Merger
2864
2865
if directory is None: directory = u'.'
2866
possible_transports = []
2867
merger = None
2868
allow_pending = True
2869
verified = 'inapplicable'
2870
tree = WorkingTree.open_containing(directory)[0]
2871
change_reporter = delta._ChangeReporter(
2872
unversioned_filter=tree.is_ignored)
2873
cleanups = []
2874
try:
2875
pb = ui.ui_factory.nested_progress_bar()
2876
cleanups.append(pb.finished)
2877
tree.lock_write()
2878
cleanups.append(tree.unlock)
2879
if location is not None:
2880
try:
2881
mergeable = bundle.read_mergeable_from_url(location,
2882
possible_transports=possible_transports)
2883
except errors.NotABundle:
2884
mergeable = None
2885
else:
2886
if uncommitted:
2887
raise errors.BzrCommandError('Cannot use --uncommitted'
2888
' with bundles or merge directives.')
2889
2890
if revision is not None:
2891
raise errors.BzrCommandError(
2892
'Cannot use -r with merge directives or bundles')
2893
merger, verified = _mod_merge.Merger.from_mergeable(tree,
2894
mergeable, pb)
2895
2896
if merger is None and uncommitted:
2897
if revision is not None and len(revision) > 0:
2898
raise errors.BzrCommandError('Cannot use --uncommitted and'
2899
' --revision at the same time.')
2900
location = self._select_branch_location(tree, location)[0]
2901
other_tree, other_path = WorkingTree.open_containing(location)
2902
merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
2903
pb)
2904
allow_pending = False
2905
if other_path != '':
2906
merger.interesting_files = [other_path]
2907
2908
if merger is None:
2909
merger, allow_pending = self._get_merger_from_branch(tree,
2910
location, revision, remember, possible_transports, pb)
2911
2912
merger.merge_type = merge_type
2913
merger.reprocess = reprocess
2914
merger.show_base = show_base
2915
self.sanity_check_merger(merger)
2916
if (merger.base_rev_id == merger.other_rev_id and
2917
merger.other_rev_id != None):
2918
note('Nothing to do.')
2919
return 0
2920
if pull:
2921
if merger.interesting_files is not None:
2922
raise errors.BzrCommandError('Cannot pull individual files')
2923
if (merger.base_rev_id == tree.last_revision()):
2924
result = tree.pull(merger.other_branch, False,
2925
merger.other_rev_id)
2926
result.report(self.outf)
2927
return 0
2928
merger.check_basis(not force)
2929
if preview:
2930
return self._do_preview(merger)
2931
else:
2932
return self._do_merge(merger, change_reporter, allow_pending,
2933
verified)
2934
finally:
2935
for cleanup in reversed(cleanups):
2936
cleanup()
2937
2938
def _do_preview(self, merger):
2939
from bzrlib.diff import show_diff_trees
2940
tree_merger = merger.make_merger()
2941
tt = tree_merger.make_preview_transform()
2942
try:
2943
result_tree = tt.get_preview_tree()
2944
show_diff_trees(merger.this_tree, result_tree, self.outf,
2945
old_label='', new_label='')
2946
finally:
2947
tt.finalize()
2948
2949
def _do_merge(self, merger, change_reporter, allow_pending, verified):
2950
merger.change_reporter = change_reporter
2951
conflict_count = merger.do_merge()
2952
if allow_pending:
2953
merger.set_pending()
2954
if verified == 'failed':
2955
warning('Preview patch does not match changes')
2956
if conflict_count != 0:
2957
return 1
2958
else:
2959
return 0
2960
2961
def sanity_check_merger(self, merger):
2962
if (merger.show_base and
2963
not merger.merge_type is _mod_merge.Merge3Merger):
2964
raise errors.BzrCommandError("Show-base is not supported for this"
2965
" merge type. %s" % merger.merge_type)
2966
if merger.reprocess and not merger.merge_type.supports_reprocess:
2967
raise errors.BzrCommandError("Conflict reduction is not supported"
2968
" for merge type %s." %
2969
merger.merge_type)
2970
if merger.reprocess and merger.show_base:
2971
raise errors.BzrCommandError("Cannot do conflict reduction and"
2972
" show base.")
2973
2974
def _get_merger_from_branch(self, tree, location, revision, remember,
2975
possible_transports, pb):
2976
"""Produce a merger from a location, assuming it refers to a branch."""
2977
from bzrlib.tag import _merge_tags_if_possible
2978
assert revision is None or len(revision) < 3
2979
# find the branch locations
2980
other_loc, user_location = self._select_branch_location(tree, location,
2981
revision, -1)
2982
if revision is not None and len(revision) == 2:
2983
base_loc, _unused = self._select_branch_location(tree,
2984
location, revision, 0)
2985
else:
2986
base_loc = other_loc
2987
# Open the branches
2988
other_branch, other_path = Branch.open_containing(other_loc,
2989
possible_transports)
2990
if base_loc == other_loc:
2991
base_branch = other_branch
2992
else:
2993
base_branch, base_path = Branch.open_containing(base_loc,
2994
possible_transports)
2995
# Find the revision ids
2996
if revision is None or len(revision) < 1 or revision[-1] is None:
2997
other_revision_id = _mod_revision.ensure_null(
2998
other_branch.last_revision())
2999
else:
3000
other_revision_id = revision[-1].as_revision_id(other_branch)
3001
if (revision is not None and len(revision) == 2
3002
and revision[0] is not None):
3003
base_revision_id = revision[0].as_revision_id(base_branch)
3004
else:
3005
base_revision_id = None
3006
# Remember where we merge from
3007
if ((remember or tree.branch.get_submit_branch() is None) and
3008
user_location is not None):
3009
tree.branch.set_submit_branch(other_branch.base)
3010
_merge_tags_if_possible(other_branch, tree.branch)
3011
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3012
other_revision_id, base_revision_id, other_branch, base_branch)
3013
if other_path != '':
3014
allow_pending = False
3015
merger.interesting_files = [other_path]
3016
else:
3017
allow_pending = True
3018
return merger, allow_pending
3019
3020
def _select_branch_location(self, tree, user_location, revision=None,
3021
index=None):
3022
"""Select a branch location, according to possible inputs.
3023
3024
If provided, branches from ``revision`` are preferred. (Both
3025
``revision`` and ``index`` must be supplied.)
3026
3027
Otherwise, the ``location`` parameter is used. If it is None, then the
3028
``submit`` or ``parent`` location is used, and a note is printed.
3029
3030
:param tree: The working tree to select a branch for merging into
3031
:param location: The location entered by the user
3032
:param revision: The revision parameter to the command
3033
:param index: The index to use for the revision parameter. Negative
3034
indices are permitted.
3035
:return: (selected_location, user_location). The default location
3036
will be the user-entered location.
3037
"""
3038
if (revision is not None and index is not None
3039
and revision[index] is not None):
3040
branch = revision[index].get_branch()
3041
if branch is not None:
3042
return branch, branch
3043
if user_location is None:
3044
location = self._get_remembered(tree, 'Merging from')
3045
else:
3046
location = user_location
3047
return location, user_location
3048
3049
def _get_remembered(self, tree, verb_string):
3050
"""Use tree.branch's parent if none was supplied.
3051
3052
Report if the remembered location was used.
3053
"""
3054
stored_location = tree.branch.get_submit_branch()
3055
if stored_location is None:
3056
stored_location = tree.branch.get_parent()
3057
mutter("%s", stored_location)
3058
if stored_location is None:
3059
raise errors.BzrCommandError("No location specified or remembered")
3060
display_url = urlutils.unescape_for_display(stored_location, 'utf-8')
3061
note(u"%s remembered location %s", verb_string, display_url)
3062
return stored_location
3063
3064
3065
class cmd_remerge(Command):
3066
"""Redo a merge.
3067
3068
Use this if you want to try a different merge technique while resolving
3069
conflicts. Some merge techniques are better than others, and remerge
3070
lets you try different ones on different files.
3071
3072
The options for remerge have the same meaning and defaults as the ones for
3073
merge. The difference is that remerge can (only) be run when there is a
3074
pending merge, and it lets you specify particular files.
3075
3076
:Examples:
3077
Re-do the merge of all conflicted files, and show the base text in
3078
conflict regions, in addition to the usual THIS and OTHER texts::
3079
3080
bzr remerge --show-base
3081
3082
Re-do the merge of "foobar", using the weave merge algorithm, with
3083
additional processing to reduce the size of conflict regions::
3084
3085
bzr remerge --merge-type weave --reprocess foobar
3086
"""
3087
takes_args = ['file*']
3088
takes_options = [
3089
'merge-type',
3090
'reprocess',
3091
Option('show-base',
3092
help="Show base revision text in conflicts."),
3093
]
3094
3095
def run(self, file_list=None, merge_type=None, show_base=False,
3096
reprocess=False):
3097
if merge_type is None:
3098
merge_type = _mod_merge.Merge3Merger
3099
tree, file_list = tree_files(file_list)
3100
tree.lock_write()
3101
try:
3102
parents = tree.get_parent_ids()
3103
if len(parents) != 2:
3104
raise errors.BzrCommandError("Sorry, remerge only works after normal"
3105
" merges. Not cherrypicking or"
3106
" multi-merges.")
3107
repository = tree.branch.repository
3108
interesting_ids = None
3109
new_conflicts = []
3110
conflicts = tree.conflicts()
3111
if file_list is not None:
3112
interesting_ids = set()
3113
for filename in file_list:
3114
file_id = tree.path2id(filename)
3115
if file_id is None:
3116
raise errors.NotVersionedError(filename)
3117
interesting_ids.add(file_id)
3118
if tree.kind(file_id) != "directory":
3119
continue
3120
3121
for name, ie in tree.inventory.iter_entries(file_id):
3122
interesting_ids.add(ie.file_id)
3123
new_conflicts = conflicts.select_conflicts(tree, file_list)[0]
3124
else:
3125
# Remerge only supports resolving contents conflicts
3126
allowed_conflicts = ('text conflict', 'contents conflict')
3127
restore_files = [c.path for c in conflicts
3128
if c.typestring in allowed_conflicts]
3129
_mod_merge.transform_tree(tree, tree.basis_tree(), interesting_ids)
3130
tree.set_conflicts(ConflictList(new_conflicts))
3131
if file_list is not None:
3132
restore_files = file_list
3133
for filename in restore_files:
3134
try:
3135
restore(tree.abspath(filename))
3136
except errors.NotConflicted:
3137
pass
3138
# Disable pending merges, because the file texts we are remerging
3139
# have not had those merges performed. If we use the wrong parents
3140
# list, we imply that the working tree text has seen and rejected
3141
# all the changes from the other tree, when in fact those changes
3142
# have not yet been seen.
3143
pb = ui.ui_factory.nested_progress_bar()
3144
tree.set_parent_ids(parents[:1])
3145
try:
3146
merger = _mod_merge.Merger.from_revision_ids(pb,
3147
tree, parents[1])
3148
merger.interesting_ids = interesting_ids
3149
merger.merge_type = merge_type
3150
merger.show_base = show_base
3151
merger.reprocess = reprocess
3152
conflicts = merger.do_merge()
3153
finally:
3154
tree.set_parent_ids(parents)
3155
pb.finished()
3156
finally:
3157
tree.unlock()
3158
if conflicts > 0:
3159
return 1
3160
else:
3161
return 0
3162
3163
3164
class cmd_revert(Command):
3165
"""Revert files to a previous revision.
3166
3167
Giving a list of files will revert only those files. Otherwise, all files
3168
will be reverted. If the revision is not specified with '--revision', the
3169
last committed revision is used.
3170
3171
To remove only some changes, without reverting to a prior version, use
3172
merge instead. For example, "merge . --revision -2..-3" will remove the
3173
changes introduced by -2, without affecting the changes introduced by -1.
3174
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
3175
3176
By default, any files that have been manually changed will be backed up
3177
first. (Files changed only by merge are not backed up.) Backup files have
3178
'.~#~' appended to their name, where # is a number.
3179
3180
When you provide files, you can use their current pathname or the pathname
3181
from the target revision. So you can use revert to "undelete" a file by
3182
name. If you name a directory, all the contents of that directory will be
3183
reverted.
3184
3185
Any files that have been newly added since that revision will be deleted,
3186
with a backup kept if appropriate. Directories containing unknown files
3187
will not be deleted.
3188
3189
The working tree contains a list of pending merged revisions, which will
3190
be included as parents in the next commit. Normally, revert clears that
3191
list as well as reverting the files. If any files are specified, revert
3192
leaves the pending merge list alone and reverts only the files. Use "bzr
3193
revert ." in the tree root to revert all files but keep the merge record,
3194
and "bzr revert --forget-merges" to clear the pending merge list without
3195
reverting any files.
3196
"""
3197
3198
_see_also = ['cat', 'export']
3199
takes_options = [
3200
'revision',
3201
Option('no-backup', "Do not save backups of reverted files."),
3202
Option('forget-merges',
3203
'Remove pending merge marker, without changing any files.'),
3204
]
3205
takes_args = ['file*']
3206
3207
def run(self, revision=None, no_backup=False, file_list=None,
3208
forget_merges=None):
3209
tree, file_list = tree_files(file_list)
3210
if forget_merges:
3211
tree.set_parent_ids(tree.get_parent_ids()[:1])
3212
else:
3213
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
3214
3215
@staticmethod
3216
def _revert_tree_to_revision(tree, revision, file_list, no_backup):
3217
if revision is None:
3218
rev_id = tree.last_revision()
3219
elif len(revision) != 1:
3220
raise errors.BzrCommandError('bzr revert --revision takes exactly 1 argument')
3221
else:
3222
rev_id = revision[0].as_revision_id(tree.branch)
3223
pb = ui.ui_factory.nested_progress_bar()
3224
try:
3225
tree.revert(file_list,
3226
tree.branch.repository.revision_tree(rev_id),
3227
not no_backup, pb, report_changes=True)
3228
finally:
3229
pb.finished()
3230
3231
3232
class cmd_assert_fail(Command):
3233
"""Test reporting of assertion failures"""
3234
# intended just for use in testing
3235
3236
hidden = True
3237
3238
def run(self):
3239
raise AssertionError("always fails")
3240
3241
3242
class cmd_help(Command):
3243
"""Show help on a command or other topic.
3244
"""
3245
3246
_see_also = ['topics']
3247
takes_options = [
3248
Option('long', 'Show help on all commands.'),
3249
]
3250
takes_args = ['topic?']
3251
aliases = ['?', '--help', '-?', '-h']
3252
3253
@display_command
3254
def run(self, topic=None, long=False):
3255
import bzrlib.help
3256
if topic is None and long:
3257
topic = "commands"
3258
bzrlib.help.help(topic)
3259
3260
3261
class cmd_shell_complete(Command):
3262
"""Show appropriate completions for context.
3263
3264
For a list of all available commands, say 'bzr shell-complete'.
3265
"""
3266
takes_args = ['context?']
3267
aliases = ['s-c']
3268
hidden = True
3269
3270
@display_command
3271
def run(self, context=None):
3272
import shellcomplete
3273
shellcomplete.shellcomplete(context)
3274
3275
3276
class cmd_fetch(Command):
3277
"""Copy in history from another branch but don't merge it.
3278
3279
This is an internal method used for pull and merge.
3280
"""
3281
hidden = True
3282
takes_args = ['from_branch', 'to_branch']
3283
def run(self, from_branch, to_branch):
3284
from bzrlib.fetch import Fetcher
3285
from_b = Branch.open(from_branch)
3286
to_b = Branch.open(to_branch)
3287
Fetcher(to_b, from_b)
3288
3289
3290
class cmd_missing(Command):
3291
"""Show unmerged/unpulled revisions between two branches.
3292
3293
OTHER_BRANCH may be local or remote.
3294
"""
3295
3296
_see_also = ['merge', 'pull']
3297
takes_args = ['other_branch?']
3298
takes_options = [
3299
Option('reverse', 'Reverse the order of revisions.'),
3300
Option('mine-only',
3301
'Display changes in the local branch only.'),
3302
Option('this' , 'Same as --mine-only.'),
3303
Option('theirs-only',
3304
'Display changes in the remote branch only.'),
3305
Option('other', 'Same as --theirs-only.'),
3306
'log-format',
3307
'show-ids',
3308
'verbose'
3309
]
3310
encoding_type = 'replace'
3311
3312
@display_command
3313
def run(self, other_branch=None, reverse=False, mine_only=False,
3314
theirs_only=False, log_format=None, long=False, short=False, line=False,
3315
show_ids=False, verbose=False, this=False, other=False):
3316
from bzrlib.missing import find_unmerged, iter_log_revisions
3317
3318
if this:
3319
mine_only = this
3320
if other:
3321
theirs_only = other
3322
3323
local_branch = Branch.open_containing(u".")[0]
3324
parent = local_branch.get_parent()
3325
if other_branch is None:
3326
other_branch = parent
3327
if other_branch is None:
3328
raise errors.BzrCommandError("No peer location known"
3329
" or specified.")
3330
display_url = urlutils.unescape_for_display(parent,
3331
self.outf.encoding)
3332
self.outf.write("Using last location: " + display_url + "\n")
3333
3334
remote_branch = Branch.open(other_branch)
3335
if remote_branch.base == local_branch.base:
3336
remote_branch = local_branch
3337
local_branch.lock_read()
3338
try:
3339
remote_branch.lock_read()
3340
try:
3341
local_extra, remote_extra = find_unmerged(local_branch,
3342
remote_branch)
3343
if log_format is None:
3344
registry = log.log_formatter_registry
3345
log_format = registry.get_default(local_branch)
3346
lf = log_format(to_file=self.outf,
3347
show_ids=show_ids,
3348
show_timezone='original')
3349
if reverse is False:
3350
local_extra.reverse()
3351
remote_extra.reverse()
3352
if local_extra and not theirs_only:
3353
self.outf.write("You have %d extra revision(s):\n" %
3354
len(local_extra))
3355
for revision in iter_log_revisions(local_extra,
3356
local_branch.repository,
3357
verbose):
3358
lf.log_revision(revision)
3359
printed_local = True
3360
else:
3361
printed_local = False
3362
if remote_extra and not mine_only:
3363
if printed_local is True:
3364
self.outf.write("\n\n\n")
3365
self.outf.write("You are missing %d revision(s):\n" %
3366
len(remote_extra))
3367
for revision in iter_log_revisions(remote_extra,
3368
remote_branch.repository,
3369
verbose):
3370
lf.log_revision(revision)
3371
if not remote_extra and not local_extra:
3372
status_code = 0
3373
self.outf.write("Branches are up to date.\n")
3374
else:
3375
status_code = 1
3376
finally:
3377
remote_branch.unlock()
3378
finally:
3379
local_branch.unlock()
3380
if not status_code and parent is None and other_branch is not None:
3381
local_branch.lock_write()
3382
try:
3383
# handle race conditions - a parent might be set while we run.
3384
if local_branch.get_parent() is None:
3385
local_branch.set_parent(remote_branch.base)
3386
finally:
3387
local_branch.unlock()
3388
return status_code
3389
3390
3391
class cmd_pack(Command):
3392
"""Compress the data within a repository."""
3393
3394
_see_also = ['repositories']
3395
takes_args = ['branch_or_repo?']
3396
3397
def run(self, branch_or_repo='.'):
3398
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
3399
try:
3400
branch = dir.open_branch()
3401
repository = branch.repository
3402
except errors.NotBranchError:
3403
repository = dir.open_repository()
3404
repository.pack()
3405
3406
3407
class cmd_plugins(Command):
3408
"""List the installed plugins.
3409
3410
This command displays the list of installed plugins including
3411
version of plugin and a short description of each.
3412
3413
--verbose shows the path where each plugin is located.
3414
3415
A plugin is an external component for Bazaar that extends the
3416
revision control system, by adding or replacing code in Bazaar.
3417
Plugins can do a variety of things, including overriding commands,
3418
adding new commands, providing additional network transports and
3419
customizing log output.
3420
3421
See the Bazaar web site, http://bazaar-vcs.org, for further
3422
information on plugins including where to find them and how to
3423
install them. Instructions are also provided there on how to
3424
write new plugins using the Python programming language.
3425
"""
3426
takes_options = ['verbose']
3427
3428
@display_command
3429
def run(self, verbose=False):
3430
import bzrlib.plugin
3431
from inspect import getdoc
3432
result = []
3433
for name, plugin in bzrlib.plugin.plugins().items():
3434
version = plugin.__version__
3435
if version == 'unknown':
3436
version = ''
3437
name_ver = '%s %s' % (name, version)
3438
d = getdoc(plugin.module)
3439
if d:
3440
doc = d.split('\n')[0]
3441
else:
3442
doc = '(no description)'
3443
result.append((name_ver, doc, plugin.path()))
3444
for name_ver, doc, path in sorted(result):
3445
print name_ver
3446
print ' ', doc
3447
if verbose:
3448
print ' ', path
3449
print
3450
3451
3452
class cmd_testament(Command):
3453
"""Show testament (signing-form) of a revision."""
3454
takes_options = [
3455
'revision',
3456
Option('long', help='Produce long-format testament.'),
3457
Option('strict',
3458
help='Produce a strict-format testament.')]
3459
takes_args = ['branch?']
3460
@display_command
3461
def run(self, branch=u'.', revision=None, long=False, strict=False):
3462
from bzrlib.testament import Testament, StrictTestament
3463
if strict is True:
3464
testament_class = StrictTestament
3465
else:
3466
testament_class = Testament
3467
b = WorkingTree.open_containing(branch)[0].branch
3468
b.lock_read()
3469
try:
3470
if revision is None:
3471
rev_id = b.last_revision()
3472
else:
3473
rev_id = revision[0].as_revision_id(b)
3474
t = testament_class.from_revision(b.repository, rev_id)
3475
if long:
3476
sys.stdout.writelines(t.as_text_lines())
3477
else:
3478
sys.stdout.write(t.as_short_text())
3479
finally:
3480
b.unlock()
3481
3482
3483
class cmd_annotate(Command):
3484
"""Show the origin of each line in a file.
3485
3486
This prints out the given file with an annotation on the left side
3487
indicating which revision, author and date introduced the change.
3488
3489
If the origin is the same for a run of consecutive lines, it is
3490
shown only at the top, unless the --all option is given.
3491
"""
3492
# TODO: annotate directories; showing when each file was last changed
3493
# TODO: if the working copy is modified, show annotations on that
3494
# with new uncommitted lines marked
3495
aliases = ['ann', 'blame', 'praise']
3496
takes_args = ['filename']
3497
takes_options = [Option('all', help='Show annotations on all lines.'),
3498
Option('long', help='Show commit date in annotations.'),
3499
'revision',
3500
'show-ids',
3501
]
3502
encoding_type = 'exact'
3503
3504
@display_command
3505
def run(self, filename, all=False, long=False, revision=None,
3506
show_ids=False):
3507
from bzrlib.annotate import annotate_file
3508
wt, branch, relpath = \
3509
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
3510
if wt is not None:
3511
wt.lock_read()
3512
else:
3513
branch.lock_read()
3514
try:
3515
if revision is None:
3516
revision_id = branch.last_revision()
3517
elif len(revision) != 1:
3518
raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
3519
else:
3520
revision_id = revision[0].as_revision_id(branch)
3521
tree = branch.repository.revision_tree(revision_id)
3522
if wt is not None:
3523
file_id = wt.path2id(relpath)
3524
else:
3525
file_id = tree.path2id(relpath)
3526
if file_id is None:
3527
raise errors.NotVersionedError(filename)
3528
file_version = tree.inventory[file_id].revision
3529
annotate_file(branch, file_version, file_id, long, all, self.outf,
3530
show_ids=show_ids)
3531
finally:
3532
if wt is not None:
3533
wt.unlock()
3534
else:
3535
branch.unlock()
3536
3537
3538
class cmd_re_sign(Command):
3539
"""Create a digital signature for an existing revision."""
3540
# TODO be able to replace existing ones.
3541
3542
hidden = True # is this right ?
3543
takes_args = ['revision_id*']
3544
takes_options = ['revision']
3545
3546
def run(self, revision_id_list=None, revision=None):
3547
if revision_id_list is not None and revision is not None:
3548
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
3549
if revision_id_list is None and revision is None:
3550
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
3551
b = WorkingTree.open_containing(u'.')[0].branch
3552
b.lock_write()
3553
try:
3554
return self._run(b, revision_id_list, revision)
3555
finally:
3556
b.unlock()
3557
3558
def _run(self, b, revision_id_list, revision):
3559
import bzrlib.gpg as gpg
3560
gpg_strategy = gpg.GPGStrategy(b.get_config())
3561
if revision_id_list is not None:
3562
b.repository.start_write_group()
3563
try:
3564
for revision_id in revision_id_list:
3565
b.repository.sign_revision(revision_id, gpg_strategy)
3566
except:
3567
b.repository.abort_write_group()
3568
raise
3569
else:
3570
b.repository.commit_write_group()
3571
elif revision is not None:
3572
if len(revision) == 1:
3573
revno, rev_id = revision[0].in_history(b)
3574
b.repository.start_write_group()
3575
try:
3576
b.repository.sign_revision(rev_id, gpg_strategy)
3577
except:
3578
b.repository.abort_write_group()
3579
raise
3580
else:
3581
b.repository.commit_write_group()
3582
elif len(revision) == 2:
3583
# are they both on rh- if so we can walk between them
3584
# might be nice to have a range helper for arbitrary
3585
# revision paths. hmm.
3586
from_revno, from_revid = revision[0].in_history(b)
3587
to_revno, to_revid = revision[1].in_history(b)
3588
if to_revid is None:
3589
to_revno = b.revno()
3590
if from_revno is None or to_revno is None:
3591
raise errors.BzrCommandError('Cannot sign a range of non-revision-history revisions')
3592
b.repository.start_write_group()
3593
try:
3594
for revno in range(from_revno, to_revno + 1):
3595
b.repository.sign_revision(b.get_rev_id(revno),
3596
gpg_strategy)
3597
except:
3598
b.repository.abort_write_group()
3599
raise
3600
else:
3601
b.repository.commit_write_group()
3602
else:
3603
raise errors.BzrCommandError('Please supply either one revision, or a range.')
3604
3605
3606
class cmd_bind(Command):
3607
"""Convert the current branch into a checkout of the supplied branch.
3608
3609
Once converted into a checkout, commits must succeed on the master branch
3610
before they will be applied to the local branch.
3611
"""
3612
3613
_see_also = ['checkouts', 'unbind']
3614
takes_args = ['location?']
3615
takes_options = []
3616
3617
def run(self, location=None):
3618
b, relpath = Branch.open_containing(u'.')
3619
if location is None:
3620
try:
3621
location = b.get_old_bound_location()
3622
except errors.UpgradeRequired:
3623
raise errors.BzrCommandError('No location supplied. '
3624
'This format does not remember old locations.')
3625
else:
3626
if location is None:
3627
raise errors.BzrCommandError('No location supplied and no '
3628
'previous location known')
3629
b_other = Branch.open(location)
3630
try:
3631
b.bind(b_other)
3632
except errors.DivergedBranches:
3633
raise errors.BzrCommandError('These branches have diverged.'
3634
' Try merging, and then bind again.')
3635
3636
3637
class cmd_unbind(Command):
3638
"""Convert the current checkout into a regular branch.
3639
3640
After unbinding, the local branch is considered independent and subsequent
3641
commits will be local only.
3642
"""
3643
3644
_see_also = ['checkouts', 'bind']
3645
takes_args = []
3646
takes_options = []
3647
3648
def run(self):
3649
b, relpath = Branch.open_containing(u'.')
3650
if not b.unbind():
3651
raise errors.BzrCommandError('Local branch is not bound')
3652
3653
3654
class cmd_uncommit(Command):
3655
"""Remove the last committed revision.
3656
3657
--verbose will print out what is being removed.
3658
--dry-run will go through all the motions, but not actually
3659
remove anything.
3660
3661
If --revision is specified, uncommit revisions to leave the branch at the
3662
specified revision. For example, "bzr uncommit -r 15" will leave the
3663
branch at revision 15.
3664
3665
In the future, uncommit will create a revision bundle, which can then
3666
be re-applied.
3667
"""
3668
3669
# TODO: jam 20060108 Add an option to allow uncommit to remove
3670
# unreferenced information in 'branch-as-repository' branches.
3671
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
3672
# information in shared branches as well.
3673
_see_also = ['commit']
3674
takes_options = ['verbose', 'revision',
3675
Option('dry-run', help='Don\'t actually make changes.'),
3676
Option('force', help='Say yes to all questions.'),
3677
Option('local',
3678
help="Only remove the commits from the local branch"
3679
" when in a checkout."
3680
),
3681
]
3682
takes_args = ['location?']
3683
aliases = []
3684
encoding_type = 'replace'
3685
3686
def run(self, location=None,
3687
dry_run=False, verbose=False,
3688
revision=None, force=False, local=False):
3689
if location is None:
3690
location = u'.'
3691
control, relpath = bzrdir.BzrDir.open_containing(location)
3692
try:
3693
tree = control.open_workingtree()
3694
b = tree.branch
3695
except (errors.NoWorkingTree, errors.NotLocalUrl):
3696
tree = None
3697
b = control.open_branch()
3698
3699
if tree is not None:
3700
tree.lock_write()
3701
else:
3702
b.lock_write()
3703
try:
3704
return self._run(b, tree, dry_run, verbose, revision, force,
3705
local=local)
3706
finally:
3707
if tree is not None:
3708
tree.unlock()
3709
else:
3710
b.unlock()
3711
3712
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
3713
from bzrlib.log import log_formatter, show_log
3714
from bzrlib.uncommit import uncommit
3715
3716
last_revno, last_rev_id = b.last_revision_info()
3717
3718
rev_id = None
3719
if revision is None:
3720
revno = last_revno
3721
rev_id = last_rev_id
3722
else:
3723
# 'bzr uncommit -r 10' actually means uncommit
3724
# so that the final tree is at revno 10.
3725
# but bzrlib.uncommit.uncommit() actually uncommits
3726
# the revisions that are supplied.
3727
# So we need to offset it by one
3728
revno = revision[0].in_history(b).revno + 1
3729
if revno <= last_revno:
3730
rev_id = b.get_rev_id(revno)
3731
3732
if rev_id is None or _mod_revision.is_null(rev_id):
3733
self.outf.write('No revisions to uncommit.\n')
3734
return 1
3735
3736
lf = log_formatter('short',
3737
to_file=self.outf,
3738
show_timezone='original')
3739
3740
show_log(b,
3741
lf,
3742
verbose=False,
3743
direction='forward',
3744
start_revision=revno,
3745
end_revision=last_revno)
3746
3747
if dry_run:
3748
print 'Dry-run, pretending to remove the above revisions.'
3749
if not force:
3750
val = raw_input('Press <enter> to continue')
3751
else:
3752
print 'The above revision(s) will be removed.'
3753
if not force:
3754
val = raw_input('Are you sure [y/N]? ')
3755
if val.lower() not in ('y', 'yes'):
3756
print 'Canceled'
3757
return 0
3758
3759
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
3760
revno=revno, local=local)
3761
3762
3763
class cmd_break_lock(Command):
3764
"""Break a dead lock on a repository, branch or working directory.
3765
3766
CAUTION: Locks should only be broken when you are sure that the process
3767
holding the lock has been stopped.
3768
3769
You can get information on what locks are open via the 'bzr info' command.
3770
3771
:Examples:
3772
bzr break-lock
3773
"""
3774
takes_args = ['location?']
3775
3776
def run(self, location=None, show=False):
3777
if location is None:
3778
location = u'.'
3779
control, relpath = bzrdir.BzrDir.open_containing(location)
3780
try:
3781
control.break_lock()
3782
except NotImplementedError:
3783
pass
3784
3785
3786
class cmd_wait_until_signalled(Command):
3787
"""Test helper for test_start_and_stop_bzr_subprocess_send_signal.
3788
3789
This just prints a line to signal when it is ready, then blocks on stdin.
3790
"""
3791
3792
hidden = True
3793
3794
def run(self):
3795
sys.stdout.write("running\n")
3796
sys.stdout.flush()
3797
sys.stdin.readline()
3798
3799
3800
class cmd_serve(Command):
3801
"""Run the bzr server."""
3802
3803
aliases = ['server']
3804
3805
takes_options = [
3806
Option('inet',
3807
help='Serve on stdin/out for use from inetd or sshd.'),
3808
Option('port',
3809
help='Listen for connections on nominated port of the form '
3810
'[hostname:]portnumber. Passing 0 as the port number will '
3811
'result in a dynamically allocated port. The default port is '
3812
'4155.',
3813
type=str),
3814
Option('directory',
3815
help='Serve contents of this directory.',
3816
type=unicode),
3817
Option('allow-writes',
3818
help='By default the server is a readonly server. Supplying '
3819
'--allow-writes enables write access to the contents of '
3820
'the served directory and below.'
3821
),
3822
]
3823
3824
def run(self, port=None, inet=False, directory=None, allow_writes=False):
3825
from bzrlib import lockdir
3826
from bzrlib.smart import medium, server
3827
from bzrlib.transport import get_transport
3828
from bzrlib.transport.chroot import ChrootServer
3829
if directory is None:
3830
directory = os.getcwd()
3831
url = urlutils.local_path_to_url(directory)
3832
if not allow_writes:
3833
url = 'readonly+' + url
3834
chroot_server = ChrootServer(get_transport(url))
3835
chroot_server.setUp()
3836
t = get_transport(chroot_server.get_url())
3837
if inet:
3838
smart_server = medium.SmartServerPipeStreamMedium(
3839
sys.stdin, sys.stdout, t)
3840
else:
3841
host = medium.BZR_DEFAULT_INTERFACE
3842
if port is None:
3843
port = medium.BZR_DEFAULT_PORT
3844
else:
3845
if ':' in port:
3846
host, port = port.split(':')
3847
port = int(port)
3848
smart_server = server.SmartTCPServer(t, host=host, port=port)
3849
print 'listening on port: ', smart_server.port
3850
sys.stdout.flush()
3851
# for the duration of this server, no UI output is permitted.
3852
# note that this may cause problems with blackbox tests. This should
3853
# be changed with care though, as we dont want to use bandwidth sending
3854
# progress over stderr to smart server clients!
3855
old_factory = ui.ui_factory
3856
old_lockdir_timeout = lockdir._DEFAULT_TIMEOUT_SECONDS
3857
try:
3858
ui.ui_factory = ui.SilentUIFactory()
3859
lockdir._DEFAULT_TIMEOUT_SECONDS = 0
3860
smart_server.serve()
3861
finally:
3862
ui.ui_factory = old_factory
3863
lockdir._DEFAULT_TIMEOUT_SECONDS = old_lockdir_timeout
3864
3865
3866
class cmd_join(Command):
3867
"""Combine a subtree into its containing tree.
3868
3869
This command is for experimental use only. It requires the target tree
3870
to be in dirstate-with-subtree format, which cannot be converted into
3871
earlier formats.
3872
3873
The TREE argument should be an independent tree, inside another tree, but
3874
not part of it. (Such trees can be produced by "bzr split", but also by
3875
running "bzr branch" with the target inside a tree.)
3876
3877
The result is a combined tree, with the subtree no longer an independant
3878
part. This is marked as a merge of the subtree into the containing tree,
3879
and all history is preserved.
3880
3881
If --reference is specified, the subtree retains its independence. It can
3882
be branched by itself, and can be part of multiple projects at the same
3883
time. But operations performed in the containing tree, such as commit
3884
and merge, will recurse into the subtree.
3885
"""
3886
3887
_see_also = ['split']
3888
takes_args = ['tree']
3889
takes_options = [
3890
Option('reference', help='Join by reference.'),
3891
]
3892
hidden = True
3893
3894
def run(self, tree, reference=False):
3895
sub_tree = WorkingTree.open(tree)
3896
parent_dir = osutils.dirname(sub_tree.basedir)
3897
containing_tree = WorkingTree.open_containing(parent_dir)[0]
3898
repo = containing_tree.branch.repository
3899
if not repo.supports_rich_root():
3900
raise errors.BzrCommandError(
3901
"Can't join trees because %s doesn't support rich root data.\n"
3902
"You can use bzr upgrade on the repository."
3903
% (repo,))
3904
if reference:
3905
try:
3906
containing_tree.add_reference(sub_tree)
3907
except errors.BadReferenceTarget, e:
3908
# XXX: Would be better to just raise a nicely printable
3909
# exception from the real origin. Also below. mbp 20070306
3910
raise errors.BzrCommandError("Cannot join %s. %s" %
3911
(tree, e.reason))
3912
else:
3913
try:
3914
containing_tree.subsume(sub_tree)
3915
except errors.BadSubsumeSource, e:
3916
raise errors.BzrCommandError("Cannot join %s. %s" %
3917
(tree, e.reason))
3918
3919
3920
class cmd_split(Command):
3921
"""Split a subdirectory of a tree into a separate tree.
3922
3923
This command will produce a target tree in a format that supports
3924
rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be
3925
converted into earlier formats like 'dirstate-tags'.
3926
3927
The TREE argument should be a subdirectory of a working tree. That
3928
subdirectory will be converted into an independent tree, with its own
3929
branch. Commits in the top-level tree will not apply to the new subtree.
3930
"""
3931
3932
# join is not un-hidden yet
3933
#_see_also = ['join']
3934
takes_args = ['tree']
3935
3936
def run(self, tree):
3937
containing_tree, subdir = WorkingTree.open_containing(tree)
3938
sub_id = containing_tree.path2id(subdir)
3939
if sub_id is None:
3940
raise errors.NotVersionedError(subdir)
3941
try:
3942
containing_tree.extract(sub_id)
3943
except errors.RootNotRich:
3944
raise errors.UpgradeRequired(containing_tree.branch.base)
3945
3946
3947
class cmd_merge_directive(Command):
3948
"""Generate a merge directive for auto-merge tools.
3949
3950
A directive requests a merge to be performed, and also provides all the
3951
information necessary to do so. This means it must either include a
3952
revision bundle, or the location of a branch containing the desired
3953
revision.
3954
3955
A submit branch (the location to merge into) must be supplied the first
3956
time the command is issued. After it has been supplied once, it will
3957
be remembered as the default.
3958
3959
A public branch is optional if a revision bundle is supplied, but required
3960
if --diff or --plain is specified. It will be remembered as the default
3961
after the first use.
3962
"""
3963
3964
takes_args = ['submit_branch?', 'public_branch?']
3965
3966
hidden = True
3967
3968
_see_also = ['send']
3969
3970
takes_options = [
3971
RegistryOption.from_kwargs('patch-type',
3972
'The type of patch to include in the directive.',
3973
title='Patch type',
3974
value_switches=True,
3975
enum_switch=False,
3976
bundle='Bazaar revision bundle (default).',
3977
diff='Normal unified diff.',
3978
plain='No patch, just directive.'),
3979
Option('sign', help='GPG-sign the directive.'), 'revision',
3980
Option('mail-to', type=str,
3981
help='Instead of printing the directive, email to this address.'),
3982
Option('message', type=str, short_name='m',
3983
help='Message to use when committing this merge.')
3984
]
3985
3986
encoding_type = 'exact'
3987
3988
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
3989
sign=False, revision=None, mail_to=None, message=None):
3990
from bzrlib.revision import ensure_null, NULL_REVISION
3991
include_patch, include_bundle = {
3992
'plain': (False, False),
3993
'diff': (True, False),
3994
'bundle': (True, True),
3995
}[patch_type]
3996
branch = Branch.open('.')
3997
stored_submit_branch = branch.get_submit_branch()
3998
if submit_branch is None:
3999
submit_branch = stored_submit_branch
4000
else:
4001
if stored_submit_branch is None:
4002
branch.set_submit_branch(submit_branch)
4003
if submit_branch is None:
4004
submit_branch = branch.get_parent()
4005
if submit_branch is None:
4006
raise errors.BzrCommandError('No submit branch specified or known')
4007
4008
stored_public_branch = branch.get_public_branch()
4009
if public_branch is None:
4010
public_branch = stored_public_branch
4011
elif stored_public_branch is None:
4012
branch.set_public_branch(public_branch)
4013
if not include_bundle and public_branch is None:
4014
raise errors.BzrCommandError('No public branch specified or'
4015
' known')
4016
base_revision_id = None
4017
if revision is not None:
4018
if len(revision) > 2:
4019
raise errors.BzrCommandError('bzr merge-directive takes '
4020
'at most two one revision identifiers')
4021
revision_id = revision[-1].as_revision_id(branch)
4022
if len(revision) == 2:
4023
base_revision_id = revision[0].as_revision_id(branch)
4024
else:
4025
revision_id = branch.last_revision()
4026
revision_id = ensure_null(revision_id)
4027
if revision_id == NULL_REVISION:
4028
raise errors.BzrCommandError('No revisions to bundle.')
4029
directive = merge_directive.MergeDirective2.from_objects(
4030
branch.repository, revision_id, time.time(),
4031
osutils.local_time_offset(), submit_branch,
4032
public_branch=public_branch, include_patch=include_patch,
4033
include_bundle=include_bundle, message=message,
4034
base_revision_id=base_revision_id)
4035
if mail_to is None:
4036
if sign:
4037
self.outf.write(directive.to_signed(branch))
4038
else:
4039
self.outf.writelines(directive.to_lines())
4040
else:
4041
message = directive.to_email(mail_to, branch, sign)
4042
s = SMTPConnection(branch.get_config())
4043
s.send_email(message)
4044
4045
4046
class cmd_send(Command):
4047
"""Mail or create a merge-directive for submiting changes.
4048
4049
A merge directive provides many things needed for requesting merges:
4050
4051
* A machine-readable description of the merge to perform
4052
4053
* An optional patch that is a preview of the changes requested
4054
4055
* An optional bundle of revision data, so that the changes can be applied
4056
directly from the merge directive, without retrieving data from a
4057
branch.
4058
4059
If --no-bundle is specified, then public_branch is needed (and must be
4060
up-to-date), so that the receiver can perform the merge using the
4061
public_branch. The public_branch is always included if known, so that
4062
people can check it later.
4063
4064
The submit branch defaults to the parent, but can be overridden. Both
4065
submit branch and public branch will be remembered if supplied.
4066
4067
If a public_branch is known for the submit_branch, that public submit
4068
branch is used in the merge instructions. This means that a local mirror
4069
can be used as your actual submit branch, once you have set public_branch
4070
for that mirror.
4071
4072
Mail is sent using your preferred mail program. This should be transparent
4073
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
4074
If the preferred client can't be found (or used), your editor will be used.
4075
4076
To use a specific mail program, set the mail_client configuration option.
4077
(For Thunderbird 1.5, this works around some bugs.) Supported values for
4078
specific clients are "evolution", "kmail", "mutt", and "thunderbird";
4079
generic options are "default", "editor", "mapi", and "xdg-email".
4080
4081
If mail is being sent, a to address is required. This can be supplied
4082
either on the commandline, by setting the submit_to configuration
4083
option in the branch itself or the child_submit_to configuration option
4084
in the submit branch.
4085
4086
Two formats are currently supported: "4" uses revision bundle format 4 and
4087
merge directive format 2. It is significantly faster and smaller than
4088
older formats. It is compatible with Bazaar 0.19 and later. It is the
4089
default. "0.9" uses revision bundle format 0.9 and merge directive
4090
format 1. It is compatible with Bazaar 0.12 - 0.18.
4091
4092
Merge directives are applied using the merge command or the pull command.
4093
"""
4094
4095
encoding_type = 'exact'
4096
4097
_see_also = ['merge', 'pull']
4098
4099
takes_args = ['submit_branch?', 'public_branch?']
4100
4101
takes_options = [
4102
Option('no-bundle',
4103
help='Do not include a bundle in the merge directive.'),
4104
Option('no-patch', help='Do not include a preview patch in the merge'
4105
' directive.'),
4106
Option('remember',
4107
help='Remember submit and public branch.'),
4108
Option('from',
4109
help='Branch to generate the submission from, '
4110
'rather than the one containing the working directory.',
4111
short_name='f',
4112
type=unicode),
4113
Option('output', short_name='o', help='Write directive to this file.',
4114
type=unicode),
4115
Option('mail-to', help='Mail the request to this address.',
4116
type=unicode),
4117
'revision',
4118
'message',
4119
RegistryOption.from_kwargs('format',
4120
'Use the specified output format.',
4121
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4122
'0.9': 'Bundle format 0.9, Merge Directive 1',})
4123
]
4124
4125
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4126
no_patch=False, revision=None, remember=False, output=None,
4127
format='4', mail_to=None, message=None, **kwargs):
4128
return self._run(submit_branch, revision, public_branch, remember,
4129
format, no_bundle, no_patch, output,
4130
kwargs.get('from', '.'), mail_to, message)
4131
4132
def _run(self, submit_branch, revision, public_branch, remember, format,
4133
no_bundle, no_patch, output, from_, mail_to, message):
4134
from bzrlib.revision import NULL_REVISION
4135
branch = Branch.open_containing(from_)[0]
4136
if output is None:
4137
outfile = StringIO()
4138
elif output == '-':
4139
outfile = self.outf
4140
else:
4141
outfile = open(output, 'wb')
4142
# we may need to write data into branch's repository to calculate
4143
# the data to send.
4144
branch.lock_write()
4145
try:
4146
if output is None:
4147
config = branch.get_config()
4148
if mail_to is None:
4149
mail_to = config.get_user_option('submit_to')
4150
mail_client = config.get_mail_client()
4151
if remember and submit_branch is None:
4152
raise errors.BzrCommandError(
4153
'--remember requires a branch to be specified.')
4154
stored_submit_branch = branch.get_submit_branch()
4155
remembered_submit_branch = False
4156
if submit_branch is None:
4157
submit_branch = stored_submit_branch
4158
remembered_submit_branch = True
4159
else:
4160
if stored_submit_branch is None or remember:
4161
branch.set_submit_branch(submit_branch)
4162
if submit_branch is None:
4163
submit_branch = branch.get_parent()
4164
remembered_submit_branch = True
4165
if submit_branch is None:
4166
raise errors.BzrCommandError('No submit branch known or'
4167
' specified')
4168
if remembered_submit_branch:
4169
note('Using saved location: %s', submit_branch)
4170
4171
if mail_to is None:
4172
submit_config = Branch.open(submit_branch).get_config()
4173
mail_to = submit_config.get_user_option("child_submit_to")
4174
4175
stored_public_branch = branch.get_public_branch()
4176
if public_branch is None:
4177
public_branch = stored_public_branch
4178
elif stored_public_branch is None or remember:
4179
branch.set_public_branch(public_branch)
4180
if no_bundle and public_branch is None:
4181
raise errors.BzrCommandError('No public branch specified or'
4182
' known')
4183
base_revision_id = None
4184
revision_id = None
4185
if revision is not None:
4186
if len(revision) > 2:
4187
raise errors.BzrCommandError('bzr send takes '
4188
'at most two one revision identifiers')
4189
revision_id = revision[-1].as_revision_id(branch)
4190
if len(revision) == 2:
4191
base_revision_id = revision[0].as_revision_id(branch)
4192
if revision_id is None:
4193
revision_id = branch.last_revision()
4194
if revision_id == NULL_REVISION:
4195
raise errors.BzrCommandError('No revisions to submit.')
4196
if format == '4':
4197
directive = merge_directive.MergeDirective2.from_objects(
4198
branch.repository, revision_id, time.time(),
4199
osutils.local_time_offset(), submit_branch,
4200
public_branch=public_branch, include_patch=not no_patch,
4201
include_bundle=not no_bundle, message=message,
4202
base_revision_id=base_revision_id)
4203
elif format == '0.9':
4204
if not no_bundle:
4205
if not no_patch:
4206
patch_type = 'bundle'
4207
else:
4208
raise errors.BzrCommandError('Format 0.9 does not'
4209
' permit bundle with no patch')
4210
else:
4211
if not no_patch:
4212
patch_type = 'diff'
4213
else:
4214
patch_type = None
4215
directive = merge_directive.MergeDirective.from_objects(
4216
branch.repository, revision_id, time.time(),
4217
osutils.local_time_offset(), submit_branch,
4218
public_branch=public_branch, patch_type=patch_type,
4219
message=message)
4220
4221
outfile.writelines(directive.to_lines())
4222
if output is None:
4223
subject = '[MERGE] '
4224
if message is not None:
4225
subject += message
4226
else:
4227
revision = branch.repository.get_revision(revision_id)
4228
subject += revision.get_summary()
4229
basename = directive.get_disk_name(branch)
4230
mail_client.compose_merge_request(mail_to, subject,
4231
outfile.getvalue(), basename)
4232
finally:
4233
if output != '-':
4234
outfile.close()
4235
branch.unlock()
4236
4237
4238
class cmd_bundle_revisions(cmd_send):
4239
4240
"""Create a merge-directive for submiting changes.
4241
4242
A merge directive provides many things needed for requesting merges:
4243
4244
* A machine-readable description of the merge to perform
4245
4246
* An optional patch that is a preview of the changes requested
4247
4248
* An optional bundle of revision data, so that the changes can be applied
4249
directly from the merge directive, without retrieving data from a
4250
branch.
4251
4252
If --no-bundle is specified, then public_branch is needed (and must be
4253
up-to-date), so that the receiver can perform the merge using the
4254
public_branch. The public_branch is always included if known, so that
4255
people can check it later.
4256
4257
The submit branch defaults to the parent, but can be overridden. Both
4258
submit branch and public branch will be remembered if supplied.
4259
4260
If a public_branch is known for the submit_branch, that public submit
4261
branch is used in the merge instructions. This means that a local mirror
4262
can be used as your actual submit branch, once you have set public_branch
4263
for that mirror.
4264
4265
Two formats are currently supported: "4" uses revision bundle format 4 and
4266
merge directive format 2. It is significantly faster and smaller than
4267
older formats. It is compatible with Bazaar 0.19 and later. It is the
4268
default. "0.9" uses revision bundle format 0.9 and merge directive
4269
format 1. It is compatible with Bazaar 0.12 - 0.18.
4270
"""
4271
4272
takes_options = [
4273
Option('no-bundle',
4274
help='Do not include a bundle in the merge directive.'),
4275
Option('no-patch', help='Do not include a preview patch in the merge'
4276
' directive.'),
4277
Option('remember',
4278
help='Remember submit and public branch.'),
4279
Option('from',
4280
help='Branch to generate the submission from, '
4281
'rather than the one containing the working directory.',
4282
short_name='f',
4283
type=unicode),
4284
Option('output', short_name='o', help='Write directive to this file.',
4285
type=unicode),
4286
'revision',
4287
RegistryOption.from_kwargs('format',
4288
'Use the specified output format.',
4289
**{'4': 'Bundle format 4, Merge Directive 2 (default)',
4290
'0.9': 'Bundle format 0.9, Merge Directive 1',})
4291
]
4292
aliases = ['bundle']
4293
4294
_see_also = ['send', 'merge']
4295
4296
hidden = True
4297
4298
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
4299
no_patch=False, revision=None, remember=False, output=None,
4300
format='4', **kwargs):
4301
if output is None:
4302
output = '-'
4303
return self._run(submit_branch, revision, public_branch, remember,
4304
format, no_bundle, no_patch, output,
4305
kwargs.get('from', '.'), None, None)
4306
4307
4308
class cmd_tag(Command):
4309
"""Create, remove or modify a tag naming a revision.
4310
4311
Tags give human-meaningful names to revisions. Commands that take a -r
4312
(--revision) option can be given -rtag:X, where X is any previously
4313
created tag.
4314
4315
Tags are stored in the branch. Tags are copied from one branch to another
4316
along when you branch, push, pull or merge.
4317
4318
It is an error to give a tag name that already exists unless you pass
4319
--force, in which case the tag is moved to point to the new revision.
4320
"""
4321
4322
_see_also = ['commit', 'tags']
4323
takes_args = ['tag_name']
4324
takes_options = [
4325
Option('delete',
4326
help='Delete this tag rather than placing it.',
4327
),
4328
Option('directory',
4329
help='Branch in which to place the tag.',
4330
short_name='d',
4331
type=unicode,
4332
),
4333
Option('force',
4334
help='Replace existing tags.',
4335
),
4336
'revision',
4337
]
4338
4339
def run(self, tag_name,
4340
delete=None,
4341
directory='.',
4342
force=None,
4343
revision=None,
4344
):
4345
branch, relpath = Branch.open_containing(directory)
4346
branch.lock_write()
4347
try:
4348
if delete:
4349
branch.tags.delete_tag(tag_name)
4350
self.outf.write('Deleted tag %s.\n' % tag_name)
4351
else:
4352
if revision:
4353
if len(revision) != 1:
4354
raise errors.BzrCommandError(
4355
"Tags can only be placed on a single revision, "
4356
"not on a range")
4357
revision_id = revision[0].as_revision_id(branch)
4358
else:
4359
revision_id = branch.last_revision()
4360
if (not force) and branch.tags.has_tag(tag_name):
4361
raise errors.TagAlreadyExists(tag_name)
4362
branch.tags.set_tag(tag_name, revision_id)
4363
self.outf.write('Created tag %s.\n' % tag_name)
4364
finally:
4365
branch.unlock()
4366
4367
4368
class cmd_tags(Command):
4369
"""List tags.
4370
4371
This command shows a table of tag names and the revisions they reference.
4372
"""
4373
4374
_see_also = ['tag']
4375
takes_options = [
4376
Option('directory',
4377
help='Branch whose tags should be displayed.',
4378
short_name='d',
4379
type=unicode,
4380
),
4381
RegistryOption.from_kwargs('sort',
4382
'Sort tags by different criteria.', title='Sorting',
4383
alpha='Sort tags lexicographically (default).',
4384
time='Sort tags chronologically.',
4385
),
4386
'show-ids',
4387
]
4388
4389
@display_command
4390
def run(self,
4391
directory='.',
4392
sort='alpha',
4393
show_ids=False,
4394
):
4395
branch, relpath = Branch.open_containing(directory)
4396
tags = branch.tags.get_tag_dict().items()
4397
if sort == 'alpha':
4398
tags.sort()
4399
elif sort == 'time':
4400
timestamps = {}
4401
for tag, revid in tags:
4402
try:
4403
revobj = branch.repository.get_revision(revid)
4404
except errors.NoSuchRevision:
4405
timestamp = sys.maxint # place them at the end
4406
else:
4407
timestamp = revobj.timestamp
4408
timestamps[revid] = timestamp
4409
tags.sort(key=lambda x: timestamps[x[1]])
4410
if not show_ids:
4411
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
4412
revno_map = branch.get_revision_id_to_revno_map()
4413
tags = [ (tag, '.'.join(map(str, revno_map.get(revid, ('?',)))))
4414
for tag, revid in tags ]
4415
for tag, revspec in tags:
4416
self.outf.write('%-20s %s\n' % (tag, revspec))
4417
4418
4419
class cmd_reconfigure(Command):
4420
"""Reconfigure the type of a bzr directory.
4421
4422
A target configuration must be specified.
4423
4424
For checkouts, the bind-to location will be auto-detected if not specified.
4425
The order of preference is
4426
1. For a lightweight checkout, the current bound location.
4427
2. For branches that used to be checkouts, the previously-bound location.
4428
3. The push location.
4429
4. The parent location.
4430
If none of these is available, --bind-to must be specified.
4431
"""
4432
4433
takes_args = ['location?']
4434
takes_options = [RegistryOption.from_kwargs('target_type',
4435
title='Target type',
4436
help='The type to reconfigure the directory to.',
4437
value_switches=True, enum_switch=False,
4438
branch='Reconfigure to a branch.',
4439
tree='Reconfigure to a tree.',
4440
checkout='Reconfigure to a checkout.',
4441
lightweight_checkout='Reconfigure to a lightweight'
4442
' checkout.'),
4443
Option('bind-to', help='Branch to bind checkout to.',
4444
type=str),
4445
Option('force',
4446
help='Perform reconfiguration even if local changes'
4447
' will be lost.')
4448
]
4449
4450
def run(self, location=None, target_type=None, bind_to=None, force=False):
4451
directory = bzrdir.BzrDir.open(location)
4452
if target_type is None:
4453
raise errors.BzrCommandError('No target configuration specified')
4454
elif target_type == 'branch':
4455
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
4456
elif target_type == 'tree':
4457
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
4458
elif target_type == 'checkout':
4459
reconfiguration = reconfigure.Reconfigure.to_checkout(directory,
4460
bind_to)
4461
elif target_type == 'lightweight-checkout':
4462
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
4463
directory, bind_to)
4464
reconfiguration.apply(force)
4465
4466
4467
class cmd_switch(Command):
4468
"""Set the branch of a checkout and update.
4469
4470
For lightweight checkouts, this changes the branch being referenced.
4471
For heavyweight checkouts, this checks that there are no local commits
4472
versus the current bound branch, then it makes the local branch a mirror
4473
of the new location and binds to it.
4474
4475
In both cases, the working tree is updated and uncommitted changes
4476
are merged. The user can commit or revert these as they desire.
4477
4478
Pending merges need to be committed or reverted before using switch.
4479
4480
The path to the branch to switch to can be specified relative to the parent
4481
directory of the current branch. For example, if you are currently in a
4482
checkout of /path/to/branch, specifying 'newbranch' will find a branch at
4483
/path/to/newbranch.
4484
"""
4485
4486
takes_args = ['to_location']
4487
takes_options = [Option('force',
4488
help='Switch even if local commits will be lost.')
4489
]
4490
4491
def run(self, to_location, force=False):
4492
from bzrlib import switch
4493
tree_location = '.'
4494
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
4495
try:
4496
to_branch = Branch.open(to_location)
4497
except errors.NotBranchError:
4498
to_branch = Branch.open(
4499
control_dir.open_branch().base + '../' + to_location)
4500
switch.switch(control_dir, to_branch, force)
4501
note('Switched to branch: %s',
4502
urlutils.unescape_for_display(to_branch.base, 'utf-8'))
4503
4504
4505
class cmd_hooks(Command):
4506
"""Show a branch's currently registered hooks.
4507
"""
4508
4509
hidden = True
4510
takes_args = ['path?']
4511
4512
def run(self, path=None):
4513
if path is None:
4514
path = '.'
4515
branch_hooks = Branch.open(path).hooks
4516
for hook_type in branch_hooks:
4517
hooks = branch_hooks[hook_type]
4518
self.outf.write("%s:\n" % (hook_type,))
4519
if hooks:
4520
for hook in hooks:
4521
self.outf.write(" %s\n" %
4522
(branch_hooks.get_hook_name(hook),))
4523
else:
4524
self.outf.write(" <no hooks installed>\n")
4525
4526
4527
def _create_prefix(cur_transport):
4528
needed = [cur_transport]
4529
# Recurse upwards until we can create a directory successfully
4530
while True:
4531
new_transport = cur_transport.clone('..')
4532
if new_transport.base == cur_transport.base:
4533
raise errors.BzrCommandError(
4534
"Failed to create path prefix for %s."
4535
% cur_transport.base)
4536
try:
4537
new_transport.mkdir('.')
4538
except errors.NoSuchFile:
4539
needed.append(new_transport)
4540
cur_transport = new_transport
4541
else:
4542
break
4543
# Now we only need to create child directories
4544
while needed:
4545
cur_transport = needed.pop()
4546
cur_transport.ensure_base()
4547
4548
4549
# these get imported and then picked up by the scan for cmd_*
4550
# TODO: Some more consistent way to split command definitions across files;
4551
# we do need to load at least some information about them to know of
4552
# aliases. ideally we would avoid loading the implementation until the
4553
# details were needed.
4554
from bzrlib.cmd_version_info import cmd_version_info
4555
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
4556
from bzrlib.bundle.commands import (
4557
cmd_bundle_info,
4558
)
4559
from bzrlib.sign_my_commits import cmd_sign_my_commits
4560
from bzrlib.weave_commands import cmd_versionedfile_list, cmd_weave_join, \
4561
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0