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