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