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