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