« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 2127.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 2127.1.1
- Committer: John Arbash Meinel
- Date: 2006-11-10 15:38:16 UTC
- mto: This revision was merged to the branch mainline in revision 2129.
- Revision ID: john@arbash-meinel.com-20061110153816-46acf76fc86a512b
use try/finally to clean up a nested progress bar during weave fetching
- files added:
- NEWS.developers
- files removed:
- bzrlib/api.py
- bzrlib/repofmt
- bzrlib/smart
- bzrlib/tests/per_lock
- doc/developers
- man1
- files renamed:
- doc/developers/HACKING => HACKING
- bzrlib/deprecated_graph.py => bzrlib/graph.py
- bzrlib/tests/test_commands.py => bzrlib/tests/test_command.py
- bzrlib/tests/test_deprecated_graph.py => bzrlib/tests/test_graph.py
- bzrlib/transport/remote.py => bzrlib/transport/smart.py
- bzrlib/win32utils.py => bzrlib/win32console.py
- files modified:
- .bzrignore
- setup.py *
added
removed
bzrlib/builtins.py
1
# Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd
1
# Copyright (C) 2004, 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
"""builtin bzr commands"""
18
18
19
19
import os
20
from StringIO import StringIO
21
20
22
21
from bzrlib.lazy_import import lazy_import
23
22
lazy_import(globals(), """
25
24
import errno
26
25
import sys
27
26
import tempfile
28
import time
29
27
30
28
import bzrlib
31
29
from bzrlib import (
32
30
branch,
33
bugtracker,
34
31
bundle,
35
32
bzrdir,
36
delta,
37
33
config,
38
34
errors,
39
globbing,
40
35
ignores,
41
36
log,
42
37
merge as _mod_merge,
43
merge_directive,
44
38
osutils,
45
registry,
46
39
repository,
47
revisionspec,
48
symbol_versioning,
49
40
transport,
50
41
tree as _mod_tree,
51
42
ui,
54
45
from bzrlib.branch import Branch
55
46
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
56
47
from bzrlib.conflicts import ConflictList
48
from bzrlib.revision import common_ancestor
57
49
from bzrlib.revisionspec import RevisionSpec
58
from bzrlib.smtp_connection import SMTPConnection
59
50
from bzrlib.workingtree import WorkingTree
60
51
""")
61
52
62
53
from bzrlib.commands import Command, display_command
63
from bzrlib.option import ListOption, Option, RegistryOption
54
from bzrlib.option import Option
64
55
from bzrlib.progress import DummyProgress, ProgressPhase
65
56
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
66
57
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
if typestring == "experimental-knit2":
111
format = bzrdir.BzrDirMetaFormat1()
112
format.repository_format = repository.RepositoryFormatKnit2()
113
return format
114
msg = "Unknown bzr format %s. Current formats are: default, knit,\n" \
115
"metaweave and weave" % typestring
116
raise errors.BzrCommandError(msg)
117
117
118
118
119
119
# TODO: Make sure no commands unconditionally use the working directory as a
143
143
modified
144
144
Text has changed since the previous revision.
145
145
146
kind changed
147
File kind has been changed (e.g. from file to directory).
148
149
146
unknown
150
147
Not versioned and not matching an ignore pattern.
151
148
152
To see ignored files use 'bzr ignored'. For details on the
149
To see ignored files use 'bzr ignored'. For details in the
153
150
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
151
158
152
If no arguments are specified, the status of the entire working
159
153
directory is shown. Otherwise, only the status of the specified
167
161
# TODO: --no-recurse, --recurse options
168
162
169
163
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.')]
164
takes_options = ['show-ids', 'revision']
173
165
aliases = ['st', 'stat']
174
166
175
167
encoding_type = 'replace'
176
_see_also = ['diff', 'revert', 'status-flags']
177
168
178
169
@display_command
179
def run(self, show_ids=False, file_list=None, revision=None, short=False,
180
versioned=False):
170
def run(self, show_ids=False, file_list=None, revision=None):
181
171
from bzrlib.status import show_tree_status
182
172
183
173
tree, file_list = tree_files(file_list)
184
174
185
175
show_tree_status(tree, show_ids=show_ids,
186
176
specific_files=file_list, revision=revision,
187
to_file=self.outf, short=short, versioned=versioned)
177
to_file=self.outf)
188
178
189
179
190
180
class cmd_cat_revision(Command):
203
193
@display_command
204
194
def run(self, revision_id=None, revision=None):
205
195
206
revision_id = osutils.safe_revision_id(revision_id, warn=False)
207
196
if revision_id is not None and revision is not None:
208
197
raise errors.BzrCommandError('You can only supply one of'
209
198
' revision_id or --revision')
224
213
self.outf.write(b.repository.get_revision_xml(rev_id).decode('utf-8'))
225
214
226
215
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
216
class cmd_revno(Command):
260
217
"""Show current revision number.
261
218
262
219
This is equal to the number of revisions on this branch.
263
220
"""
264
221
265
_see_also = ['info']
266
222
takes_args = ['location?']
267
223
268
224
@display_command
287
243
if revision_info_list is not None:
288
244
for rev in revision_info_list:
289
245
revs.append(RevisionSpec.from_string(rev))
290
291
b = Branch.open_containing(u'.')[0]
292
293
246
if len(revs) == 0:
294
revs.append(RevisionSpec.from_string('-1'))
247
raise errors.BzrCommandError('You must supply a revision identifier')
248
249
b = WorkingTree.open_containing(u'.')[0].branch
295
250
296
251
for rev in revs:
297
252
revinfo = rev.in_history(b)
298
253
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)
254
print ' %s' % revinfo.rev_id
302
255
else:
303
256
print '%4d %s' % (revinfo.revno, revinfo.rev_id)
304
257
331
284
332
285
--file-ids-from will try to use the file ids from the supplied path.
333
286
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.
287
same filename, and then by pure path.
339
288
"""
340
289
takes_args = ['file*']
341
290
takes_options = ['no-recurse', 'dry-run', 'verbose',
342
291
Option('file-ids-from', type=unicode,
343
help='Lookup file ids from this tree.')]
292
help='Lookup file ids from here')]
344
293
encoding_type = 'replace'
345
_see_also = ['remove']
346
294
347
295
def run(self, file_list, no_recurse=False, dry_run=False, verbose=False,
348
296
file_ids_from=None):
349
297
import bzrlib.add
350
298
351
base_tree = None
352
299
if file_ids_from is not None:
353
300
try:
354
301
base_tree, base_path = WorkingTree.open_containing(
364
311
action = bzrlib.add.AddAction(to_file=self.outf,
365
312
should_print=(not is_quiet()))
366
313
367
if base_tree:
368
base_tree.lock_read()
369
try:
370
file_list = self._maybe_expand_globs(file_list)
371
if file_list:
372
tree = WorkingTree.open_containing(file_list[0])[0]
373
else:
374
tree = WorkingTree.open_containing(u'.')[0]
375
added, ignored = tree.smart_add(file_list, not
376
no_recurse, action=action, save=not dry_run)
377
finally:
378
if base_tree is not None:
379
base_tree.unlock()
314
added, ignored = bzrlib.add.smart_add(file_list, not no_recurse,
315
action=action, save=not dry_run)
380
316
if len(ignored) > 0:
381
317
if verbose:
382
318
for glob in sorted(ignored.keys()):
434
370
set. For example: bzr inventory --show-ids this/file
435
371
"""
436
372
437
hidden = True
438
_see_also = ['ls']
439
373
takes_options = ['revision', 'show-ids', 'kind']
440
374
takes_args = ['file*']
441
375
445
379
raise errors.BzrCommandError('invalid kind specified')
446
380
447
381
work_tree, file_list = tree_files(file_list)
448
work_tree.lock_read()
449
try:
450
if revision is not None:
451
if len(revision) > 1:
452
raise errors.BzrCommandError(
453
'bzr inventory --revision takes exactly one revision'
454
' identifier')
455
revision_id = revision[0].in_history(work_tree.branch).rev_id
456
tree = work_tree.branch.repository.revision_tree(revision_id)
457
458
extra_trees = [work_tree]
459
tree.lock_read()
460
else:
461
tree = work_tree
462
extra_trees = []
463
464
if file_list is not None:
465
file_ids = tree.paths2ids(file_list, trees=extra_trees,
466
require_versioned=True)
467
# find_ids_across_trees may include some paths that don't
468
# exist in 'tree'.
469
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
470
for file_id in file_ids if file_id in tree)
471
else:
472
entries = tree.inventory.entries()
473
finally:
474
tree.unlock()
475
if tree is not work_tree:
476
work_tree.unlock()
382
383
if revision is not None:
384
if len(revision) > 1:
385
raise errors.BzrCommandError('bzr inventory --revision takes'
386
' exactly one revision identifier')
387
revision_id = revision[0].in_history(work_tree.branch).rev_id
388
tree = work_tree.branch.repository.revision_tree(revision_id)
389
390
# We include work_tree as well as 'tree' here
391
# So that doing '-r 10 path/foo' will lookup whatever file
392
# exists now at 'path/foo' even if it has been renamed, as
393
# well as whatever files existed in revision 10 at path/foo
394
trees = [tree, work_tree]
395
else:
396
tree = work_tree
397
trees = [tree]
398
399
if file_list is not None:
400
file_ids = _mod_tree.find_ids_across_trees(file_list, trees,
401
require_versioned=True)
402
# find_ids_across_trees may include some paths that don't
403
# exist in 'tree'.
404
entries = sorted((tree.id2path(file_id), tree.inventory[file_id])
405
for file_id in file_ids if file_id in tree)
406
else:
407
entries = tree.inventory.entries()
477
408
478
409
for path, entry in entries:
479
410
if kind and kind != entry.kind:
494
425
495
426
If the last argument is a versioned directory, all the other names
496
427
are moved into it. Otherwise, there must be exactly two arguments
497
and the file is changed to a new name.
498
499
If OLDNAME does not exist on the filesystem but is versioned and
500
NEWNAME does exist on the filesystem but is not versioned, mv
501
assumes that the file has been manually moved and only updates
502
its internal inventory to reflect that change.
503
The same is valid when moving many SOURCE files to a DESTINATION.
428
and the file is changed to a new name, which must not already exist.
504
429
505
430
Files cannot be moved between branches.
506
431
"""
507
432
508
433
takes_args = ['names*']
509
takes_options = [Option("after", help="Move only the bzr identifier"
510
" of the file, because the file has already been moved."),
511
]
512
434
aliases = ['move', 'rename']
513
435
encoding_type = 'replace'
514
436
515
def run(self, names_list, after=False):
437
def run(self, names_list):
516
438
if names_list is None:
517
439
names_list = []
518
440
522
444
523
445
if os.path.isdir(names_list[-1]):
524
446
# move into existing directory
525
for pair in tree.move(rel_names[:-1], rel_names[-1], after=after):
447
for pair in tree.move(rel_names[:-1], rel_names[-1]):
526
448
self.outf.write("%s => %s\n" % pair)
527
449
else:
528
450
if len(names_list) != 2:
529
raise errors.BzrCommandError('to mv multiple files the'
530
' destination must be a versioned'
531
' directory')
532
tree.rename_one(rel_names[0], rel_names[1], after=after)
451
raise errors.BzrCommandError('to mv multiple files the destination '
452
'must be a versioned directory')
453
tree.rename_one(rel_names[0], rel_names[1])
533
454
self.outf.write("%s => %s\n" % (rel_names[0], rel_names[1]))
534
455
535
456
553
474
location can be accessed.
554
475
"""
555
476
556
_see_also = ['push', 'update', 'status-flags']
557
takes_options = ['remember', 'overwrite', 'revision', 'verbose',
558
Option('directory',
559
help='Branch to pull into, '
560
'rather than the one containing the working directory.',
561
short_name='d',
562
type=unicode,
563
),
564
]
477
takes_options = ['remember', 'overwrite', 'revision', 'verbose']
565
478
takes_args = ['location?']
566
479
encoding_type = 'replace'
567
480
568
def run(self, location=None, remember=False, overwrite=False,
569
revision=None, verbose=False,
570
directory=None):
571
from bzrlib.tag import _merge_tags_if_possible
481
def run(self, location=None, remember=False, overwrite=False, revision=None, verbose=False):
572
482
# FIXME: too much stuff is in the command class
573
revision_id = None
574
mergeable = None
575
if directory is None:
576
directory = u'.'
577
483
try:
578
tree_to = WorkingTree.open_containing(directory)[0]
484
tree_to = WorkingTree.open_containing(u'.')[0]
579
485
branch_to = tree_to.branch
580
486
except errors.NoWorkingTree:
581
487
tree_to = None
582
branch_to = Branch.open_containing(directory)[0]
488
branch_to = Branch.open_containing(u'.')[0]
583
489
584
490
reader = None
585
491
if location is not None:
586
492
try:
587
mergeable = bundle.read_mergeable_from_url(
588
location)
493
reader = bundle.read_bundle_from_url(location)
589
494
except errors.NotABundle:
590
495
pass # Continue on considering this url a Branch
591
496
600
505
self.outf.write("Using saved location: %s\n" % display_url)
601
506
location = stored_loc
602
507
603
if mergeable is not None:
604
if revision is not None:
605
raise errors.BzrCommandError(
606
'Cannot use -r with merge directives or bundles')
607
revision_id = mergeable.install_revisions(branch_to.repository)
508
509
if reader is not None:
510
install_bundle(branch_to.repository, reader)
608
511
branch_from = branch_to
609
512
else:
610
513
branch_from = Branch.open(location)
612
515
if branch_to.get_parent() is None or remember:
613
516
branch_to.set_parent(branch_from.base)
614
517
615
if revision is not None:
616
if len(revision) == 1:
617
revision_id = revision[0].in_history(branch_from).rev_id
618
else:
619
raise errors.BzrCommandError(
620
'bzr pull --revision takes one value.')
518
rev_id = None
519
if revision is None:
520
if reader is not None:
521
rev_id = reader.target
522
elif len(revision) == 1:
523
rev_id = revision[0].in_history(branch_from).rev_id
524
else:
525
raise errors.BzrCommandError('bzr pull --revision takes one value.')
621
526
622
527
old_rh = branch_to.revision_history()
623
528
if tree_to is not None:
624
result = tree_to.pull(branch_from, overwrite, revision_id,
625
delta._ChangeReporter(unversioned_filter=tree_to.is_ignored))
529
count = tree_to.pull(branch_from, overwrite, rev_id)
626
530
else:
627
result = branch_to.pull(branch_from, overwrite, revision_id)
531
count = branch_to.pull(branch_from, overwrite, rev_id)
532
note('%d revision(s) pulled.' % (count,))
628
533
629
result.report(self.outf)
630
534
if verbose:
631
from bzrlib.log import show_changed_revisions
632
535
new_rh = branch_to.revision_history()
633
show_changed_revisions(branch_to, old_rh, new_rh,
634
to_file=self.outf)
536
if old_rh != new_rh:
537
# Something changed
538
from bzrlib.log import show_changed_revisions
539
show_changed_revisions(branch_to, old_rh, new_rh,
540
to_file=self.outf)
635
541
636
542
637
543
class cmd_push(Command):
660
566
location can be accessed.
661
567
"""
662
568
663
_see_also = ['pull', 'update', 'working-trees']
664
569
takes_options = ['remember', 'overwrite', 'verbose',
665
Option('create-prefix',
666
help='Create the path leading up to the branch '
667
'if it does not already exist.'),
668
Option('directory',
669
help='Branch to push from, '
670
'rather than the one containing the working directory.',
671
short_name='d',
672
type=unicode,
673
),
674
Option('use-existing-dir',
675
help='By default push will fail if the target'
676
' directory exists, but does not already'
677
' have a control directory. This flag will'
678
' allow push to proceed.'),
679
]
570
Option('create-prefix',
571
help='Create the path leading up to the branch '
572
'if it does not already exist')]
680
573
takes_args = ['location?']
681
574
encoding_type = 'replace'
682
575
683
576
def run(self, location=None, remember=False, overwrite=False,
684
create_prefix=False, verbose=False,
685
use_existing_dir=False,
686
directory=None):
577
create_prefix=False, verbose=False):
687
578
# FIXME: Way too big! Put this into a function called from the
688
579
# command.
689
if directory is None:
690
directory = '.'
691
br_from = Branch.open_containing(directory)[0]
580
581
br_from = Branch.open_containing('.')[0]
692
582
stored_loc = br_from.get_push_location()
693
583
if location is None:
694
584
if stored_loc is None:
700
590
location = stored_loc
701
591
702
592
to_transport = transport.get_transport(location)
593
location_url = to_transport.base
703
594
704
br_to = repository_to = dir_to = None
705
try:
706
dir_to = bzrdir.BzrDir.open_from_transport(to_transport)
707
except errors.NotBranchError:
708
pass # Didn't find anything
709
else:
710
# If we can open a branch, use its direct repository, otherwise see
711
# if there is a repository without a branch.
712
try:
713
br_to = dir_to.open_branch()
714
except errors.NotBranchError:
715
# Didn't find a branch, can we find a repository?
716
try:
717
repository_to = dir_to.find_repository()
718
except errors.NoRepositoryPresent:
719
pass
720
else:
721
# Found a branch, so we must have found a repository
722
repository_to = br_to.repository
723
push_result = None
724
595
old_rh = []
725
if dir_to is None:
726
# The destination doesn't exist; create it.
727
# XXX: Refactor the create_prefix/no_create_prefix code into a
728
# common helper function
729
try:
730
to_transport.mkdir('.')
731
except errors.FileExists:
732
if not use_existing_dir:
733
raise errors.BzrCommandError("Target directory %s"
734
" already exists, but does not have a valid .bzr"
735
" directory. Supply --use-existing-dir to push"
736
" there anyway." % location)
737
except errors.NoSuchFile:
738
if not create_prefix:
739
raise errors.BzrCommandError("Parent directory of %s"
740
" does not exist."
741
"\nYou may supply --create-prefix to create all"
742
" leading parent directories."
743
% location)
744
745
_create_prefix(to_transport)
746
747
# Now the target directory exists, but doesn't have a .bzr
748
# directory. So we need to create it, along with any work to create
749
# all of the dependent branches, etc.
750
dir_to = br_from.bzrdir.clone_on_transport(to_transport,
596
try:
597
dir_to = bzrdir.BzrDir.open(location_url)
598
br_to = dir_to.open_branch()
599
except errors.NotBranchError:
600
# create a branch.
601
to_transport = to_transport.clone('..')
602
if not create_prefix:
603
try:
604
relurl = to_transport.relpath(location_url)
605
mutter('creating directory %s => %s', location_url, relurl)
606
to_transport.mkdir(relurl)
607
except errors.NoSuchFile:
608
raise errors.BzrCommandError("Parent directory of %s "
609
"does not exist." % location)
610
else:
611
current = to_transport.base
612
needed = [(to_transport, to_transport.relpath(location_url))]
613
while needed:
614
try:
615
to_transport, relpath = needed[-1]
616
to_transport.mkdir(relpath)
617
needed.pop()
618
except errors.NoSuchFile:
619
new_transport = to_transport.clone('..')
620
needed.append((new_transport,
621
new_transport.relpath(to_transport.base)))
622
if new_transport.base == to_transport.base:
623
raise errors.BzrCommandError("Could not create "
624
"path prefix.")
625
dir_to = br_from.bzrdir.clone(location_url,
751
626
revision_id=br_from.last_revision())
752
627
br_to = dir_to.open_branch()
753
# TODO: Some more useful message about what was copied
754
note('Created new branch.')
628
count = len(br_to.revision_history())
755
629
# We successfully created the target, remember it
756
630
if br_from.get_push_location() is None or remember:
757
631
br_from.set_push_location(br_to.base)
758
elif repository_to is None:
759
# we have a bzrdir but no branch or repository
760
# XXX: Figure out what to do other than complain.
761
raise errors.BzrCommandError("At %s you have a valid .bzr control"
762
" directory, but not a branch or repository. This is an"
763
" unsupported configuration. Please move the target directory"
764
" out of the way and try again."
765
% location)
766
elif br_to is None:
767
# We have a repository but no branch, copy the revisions, and then
768
# create a branch.
769
last_revision_id = br_from.last_revision()
770
repository_to.fetch(br_from.repository,
771
revision_id=last_revision_id)
772
br_to = br_from.clone(dir_to, revision_id=last_revision_id)
773
note('Created new branch.')
774
if br_from.get_push_location() is None or remember:
775
br_from.set_push_location(br_to.base)
776
else: # We have a valid to branch
632
else:
777
633
# We were able to connect to the remote location, so remember it
778
634
# we don't need to successfully push because of possible divergence.
779
635
if br_from.get_push_location() is None or remember:
783
639
try:
784
640
tree_to = dir_to.open_workingtree()
785
641
except errors.NotLocalUrl:
786
warning("This transport does not update the working "
787
"tree of: %s. See 'bzr help working-trees' for "
788
"more information." % br_to.base)
789
push_result = br_from.push(br_to, overwrite)
642
warning('This transport does not update the working '
643
'tree of: %s' % (br_to.base,))
644
count = br_to.pull(br_from, overwrite)
790
645
except errors.NoWorkingTree:
791
push_result = br_from.push(br_to, overwrite)
646
count = br_to.pull(br_from, overwrite)
792
647
else:
793
tree_to.lock_write()
794
try:
795
push_result = br_from.push(tree_to.branch, overwrite)
796
tree_to.update()
797
finally:
798
tree_to.unlock()
648
count = tree_to.pull(br_from, overwrite)
799
649
except errors.DivergedBranches:
800
650
raise errors.BzrCommandError('These branches have diverged.'
801
651
' Try using "merge" and then "push".')
802
if push_result is not None:
803
push_result.report(self.outf)
804
elif verbose:
652
note('%d revision(s) pushed.' % (count,))
653
654
if verbose:
805
655
new_rh = br_to.revision_history()
806
656
if old_rh != new_rh:
807
657
# Something changed
808
658
from bzrlib.log import show_changed_revisions
809
659
show_changed_revisions(br_to, old_rh, new_rh,
810
660
to_file=self.outf)
811
else:
812
# we probably did a clone rather than a push, so a message was
813
# emitted above
814
pass
815
661
816
662
817
663
class cmd_branch(Command):
819
665
820
666
If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will
821
667
be used. In other words, "branch ../foo/bar" will attempt to create ./bar.
822
If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION
823
is derived from the FROM_LOCATION by stripping a leading scheme or drive
824
identifier, if any. For example, "branch lp:foo-bar" will attempt to
825
create ./foo-bar.
826
668
827
669
To retrieve the branch as of a particular revision, supply the --revision
828
670
parameter, as in "branch foo/bar -r 5".
671
672
--basis is to speed up branching from remote branches. When specified, it
673
copies all the file-contents, inventory and revision data from the basis
674
branch before copying anything from the remote branch.
829
675
"""
830
831
_see_also = ['checkout']
832
676
takes_args = ['from_location', 'to_location?']
833
takes_options = ['revision']
677
takes_options = ['revision', 'basis']
834
678
aliases = ['get', 'clone']
835
679
836
def run(self, from_location, to_location=None, revision=None):
837
from bzrlib.tag import _merge_tags_if_possible
680
def run(self, from_location, to_location=None, revision=None, basis=None):
838
681
if revision is None:
839
682
revision = [None]
840
683
elif len(revision) > 1:
841
684
raise errors.BzrCommandError(
842
685
'bzr branch --revision takes exactly 1 revision value')
843
844
br_from = Branch.open(from_location)
686
try:
687
br_from = Branch.open(from_location)
688
except OSError, e:
689
if e.errno == errno.ENOENT:
690
raise errors.BzrCommandError('Source location "%s" does not'
691
' exist.' % to_location)
692
else:
693
raise
845
694
br_from.lock_read()
846
695
try:
696
if basis is not None:
697
basis_dir = bzrdir.BzrDir.open_containing(basis)[0]
698
else:
699
basis_dir = None
847
700
if len(revision) == 1 and revision[0] is not None:
848
701
revision_id = revision[0].in_history(br_from)[1]
849
702
else:
852
705
# RBC 20060209
853
706
revision_id = br_from.last_revision()
854
707
if to_location is None:
855
to_location = urlutils.derive_to_location(from_location)
708
to_location = os.path.basename(from_location.rstrip("/\\"))
856
709
name = None
857
710
else:
858
711
name = os.path.basename(to_location) + '\n'
868
721
% to_location)
869
722
try:
870
723
# preserve whatever source format we have.
871
dir = br_from.bzrdir.sprout(to_transport.base, revision_id)
724
dir = br_from.bzrdir.sprout(to_transport.base,
725
revision_id, basis_dir)
872
726
branch = dir.open_branch()
873
727
except errors.NoSuchRevision:
874
728
to_transport.delete_tree('.')
875
729
msg = "The branch %s has no revision %s." % (from_location, revision[0])
876
730
raise errors.BzrCommandError(msg)
731
except errors.UnlistableBranch:
732
osutils.rmtree(to_location)
733
msg = "The branch %s cannot be used as a --basis" % (basis,)
734
raise errors.BzrCommandError(msg)
877
735
if name:
878
736
branch.control_files.put_utf8('branch-name', name)
879
_merge_tags_if_possible(br_from, branch)
880
737
note('Branched %d revision(s).' % branch.revno())
881
738
finally:
882
739
br_from.unlock()
892
749
893
750
If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION will
894
751
be used. In other words, "checkout ../foo/bar" will attempt to create ./bar.
895
If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION
896
is derived from the BRANCH_LOCATION by stripping a leading scheme or drive
897
identifier, if any. For example, "checkout lp:foo-bar" will attempt to
898
create ./foo-bar.
899
752
900
753
To retrieve the branch as of a particular revision, supply the --revision
901
754
parameter, as in "checkout foo/bar -r 5". Note that this will be immediately
902
755
out of date [so you cannot commit] but it may be useful (i.e. to examine old
903
756
code.)
757
758
--basis is to speed up checking out from remote branches. When specified, it
759
uses the inventory and file contents from the basis branch in preference to the
760
branch being checked out.
904
761
"""
905
906
_see_also = ['checkouts', 'branch']
907
762
takes_args = ['branch_location?', 'to_location?']
908
takes_options = ['revision',
763
takes_options = ['revision', # , 'basis']
909
764
Option('lightweight',
910
help="Perform a lightweight checkout. Lightweight "
765
help="perform a lightweight checkout. Lightweight "
911
766
"checkouts depend on access to the branch for "
912
"every operation. Normal checkouts can perform "
767
"every operation. Normal checkouts can perform "
913
768
"common operations like diff and status without "
914
769
"such access, and also support local commits."
915
770
),
916
771
]
917
772
aliases = ['co']
918
773
919
def run(self, branch_location=None, to_location=None, revision=None,
774
def run(self, branch_location=None, to_location=None, revision=None, basis=None,
920
775
lightweight=False):
921
776
if revision is None:
922
777
revision = [None]
932
787
else:
933
788
revision_id = None
934
789
if to_location is None:
935
to_location = urlutils.derive_to_location(branch_location)
790
to_location = os.path.basename(branch_location.rstrip("/\\"))
936
791
# if the source and to_location are the same,
937
792
# and there is no working tree,
938
793
# then reconstitute a branch
954
809
% to_location)
955
810
else:
956
811
raise
957
source.create_checkout(to_location, revision_id, lightweight)
812
old_format = bzrdir.BzrDirFormat.get_default_format()
813
bzrdir.BzrDirFormat.set_default_format(bzrdir.BzrDirMetaFormat1())
814
try:
815
source.create_checkout(to_location, revision_id, lightweight)
816
finally:
817
bzrdir.BzrDirFormat.set_default_format(old_format)
958
818
959
819
960
820
class cmd_renames(Command):
963
823
# TODO: Option to show renames between two historical versions.
964
824
965
825
# TODO: Only show renames under dir, rather than in the whole branch.
966
_see_also = ['status']
967
826
takes_args = ['dir?']
968
827
969
828
@display_command
970
829
def run(self, dir=u'.'):
971
830
tree = WorkingTree.open_containing(dir)[0]
972
tree.lock_read()
973
try:
974
new_inv = tree.inventory
975
old_tree = tree.basis_tree()
976
old_tree.lock_read()
977
try:
978
old_inv = old_tree.inventory
979
renames = list(_mod_tree.find_renames(old_inv, new_inv))
980
renames.sort()
981
for old_name, new_name in renames:
982
self.outf.write("%s => %s\n" % (old_name, new_name))
983
finally:
984
old_tree.unlock()
985
finally:
986
tree.unlock()
831
old_inv = tree.basis_tree().inventory
832
new_inv = tree.read_working_inventory()
833
renames = list(_mod_tree.find_renames(old_inv, new_inv))
834
renames.sort()
835
for old_name, new_name in renames:
836
self.outf.write("%s => %s\n" % (old_name, new_name))
987
837
988
838
989
839
class cmd_update(Command):
996
846
If you want to discard your local changes, you can just do a
997
847
'bzr revert' instead of 'bzr commit' after the update.
998
848
"""
999
1000
_see_also = ['pull', 'working-trees']
1001
849
takes_args = ['dir?']
1002
850
aliases = ['up']
1003
851
1018
866
revno = tree.branch.revision_id_to_revno(last_rev)
1019
867
note("Tree is up to date at revision %d." % (revno,))
1020
868
return 0
1021
conflicts = tree.update(delta._ChangeReporter(
1022
unversioned_filter=tree.is_ignored))
869
conflicts = tree.update()
1023
870
revno = tree.branch.revision_id_to_revno(tree.last_revision())
1024
871
note('Updated to revision %d.' % (revno,))
1025
872
if tree.get_parent_ids()[1:] != existing_pending_merges:
1042
889
1043
890
Branches and working trees will also report any missing revisions.
1044
891
"""
1045
_see_also = ['revno', 'working-trees', 'repositories']
1046
892
takes_args = ['location?']
1047
893
takes_options = ['verbose']
1048
894
1049
895
@display_command
1050
def run(self, location=None, verbose=0):
896
def run(self, location=None, verbose=False):
1051
897
from bzrlib.info import show_bzrdir_info
1052
898
show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1053
899
verbose=verbose)
1054
900
1055
901
1056
902
class cmd_remove(Command):
1057
"""Remove files or directories.
903
"""Make a file unversioned.
1058
904
1059
This makes bzr stop tracking changes to the specified files and
1060
delete them if they can easily be recovered using revert.
905
This makes bzr stop tracking changes to a versioned file. It does
906
not delete the working copy.
1061
907
1062
908
You can specify one or more files, and/or --new. If you specify --new,
1063
909
only 'added' files will be removed. If you specify both, then new files
1065
911
also new, they will also be removed.
1066
912
"""
1067
913
takes_args = ['file*']
1068
takes_options = ['verbose',
1069
Option('new', help='Remove newly-added files.'),
1070
RegistryOption.from_kwargs('file-deletion-strategy',
1071
'The file deletion mode to be used',
1072
title='Deletion Strategy', value_switches=True, enum_switch=False,
1073
safe='Only delete files if they can be'
1074
' safely recovered (default).',
1075
keep="Don't delete any files.",
1076
force='Delete all the specified files, even if they can not be '
1077
'recovered and even if they are non-empty directories.')]
914
takes_options = ['verbose', Option('new', help='remove newly-added files')]
1078
915
aliases = ['rm']
1079
916
encoding_type = 'replace'
1080
1081
def run(self, file_list, verbose=False, new=False,
1082
file_deletion_strategy='safe'):
917
918
def run(self, file_list, verbose=False, new=False):
1083
919
tree, file_list = tree_files(file_list)
1084
1085
if file_list is not None:
1086
file_list = [f for f in file_list if f != '']
1087
elif not new:
1088
raise errors.BzrCommandError('Specify one or more files to'
1089
' remove, or use --new.')
1090
1091
if new:
920
if new is False:
921
if file_list is None:
922
raise errors.BzrCommandError('Specify one or more files to'
923
' remove, or use --new.')
924
else:
1092
925
added = tree.changes_from(tree.basis_tree(),
1093
926
specific_files=file_list).added
1094
927
file_list = sorted([f[0] for f in added], reverse=True)
1095
928
if len(file_list) == 0:
1096
929
raise errors.BzrCommandError('No matching files.')
1097
tree.remove(file_list, verbose=verbose, to_file=self.outf,
1098
keep_files=file_deletion_strategy=='keep',
1099
force=file_deletion_strategy=='force')
930
tree.remove(file_list, verbose=verbose, to_file=self.outf)
1100
931
1101
932
1102
933
class cmd_file_id(Command):
1108
939
"""
1109
940
1110
941
hidden = True
1111
_see_also = ['inventory', 'ls']
1112
942
takes_args = ['filename']
1113
943
1114
944
@display_command
1115
945
def run(self, filename):
1116
946
tree, relpath = WorkingTree.open_containing(filename)
1117
i = tree.path2id(relpath)
947
i = tree.inventory.path2id(relpath)
1118
948
if i is None:
1119
949
raise errors.NotVersionedError(filename)
1120
950
else:
1134
964
@display_command
1135
965
def run(self, filename):
1136
966
tree, relpath = WorkingTree.open_containing(filename)
1137
fid = tree.path2id(relpath)
967
inv = tree.inventory
968
fid = inv.path2id(relpath)
1138
969
if fid is None:
1139
970
raise errors.NotVersionedError(filename)
1140
segments = osutils.splitpath(relpath)
1141
for pos in range(1, len(segments) + 1):
1142
path = osutils.joinpath(segments[:pos])
1143
self.outf.write("%s\n" % tree.path2id(path))
971
for fip in inv.get_idpath(fid):
972
self.outf.write(fip + '\n')
1144
973
1145
974
1146
975
class cmd_reconcile(Command):
1161
990
1162
991
The branch *MUST* be on a listable system such as local disk or sftp.
1163
992
"""
1164
1165
_see_also = ['check']
1166
993
takes_args = ['branch?']
1167
994
1168
995
def run(self, branch="."):
1173
1000
1174
1001
class cmd_revision_history(Command):
1175
1002
"""Display the list of revision ids on a branch."""
1176
1177
_see_also = ['log']
1178
1003
takes_args = ['location?']
1179
1004
1180
1005
hidden = True
1189
1014
1190
1015
class cmd_ancestry(Command):
1191
1016
"""List all revisions merged into this branch."""
1192
1193
_see_also = ['log', 'revision-history']
1194
1017
takes_args = ['location?']
1195
1018
1196
1019
hidden = True
1221
1044
1222
1045
If there is a repository in a parent directory of the location, then
1223
1046
the history of the branch will be stored in the repository. Otherwise
1224
init creates a standalone branch which carries its own history
1225
in the .bzr directory.
1047
init creates a standalone branch which carries its own history in
1048
.bzr.
1226
1049
1227
1050
If there is already a branch at the location but it has no working tree,
1228
1051
the tree can be populated with 'bzr checkout'.
1234
1057
bzr status
1235
1058
bzr commit -m 'imported project'
1236
1059
"""
1237
1238
_see_also = ['init-repo', 'branch', 'checkout']
1239
1060
takes_args = ['location?']
1240
1061
takes_options = [
1241
Option('create-prefix',
1242
help='Create the path leading up to the branch '
1243
'if it does not already exist.'),
1244
RegistryOption('format',
1245
help='Specify a format for this branch. '
1246
'See "help formats".',
1247
registry=bzrdir.format_registry,
1248
converter=bzrdir.format_registry.make_bzrdir,
1249
value_switches=True,
1250
title="Branch Format",
1251
),
1252
Option('append-revisions-only',
1253
help='Never change revnos or the existing log.'
1254
' Append revisions to it only.')
1255
]
1256
def run(self, location=None, format=None, append_revisions_only=False,
1257
create_prefix=False):
1062
Option('format',
1063
help='Specify a format for this branch. Current'
1064
' formats are: default, knit, metaweave and'
1065
' weave. Default is knit; metaweave and'
1066
' weave are deprecated',
1067
type=get_format_type),
1068
]
1069
def run(self, location=None, format=None):
1258
1070
if format is None:
1259
format = bzrdir.format_registry.make_bzrdir('default')
1071
format = get_format_type('default')
1260
1072
if location is None:
1261
1073
location = u'.'
1262
1074
1267
1079
# Just using os.mkdir, since I don't
1268
1080
# believe that we want to create a bunch of
1269
1081
# locations if the user supplies an extended path
1082
# TODO: create-prefix
1270
1083
try:
1271
to_transport.ensure_base()
1272
except errors.NoSuchFile:
1273
if not create_prefix:
1274
raise errors.BzrCommandError("Parent directory of %s"
1275
" does not exist."
1276
"\nYou may supply --create-prefix to create all"
1277
" leading parent directories."
1278
% location)
1279
_create_prefix(to_transport)
1280
1084
to_transport.mkdir('.')
1085
except errors.FileExists:
1086
pass
1087
1281
1088
try:
1282
1089
existing_bzrdir = bzrdir.BzrDir.open(location)
1283
1090
except errors.NotBranchError:
1284
1091
# really a NotBzrDir error...
1285
branch = bzrdir.BzrDir.create_branch_convenience(to_transport.base,
1286
format=format)
1092
bzrdir.BzrDir.create_branch_convenience(location, format=format)
1287
1093
else:
1288
1094
from bzrlib.transport.local import LocalTransport
1289
1095
if existing_bzrdir.has_branch():
1292
1098
raise errors.BranchExistsWithoutWorkingTree(location)
1293
1099
raise errors.AlreadyBranchError(location)
1294
1100
else:
1295
branch = existing_bzrdir.create_branch()
1101
existing_bzrdir.create_branch()
1296
1102
existing_bzrdir.create_workingtree()
1297
if append_revisions_only:
1298
try:
1299
branch.set_append_revisions_only(True)
1300
except errors.UpgradeRequired:
1301
raise errors.BzrCommandError('This branch format cannot be set'
1302
' to append-revisions-only. Try --experimental-branch6')
1303
1103
1304
1104
1305
1105
class cmd_init_repository(Command):
1306
1106
"""Create a shared repository to hold branches.
1307
1107
1308
New branches created under the repository directory will store their
1309
revisions in the repository, not in the branch directory.
1310
1311
If the --no-trees option is used then the branches in the repository
1312
will not have working trees by default.
1108
New branches created under the repository directory will store their revisions
1109
in the repository, not in the branch directory, if the branch format supports
1110
shared storage.
1313
1111
1314
1112
example:
1315
bzr init-repo --no-trees repo
1113
bzr init-repo repo
1316
1114
bzr init repo/trunk
1317
1115
bzr checkout --lightweight repo/trunk trunk-checkout
1318
1116
cd trunk-checkout
1319
1117
(add files here)
1320
1321
See 'bzr help repositories' for more information.
1322
1118
"""
1323
1324
_see_also = ['init', 'branch', 'checkout']
1325
takes_args = ["location"]
1326
takes_options = [RegistryOption('format',
1327
help='Specify a format for this repository. See'
1328
' "bzr help formats" for details.',
1329
registry=bzrdir.format_registry,
1330
converter=bzrdir.format_registry.make_bzrdir,
1331
value_switches=True, title='Repository format'),
1332
Option('no-trees',
1333
help='Branches in the repository will default to'
1334
' not having a working tree.'),
1335
]
1119
takes_args = ["location"]
1120
takes_options = [Option('format',
1121
help='Specify a format for this repository.'
1122
' Current formats are: default, knit,'
1123
' metaweave and weave. Default is knit;'
1124
' metaweave and weave are deprecated',
1125
type=get_format_type),
1126
Option('trees',
1127
help='Allows branches in repository to have'
1128
' a working tree')]
1336
1129
aliases = ["init-repo"]
1337
1338
def run(self, location, format=None, no_trees=False):
1130
def run(self, location, format=None, trees=False):
1339
1131
if format is None:
1340
format = bzrdir.format_registry.make_bzrdir('default')
1132
format = get_format_type('default')
1341
1133
1342
1134
if location is None:
1343
1135
location = '.'
1344
1136
1345
1137
to_transport = transport.get_transport(location)
1346
to_transport.ensure_base()
1138
try:
1139
to_transport.mkdir('.')
1140
except errors.FileExists:
1141
pass
1347
1142
1348
1143
newdir = format.initialize_on_transport(to_transport)
1349
1144
repo = newdir.create_repository(shared=True)
1350
repo.set_make_working_trees(not no_trees)
1145
repo.set_make_working_trees(trees)
1351
1146
1352
1147
1353
1148
class cmd_diff(Command):
1366
1161
Difference between the working tree and revision 1
1367
1162
bzr diff -r1..2
1368
1163
Difference between revision 2 and revision 1
1369
bzr diff --prefix old/:new/
1164
bzr diff --diff-prefix old/:new/
1370
1165
Same as 'bzr diff' but prefix paths with old/ and new/
1371
1166
bzr diff bzr.mine bzr.dev
1372
1167
Show the differences between the two working trees
1383
1178
# deleted files.
1384
1179
1385
1180
# TODO: This probably handles non-Unix newlines poorly.
1386
1387
_see_also = ['status']
1181
1388
1182
takes_args = ['file*']
1389
takes_options = ['revision', 'diff-options',
1390
Option('prefix', type=str,
1391
short_name='p',
1392
help='Set prefixes to added to old and new filenames, as '
1393
'two values separated by a colon. (eg "old/:new/").'),
1394
]
1183
takes_options = ['revision', 'diff-options', 'prefix']
1395
1184
aliases = ['di', 'dif']
1396
1185
encoding_type = 'exact'
1397
1186
1407
1196
elif prefix == '1':
1408
1197
old_label = 'old/'
1409
1198
new_label = 'new/'
1410
elif ':' in prefix:
1199
else:
1200
if not ':' in prefix:
1201
raise BzrCommandError(
1202
"--diff-prefix expects two values separated by a colon")
1411
1203
old_label, new_label = prefix.split(":")
1412
else:
1413
raise errors.BzrCommandError(
1414
'--prefix expects two values separated by a colon'
1415
' (eg "old/:new/")')
1416
1417
if revision and len(revision) > 2:
1418
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1419
' one or two revision specifiers')
1420
1204
1421
1205
try:
1422
1206
tree1, file_list = internal_tree_files(file_list)
1423
1207
tree2 = None
1442
1226
tree1, tree2 = None, None
1443
1227
else:
1444
1228
raise
1445
1446
if tree2 is not None:
1447
if revision is not None:
1448
# FIXME: but there should be a clean way to diff between
1449
# non-default versions of two trees, it's not hard to do
1450
# internally...
1451
raise errors.BzrCommandError(
1452
"Sorry, diffing arbitrary revisions across branches "
1453
"is not implemented yet")
1454
return show_diff_trees(tree1, tree2, sys.stdout,
1455
specific_files=file_list,
1456
external_diff_options=diff_options,
1457
old_label=old_label, new_label=new_label)
1458
1459
return diff_cmd_helper(tree1, file_list, diff_options,
1460
revision_specs=revision,
1461
old_label=old_label, new_label=new_label)
1229
if revision is not None:
1230
if tree2 is not None:
1231
raise errors.BzrCommandError("Can't specify -r with two branches")
1232
if (len(revision) == 1) or (revision[1].spec is None):
1233
return diff_cmd_helper(tree1, file_list, diff_options,
1234
revision[0],
1235
old_label=old_label, new_label=new_label)
1236
elif len(revision) == 2:
1237
return diff_cmd_helper(tree1, file_list, diff_options,
1238
revision[0], revision[1],
1239
old_label=old_label, new_label=new_label)
1240
else:
1241
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1242
' one or two revision identifiers')
1243
else:
1244
if tree2 is not None:
1245
return show_diff_trees(tree1, tree2, sys.stdout,
1246
specific_files=file_list,
1247
external_diff_options=diff_options,
1248
old_label=old_label, new_label=new_label)
1249
else:
1250
return diff_cmd_helper(tree1, file_list, diff_options,
1251
old_label=old_label, new_label=new_label)
1462
1252
1463
1253
1464
1254
class cmd_deleted(Command):
1470
1260
# directories with readdir, rather than stating each one. Same
1471
1261
# level of effort but possibly much less IO. (Or possibly not,
1472
1262
# if the directories are very large...)
1473
_see_also = ['status', 'ls']
1474
1263
takes_options = ['show-ids']
1475
1264
1476
1265
@display_command
1477
1266
def run(self, show_ids=False):
1478
1267
tree = WorkingTree.open_containing(u'.')[0]
1479
tree.lock_read()
1480
try:
1481
old = tree.basis_tree()
1482
old.lock_read()
1483
try:
1484
for path, ie in old.inventory.iter_entries():
1485
if not tree.has_id(ie.file_id):
1486
self.outf.write(path)
1487
if show_ids:
1488
self.outf.write(' ')
1489
self.outf.write(ie.file_id)
1490
self.outf.write('\n')
1491
finally:
1492
old.unlock()
1493
finally:
1494
tree.unlock()
1268
old = tree.basis_tree()
1269
for path, ie in old.inventory.iter_entries():
1270
if not tree.has_id(ie.file_id):
1271
self.outf.write(path)
1272
if show_ids:
1273
self.outf.write(' ')
1274
self.outf.write(ie.file_id)
1275
self.outf.write('\n')
1495
1276
1496
1277
1497
1278
class cmd_modified(Command):
1498
"""List files modified in working tree.
1499
"""
1500
1279
"""List files modified in working tree."""
1501
1280
hidden = True
1502
_see_also = ['status', 'ls']
1503
1504
1281
@display_command
1505
1282
def run(self):
1506
1283
tree = WorkingTree.open_containing(u'.')[0]
1510
1287
1511
1288
1512
1289
class cmd_added(Command):
1513
"""List files added in working tree.
1514
"""
1515
1290
"""List files added in working tree."""
1516
1291
hidden = True
1517
_see_also = ['status', 'ls']
1518
1519
1292
@display_command
1520
1293
def run(self):
1521
1294
wt = WorkingTree.open_containing(u'.')[0]
1522
wt.lock_read()
1523
try:
1524
basis = wt.basis_tree()
1525
basis.lock_read()
1526
try:
1527
basis_inv = basis.inventory
1528
inv = wt.inventory
1529
for file_id in inv:
1530
if file_id in basis_inv:
1531
continue
1532
if inv.is_root(file_id) and len(basis_inv) == 0:
1533
continue
1534
path = inv.id2path(file_id)
1535
if not os.access(osutils.abspath(path), os.F_OK):
1536
continue
1537
self.outf.write(path + '\n')
1538
finally:
1539
basis.unlock()
1540
finally:
1541
wt.unlock()
1295
basis_inv = wt.basis_tree().inventory
1296
inv = wt.inventory
1297
for file_id in inv:
1298
if file_id in basis_inv:
1299
continue
1300
if inv.is_root(file_id) and len(basis_inv) == 0:
1301
continue
1302
path = inv.id2path(file_id)
1303
if not os.access(osutils.abspath(path), os.F_OK):
1304
continue
1305
self.outf.write(path + '\n')
1542
1306
1543
1307
1544
1308
class cmd_root(Command):
1546
1310
1547
1311
The root is the nearest enclosing directory with a .bzr control
1548
1312
directory."""
1549
1550
1313
takes_args = ['filename?']
1551
1314
@display_command
1552
1315
def run(self, filename=None):
1555
1318
self.outf.write(tree.basedir + '\n')
1556
1319
1557
1320
1558
def _parse_limit(limitstring):
1559
try:
1560
return int(limitstring)
1561
except ValueError:
1562
msg = "The limit argument must be an integer."
1563
raise errors.BzrCommandError(msg)
1564
1565
1566
1321
class cmd_log(Command):
1567
1322
"""Show log of a branch, file, or directory.
1568
1323
1581
1336
# TODO: Make --revision support uuid: and hash: [future tag:] notation.
1582
1337
1583
1338
takes_args = ['location?']
1584
takes_options = [
1585
Option('forward',
1586
help='Show from oldest to newest.'),
1587
'timezone',
1588
Option('verbose',
1589
short_name='v',
1590
help='Show files changed in each revision.'),
1591
'show-ids',
1592
'revision',
1593
'log-format',
1594
Option('message',
1595
short_name='m',
1596
help='Show revisions whose message matches this '
1597
'regular expression.',
1598
type=str),
1599
Option('limit',
1600
help='Limit the output to the first N revisions.',
1601
argname='N',
1602
type=_parse_limit),
1603
]
1339
takes_options = [Option('forward',
1340
help='show from oldest to newest'),
1341
'timezone',
1342
Option('verbose',
1343
help='show files changed in each revision'),
1344
'show-ids', 'revision',
1345
'log-format',
1346
'line', 'long',
1347
Option('message',
1348
help='show revisions whose message matches this regexp',
1349
type=str),
1350
'short',
1351
]
1604
1352
encoding_type = 'replace'
1605
1353
1606
1354
@display_command
1611
1359
revision=None,
1612
1360
log_format=None,
1613
1361
message=None,
1614
limit=None):
1615
from bzrlib.log import show_log
1362
long=False,
1363
short=False,
1364
line=False):
1365
from bzrlib.log import log_formatter, show_log
1616
1366
assert message is None or isinstance(message, basestring), \
1617
1367
"invalid message argument %r" % message
1618
1368
direction = (forward and 'forward') or 'reverse'
1622
1372
if location:
1623
1373
# find the file id to log:
1624
1374
1625
tree, b, fp = bzrdir.BzrDir.open_containing_tree_or_branch(
1626
location)
1375
dir, fp = bzrdir.BzrDir.open_containing(location)
1376
b = dir.open_branch()
1627
1377
if fp != '':
1628
if tree is None:
1629
tree = b.basis_tree()
1630
file_id = tree.path2id(fp)
1378
try:
1379
# might be a tree:
1380
inv = dir.open_workingtree().inventory
1381
except (errors.NotBranchError, errors.NotLocalUrl):
1382
# either no tree, or is remote.
1383
inv = b.basis_tree().inventory
1384
file_id = inv.path2id(fp)
1631
1385
if file_id is None:
1632
1386
raise errors.BzrCommandError(
1633
1387
"Path does not have any revision history: %s" %
1643
1397
dir, relpath = bzrdir.BzrDir.open_containing(location)
1644
1398
b = dir.open_branch()
1645
1399
1646
b.lock_read()
1647
try:
1648
if revision is None:
1649
rev1 = None
1650
rev2 = None
1651
elif len(revision) == 1:
1652
rev1 = rev2 = revision[0].in_history(b)
1653
elif len(revision) == 2:
1654
if revision[1].get_branch() != revision[0].get_branch():
1655
# b is taken from revision[0].get_branch(), and
1656
# show_log will use its revision_history. Having
1657
# different branches will lead to weird behaviors.
1658
raise errors.BzrCommandError(
1659
"Log doesn't accept two revisions in different"
1660
" branches.")
1661
rev1 = revision[0].in_history(b)
1662
rev2 = revision[1].in_history(b)
1663
else:
1400
if revision is None:
1401
rev1 = None
1402
rev2 = None
1403
elif len(revision) == 1:
1404
rev1 = rev2 = revision[0].in_history(b).revno
1405
elif len(revision) == 2:
1406
if revision[1].get_branch() != revision[0].get_branch():
1407
# b is taken from revision[0].get_branch(), and
1408
# show_log will use its revision_history. Having
1409
# different branches will lead to weird behaviors.
1664
1410
raise errors.BzrCommandError(
1665
'bzr log --revision takes one or two values.')
1666
1667
if log_format is None:
1668
log_format = log.log_formatter_registry.get_default(b)
1669
1670
lf = log_format(show_ids=show_ids, to_file=self.outf,
1671
show_timezone=timezone)
1672
1673
show_log(b,
1674
lf,
1675
file_id,
1676
verbose=verbose,
1677
direction=direction,
1678
start_revision=rev1,
1679
end_revision=rev2,
1680
search=message,
1681
limit=limit)
1682
finally:
1683
b.unlock()
1411
"Log doesn't accept two revisions in different branches.")
1412
if revision[0].spec is None:
1413
# missing begin-range means first revision
1414
rev1 = 1
1415
else:
1416
rev1 = revision[0].in_history(b).revno
1417
1418
if revision[1].spec is None:
1419
# missing end-range means last known revision
1420
rev2 = b.revno()
1421
else:
1422
rev2 = revision[1].in_history(b).revno
1423
else:
1424
raise errors.BzrCommandError('bzr log --revision takes one or two values.')
1425
1426
# By this point, the revision numbers are converted to the +ve
1427
# form if they were supplied in the -ve form, so we can do
1428
# this comparison in relative safety
1429
if rev1 > rev2:
1430
(rev2, rev1) = (rev1, rev2)
1431
1432
if (log_format is None):
1433
default = b.get_config().log_format()
1434
log_format = get_log_format(long=long, short=short, line=line,
1435
default=default)
1436
lf = log_formatter(log_format,
1437
show_ids=show_ids,
1438
to_file=self.outf,
1439
show_timezone=timezone)
1440
1441
show_log(b,
1442
lf,
1443
file_id,
1444
verbose=verbose,
1445
direction=direction,
1446
start_revision=rev1,
1447
end_revision=rev2,
1448
search=message)
1684
1449
1685
1450
1686
1451
def get_log_format(long=False, short=False, line=False, default='long'):
1707
1472
def run(self, filename):
1708
1473
tree, relpath = WorkingTree.open_containing(filename)
1709
1474
b = tree.branch
1710
file_id = tree.path2id(relpath)
1475
inv = tree.read_working_inventory()
1476
file_id = inv.path2id(relpath)
1711
1477
for revno, revision_id, what in log.find_touching_revisions(b, file_id):
1712
1478
self.outf.write("%6d %s\n" % (revno, what))
1713
1479
1715
1481
class cmd_ls(Command):
1716
1482
"""List files in a tree.
1717
1483
"""
1718
1719
_see_also = ['status', 'cat']
1720
takes_args = ['path?']
1721
1484
# TODO: Take a revision or remote path and list that tree instead.
1722
takes_options = [
1723
'verbose',
1724
'revision',
1725
Option('non-recursive',
1726
help='Don\'t recurse into subdirectories.'),
1727
Option('from-root',
1728
help='Print paths relative to the root of the branch.'),
1729
Option('unknown', help='Print unknown files.'),
1730
Option('versioned', help='Print versioned files.'),
1731
Option('ignored', help='Print ignored files.'),
1732
Option('null',
1733
help='Write an ascii NUL (\\0) separator '
1734
'between files rather than a newline.'),
1735
'kind',
1736
'show-ids',
1737
]
1485
hidden = True
1486
takes_options = ['verbose', 'revision',
1487
Option('non-recursive',
1488
help='don\'t recurse into sub-directories'),
1489
Option('from-root',
1490
help='Print all paths from the root of the branch.'),
1491
Option('unknown', help='Print unknown files'),
1492
Option('versioned', help='Print versioned files'),
1493
Option('ignored', help='Print ignored files'),
1494
1495
Option('null', help='Null separate the files'),
1496
]
1738
1497
@display_command
1739
1498
def run(self, revision=None, verbose=False,
1740
1499
non_recursive=False, from_root=False,
1741
1500
unknown=False, versioned=False, ignored=False,
1742
null=False, kind=None, show_ids=False, path=None):
1743
1744
if kind and kind not in ('file', 'directory', 'symlink'):
1745
raise errors.BzrCommandError('invalid kind specified')
1501
null=False):
1746
1502
1747
1503
if verbose and null:
1748
1504
raise errors.BzrCommandError('Cannot set both --verbose and --null')
1750
1506
1751
1507
selection = {'I':ignored, '?':unknown, 'V':versioned}
1752
1508
1753
if path is None:
1754
fs_path = '.'
1755
prefix = ''
1756
else:
1757
if from_root:
1758
raise errors.BzrCommandError('cannot specify both --from-root'
1759
' and PATH')
1760
fs_path = path
1761
prefix = path
1762
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
1763
fs_path)
1509
tree, relpath = WorkingTree.open_containing(u'.')
1764
1510
if from_root:
1765
1511
relpath = u''
1766
1512
elif relpath:
1767
1513
relpath += '/'
1768
1514
if revision is not None:
1769
tree = branch.repository.revision_tree(
1770
revision[0].in_history(branch).rev_id)
1771
elif tree is None:
1772
tree = branch.basis_tree()
1515
tree = tree.branch.repository.revision_tree(
1516
revision[0].in_history(tree.branch).rev_id)
1773
1517
1774
tree.lock_read()
1775
try:
1776
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1777
if fp.startswith(relpath):
1778
fp = osutils.pathjoin(prefix, fp[len(relpath):])
1779
if non_recursive and '/' in fp:
1780
continue
1781
if not all and not selection[fc]:
1782
continue
1783
if kind is not None and fkind != kind:
1784
continue
1785
if verbose:
1786
kindch = entry.kind_character()
1787
outstring = '%-8s %s%s' % (fc, fp, kindch)
1788
if show_ids and fid is not None:
1789
outstring = "%-50s %s" % (outstring, fid)
1790
self.outf.write(outstring + '\n')
1791
elif null:
1792
self.outf.write(fp + '\0')
1793
if show_ids:
1794
if fid is not None:
1795
self.outf.write(fid)
1796
self.outf.write('\0')
1797
self.outf.flush()
1798
else:
1799
if fid is not None:
1800
my_id = fid
1801
else:
1802
my_id = ''
1803
if show_ids:
1804
self.outf.write('%-50s %s\n' % (fp, my_id))
1805
else:
1806
self.outf.write(fp + '\n')
1807
finally:
1808
tree.unlock()
1518
for fp, fc, kind, fid, entry in tree.list_files(include_root=False):
1519
if fp.startswith(relpath):
1520
fp = fp[len(relpath):]
1521
if non_recursive and '/' in fp:
1522
continue
1523
if not all and not selection[fc]:
1524
continue
1525
if verbose:
1526
kindch = entry.kind_character()
1527
self.outf.write('%-8s %s%s\n' % (fc, fp, kindch))
1528
elif null:
1529
self.outf.write(fp + '\0')
1530
self.outf.flush()
1531
else:
1532
self.outf.write(fp + '\n')
1809
1533
1810
1534
1811
1535
class cmd_unknowns(Command):
1812
"""List unknown files.
1813
"""
1814
1815
hidden = True
1816
_see_also = ['ls']
1817
1536
"""List unknown files."""
1818
1537
@display_command
1819
1538
def run(self):
1820
1539
for f in WorkingTree.open_containing(u'.')[0].unknowns():
1827
1546
To remove patterns from the ignore list, edit the .bzrignore file.
1828
1547
1829
1548
Trailing slashes on patterns are ignored.
1830
If the pattern contains a slash or is a regular expression, it is compared
1831
to the whole path from the branch root. Otherwise, it is compared to only
1832
the last component of the path. To match a file only in the root
1833
directory, prepend './'.
1549
If the pattern contains a slash, it is compared to the whole path
1550
from the branch root. Otherwise, it is compared to only the last
1551
component of the path. To match a file only in the root directory,
1552
prepend './'.
1834
1553
1835
1554
Ignore patterns specifying absolute paths are not allowed.
1836
1555
1837
Ignore patterns may include globbing wildcards such as:
1838
? - Matches any single character except '/'
1839
* - Matches 0 or more characters except '/'
1840
/**/ - Matches 0 or more directories in a path
1841
[a-z] - Matches a single character from within a group of characters
1842
1843
Ignore patterns may also be Python regular expressions.
1844
Regular expression ignore patterns are identified by a 'RE:' prefix
1845
followed by the regular expression. Regular expression ignore patterns
1846
may not include named or numbered groups.
1556
Ignore patterns are case-insensitive on case-insensitive systems.
1847
1557
1848
Note: ignore patterns containing shell wildcards must be quoted from
1849
the shell on Unix.
1558
Note: wildcards must be quoted from the shell on Unix.
1850
1559
1851
1560
examples:
1852
1561
bzr ignore ./Makefile
1853
1562
bzr ignore '*.class'
1854
bzr ignore 'lib/**/*.o'
1855
bzr ignore 'RE:lib/.*\.o'
1856
1563
"""
1857
1858
_see_also = ['status', 'ignored']
1859
1564
takes_args = ['name_pattern*']
1860
1565
takes_options = [
1861
Option('old-default-rules',
1862
help='Write out the ignore rules bzr < 0.9 always used.')
1863
]
1566
Option('old-default-rules',
1567
help='Out the ignore rules bzr < 0.9 always used.')
1568
]
1864
1569
1865
1570
def run(self, name_pattern_list=None, old_default_rules=None):
1866
1571
from bzrlib.atomicfile import AtomicFile
1872
1577
if not name_pattern_list:
1873
1578
raise errors.BzrCommandError("ignore requires at least one "
1874
1579
"NAME_PATTERN or --old-default-rules")
1875
name_pattern_list = [globbing.normalize_pattern(p)
1876
for p in name_pattern_list]
1877
1580
for name_pattern in name_pattern_list:
1878
if (name_pattern[0] == '/' or
1879
(len(name_pattern) > 1 and name_pattern[1] == ':')):
1581
if name_pattern[0] == '/':
1880
1582
raise errors.BzrCommandError(
1881
1583
"NAME_PATTERN should not be an absolute path")
1882
1584
tree, relpath = WorkingTree.open_containing(u'.')
1896
1598
if igns and igns[-1] != '\n':
1897
1599
igns += '\n'
1898
1600
for name_pattern in name_pattern_list:
1899
igns += name_pattern + '\n'
1601
igns += name_pattern.rstrip('/') + '\n'
1900
1602
1901
1603
f = AtomicFile(ifn, 'wb')
1902
1604
try:
1905
1607
finally:
1906
1608
f.close()
1907
1609
1908
if not tree.path2id('.bzrignore'):
1610
inv = tree.inventory
1611
if inv.path2id('.bzrignore'):
1612
mutter('.bzrignore is already versioned')
1613
else:
1614
mutter('need to make new .bzrignore file versioned')
1909
1615
tree.add(['.bzrignore'])
1910
1616
1911
1617
1912
1618
class cmd_ignored(Command):
1913
1619
"""List ignored files and the patterns that matched them.
1914
"""
1915
1620
1916
_see_also = ['ignore']
1621
See also: bzr ignore"""
1917
1622
@display_command
1918
1623
def run(self):
1919
1624
tree = WorkingTree.open_containing(u'.')[0]
1920
tree.lock_read()
1921
try:
1922
for path, file_class, kind, file_id, entry in tree.list_files():
1923
if file_class != 'I':
1924
continue
1925
## XXX: Slightly inefficient since this was already calculated
1926
pat = tree.is_ignored(path)
1927
print '%-50s %s' % (path, pat)
1928
finally:
1929
tree.unlock()
1625
for path, file_class, kind, file_id, entry in tree.list_files():
1626
if file_class != 'I':
1627
continue
1628
## XXX: Slightly inefficient since this was already calculated
1629
pat = tree.is_ignored(path)
1630
print '%-50s %s' % (path, pat)
1930
1631
1931
1632
1932
1633
class cmd_lookup_revision(Command):
1949
1650
1950
1651
1951
1652
class cmd_export(Command):
1952
"""Export current or past revision to a destination directory or archive.
1653
"""Export past revision to destination directory.
1953
1654
1954
1655
If no revision is specified this exports the last committed revision.
1955
1656
1957
1658
given, try to find the format with the extension. If no extension
1958
1659
is found exports to a directory (equivalent to --format=dir).
1959
1660
1960
If root is supplied, it will be used as the root directory inside
1961
container formats (tar, zip, etc). If it is not supplied it will default
1962
to the exported filename. The root option has no effect for 'dir' format.
1963
1964
If branch is omitted then the branch containing the current working
1965
directory will be used.
1966
1967
Note: Export of tree with non-ASCII filenames to zip is not supported.
1661
Root may be the top directory for tar, tgz and tbz2 formats. If none
1662
is given, the top directory will be the root name of the file.
1663
1664
If branch is omitted then the branch containing the CWD will be used.
1665
1666
Note: export of tree with non-ascii filenames to zip is not supported.
1968
1667
1969
1668
Supported formats Autodetected by extension
1970
1669
----------------- -------------------------
2000
1699
2001
1700
2002
1701
class cmd_cat(Command):
2003
"""Write the contents of a file as of a given revision to standard output.
2004
2005
If no revision is nominated, the last revision is used.
2006
2007
Note: Take care to redirect standard output when using this command on a
2008
binary file.
2009
"""
2010
2011
_see_also = ['ls']
1702
"""Write a file's text from a previous revision."""
1703
2012
1704
takes_options = ['revision', 'name-from-revision']
2013
1705
takes_args = ['filename']
2014
encoding_type = 'exact'
2015
1706
2016
1707
@display_command
2017
1708
def run(self, filename, revision=None, name_from_revision=False):
2021
1712
2022
1713
tree = None
2023
1714
try:
2024
tree, b, relpath = \
2025
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
1715
tree, relpath = WorkingTree.open_containing(filename)
1716
b = tree.branch
2026
1717
except errors.NotBranchError:
2027
1718
pass
2028
1719
1720
if tree is None:
1721
b, relpath = Branch.open_containing(filename)
2029
1722
if revision is not None and revision[0].get_branch() is not None:
2030
1723
b = Branch.open(revision[0].get_branch())
2031
if tree is None:
2032
tree = b.basis_tree()
2033
1724
if revision is None:
2034
1725
revision_id = b.last_revision()
2035
1726
else:
2073
1764
within it is committed.
2074
1765
2075
1766
A selected-file commit may fail in some cases where the committed
2076
tree would be invalid. Consider::
2077
2078
bzr init foo
2079
mkdir foo/bar
2080
bzr add foo/bar
2081
bzr commit foo -m "committing foo"
2082
bzr mv foo/bar foo/baz
2083
mkdir foo/bar
2084
bzr add foo/bar
2085
bzr commit foo/bar -m "committing bar but not baz"
2086
2087
In the example above, the last commit will fail by design. This gives
2088
the user the opportunity to decide whether they want to commit the
2089
rename at the same time, separately first, or not at all. (As a general
2090
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
2091
2092
Note: A selected-file commit after a merge is not yet supported.
1767
tree would be invalid, such as trying to commit a file in a
1768
newly-added directory that is not itself committed.
2093
1769
"""
2094
1770
# TODO: Run hooks on tree to-be-committed, and after commit.
2095
1771
2100
1776
2101
1777
# XXX: verbose currently does nothing
2102
1778
2103
_see_also = ['bugs', 'uncommit']
2104
1779
takes_args = ['selected*']
2105
takes_options = [
2106
'message',
2107
'verbose',
2108
Option('unchanged',
2109
help='Commit even if nothing has changed.'),
2110
Option('file', type=str,
2111
short_name='F',
2112
argname='msgfile',
2113
help='Take commit message from this file.'),
2114
Option('strict',
2115
help="Refuse to commit if there are unknown "
2116
"files in the working tree."),
2117
ListOption('fixes', type=str,
2118
help="Mark a bug as being fixed by this revision."),
2119
Option('local',
2120
help="Perform a local commit in a bound "
2121
"branch. Local commits are not pushed to "
2122
"the master branch until a normal commit "
2123
"is performed."
2124
),
2125
]
1780
takes_options = ['message', 'verbose',
1781
Option('unchanged',
1782
help='commit even if nothing has changed'),
1783
Option('file', type=str,
1784
argname='msgfile',
1785
help='file containing commit message'),
1786
Option('strict',
1787
help="refuse to commit if there are unknown "
1788
"files in the working tree."),
1789
Option('local',
1790
help="perform a local only commit in a bound "
1791
"branch. Such commits are not pushed to "
1792
"the master branch until a normal commit "
1793
"is performed."
1794
),
1795
]
2126
1796
aliases = ['ci', 'checkin']
2127
1797
2128
def _get_bug_fix_properties(self, fixes, branch):
2129
properties = []
2130
# Configure the properties for bug fixing attributes.
2131
for fixed_bug in fixes:
2132
tokens = fixed_bug.split(':')
2133
if len(tokens) != 2:
2134
raise errors.BzrCommandError(
2135
"Invalid bug %s. Must be in the form of 'tag:id'. "
2136
"Commit refused." % fixed_bug)
2137
tag, bug_id = tokens
2138
try:
2139
bug_url = bugtracker.get_bug_url(tag, branch, bug_id)
2140
except errors.UnknownBugTrackerAbbreviation:
2141
raise errors.BzrCommandError(
2142
'Unrecognized bug %s. Commit refused.' % fixed_bug)
2143
except errors.MalformedBugIdentifier:
2144
raise errors.BzrCommandError(
2145
"Invalid bug identifier for %s. Commit refused."
2146
% fixed_bug)
2147
properties.append('%s fixed' % bug_url)
2148
return '\n'.join(properties)
2149
2150
1798
def run(self, message=None, file=None, verbose=True, selected_list=None,
2151
unchanged=False, strict=False, local=False, fixes=None):
1799
unchanged=False, strict=False, local=False):
2152
1800
from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
2153
1801
from bzrlib.errors import (PointlessCommit, ConflictsInTree,
2154
1802
StrictCommitFailed)
2160
1808
2161
1809
# TODO: do more checks that the commit will succeed before
2162
1810
# spending the user's valuable time typing a commit message.
2163
2164
properties = {}
2165
2166
1811
tree, selected_list = tree_files(selected_list)
2167
1812
if selected_list == ['']:
2168
1813
# workaround - commit of root of tree should be exactly the same
2170
1815
# selected-file merge commit is not done yet
2171
1816
selected_list = []
2172
1817
2173
bug_property = self._get_bug_fix_properties(fixes, tree.branch)
2174
if bug_property:
2175
properties['bugs'] = bug_property
2176
2177
1818
if local and not tree.branch.get_bound_location():
2178
1819
raise errors.LocalRequiresBoundBranch()
2179
2180
def get_message(commit_obj):
2181
"""Callback to get commit message"""
2182
my_message = message
2183
if my_message is None and not file:
2184
template = make_commit_message_template(tree, selected_list)
2185
my_message = edit_commit_message(template)
2186
if my_message is None:
2187
raise errors.BzrCommandError("please specify a commit"
2188
" message with either --message or --file")
2189
elif my_message and file:
2190
raise errors.BzrCommandError(
2191
"please specify either --message or --file")
2192
if file:
2193
my_message = codecs.open(file, 'rt',
2194
bzrlib.user_encoding).read()
2195
if my_message == "":
2196
raise errors.BzrCommandError("empty commit message specified")
2197
return my_message
2198
1820
if message is None and not file:
1821
template = make_commit_message_template(tree, selected_list)
1822
message = edit_commit_message(template)
1823
if message is None:
1824
raise errors.BzrCommandError("please specify a commit message"
1825
" with either --message or --file")
1826
elif message and file:
1827
raise errors.BzrCommandError("please specify either --message or --file")
1828
1829
if file:
1830
message = codecs.open(file, 'rt', bzrlib.user_encoding).read()
1831
1832
if message == "":
1833
raise errors.BzrCommandError("empty commit message specified")
1834
2199
1835
if verbose:
2200
1836
reporter = ReportCommitToLog()
2201
1837
else:
2202
1838
reporter = NullCommitReporter()
2203
1839
1840
msgfilename = self._save_commit_message(message, tree.basedir)
2204
1841
try:
2205
tree.commit(message_callback=get_message,
2206
specific_files=selected_list,
1842
tree.commit(message, specific_files=selected_list,
2207
1843
allow_pointless=unchanged, strict=strict, local=local,
2208
reporter=reporter, revprops=properties)
1844
reporter=reporter)
1845
if msgfilename is not None:
1846
try:
1847
os.unlink(msgfilename)
1848
except IOError, e:
1849
warning("failed to unlink %s: %s; ignored", msgfilename, e)
2209
1850
except PointlessCommit:
2210
1851
# FIXME: This should really happen before the file is read in;
2211
1852
# perhaps prepare the commit; get the message; then actually commit
2212
raise errors.BzrCommandError("no changes to commit."
2213
" use --unchanged to commit anyhow")
1853
if msgfilename is not None:
1854
raise errors.BzrCommandError("no changes to commit."
1855
" use --unchanged to commit anyhow\n"
1856
"Commit message saved. To reuse the message,"
1857
" do\nbzr commit --file " + msgfilename)
1858
else:
1859
raise errors.BzrCommandError("no changes to commit."
1860
" use --unchanged to commit anyhow")
2214
1861
except ConflictsInTree:
2215
raise errors.BzrCommandError('Conflicts detected in working '
2216
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
2217
' resolve.')
1862
if msgfilename is not None:
1863
raise errors.BzrCommandError('Conflicts detected in working '
1864
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
1865
' resolve.\n'
1866
'Commit message saved. To reuse the message,'
1867
' do\nbzr commit --file ' + msgfilename)
1868
else:
1869
raise errors.BzrCommandError('Conflicts detected in working '
1870
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
1871
' resolve.')
2218
1872
except StrictCommitFailed:
2219
raise errors.BzrCommandError("Commit refused because there are"
2220
" unknown files in the working tree.")
1873
if msgfilename is not None:
1874
raise errors.BzrCommandError("Commit refused because there are"
1875
" unknown files in the working tree.\n"
1876
"Commit message saved. To reuse the message,"
1877
" do\nbzr commit --file " + msgfilename)
1878
else:
1879
raise errors.BzrCommandError("Commit refused because there are"
1880
" unknown files in the working tree.")
2221
1881
except errors.BoundBranchOutOfDate, e:
2222
raise errors.BzrCommandError(str(e) + "\n"
2223
'To commit to master branch, run update and then commit.\n'
2224
'You can also pass --local to commit to continue working '
2225
'disconnected.')
1882
if msgfilename is not None:
1883
raise errors.BzrCommandError(str(e) + "\n"
1884
'To commit to master branch, run update and then commit.\n'
1885
'You can also pass --local to commit to continue working '
1886
'disconnected.\n'
1887
'Commit message saved. To reuse the message,'
1888
' do\nbzr commit --file ' + msgfilename)
1889
else:
1890
raise errors.BzrCommandError(str(e) + "\n"
1891
'To commit to master branch, run update and then commit.\n'
1892
'You can also pass --local to commit to continue working '
1893
'disconnected.')
1894
1895
def _save_commit_message(self, message, basedir):
1896
# save the commit message and only unlink it if the commit was
1897
# successful
1898
msgfilename = None
1899
try:
1900
tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr-commit-',
1901
dir=basedir)
1902
except OSError:
1903
try:
1904
# No access to working dir, try $TMP
1905
tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr-commit-')
1906
except OSError:
1907
# We can't create a temp file, try to work without it
1908
return None
1909
try:
1910
os.write(tmp_fileno, message.encode(bzrlib.user_encoding, 'replace'))
1911
finally:
1912
os.close(tmp_fileno)
1913
return msgfilename
2226
1914
2227
1915
2228
1916
class cmd_check(Command):
2231
1919
This command checks various invariants about the branch storage to
2232
1920
detect data corruption or bzr bugs.
2233
1921
"""
2234
2235
_see_also = ['reconcile']
2236
1922
takes_args = ['branch?']
2237
1923
takes_options = ['verbose']
2238
1924
2253
1939
this command. When the default format has changed you may also be warned
2254
1940
during other operations to upgrade.
2255
1941
"""
2256
2257
_see_also = ['check']
2258
1942
takes_args = ['url?']
2259
1943
takes_options = [
2260
RegistryOption('format',
2261
help='Upgrade to a specific format. See "bzr help'
2262
' formats" for details.',
2263
registry=bzrdir.format_registry,
2264
converter=bzrdir.format_registry.make_bzrdir,
2265
value_switches=True, title='Branch format'),
1944
Option('format',
1945
help='Upgrade to a specific format. Current formats'
1946
' are: default, knit, metaweave and weave.'
1947
' Default is knit; metaweave and weave are'
1948
' deprecated',
1949
type=get_format_type),
2266
1950
]
2267
1951
1952
2268
1953
def run(self, url='.', format=None):
2269
1954
from bzrlib.upgrade import upgrade
2270
1955
if format is None:
2271
format = bzrdir.format_registry.make_bzrdir('default')
1956
format = get_format_type('default')
2272
1957
upgrade(url, format)
2273
1958
2274
1959
2280
1965
bzr whoami 'Frank Chu <fchu@example.com>'
2281
1966
"""
2282
1967
takes_options = [ Option('email',
2283
help='Display email address only.'),
1968
help='display email address only'),
2284
1969
Option('branch',
2285
help='Set identity for the current branch instead of '
2286
'globally.'),
1970
help='set identity for the current branch instead of '
1971
'globally'),
2287
1972
]
2288
1973
takes_args = ['name?']
2289
1974
encoding_type = 'replace'
2323
2008
If unset, the tree root directory name is used as the nickname
2324
2009
To print the current nickname, execute with no argument.
2325
2010
"""
2326
2327
_see_also = ['info']
2328
2011
takes_args = ['nickname?']
2329
2012
def run(self, nickname=None):
2330
2013
branch = Branch.open_containing(u'.')[0]
2335
2018
2336
2019
@display_command
2337
2020
def printme(self, branch):
2338
print branch.nick
2021
print branch.nick
2339
2022
2340
2023
2341
2024
class cmd_selftest(Command):
2342
2025
"""Run internal test suite.
2343
2026
2344
If arguments are given, they are regular expressions that say which tests
2345
should run. Tests matching any expression are run, and other tests are
2346
not run.
2347
2348
Alternatively if --first is given, matching tests are run first and then
2349
all other tests are run. This is useful if you have been working in a
2350
particular area, but want to make sure nothing else was broken.
2351
2352
If --exclude is given, tests that match that regular expression are
2353
excluded, regardless of whether they match --first or not.
2354
2355
To help catch accidential dependencies between tests, the --randomize
2356
option is useful. In most cases, the argument used is the word 'now'.
2357
Note that the seed used for the random number generator is displayed
2358
when this option is used. The seed can be explicitly passed as the
2359
argument to this option if required. This enables reproduction of the
2360
actual ordering used if and when an order sensitive problem is encountered.
2361
2362
If --list-only is given, the tests that would be run are listed. This is
2363
useful when combined with --first, --exclude and/or --randomize to
2364
understand their impact. The test harness reports "Listed nn tests in ..."
2365
instead of "Ran nn tests in ..." when list mode is enabled.
2027
This creates temporary test directories in the working directory,
2028
but not existing data is affected. These directories are deleted
2029
if the tests pass, or left behind to help in debugging if they
2030
fail and --keep-output is specified.
2031
2032
If arguments are given, they are regular expressions that say
2033
which tests should run.
2366
2034
2367
2035
If the global option '--no-plugins' is given, plugins are not loaded
2368
2036
before running the selftests. This has two effects: features provided or
2369
2037
modified by plugins will not be tested, and tests provided by plugins will
2370
2038
not be run.
2371
2039
2372
examples::
2040
examples:
2373
2041
bzr selftest ignore
2374
run only tests relating to 'ignore'
2375
2042
bzr --no-plugins selftest -v
2376
disable plugins and list tests as they're run
2043
"""
2044
# TODO: --list should give a list of all available tests
2377
2045
2378
For each test, that needs actual disk access, bzr create their own
2379
subdirectory in the temporary testing directory (testXXXX.tmp).
2380
By default the name of such subdirectory is based on the name of the test.
2381
If option '--numbered-dirs' is given, bzr will use sequent numbers
2382
of running tests to create such subdirectories. This is default behavior
2383
on Windows because of path length limitation.
2384
"""
2385
2046
# NB: this is used from the class without creating an instance, which is
2386
2047
# why it does not have a self parameter.
2387
2048
def get_transport_type(typestring):
2402
2063
hidden = True
2403
2064
takes_args = ['testspecs*']
2404
2065
takes_options = ['verbose',
2405
Option('one',
2406
help='Stop when one test fails.',
2407
short_name='1',
2408
),
2409
Option('keep-output',
2410
help='Keep output directories when tests fail.'),
2411
Option('transport',
2066
Option('one', help='stop when one test fails'),
2067
Option('keep-output',
2068
help='keep output directories when tests fail'),
2069
Option('transport',
2412
2070
help='Use a different transport by default '
2413
2071
'throughout the test suite.',
2414
2072
type=get_transport_type),
2415
Option('benchmark',
2416
help='Run the benchmarks rather than selftests.'),
2073
Option('benchmark', help='run the bzr bencharks.'),
2417
2074
Option('lsprof-timed',
2418
help='Generate lsprof output for benchmarked'
2075
help='generate lsprof output for benchmarked'
2419
2076
' sections of code.'),
2420
2077
Option('cache-dir', type=str,
2421
help='Cache intermediate benchmark output in this '
2422
'directory.'),
2423
Option('clean-output',
2424
help='Clean temporary tests directories'
2425
' without running tests.'),
2426
Option('first',
2427
help='Run all tests, but run specified tests first.',
2428
short_name='f',
2429
),
2430
Option('numbered-dirs',
2431
help='Use numbered dirs for TestCaseInTempDir.'),
2432
Option('list-only',
2433
help='List the tests instead of running them.'),
2434
Option('randomize', type=str, argname="SEED",
2435
help='Randomize the order of tests using the given'
2436
' seed or "now" for the current time.'),
2437
Option('exclude', type=str, argname="PATTERN",
2438
short_name='x',
2439
help='Exclude tests that match this regular'
2440
' expression.'),
2078
help='a directory to cache intermediate'
2079
' benchmark steps'),
2441
2080
]
2442
encoding_type = 'replace'
2443
2081
2444
2082
def run(self, testspecs_list=None, verbose=None, one=False,
2445
2083
keep_output=False, transport=None, benchmark=None,
2446
lsprof_timed=None, cache_dir=None, clean_output=False,
2447
first=False, numbered_dirs=None, list_only=False,
2448
randomize=None, exclude=None):
2084
lsprof_timed=None, cache_dir=None):
2449
2085
import bzrlib.ui
2450
2086
from bzrlib.tests import selftest
2451
2087
import bzrlib.benchmarks as benchmarks
2452
2088
from bzrlib.benchmarks import tree_creator
2453
2089
2454
if clean_output:
2455
from bzrlib.tests import clean_selftest_output
2456
clean_selftest_output()
2457
return 0
2458
if keep_output:
2459
warning("notice: selftest --keep-output "
2460
"is no longer supported; "
2461
"test output is always removed")
2462
2463
if numbered_dirs is None and sys.platform == 'win32':
2464
numbered_dirs = True
2465
2466
2090
if cache_dir is not None:
2467
2091
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
2468
2092
print '%10s: %s' % ('bzr', osutils.realpath(sys.argv[0]))
2477
2101
if verbose is None:
2478
2102
verbose = True
2479
2103
# TODO: should possibly lock the history file...
2480
benchfile = open(".perf_history", "at", buffering=1)
2104
benchfile = open(".perf_history", "at")
2481
2105
else:
2482
2106
test_suite_factory = None
2483
2107
if verbose is None:
2487
2111
result = selftest(verbose=verbose,
2488
2112
pattern=pattern,
2489
2113
stop_on_failure=one,
2114
keep_output=keep_output,
2490
2115
transport=transport,
2491
2116
test_suite_factory=test_suite_factory,
2492
2117
lsprof_timed=lsprof_timed,
2493
bench_history=benchfile,
2494
matching_tests_first=first,
2495
numbered_dirs=numbered_dirs,
2496
list_only=list_only,
2497
random_seed=randomize,
2498
exclude_pattern=exclude
2499
)
2118
bench_history=benchfile)
2500
2119
finally:
2501
2120
if benchfile is not None:
2502
2121
benchfile.close()
2523
2142
2524
2143
@display_command
2525
2144
def run(self):
2526
print "It sure does!"
2145
print "it sure does!"
2527
2146
2528
2147
2529
2148
class cmd_find_merge_base(Command):
2535
2154
2536
2155
@display_command
2537
2156
def run(self, branch, other):
2538
from bzrlib.revision import ensure_null, MultipleRevisionSources
2157
from bzrlib.revision import MultipleRevisionSources
2539
2158
2540
2159
branch1 = Branch.open_containing(branch)[0]
2541
2160
branch2 = Branch.open_containing(other)[0]
2542
2161
2543
last1 = ensure_null(branch1.last_revision())
2544
last2 = ensure_null(branch2.last_revision())
2545
2546
graph = branch1.repository.get_graph(branch2.repository)
2547
base_rev_id = graph.find_unique_lca(last1, last2)
2162
history_1 = branch1.revision_history()
2163
history_2 = branch2.revision_history()
2164
2165
last1 = branch1.last_revision()
2166
last2 = branch2.last_revision()
2167
2168
source = MultipleRevisionSources(branch1.repository,
2169
branch2.repository)
2170
2171
base_rev_id = common_ancestor(last1, last2, source)
2548
2172
2549
2173
print 'merge base is revision %s' % base_rev_id
2550
2174
2574
2198
default, use --remember. The value will only be saved if the remote
2575
2199
location can be accessed.
2576
2200
2577
The results of the merge are placed into the destination working
2578
directory, where they can be reviewed (with bzr diff), tested, and then
2579
committed to record the result of the merge.
2580
2581
2201
Examples:
2582
2202
2583
To merge the latest revision from bzr.dev:
2584
bzr merge ../bzr.dev
2203
To merge the latest revision from bzr.dev
2204
bzr merge ../bzr.dev
2585
2205
2586
To merge changes up to and including revision 82 from bzr.dev:
2587
bzr merge -r 82 ../bzr.dev
2206
To merge changes up to and including revision 82 from bzr.dev
2207
bzr merge -r 82 ../bzr.dev
2588
2208
2589
2209
To merge the changes introduced by 82, without previous changes:
2590
bzr merge -r 81..82 ../bzr.dev
2210
bzr merge -r 81..82 ../bzr.dev
2591
2211
2592
2212
merge refuses to run if there are any uncommitted changes, unless
2593
2213
--force is given.
2214
2215
The following merge types are available:
2594
2216
"""
2595
2596
_see_also = ['update', 'remerge', 'status-flags']
2597
2217
takes_args = ['branch?']
2598
2218
takes_options = ['revision', 'force', 'merge-type', 'reprocess', 'remember',
2599
Option('show-base', help="Show base revision text in "
2600
"conflicts."),
2601
Option('uncommitted', help='Apply uncommitted changes'
2602
' from a working copy, instead of branch changes.'),
2603
Option('pull', help='If the destination is already'
2604
' completely merged into the source, pull from the'
2605
' source rather than merging. When this happens,'
2606
' you do not need to commit the result.'),
2607
Option('directory',
2608
help='Branch to merge into, '
2609
'rather than the one containing the working directory.',
2610
short_name='d',
2611
type=unicode,
2612
),
2613
]
2219
Option('show-base', help="Show base revision text in "
2220
"conflicts"),
2221
Option('uncommitted', help='Apply uncommitted changes'
2222
' from a working copy, instead of branch changes')]
2223
2224
def help(self):
2225
from inspect import getdoc
2226
return getdoc(self) + '\n' + _mod_merge.merge_type_help()
2614
2227
2615
2228
def run(self, branch=None, revision=None, force=False, merge_type=None,
2616
show_base=False, reprocess=False, remember=False,
2617
uncommitted=False, pull=False,
2618
directory=None,
2619
):
2620
from bzrlib.tag import _merge_tags_if_possible
2621
other_revision_id = None
2229
show_base=False, reprocess=False, remember=False,
2230
uncommitted=False):
2622
2231
if merge_type is None:
2623
2232
merge_type = _mod_merge.Merge3Merger
2624
2233
2625
if directory is None: directory = u'.'
2626
# XXX: jam 20070225 WorkingTree should be locked before you extract its
2627
# inventory. Because merge is a mutating operation, it really
2628
# should be a lock_write() for the whole cmd_merge operation.
2629
# However, cmd_merge open's its own tree in _merge_helper, which
2630
# means if we lock here, the later lock_write() will always block.
2631
# Either the merge helper code should be updated to take a tree,
2632
# (What about tree.merge_from_branch?)
2633
tree = WorkingTree.open_containing(directory)[0]
2634
change_reporter = delta._ChangeReporter(
2635
unversioned_filter=tree.is_ignored)
2234
tree = WorkingTree.open_containing(u'.')[0]
2636
2235
2637
2236
if branch is not None:
2638
2237
try:
2639
mergeable = bundle.read_mergeable_from_url(
2640
branch)
2238
reader = bundle.read_bundle_from_url(branch)
2641
2239
except errors.NotABundle:
2642
2240
pass # Continue on considering this url a Branch
2643
2241
else:
2644
if revision is not None:
2645
raise errors.BzrCommandError(
2646
'Cannot use -r with merge directives or bundles')
2647
other_revision_id = mergeable.install_revisions(
2648
tree.branch.repository)
2649
revision = [RevisionSpec.from_string(
2650
'revid:' + other_revision_id)]
2242
conflicts = merge_bundle(reader, tree, not force, merge_type,
2243
reprocess, show_base)
2244
if conflicts == 0:
2245
return 0
2246
else:
2247
return 1
2651
2248
2652
2249
if revision is None \
2653
2250
or len(revision) < 1 or revision[0].needs_branch():
2668
2265
branch = revision[0].get_branch() or branch
2669
2266
if len(revision) == 1:
2670
2267
base = [None, None]
2671
if other_revision_id is not None:
2672
other_branch = None
2673
path = ""
2674
other = None
2675
else:
2676
other_branch, path = Branch.open_containing(branch)
2677
revno = revision[0].in_history(other_branch).revno
2678
other = [branch, revno]
2268
other_branch, path = Branch.open_containing(branch)
2269
revno = revision[0].in_history(other_branch).revno
2270
other = [branch, revno]
2679
2271
else:
2680
2272
assert len(revision) == 2
2681
2273
if None in revision:
2691
2283
base = [branch, revision[0].in_history(base_branch).revno]
2692
2284
other = [branch1, revision[1].in_history(other_branch).revno]
2693
2285
2694
if ((tree.branch.get_parent() is None or remember) and
2695
other_branch is not None):
2286
if tree.branch.get_parent() is None or remember:
2696
2287
tree.branch.set_parent(other_branch.base)
2697
2288
2698
# pull tags now... it's a bit inconsistent to do it ahead of copying
2699
# the history but that's done inside the merge code
2700
if other_branch is not None:
2701
_merge_tags_if_possible(other_branch, tree.branch)
2702
2703
2289
if path != "":
2704
2290
interesting_files = [path]
2705
2291
else:
2708
2294
try:
2709
2295
try:
2710
2296
conflict_count = _merge_helper(
2711
other, base, other_rev_id=other_revision_id,
2712
check_clean=(not force),
2297
other, base, check_clean=(not force),
2713
2298
merge_type=merge_type,
2714
2299
reprocess=reprocess,
2715
2300
show_base=show_base,
2716
pull=pull,
2717
this_dir=directory,
2718
pb=pb, file_list=interesting_files,
2719
change_reporter=change_reporter)
2301
pb=pb, file_list=interesting_files)
2720
2302
finally:
2721
2303
pb.finished()
2722
2304
if conflict_count != 0:
2761
2343
pending merge, and it lets you specify particular files.
2762
2344
2763
2345
Examples:
2764
2765
2346
$ bzr remerge --show-base
2766
2347
Re-do the merge of all conflicted files, and show the base text in
2767
2348
conflict regions, in addition to the usual THIS and OTHER texts.
2769
2350
$ bzr remerge --merge-type weave --reprocess foobar
2770
2351
Re-do the merge of "foobar", using the weave merge algorithm, with
2771
2352
additional processing to reduce the size of conflict regions.
2772
"""
2353
2354
The following merge types are available:"""
2773
2355
takes_args = ['file*']
2774
takes_options = [
2775
'merge-type',
2776
'reprocess',
2777
Option('show-base',
2778
help="Show base revision text in conflicts."),
2779
]
2356
takes_options = ['merge-type', 'reprocess',
2357
Option('show-base', help="Show base revision text in "
2358
"conflicts")]
2359
2360
def help(self):
2361
from inspect import getdoc
2362
return getdoc(self) + '\n' + _mod_merge.merge_type_help()
2780
2363
2781
2364
def run(self, file_list=None, merge_type=None, show_base=False,
2782
2365
reprocess=False):
2791
2374
" merges. Not cherrypicking or"
2792
2375
" multi-merges.")
2793
2376
repository = tree.branch.repository
2794
graph = repository.get_graph()
2795
base_revision = graph.find_unique_lca(parents[0], parents[1])
2377
base_revision = common_ancestor(parents[0],
2378
parents[1], repository)
2796
2379
base_tree = repository.revision_tree(base_revision)
2797
2380
other_tree = repository.revision_tree(parents[1])
2798
2381
interesting_ids = None
2862
2445
name. If you name a directory, all the contents of that directory will be
2863
2446
reverted.
2864
2447
"""
2865
2866
_see_also = ['cat', 'export']
2867
2448
takes_options = ['revision', 'no-backup']
2868
2449
takes_args = ['file*']
2450
aliases = ['merge-revert']
2869
2451
2870
2452
def run(self, revision=None, no_backup=False, file_list=None):
2871
2453
if file_list is not None:
2886
2468
try:
2887
2469
tree.revert(file_list,
2888
2470
tree.branch.repository.revision_tree(rev_id),
2889
not no_backup, pb, report_changes=True)
2471
not no_backup, pb)
2890
2472
finally:
2891
2473
pb.finished()
2892
2474
2903
2485
2904
2486
class cmd_help(Command):
2905
2487
"""Show help on a command or other topic.
2488
2489
For a list of all available commands, say 'bzr help commands'.
2906
2490
"""
2907
2908
_see_also = ['topics']
2909
takes_options = [
2910
Option('long', 'Show help on all commands.'),
2911
]
2491
takes_options = [Option('long', 'show help on all commands')]
2912
2492
takes_args = ['topic?']
2913
2493
aliases = ['?', '--help', '-?', '-h']
2914
2494
2951
2531
2952
2532
class cmd_missing(Command):
2953
2533
"""Show unmerged/unpulled revisions between two branches.
2954
2534
2955
2535
OTHER_BRANCH may be local or remote.
2956
2536
"""
2957
2958
_see_also = ['merge', 'pull']
2959
2537
takes_args = ['other_branch?']
2960
takes_options = [
2961
Option('reverse', 'Reverse the order of revisions.'),
2962
Option('mine-only',
2963
'Display changes in the local branch only.'),
2964
Option('this' , 'Same as --mine-only.'),
2965
Option('theirs-only',
2966
'Display changes in the remote branch only.'),
2967
Option('other', 'Same as --theirs-only.'),
2968
'log-format',
2969
'show-ids',
2970
'verbose'
2971
]
2538
takes_options = [Option('reverse', 'Reverse the order of revisions'),
2539
Option('mine-only',
2540
'Display changes in the local branch only'),
2541
Option('theirs-only',
2542
'Display changes in the remote branch only'),
2543
'log-format',
2544
'line',
2545
'long',
2546
'short',
2547
'show-ids',
2548
'verbose'
2549
]
2972
2550
encoding_type = 'replace'
2973
2551
2974
2552
@display_command
2975
2553
def run(self, other_branch=None, reverse=False, mine_only=False,
2976
2554
theirs_only=False, log_format=None, long=False, short=False, line=False,
2977
show_ids=False, verbose=False, this=False, other=False):
2978
from bzrlib.missing import find_unmerged, iter_log_revisions
2555
show_ids=False, verbose=False):
2556
from bzrlib.missing import find_unmerged, iter_log_data
2979
2557
from bzrlib.log import log_formatter
2980
2981
if this:
2982
mine_only = this
2983
if other:
2984
theirs_only = other
2985
2986
2558
local_branch = Branch.open_containing(u".")[0]
2987
2559
parent = local_branch.get_parent()
2988
2560
if other_branch is None:
2989
2561
other_branch = parent
2990
2562
if other_branch is None:
2991
2563
raise errors.BzrCommandError("No peer location known or specified.")
2992
display_url = urlutils.unescape_for_display(parent,
2993
self.outf.encoding)
2994
print "Using last location: " + display_url
2995
2564
print "Using last location: " + local_branch.get_parent()
2996
2565
remote_branch = Branch.open(other_branch)
2997
2566
if remote_branch.base == local_branch.base:
2998
2567
remote_branch = local_branch
3002
2571
try:
3003
2572
local_extra, remote_extra = find_unmerged(local_branch, remote_branch)
3004
2573
if (log_format is None):
3005
log_format = log.log_formatter_registry.get_default(
3006
local_branch)
3007
lf = log_format(to_file=self.outf,
3008
show_ids=show_ids,
3009
show_timezone='original')
2574
default = local_branch.get_config().log_format()
2575
log_format = get_log_format(long=long, short=short,
2576
line=line, default=default)
2577
lf = log_formatter(log_format,
2578
to_file=self.outf,
2579
show_ids=show_ids,
2580
show_timezone='original')
3010
2581
if reverse is False:
3011
2582
local_extra.reverse()
3012
2583
remote_extra.reverse()
3013
2584
if local_extra and not theirs_only:
3014
2585
print "You have %d extra revision(s):" % len(local_extra)
3015
for revision in iter_log_revisions(local_extra,
3016
local_branch.repository,
3017
verbose):
3018
lf.log_revision(revision)
2586
for data in iter_log_data(local_extra, local_branch.repository,
2587
verbose):
2588
lf.show(*data)
3019
2589
printed_local = True
3020
2590
else:
3021
2591
printed_local = False
3023
2593
if printed_local is True:
3024
2594
print "\n\n"
3025
2595
print "You are missing %d revision(s):" % len(remote_extra)
3026
for revision in iter_log_revisions(remote_extra,
3027
remote_branch.repository,
3028
verbose):
3029
lf.log_revision(revision)
2596
for data in iter_log_data(remote_extra, remote_branch.repository,
2597
verbose):
2598
lf.show(*data)
3030
2599
if not remote_extra and not local_extra:
3031
2600
status_code = 0
3032
2601
print "Branches are up to date."
3069
2638
3070
2639
class cmd_testament(Command):
3071
2640
"""Show testament (signing-form) of a revision."""
3072
takes_options = [
3073
'revision',
3074
Option('long', help='Produce long-format testament.'),
3075
Option('strict',
3076
help='Produce a strict-format testament.')]
2641
takes_options = ['revision',
2642
Option('long', help='Produce long-format testament'),
2643
Option('strict', help='Produce a strict-format'
2644
' testament')]
3077
2645
takes_args = ['branch?']
3078
2646
@display_command
3079
2647
def run(self, branch=u'.', revision=None, long=False, strict=False):
3112
2680
# with new uncommitted lines marked
3113
2681
aliases = ['ann', 'blame', 'praise']
3114
2682
takes_args = ['filename']
3115
takes_options = [Option('all', help='Show annotations on all lines.'),
3116
Option('long', help='Show commit date in annotations.'),
3117
'revision',
3118
'show-ids',
2683
takes_options = [Option('all', help='show annotations on all lines'),
2684
Option('long', help='show date in annotations'),
2685
'revision'
3119
2686
]
3120
encoding_type = 'exact'
3121
2687
3122
2688
@display_command
3123
def run(self, filename, all=False, long=False, revision=None,
3124
show_ids=False):
2689
def run(self, filename, all=False, long=False, revision=None):
3125
2690
from bzrlib.annotate import annotate_file
3126
2691
tree, relpath = WorkingTree.open_containing(filename)
3127
2692
branch = tree.branch
3133
2698
raise errors.BzrCommandError('bzr annotate --revision takes exactly 1 argument')
3134
2699
else:
3135
2700
revision_id = revision[0].in_history(branch).rev_id
3136
file_id = tree.path2id(relpath)
3137
if file_id is None:
3138
raise errors.NotVersionedError(filename)
2701
file_id = tree.inventory.path2id(relpath)
3139
2702
tree = branch.repository.revision_tree(revision_id)
3140
2703
file_version = tree.inventory[file_id].revision
3141
annotate_file(branch, file_version, file_id, long, all, self.outf,
3142
show_ids=show_ids)
2704
annotate_file(branch, file_version, file_id, long, all, sys.stdout)
3143
2705
finally:
3144
2706
branch.unlock()
3145
2707
3185
2747
3186
2748
3187
2749
class cmd_bind(Command):
3188
"""Convert the current branch into a checkout of the supplied branch.
2750
"""Bind the current branch to a master branch.
3189
2751
3190
Once converted into a checkout, commits must succeed on the master branch
3191
before they will be applied to the local branch.
2752
After binding, commits must succeed on the master branch
2753
before they are executed on the local one.
3192
2754
"""
3193
2755
3194
_see_also = ['checkouts', 'unbind']
3195
takes_args = ['location?']
2756
takes_args = ['location']
3196
2757
takes_options = []
3197
2758
3198
2759
def run(self, location=None):
3199
2760
b, relpath = Branch.open_containing(u'.')
3200
if location is None:
3201
try:
3202
location = b.get_old_bound_location()
3203
except errors.UpgradeRequired:
3204
raise errors.BzrCommandError('No location supplied. '
3205
'This format does not remember old locations.')
3206
else:
3207
if location is None:
3208
raise errors.BzrCommandError('No location supplied and no '
3209
'previous location known')
3210
2761
b_other = Branch.open(location)
3211
2762
try:
3212
2763
b.bind(b_other)
3216
2767
3217
2768
3218
2769
class cmd_unbind(Command):
3219
"""Convert the current checkout into a regular branch.
2770
"""Unbind the current branch from its master branch.
3220
2771
3221
After unbinding, the local branch is considered independent and subsequent
3222
commits will be local only.
2772
After unbinding, the local branch is considered independent.
2773
All subsequent commits will be local.
3223
2774
"""
3224
2775
3225
_see_also = ['checkouts', 'bind']
3226
2776
takes_args = []
3227
2777
takes_options = []
3228
2778
3247
2797
# unreferenced information in 'branch-as-repository' branches.
3248
2798
# TODO: jam 20060108 Add the ability for uncommit to remove unreferenced
3249
2799
# information in shared branches as well.
3250
_see_also = ['commit']
3251
2800
takes_options = ['verbose', 'revision',
3252
Option('dry-run', help='Don\'t actually make changes.'),
2801
Option('dry-run', help='Don\'t actually make changes'),
3253
2802
Option('force', help='Say yes to all questions.')]
3254
2803
takes_args = ['location?']
3255
2804
aliases = []
3359
2908
3360
2909
takes_options = [
3361
2910
Option('inet',
3362
help='Serve on stdin/out for use from inetd or sshd.'),
2911
help='serve on stdin/out for use from inetd or sshd'),
3363
2912
Option('port',
3364
help='Listen for connections on nominated port of the form '
3365
'[hostname:]portnumber. Passing 0 as the port number will '
3366
'result in a dynamically allocated port. The default port is '
3367
'4155.',
2913
help='listen for connections on nominated port of the form '
2914
'[hostname:]portnumber. Passing 0 as the port number will '
2915
'result in a dynamically allocated port.',
3368
2916
type=str),
3369
2917
Option('directory',
3370
help='Serve contents of this directory.',
2918
help='serve contents of directory',
3371
2919
type=unicode),
3372
2920
Option('allow-writes',
3373
help='By default the server is a readonly server. Supplying '
2921
help='By default the server is a readonly server. Supplying '
3374
2922
'--allow-writes enables write access to the contents of '
3375
'the served directory and below.'
2923
'the served directory and below. '
3376
2924
),
3377
2925
]
3378
2926
3379
2927
def run(self, port=None, inet=False, directory=None, allow_writes=False):
3380
from bzrlib.smart import medium, server
2928
from bzrlib.transport import smart
3381
2929
from bzrlib.transport import get_transport
3382
from bzrlib.transport.chroot import ChrootServer
3383
from bzrlib.transport.remote import BZR_DEFAULT_PORT, BZR_DEFAULT_INTERFACE
3384
2930
if directory is None:
3385
2931
directory = os.getcwd()
3386
2932
url = urlutils.local_path_to_url(directory)
3387
2933
if not allow_writes:
3388
2934
url = 'readonly+' + url
3389
chroot_server = ChrootServer(get_transport(url))
3390
chroot_server.setUp()
3391
t = get_transport(chroot_server.get_url())
2935
t = get_transport(url)
3392
2936
if inet:
3393
smart_server = medium.SmartServerPipeStreamMedium(
3394
sys.stdin, sys.stdout, t)
3395
else:
3396
host = BZR_DEFAULT_INTERFACE
3397
if port is None:
3398
port = BZR_DEFAULT_PORT
2937
server = smart.SmartServerPipeStreamMedium(sys.stdin, sys.stdout, t)
2938
elif port is not None:
2939
if ':' in port:
2940
host, port = port.split(':')
3399
2941
else:
3400
if ':' in port:
3401
host, port = port.split(':')
3402
port = int(port)
3403
smart_server = server.SmartTCPServer(t, host=host, port=port)
3404
print 'listening on port: ', smart_server.port
2942
host = '127.0.0.1'
2943
server = smart.SmartTCPServer(t, host=host, port=int(port))
2944
print 'listening on port: ', server.port
3405
2945
sys.stdout.flush()
3406
# for the duration of this server, no UI output is permitted.
3407
# note that this may cause problems with blackbox tests. This should
3408
# be changed with care though, as we dont want to use bandwidth sending
3409
# progress over stderr to smart server clients!
3410
old_factory = ui.ui_factory
3411
try:
3412
ui.ui_factory = ui.SilentUIFactory()
3413
smart_server.serve()
3414
finally:
3415
ui.ui_factory = old_factory
3416
3417
3418
class cmd_join(Command):
3419
"""Combine a subtree into its containing tree.
3420
3421
This command is for experimental use only. It requires the target tree
3422
to be in dirstate-with-subtree format, which cannot be converted into
3423
earlier formats.
3424
3425
The TREE argument should be an independent tree, inside another tree, but
3426
not part of it. (Such trees can be produced by "bzr split", but also by
3427
running "bzr branch" with the target inside a tree.)
3428
3429
The result is a combined tree, with the subtree no longer an independant
3430
part. This is marked as a merge of the subtree into the containing tree,
3431
and all history is preserved.
3432
3433
If --reference is specified, the subtree retains its independence. It can
3434
be branched by itself, and can be part of multiple projects at the same
3435
time. But operations performed in the containing tree, such as commit
3436
and merge, will recurse into the subtree.
3437
"""
3438
3439
_see_also = ['split']
3440
takes_args = ['tree']
3441
takes_options = [
3442
Option('reference', help='Join by reference.'),
3443
]
3444
hidden = True
3445
3446
def run(self, tree, reference=False):
3447
sub_tree = WorkingTree.open(tree)
3448
parent_dir = osutils.dirname(sub_tree.basedir)
3449
containing_tree = WorkingTree.open_containing(parent_dir)[0]
3450
repo = containing_tree.branch.repository
3451
if not repo.supports_rich_root():
3452
raise errors.BzrCommandError(
3453
"Can't join trees because %s doesn't support rich root data.\n"
3454
"You can use bzr upgrade on the repository."
3455
% (repo,))
3456
if reference:
3457
try:
3458
containing_tree.add_reference(sub_tree)
3459
except errors.BadReferenceTarget, e:
3460
# XXX: Would be better to just raise a nicely printable
3461
# exception from the real origin. Also below. mbp 20070306
3462
raise errors.BzrCommandError("Cannot join %s. %s" %
3463
(tree, e.reason))
3464
else:
3465
try:
3466
containing_tree.subsume(sub_tree)
3467
except errors.BadSubsumeSource, e:
3468
raise errors.BzrCommandError("Cannot join %s. %s" %
3469
(tree, e.reason))
3470
3471
3472
class cmd_split(Command):
3473
"""Split a tree into two trees.
3474
3475
This command is for experimental use only. It requires the target tree
3476
to be in dirstate-with-subtree format, which cannot be converted into
3477
earlier formats.
3478
3479
The TREE argument should be a subdirectory of a working tree. That
3480
subdirectory will be converted into an independent tree, with its own
3481
branch. Commits in the top-level tree will not apply to the new subtree.
3482
If you want that behavior, do "bzr join --reference TREE".
3483
"""
3484
3485
_see_also = ['join']
3486
takes_args = ['tree']
3487
3488
hidden = True
3489
3490
def run(self, tree):
3491
containing_tree, subdir = WorkingTree.open_containing(tree)
3492
sub_id = containing_tree.path2id(subdir)
3493
if sub_id is None:
3494
raise errors.NotVersionedError(subdir)
3495
try:
3496
containing_tree.extract(sub_id)
3497
except errors.RootNotRich:
3498
raise errors.UpgradeRequired(containing_tree.branch.base)
3499
3500
3501
3502
class cmd_merge_directive(Command):
3503
"""Generate a merge directive for auto-merge tools.
3504
3505
A directive requests a merge to be performed, and also provides all the
3506
information necessary to do so. This means it must either include a
3507
revision bundle, or the location of a branch containing the desired
3508
revision.
3509
3510
A submit branch (the location to merge into) must be supplied the first
3511
time the command is issued. After it has been supplied once, it will
3512
be remembered as the default.
3513
3514
A public branch is optional if a revision bundle is supplied, but required
3515
if --diff or --plain is specified. It will be remembered as the default
3516
after the first use.
3517
"""
3518
3519
takes_args = ['submit_branch?', 'public_branch?']
3520
3521
takes_options = [
3522
RegistryOption.from_kwargs('patch-type',
3523
'The type of patch to include in the directive',
3524
title='Patch type',
3525
value_switches=True,
3526
enum_switch=False,
3527
bundle='Bazaar revision bundle (default).',
3528
diff='Normal unified diff.',
3529
plain='No patch, just directive.'),
3530
Option('sign', help='GPG-sign the directive.'), 'revision',
3531
Option('mail-to', type=str,
3532
help='Instead of printing the directive, email to this address.'),
3533
Option('message', type=str, short_name='m',
3534
help='Message to use when committing this merge.')
3535
]
3536
3537
encoding_type = 'exact'
3538
3539
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
3540
sign=False, revision=None, mail_to=None, message=None):
3541
from bzrlib.revision import ensure_null, NULL_REVISION
3542
if patch_type == 'plain':
3543
patch_type = None
3544
branch = Branch.open('.')
3545
stored_submit_branch = branch.get_submit_branch()
3546
if submit_branch is None:
3547
submit_branch = stored_submit_branch
3548
else:
3549
if stored_submit_branch is None:
3550
branch.set_submit_branch(submit_branch)
3551
if submit_branch is None:
3552
submit_branch = branch.get_parent()
3553
if submit_branch is None:
3554
raise errors.BzrCommandError('No submit branch specified or known')
3555
3556
stored_public_branch = branch.get_public_branch()
3557
if public_branch is None:
3558
public_branch = stored_public_branch
3559
elif stored_public_branch is None:
3560
branch.set_public_branch(public_branch)
3561
if patch_type != "bundle" and public_branch is None:
3562
raise errors.BzrCommandError('No public branch specified or'
3563
' known')
3564
if revision is not None:
3565
if len(revision) != 1:
3566
raise errors.BzrCommandError('bzr merge-directive takes '
3567
'exactly one revision identifier')
3568
else:
3569
revision_id = revision[0].in_history(branch).rev_id
3570
else:
3571
revision_id = branch.last_revision()
3572
revision_id = ensure_null(revision_id)
3573
if revision_id == NULL_REVISION:
3574
raise errors.BzrCommandError('No revisions to bundle.')
3575
directive = merge_directive.MergeDirective.from_objects(
3576
branch.repository, revision_id, time.time(),
3577
osutils.local_time_offset(), submit_branch,
3578
public_branch=public_branch, patch_type=patch_type,
3579
message=message)
3580
if mail_to is None:
3581
if sign:
3582
self.outf.write(directive.to_signed(branch))
3583
else:
3584
self.outf.writelines(directive.to_lines())
3585
else:
3586
message = directive.to_email(mail_to, branch, sign)
3587
s = SMTPConnection(branch.get_config())
3588
s.send_email(message)
3589
3590
3591
class cmd_tag(Command):
3592
"""Create a tag naming a revision.
3593
3594
Tags give human-meaningful names to revisions. Commands that take a -r
3595
(--revision) option can be given -rtag:X, where X is any previously
3596
created tag.
3597
3598
Tags are stored in the branch. Tags are copied from one branch to another
3599
along when you branch, push, pull or merge.
3600
3601
It is an error to give a tag name that already exists unless you pass
3602
--force, in which case the tag is moved to point to the new revision.
3603
"""
3604
3605
_see_also = ['commit', 'tags']
3606
takes_args = ['tag_name']
3607
takes_options = [
3608
Option('delete',
3609
help='Delete this tag rather than placing it.',
3610
),
3611
Option('directory',
3612
help='Branch in which to place the tag.',
3613
short_name='d',
3614
type=unicode,
3615
),
3616
Option('force',
3617
help='Replace existing tags.',
3618
),
3619
'revision',
3620
]
3621
3622
def run(self, tag_name,
3623
delete=None,
3624
directory='.',
3625
force=None,
3626
revision=None,
3627
):
3628
branch, relpath = Branch.open_containing(directory)
3629
branch.lock_write()
3630
try:
3631
if delete:
3632
branch.tags.delete_tag(tag_name)
3633
self.outf.write('Deleted tag %s.\n' % tag_name)
3634
else:
3635
if revision:
3636
if len(revision) != 1:
3637
raise errors.BzrCommandError(
3638
"Tags can only be placed on a single revision, "
3639
"not on a range")
3640
revision_id = revision[0].in_history(branch).rev_id
3641
else:
3642
revision_id = branch.last_revision()
3643
if (not force) and branch.tags.has_tag(tag_name):
3644
raise errors.TagAlreadyExists(tag_name)
3645
branch.tags.set_tag(tag_name, revision_id)
3646
self.outf.write('Created tag %s.\n' % tag_name)
3647
finally:
3648
branch.unlock()
3649
3650
3651
class cmd_tags(Command):
3652
"""List tags.
3653
3654
This tag shows a table of tag names and the revisions they reference.
3655
"""
3656
3657
_see_also = ['tag']
3658
takes_options = [
3659
Option('directory',
3660
help='Branch whose tags should be displayed.',
3661
short_name='d',
3662
type=unicode,
3663
),
3664
]
3665
3666
@display_command
3667
def run(self,
3668
directory='.',
3669
):
3670
branch, relpath = Branch.open_containing(directory)
3671
for tag_name, target in sorted(branch.tags.get_tag_dict().items()):
3672
self.outf.write('%-20s %s\n' % (tag_name, target))
2946
else:
2947
raise errors.BzrCommandError("bzr serve requires one of --inet or --port")
2948
server.serve()
3673
2949
3674
2950
3675
2951
# command-line interpretation helper for merge-related commands
3678
2954
this_dir=None, backup_files=False,
3679
2955
merge_type=None,
3680
2956
file_list=None, show_base=False, reprocess=False,
3681
pull=False,
3682
pb=DummyProgress(),
3683
change_reporter=None,
3684
other_rev_id=None):
2957
pb=DummyProgress()):
3685
2958
"""Merge changes into a tree.
3686
2959
3687
2960
base_revision
3723
2996
" type %s." % merge_type)
3724
2997
if reprocess and show_base:
3725
2998
raise errors.BzrCommandError("Cannot do conflict reduction and show base.")
3726
# TODO: jam 20070226 We should really lock these trees earlier. However, we
3727
# only want to take out a lock_tree_write() if we don't have to pull
3728
# any ancestry. But merge might fetch ancestry in the middle, in
3729
# which case we would need a lock_write().
3730
# Because we cannot upgrade locks, for now we live with the fact that
3731
# the tree will be locked multiple times during a merge. (Maybe
3732
# read-only some of the time, but it means things will get read
3733
# multiple times.)
3734
2999
try:
3735
3000
merger = _mod_merge.Merger(this_tree.branch, this_tree=this_tree,
3736
pb=pb, change_reporter=change_reporter)
3001
pb=pb)
3737
3002
merger.pp = ProgressPhase("Merge phase", 5, pb)
3738
3003
merger.pp.next_phase()
3739
3004
merger.check_basis(check_clean)
3740
if other_rev_id is not None:
3741
merger.set_other_revision(other_rev_id, this_tree.branch)
3742
else:
3743
merger.set_other(other_revision)
3005
merger.set_other(other_revision)
3744
3006
merger.pp.next_phase()
3745
3007
merger.set_base(base_revision)
3746
3008
if merger.base_rev_id == merger.other_rev_id:
3747
3009
note('Nothing to do.')
3748
3010
return 0
3749
if file_list is None:
3750
if pull and merger.base_rev_id == merger.this_rev_id:
3751
# FIXME: deduplicate with pull
3752
result = merger.this_tree.pull(merger.this_branch,
3753
False, merger.other_rev_id)
3754
if result.old_revid == result.new_revid:
3755
note('No revisions to pull.')
3756
else:
3757
note('Now on revision %d.' % result.new_revno)
3758
return 0
3759
3011
merger.backup_files = backup_files
3760
3012
merger.merge_type = merge_type
3761
3013
merger.set_interesting_files(file_list)
3769
3021
return conflicts
3770
3022
3771
3023
3772
def _create_prefix(cur_transport):
3773
needed = [cur_transport]
3774
# Recurse upwards until we can create a directory successfully
3775
while True:
3776
new_transport = cur_transport.clone('..')
3777
if new_transport.base == cur_transport.base:
3778
raise errors.BzrCommandError("Failed to create path"
3779
" prefix for %s."
3780
% location)
3781
try:
3782
new_transport.mkdir('.')
3783
except errors.NoSuchFile:
3784
needed.append(new_transport)
3785
cur_transport = new_transport
3786
else:
3787
break
3788
3789
# Now we only need to create child directories
3790
while needed:
3791
cur_transport = needed.pop()
3792
cur_transport.ensure_base()
3793
3794
3024
# Compatibility
3795
3025
merge = _merge_helper
3796
3026
3804
3034
from bzrlib.conflicts import cmd_resolve, cmd_conflicts, restore
3805
3035
from bzrlib.bundle.commands import cmd_bundle_revisions
3806
3036
from bzrlib.sign_my_commits import cmd_sign_my_commits
3807
from bzrlib.weave_commands import cmd_versionedfile_list, cmd_weave_join, \
3037
from bzrlib.weave_commands import cmd_weave_list, cmd_weave_join, \
3808
3038
cmd_weave_plan_merge, cmd_weave_merge_text
Loggerhead is a web-based interface for Breezy
Version: 2.0.1