504
504
if (working.has_changes()):
505
505
raise errors.UncommittedChanges(working)
507
if working.user_url != working.branch.user_url:
507
working_path = working.bzrdir.root_transport.base
508
branch_path = working.branch.bzrdir.root_transport.base
509
if working_path != branch_path:
508
510
raise errors.BzrCommandError("You cannot remove the working tree"
509
511
" from a lightweight checkout")
530
532
wt = WorkingTree.open_containing(location)[0]
531
self.add_cleanup(wt.lock_read().unlock)
532
534
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
535
raise errors.NoWorkingTree(location)
536
self.add_cleanup(wt.unlock)
534
537
revid = wt.last_revision()
536
539
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
569
573
wt = WorkingTree.open_containing(directory)[0]
571
self.add_cleanup(wt.lock_read().unlock)
576
self.add_cleanup(wt.unlock)
572
577
except (errors.NoWorkingTree, errors.NotLocalUrl):
574
579
b = Branch.open_containing(directory)[0]
575
self.add_cleanup(b.lock_read().unlock)
581
self.add_cleanup(b.unlock)
576
582
revision_ids = []
577
583
if revision is not None:
578
584
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
677
683
should_print=(not is_quiet()))
680
self.add_cleanup(base_tree.lock_read().unlock)
686
base_tree.lock_read()
687
self.add_cleanup(base_tree.unlock)
681
688
tree, file_list = tree_files_for_add(file_list)
682
689
added, ignored = tree.smart_add(file_list, not
683
690
no_recurse, action=action, save=not dry_run)
756
763
revision = _get_one_revision('inventory', revision)
757
764
work_tree, file_list = tree_files(file_list)
758
self.add_cleanup(work_tree.lock_read().unlock)
765
work_tree.lock_read()
766
self.add_cleanup(work_tree.unlock)
759
767
if revision is not None:
760
768
tree = revision.as_tree(work_tree.branch)
762
770
extra_trees = [work_tree]
763
self.add_cleanup(tree.lock_read().unlock)
772
self.add_cleanup(tree.unlock)
826
835
if len(names_list) < 2:
827
836
raise errors.BzrCommandError("missing file argument")
828
837
tree, rel_names = tree_files(names_list, canonicalize=False)
829
self.add_cleanup(tree.lock_tree_write().unlock)
838
tree.lock_tree_write()
839
self.add_cleanup(tree.unlock)
830
840
self._run(tree, names_list, rel_names, after)
832
842
def run_auto(self, names_list, after, dry_run):
837
847
raise errors.BzrCommandError('--after cannot be specified with'
839
849
work_tree, file_list = tree_files(names_list, default_branch='.')
840
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
work_tree.lock_tree_write()
851
self.add_cleanup(work_tree.unlock)
841
852
rename_map.RenameMap.guess_renames(work_tree, dry_run)
843
854
def _run(self, tree, names_list, rel_names, after):
978
989
tree_to = WorkingTree.open_containing(directory)[0]
979
990
branch_to = tree_to.branch
980
self.add_cleanup(tree_to.lock_write().unlock)
981
991
except errors.NoWorkingTree:
983
993
branch_to = Branch.open_containing(directory)[0]
984
self.add_cleanup(branch_to.lock_write().unlock)
986
995
if local and not branch_to.get_bound_location():
987
996
raise errors.LocalRequiresBoundBranch()
1019
1028
branch_from = Branch.open(location,
1020
1029
possible_transports=possible_transports)
1021
self.add_cleanup(branch_from.lock_read().unlock)
1023
1031
if branch_to.get_parent() is None or remember:
1024
1032
branch_to.set_parent(branch_from.base)
1034
if branch_from is not branch_to:
1035
branch_from.lock_read()
1036
self.add_cleanup(branch_from.unlock)
1026
1037
if revision is not None:
1027
1038
revision_id = revision.as_revision_id(branch_from)
1040
branch_to.lock_write()
1041
self.add_cleanup(branch_to.unlock)
1029
1042
if tree_to is not None:
1030
1043
view_info = _get_view_info_for_change_reporter(tree_to)
1031
1044
change_reporter = delta._ChangeReporter(
1113
1126
# Get the source branch
1114
1127
(tree, br_from,
1115
1128
_unused) = bzrdir.BzrDir.open_containing_tree_or_branch(directory)
1130
strict = br_from.get_config().get_user_option_as_bool('push_strict')
1131
if strict is None: strict = True # default value
1116
1132
# Get the tip's revision_id
1117
1133
revision = _get_one_revision('push', revision)
1118
1134
if revision is not None:
1119
1135
revision_id = revision.in_history(br_from).rev_id
1121
1137
revision_id = None
1122
if tree is not None and revision_id is None:
1123
tree.check_changed_or_out_of_date(
1124
strict, 'push_strict',
1125
more_error='Use --no-strict to force the push.',
1126
more_warning='Uncommitted changes will not be pushed.')
1138
if strict and tree is not None and revision_id is None:
1139
if (tree.has_changes()):
1140
raise errors.UncommittedChanges(
1141
tree, more='Use --no-strict to force the push.')
1142
if tree.last_revision() != tree.branch.last_revision():
1143
# The tree has lost sync with its branch, there is little
1144
# chance that the user is aware of it but he can still force
1145
# the push with --no-strict
1146
raise errors.OutOfDateTree(
1147
tree, more='Use --no-strict to force the push.')
1127
1149
# Get the stacked_on branch, if any
1128
1150
if stacked_on is not None:
1129
1151
stacked_on = urlutils.normalize_url(stacked_on)
1207
1229
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1209
1231
revision = _get_one_revision('branch', revision)
1210
self.add_cleanup(br_from.lock_read().unlock)
1233
self.add_cleanup(br_from.unlock)
1211
1234
if revision is not None:
1212
1235
revision_id = revision.as_revision_id(br_from)
1353
1376
@display_command
1354
1377
def run(self, dir=u'.'):
1355
1378
tree = WorkingTree.open_containing(dir)[0]
1356
self.add_cleanup(tree.lock_read().unlock)
1380
self.add_cleanup(tree.unlock)
1357
1381
new_inv = tree.inventory
1358
1382
old_tree = tree.basis_tree()
1359
self.add_cleanup(old_tree.lock_read().unlock)
1383
old_tree.lock_read()
1384
self.add_cleanup(old_tree.unlock)
1360
1385
old_inv = old_tree.inventory
1362
1387
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1400
1425
master = branch.get_master_branch(
1401
1426
possible_transports=possible_transports)
1402
1427
if master is not None:
1403
1429
branch_location = master.base
1431
tree.lock_tree_write()
1406
1432
branch_location = tree.branch.base
1407
tree.lock_tree_write()
1408
1433
self.add_cleanup(tree.unlock)
1409
1434
# get rid of the final '/' and be ready for display
1410
1435
branch_location = urlutils.unescape_for_display(
1424
1449
revision_id = branch.last_revision()
1425
1450
if revision_id == _mod_revision.ensure_null(tree.last_revision()):
1426
revno = branch.revision_id_to_dotted_revno(revision_id)
1427
note("Tree is up to date at revision %s of branch %s" %
1428
('.'.join(map(str, revno)), branch_location))
1451
revno = branch.revision_id_to_revno(revision_id)
1452
note("Tree is up to date at revision %d of branch %s" %
1453
(revno, branch_location))
1430
1455
view_info = _get_view_info_for_change_reporter(tree)
1431
1456
change_reporter = delta._ChangeReporter(
1443
1468
"bzr update --revision only works"
1444
1469
" for a revision in the branch history"
1445
1470
% (e.revision))
1446
revno = tree.branch.revision_id_to_dotted_revno(
1471
revno = tree.branch.revision_id_to_revno(
1447
1472
_mod_revision.ensure_null(tree.last_revision()))
1448
note('Updated to revision %s of branch %s' %
1449
('.'.join(map(str, revno)), branch_location))
1450
parent_ids = tree.get_parent_ids()
1451
if parent_ids[1:] and parent_ids[1:] != existing_pending_merges:
1473
note('Updated to revision %d of branch %s' %
1474
(revno, branch_location))
1475
if tree.get_parent_ids()[1:] != existing_pending_merges:
1452
1476
note('Your local commits will now show as pending merges with '
1453
1477
"'bzr status', and can be committed with 'bzr commit'.")
1454
1478
if conflicts != 0:
1929
1954
help='Use this command to compare files.',
1932
RegistryOption('format',
1933
help='Diff format to use.',
1934
lazy_registry=('bzrlib.diff', 'format_registry'),
1935
value_switches=False, title='Diff format'),
1937
1958
aliases = ['di', 'dif']
1938
1959
encoding_type = 'exact'
1940
1961
@display_command
1941
1962
def run(self, revision=None, file_list=None, diff_options=None,
1942
prefix=None, old=None, new=None, using=None, format=None):
1943
from bzrlib.diff import (get_trees_and_branches_to_diff_locked,
1963
prefix=None, old=None, new=None, using=None):
1964
from bzrlib.diff import get_trees_and_branches_to_diff, show_diff_trees
1946
1966
if (prefix is None) or (prefix == '0'):
1947
1967
# diff -p0 format
1961
1981
raise errors.BzrCommandError('bzr diff --revision takes exactly'
1962
1982
' one or two revision specifiers')
1964
if using is not None and format is not None:
1965
raise errors.BzrCommandError('--using and --format are mutually '
1968
1984
(old_tree, new_tree,
1969
1985
old_branch, new_branch,
1970
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff(
1987
file_list, revision, old, new, apply_view=True)
1972
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
1989
specific_files=specific_files,
1974
1990
external_diff_options=diff_options,
1975
1991
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
1992
extra_trees=extra_trees, using=using)
1980
1995
class cmd_deleted(Command):
1992
2007
@display_command
1993
2008
def run(self, show_ids=False):
1994
2009
tree = WorkingTree.open_containing(u'.')[0]
1995
self.add_cleanup(tree.lock_read().unlock)
2011
self.add_cleanup(tree.unlock)
1996
2012
old = tree.basis_tree()
1997
self.add_cleanup(old.lock_read().unlock)
2014
self.add_cleanup(old.unlock)
1998
2015
for path, ie in old.inventory.iter_entries():
1999
2016
if not tree.has_id(ie.file_id):
2000
2017
self.outf.write(path)
2042
2059
@display_command
2043
2060
def run(self, null=False):
2044
2061
wt = WorkingTree.open_containing(u'.')[0]
2045
self.add_cleanup(wt.lock_read().unlock)
2063
self.add_cleanup(wt.unlock)
2046
2064
basis = wt.basis_tree()
2047
self.add_cleanup(basis.lock_read().unlock)
2066
self.add_cleanup(basis.unlock)
2048
2067
basis_inv = basis.inventory
2049
2068
inv = wt.inventory
2050
2069
for file_id in inv:
2279
2298
help='Show changes made in each revision as a patch.'),
2280
2299
Option('include-merges',
2281
2300
help='Show merged revisions like --levels 0 does.'),
2282
Option('exclude-common-ancestry',
2283
help='Display only the revisions that are not part'
2284
' of both ancestries (require -rX..Y)'
2287
2302
encoding_type = 'replace'
2300
2315
show_diff=False,
2301
include_merges=False,
2302
exclude_common_ancestry=False,
2316
include_merges=False):
2304
2317
from bzrlib.log import (
2306
2319
make_log_request_dict,
2307
2320
_get_info_for_log_files,
2309
2322
direction = (forward and 'forward') or 'reverse'
2310
if (exclude_common_ancestry
2311
and (revision is None or len(revision) != 2)):
2312
raise errors.BzrCommandError(
2313
'--exclude-common-ancestry requires -r with two revisions')
2314
2323
if include_merges:
2315
2324
if levels is None:
2333
2342
# find the file ids to log and check for directory filtering
2334
2343
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2335
revision, file_list, self.add_cleanup)
2344
revision, file_list)
2345
self.add_cleanup(b.unlock)
2336
2346
for relpath, file_id, kind in file_info_list:
2337
2347
if file_id is None:
2338
2348
raise errors.BzrCommandError(
2357
2367
dir, relpath = bzrdir.BzrDir.open_containing(location)
2358
2368
b = dir.open_branch()
2359
self.add_cleanup(b.lock_read().unlock)
2370
self.add_cleanup(b.unlock)
2360
2371
rev1, rev2 = _get_revision_range(revision, b, self.name())
2362
2373
# Decide on the type of delta & diff filtering to use
2407
2418
direction=direction, specific_fileids=file_ids,
2408
2419
start_revision=rev1, end_revision=rev2, limit=limit,
2409
2420
message_search=message, delta_type=delta_type,
2410
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2411
exclude_common_ancestry=exclude_common_ancestry,
2421
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2413
2422
Logger(b, rqst).show(lf)
2486
2495
tree, relpath = WorkingTree.open_containing(filename)
2487
2496
file_id = tree.path2id(relpath)
2488
2497
b = tree.branch
2489
self.add_cleanup(b.lock_read().unlock)
2499
self.add_cleanup(b.unlock)
2490
2500
touching_revs = log.find_touching_revisions(b, file_id)
2491
2501
for revno, revision_id, what in touching_revs:
2492
2502
self.outf.write("%6d %s\n" % (revno, what))
2561
2571
view_str = views.view_display_str(view_files)
2562
2572
note("Ignoring files outside view. View is %s" % view_str)
2564
self.add_cleanup(tree.lock_read().unlock)
2575
self.add_cleanup(tree.unlock)
2565
2576
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2566
2577
from_dir=relpath, recursive=recursive):
2567
2578
# Apply additional masking
2637
2648
using this command or directly by using an editor, be sure to commit
2640
Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows
2641
the global ignore file can be found in the application data directory as
2642
C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.
2643
Global ignores are not touched by this command. The global ignore file
2644
can be edited directly using an editor.
2646
2651
Patterns prefixed with '!' are exceptions to ignore patterns and take
2647
2652
precedence over regular ignores. Such exceptions are used to specify
2648
2653
files that should be versioned which would otherwise be ignored.
2689
2694
_see_also = ['status', 'ignored', 'patterns']
2690
2695
takes_args = ['name_pattern*']
2691
2696
takes_options = [
2692
Option('default-rules',
2693
help='Display the default ignore rules that bzr uses.')
2697
Option('old-default-rules',
2698
help='Write out the ignore rules bzr < 0.9 always used.')
2696
def run(self, name_pattern_list=None, default_rules=None):
2701
def run(self, name_pattern_list=None, old_default_rules=None):
2697
2702
from bzrlib import ignores
2698
if default_rules is not None:
2699
# dump the default rules and exit
2700
for pattern in ignores.USER_DEFAULTS:
2703
if old_default_rules is not None:
2704
# dump the rules and exit
2705
for pattern in ignores.OLD_DEFAULTS:
2701
2706
self.outf.write("%s\n" % pattern)
2703
2708
if not name_pattern_list:
2704
2709
raise errors.BzrCommandError("ignore requires at least one "
2705
"NAME_PATTERN or --default-rules.")
2710
"NAME_PATTERN or --old-default-rules")
2706
2711
name_pattern_list = [globbing.normalize_pattern(p)
2707
2712
for p in name_pattern_list]
2708
2713
for name_pattern in name_pattern_list:
2746
2751
@display_command
2748
2753
tree = WorkingTree.open_containing(u'.')[0]
2749
self.add_cleanup(tree.lock_read().unlock)
2755
self.add_cleanup(tree.unlock)
2750
2756
for path, file_class, kind, file_id, entry in tree.list_files():
2751
2757
if file_class != 'I':
2865
2871
" one revision specifier")
2866
2872
tree, branch, relpath = \
2867
2873
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2868
self.add_cleanup(branch.lock_read().unlock)
2875
self.add_cleanup(branch.unlock)
2869
2876
return self._run(tree, branch, relpath, filename, revision,
2870
2877
name_from_revision, filters)
3046
3054
"the master branch until a normal commit "
3047
3055
"is performed."
3049
Option('show-diff', short_name='p',
3050
3058
help='When no message is supplied, show the diff along'
3051
3059
' with the status summary in the message editor.'),
3132
3140
'(use --file "%(f)s" to take commit message from that file)'
3133
3141
% { 'f': message })
3134
3142
ui.ui_factory.show_warning(warning_msg)
3136
message = message.replace('\r\n', '\n')
3137
message = message.replace('\r', '\n')
3139
raise errors.BzrCommandError(
3140
"please specify either --message or --file")
3142
3144
def get_message(commit_obj):
3143
3145
"""Callback to get commit message"""
3145
my_message = codecs.open(
3146
file, 'rt', osutils.get_user_encoding()).read()
3147
elif message is not None:
3148
my_message = message
3150
# No message supplied: make one up.
3151
# text is the status of the tree
3152
text = make_commit_message_template_encoded(tree,
3146
my_message = message
3147
if my_message is not None and '\r' in my_message:
3148
my_message = my_message.replace('\r\n', '\n')
3149
my_message = my_message.replace('\r', '\n')
3150
if my_message is None and not file:
3151
t = make_commit_message_template_encoded(tree,
3153
3152
selected_list, diff=show_diff,
3154
3153
output_encoding=osutils.get_user_encoding())
3155
# start_message is the template generated from hooks
3156
# XXX: Warning - looks like hooks return unicode,
3157
# make_commit_message_template_encoded returns user encoding.
3158
# We probably want to be using edit_commit_message instead to
3160
3154
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
3155
my_message = edit_commit_message_encoded(t,
3162
3156
start_message=start_message)
3163
3157
if my_message is None:
3164
3158
raise errors.BzrCommandError("please specify a commit"
3165
3159
" message with either --message or --file")
3160
elif my_message and file:
3161
raise errors.BzrCommandError(
3162
"please specify either --message or --file")
3164
my_message = codecs.open(file, 'rt',
3165
osutils.get_user_encoding()).read()
3166
3166
if my_message == "":
3167
3167
raise errors.BzrCommandError("empty commit message specified")
3168
3168
return my_message
3180
3180
timezone=offset,
3181
3181
exclude=safe_relpath_files(tree, exclude))
3182
3182
except PointlessCommit:
3183
# FIXME: This should really happen before the file is read in;
3184
# perhaps prepare the commit; get the message; then actually commit
3183
3185
raise errors.BzrCommandError("No changes to commit."
3184
3186
" Use --unchanged to commit anyhow.")
3185
3187
except ConflictsInTree:
3583
3585
raise errors.BzrCommandError("subunit not available. subunit "
3584
3586
"needs to be installed to use --subunit.")
3585
3587
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3586
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
# stdout, which would corrupt the subunit stream.
3588
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3590
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3592
3589
self.additional_selftest_args.setdefault(
3593
3590
'suite_decorators', []).append(parallel)
3664
3661
branch1 = Branch.open_containing(branch)[0]
3665
3662
branch2 = Branch.open_containing(other)[0]
3666
self.add_cleanup(branch1.lock_read().unlock)
3667
self.add_cleanup(branch2.lock_read().unlock)
3664
self.add_cleanup(branch1.unlock)
3666
self.add_cleanup(branch2.unlock)
3668
3667
last1 = ensure_null(branch1.last_revision())
3669
3668
last2 = ensure_null(branch2.last_revision())
3808
3807
unversioned_filter=tree.is_ignored, view_info=view_info)
3809
3808
pb = ui.ui_factory.nested_progress_bar()
3810
3809
self.add_cleanup(pb.finished)
3811
self.add_cleanup(tree.lock_write().unlock)
3811
self.add_cleanup(tree.unlock)
3812
3812
if location is not None:
3814
3814
mergeable = bundle.read_mergeable_from_url(location,
4070
4070
if merge_type is None:
4071
4071
merge_type = _mod_merge.Merge3Merger
4072
4072
tree, file_list = tree_files(file_list)
4073
self.add_cleanup(tree.lock_write().unlock)
4074
self.add_cleanup(tree.unlock)
4074
4075
parents = tree.get_parent_ids()
4075
4076
if len(parents) != 2:
4076
4077
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4186
4187
def run(self, revision=None, no_backup=False, file_list=None,
4187
4188
forget_merges=None):
4188
4189
tree, file_list = tree_files(file_list)
4189
self.add_cleanup(tree.lock_tree_write().unlock)
4191
self.add_cleanup(tree.unlock)
4190
4192
if forget_merges:
4191
4193
tree.set_parent_ids(tree.get_parent_ids()[:1])
4344
4344
remote_branch = Branch.open(other_branch)
4345
4345
if remote_branch.base == local_branch.base:
4346
4346
remote_branch = local_branch
4348
self.add_cleanup(remote_branch.lock_read().unlock)
4348
local_branch.lock_read()
4349
self.add_cleanup(local_branch.unlock)
4350
4350
local_revid_range = _revision_range_to_revid_range(
4351
4351
_get_revision_range(my_revision, local_branch,
4354
remote_branch.lock_read()
4355
self.add_cleanup(remote_branch.unlock)
4354
4356
remote_revid_range = _revision_range_to_revid_range(
4355
4357
_get_revision_range(revision,
4356
4358
remote_branch, self.name()))
4406
4408
message("Branches are up to date.\n")
4407
4409
self.cleanup_now()
4408
4410
if not status_code and parent is None and other_branch is not None:
4409
self.add_cleanup(local_branch.lock_write().unlock)
4411
local_branch.lock_write()
4412
self.add_cleanup(local_branch.unlock)
4410
4413
# handle race conditions - a parent might be set while we run.
4411
4414
if local_branch.get_parent() is None:
4412
4415
local_branch.set_parent(remote_branch.base)
4416
4419
class cmd_pack(Command):
4417
__doc__ = """Compress the data within a repository.
4419
This operation compresses the data within a bazaar repository. As
4420
bazaar supports automatic packing of repository, this operation is
4421
normally not required to be done manually.
4423
During the pack operation, bazaar takes a backup of existing repository
4424
data, i.e. pack files. This backup is eventually removed by bazaar
4425
automatically when it is safe to do so. To save disk space by removing
4426
the backed up pack files, the --clean-obsolete-packs option may be
4429
Warning: If you use --clean-obsolete-packs and your machine crashes
4430
during or immediately after repacking, you may be left with a state
4431
where the deletion has been written to disk but the new packs have not
4432
been. In this case the repository may be unusable.
4420
__doc__ = """Compress the data within a repository."""
4435
4422
_see_also = ['repositories']
4436
4423
takes_args = ['branch_or_repo?']
4438
Option('clean-obsolete-packs', 'Delete obsolete packs to save disk space.'),
4441
def run(self, branch_or_repo='.', clean_obsolete_packs=False):
4425
def run(self, branch_or_repo='.'):
4442
4426
dir = bzrdir.BzrDir.open_containing(branch_or_repo)[0]
4444
4428
branch = dir.open_branch()
4445
4429
repository = branch.repository
4446
4430
except errors.NotBranchError:
4447
4431
repository = dir.open_repository()
4448
repository.pack(clean_obsolete_packs=clean_obsolete_packs)
4451
4435
class cmd_plugins(Command):
4552
4537
wt, branch, relpath = \
4553
4538
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4554
4539
if wt is not None:
4555
self.add_cleanup(wt.lock_read().unlock)
4541
self.add_cleanup(wt.unlock)
4557
self.add_cleanup(branch.lock_read().unlock)
4544
self.add_cleanup(branch.unlock)
4558
4545
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
self.add_cleanup(tree.lock_read().unlock)
4547
self.add_cleanup(tree.unlock)
4560
4548
if wt is not None:
4561
4549
file_id = wt.path2id(relpath)
4588
4576
if revision_id_list is None and revision is None:
4589
4577
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
4578
b = WorkingTree.open_containing(u'.')[0].branch
4591
self.add_cleanup(b.lock_write().unlock)
4580
self.add_cleanup(b.unlock)
4592
4581
return self._run(b, revision_id_list, revision)
4594
4583
def _run(self, b, revision_id_list, revision):
4744
4732
b = control.open_branch()
4746
4734
if tree is not None:
4747
self.add_cleanup(tree.lock_write().unlock)
4736
self.add_cleanup(tree.unlock)
4749
self.add_cleanup(b.lock_write().unlock)
4739
self.add_cleanup(b.unlock)
4750
4740
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4752
4742
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
added
removed
bzrlib/builtins.py
