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