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