To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to bzrlib/builtins.py
- browse files at revision 5183.1.1
- compare with another revision
- download diff
- download tarball
- view history from revision 5183.1.1
- Committer: Vincent Ladeuil
- Date: 2010-04-24 09:08:27 UTC
- mfrom: (5116.2.10 no-chown-if-bzrlog-exists)
- mto: This revision was merged to the branch mainline in revision 5184.
- Revision ID: v.ladeuil+lp@free.fr-20100424090827-82nonepmwquri170
Only chown() the .bzr.log when creating it, fixing NEWS entry to put it under 2.2b3
- files removed:
- bzrlib/tests/blackbox/test_deleted.py
- files modified:
- NEWS
added
removed
bzrlib/builtins.py
232
232
return view_info
233
233
234
234
235
def _open_directory_or_containing_tree_or_branch(filename, directory):
236
"""Open the tree or branch containing the specified file, unless
237
the --directory option is used to specify a different branch."""
238
if directory is not None:
239
return (None, Branch.open(directory), filename)
240
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
241
242
243
235
# TODO: Make sure no commands unconditionally use the working directory as a
244
236
# branch. If a filename argument is used, the first of them should be used to
245
237
# specify the branch. (Perhaps this can be factored out into some kind of
348
340
349
341
hidden = True
350
342
takes_args = ['revision_id?']
351
takes_options = ['directory', 'revision']
343
takes_options = ['revision']
352
344
# cat-revision is more for frontends so should be exact
353
345
encoding = 'strict'
354
346
361
353
self.outf.write(revtext.decode('utf-8'))
362
354
363
355
@display_command
364
def run(self, revision_id=None, revision=None, directory=u'.'):
356
def run(self, revision_id=None, revision=None):
365
357
if revision_id is not None and revision is not None:
366
358
raise errors.BzrCommandError('You can only supply one of'
367
359
' revision_id or --revision')
368
360
if revision_id is None and revision is None:
369
361
raise errors.BzrCommandError('You must supply either'
370
362
' --revision or a revision_id')
371
b = WorkingTree.open_containing(directory)[0].branch
363
b = WorkingTree.open_containing(u'.')[0].branch
372
364
373
365
revisions = b.repository.revisions
374
366
if revisions is None:
512
504
if (working.has_changes()):
513
505
raise errors.UncommittedChanges(working)
514
506
515
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:
516
510
raise errors.BzrCommandError("You cannot remove the working tree"
517
511
" from a lightweight checkout")
518
512
536
530
if tree:
537
531
try:
538
532
wt = WorkingTree.open_containing(location)[0]
539
self.add_cleanup(wt.lock_read().unlock)
533
wt.lock_read()
540
534
except (errors.NoWorkingTree, errors.NotLocalUrl):
541
535
raise errors.NoWorkingTree(location)
536
self.add_cleanup(wt.unlock)
542
537
revid = wt.last_revision()
543
538
try:
544
539
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
547
542
revno = ".".join(str(n) for n in revno_t)
548
543
else:
549
544
b = Branch.open_containing(location)[0]
550
self.add_cleanup(b.lock_read().unlock)
545
b.lock_read()
546
self.add_cleanup(b.unlock)
551
547
revno = b.revno()
552
548
self.cleanup_now()
553
549
self.outf.write(str(revno) + '\n')
560
556
takes_args = ['revision_info*']
561
557
takes_options = [
562
558
'revision',
563
custom_help('directory',
559
Option('directory',
564
560
help='Branch to examine, '
565
'rather than the one containing the working directory.'),
561
'rather than the one containing the working directory.',
562
short_name='d',
563
type=unicode,
564
),
566
565
Option('tree', help='Show revno of working tree'),
567
566
]
568
567
573
572
try:
574
573
wt = WorkingTree.open_containing(directory)[0]
575
574
b = wt.branch
576
self.add_cleanup(wt.lock_read().unlock)
575
wt.lock_read()
576
self.add_cleanup(wt.unlock)
577
577
except (errors.NoWorkingTree, errors.NotLocalUrl):
578
578
wt = None
579
579
b = Branch.open_containing(directory)[0]
580
self.add_cleanup(b.lock_read().unlock)
580
b.lock_read()
581
self.add_cleanup(b.unlock)
581
582
revision_ids = []
582
583
if revision is not None:
583
584
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
682
683
should_print=(not is_quiet()))
683
684
684
685
if base_tree:
685
self.add_cleanup(base_tree.lock_read().unlock)
686
base_tree.lock_read()
687
self.add_cleanup(base_tree.unlock)
686
688
tree, file_list = tree_files_for_add(file_list)
687
689
added, ignored = tree.smart_add(file_list, not
688
690
no_recurse, action=action, save=not dry_run)
760
762
761
763
revision = _get_one_revision('inventory', revision)
762
764
work_tree, file_list = tree_files(file_list)
763
self.add_cleanup(work_tree.lock_read().unlock)
765
work_tree.lock_read()
766
self.add_cleanup(work_tree.unlock)
764
767
if revision is not None:
765
768
tree = revision.as_tree(work_tree.branch)
766
769
767
770
extra_trees = [work_tree]
768
self.add_cleanup(tree.lock_read().unlock)
771
tree.lock_read()
772
self.add_cleanup(tree.unlock)
769
773
else:
770
774
tree = work_tree
771
775
extra_trees = []
831
835
if len(names_list) < 2:
832
836
raise errors.BzrCommandError("missing file argument")
833
837
tree, rel_names = tree_files(names_list, canonicalize=False)
834
self.add_cleanup(tree.lock_tree_write().unlock)
838
tree.lock_tree_write()
839
self.add_cleanup(tree.unlock)
835
840
self._run(tree, names_list, rel_names, after)
836
841
837
842
def run_auto(self, names_list, after, dry_run):
842
847
raise errors.BzrCommandError('--after cannot be specified with'
843
848
' --auto.')
844
849
work_tree, file_list = tree_files(names_list, default_branch='.')
845
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
work_tree.lock_tree_write()
851
self.add_cleanup(work_tree.unlock)
846
852
rename_map.RenameMap.guess_renames(work_tree, dry_run)
847
853
848
854
def _run(self, tree, names_list, rel_names, after):
956
962
takes_options = ['remember', 'overwrite', 'revision',
957
963
custom_help('verbose',
958
964
help='Show logs of pulled revisions.'),
959
custom_help('directory',
965
Option('directory',
960
966
help='Branch to pull into, '
961
'rather than the one containing the working directory.'),
967
'rather than the one containing the working directory.',
968
short_name='d',
969
type=unicode,
970
),
962
971
Option('local',
963
972
help="Perform a local pull in a bound "
964
973
"branch. Local pulls are not applied to "
979
988
try:
980
989
tree_to = WorkingTree.open_containing(directory)[0]
981
990
branch_to = tree_to.branch
982
self.add_cleanup(tree_to.lock_write().unlock)
991
tree_to.lock_write()
992
self.add_cleanup(tree_to.unlock)
983
993
except errors.NoWorkingTree:
984
994
tree_to = None
985
995
branch_to = Branch.open_containing(directory)[0]
986
self.add_cleanup(branch_to.lock_write().unlock)
996
branch_to.lock_write()
997
self.add_cleanup(branch_to.unlock)
987
998
988
999
if local and not branch_to.get_bound_location():
989
1000
raise errors.LocalRequiresBoundBranch()
1020
1031
else:
1021
1032
branch_from = Branch.open(location,
1022
1033
possible_transports=possible_transports)
1023
self.add_cleanup(branch_from.lock_read().unlock)
1034
branch_from.lock_read()
1035
self.add_cleanup(branch_from.unlock)
1024
1036
1025
1037
if branch_to.get_parent() is None or remember:
1026
1038
branch_to.set_parent(branch_from.base)
1078
1090
Option('create-prefix',
1079
1091
help='Create the path leading up to the branch '
1080
1092
'if it does not already exist.'),
1081
custom_help('directory',
1093
Option('directory',
1082
1094
help='Branch to push from, '
1083
'rather than the one containing the working directory.'),
1095
'rather than the one containing the working directory.',
1096
short_name='d',
1097
type=unicode,
1098
),
1084
1099
Option('use-existing-dir',
1085
1100
help='By default push will fail if the target'
1086
1101
' directory exists, but does not already'
1119
1134
else:
1120
1135
revision_id = None
1121
1136
if tree is not None and revision_id is None:
1122
tree.check_changed_or_out_of_date(
1123
strict, 'push_strict',
1124
more_error='Use --no-strict to force the push.',
1125
more_warning='Uncommitted changes will not be pushed.')
1137
tree.warn_if_changed_or_out_of_date(
1138
strict, 'push_strict', 'Use --no-strict to force the push.')
1126
1139
# Get the stacked_on branch, if any
1127
1140
if stacked_on is not None:
1128
1141
stacked_on = urlutils.normalize_url(stacked_on)
1206
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1207
1220
from_location)
1208
1221
revision = _get_one_revision('branch', revision)
1209
self.add_cleanup(br_from.lock_read().unlock)
1222
br_from.lock_read()
1223
self.add_cleanup(br_from.unlock)
1210
1224
if revision is not None:
1211
1225
revision_id = revision.as_revision_id(br_from)
1212
1226
else:
1336
1350
except errors.NoWorkingTree:
1337
1351
source.bzrdir.create_workingtree(revision_id)
1338
1352
return
1339
1340
if not lightweight:
1341
message = ('Copying history to "%s". '
1342
'To checkout without local history use --lightweight.' % to_location)
1343
ui.ui_factory.show_message(message)
1344
1353
source.create_checkout(to_location, revision_id, lightweight,
1345
1354
accelerator_tree, hardlink)
1346
1355
1357
1366
@display_command
1358
1367
def run(self, dir=u'.'):
1359
1368
tree = WorkingTree.open_containing(dir)[0]
1360
self.add_cleanup(tree.lock_read().unlock)
1369
tree.lock_read()
1370
self.add_cleanup(tree.unlock)
1361
1371
new_inv = tree.inventory
1362
1372
old_tree = tree.basis_tree()
1363
self.add_cleanup(old_tree.lock_read().unlock)
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1364
1375
old_inv = old_tree.inventory
1365
1376
renames = []
1366
1377
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1404
1415
master = branch.get_master_branch(
1405
1416
possible_transports=possible_transports)
1406
1417
if master is not None:
1418
tree.lock_write()
1407
1419
branch_location = master.base
1408
tree.lock_write()
1409
1420
else:
1421
tree.lock_tree_write()
1410
1422
branch_location = tree.branch.base
1411
tree.lock_tree_write()
1412
1423
self.add_cleanup(tree.unlock)
1413
1424
# get rid of the final '/' and be ready for display
1414
1425
branch_location = urlutils.unescape_for_display(
1534
1545
if file_list is not None:
1535
1546
file_list = [f for f in file_list]
1536
1547
1537
self.add_cleanup(tree.lock_write().unlock)
1548
tree.lock_write()
1549
self.add_cleanup(tree.unlock)
1538
1550
# Heuristics should probably all move into tree.remove_smart or
1539
1551
# some such?
1540
1552
if new:
1991
2003
# level of effort but possibly much less IO. (Or possibly not,
1992
2004
# if the directories are very large...)
1993
2005
_see_also = ['status', 'ls']
1994
takes_options = ['directory', 'show-ids']
2006
takes_options = ['show-ids']
1995
2007
1996
2008
@display_command
1997
def run(self, show_ids=False, directory=u'.'):
1998
tree = WorkingTree.open_containing(directory)[0]
1999
self.add_cleanup(tree.lock_read().unlock)
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2011
tree.lock_read()
2012
self.add_cleanup(tree.unlock)
2000
2013
old = tree.basis_tree()
2001
self.add_cleanup(old.lock_read().unlock)
2014
old.lock_read()
2015
self.add_cleanup(old.unlock)
2002
2016
for path, ie in old.inventory.iter_entries():
2003
2017
if not tree.has_id(ie.file_id):
2004
2018
self.outf.write(path)
2014
2028
2015
2029
hidden = True
2016
2030
_see_also = ['status', 'ls']
2017
takes_options = ['directory', 'null']
2031
takes_options = [
2032
Option('null',
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2035
]
2018
2036
2019
2037
@display_command
2020
def run(self, null=False, directory=u'.'):
2021
tree = WorkingTree.open_containing(directory)[0]
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2022
2040
td = tree.changes_from(tree.basis_tree())
2023
2041
for path, id, kind, text_modified, meta_modified in td.modified:
2024
2042
if null:
2033
2051
2034
2052
hidden = True
2035
2053
_see_also = ['status', 'ls']
2036
takes_options = ['directory', 'null']
2054
takes_options = [
2055
Option('null',
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2058
]
2037
2059
2038
2060
@display_command
2039
def run(self, null=False, directory=u'.'):
2040
wt = WorkingTree.open_containing(directory)[0]
2041
self.add_cleanup(wt.lock_read().unlock)
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2063
wt.lock_read()
2064
self.add_cleanup(wt.unlock)
2042
2065
basis = wt.basis_tree()
2043
self.add_cleanup(basis.lock_read().unlock)
2066
basis.lock_read()
2067
self.add_cleanup(basis.unlock)
2044
2068
basis_inv = basis.inventory
2045
2069
inv = wt.inventory
2046
2070
for file_id in inv:
2049
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2050
2074
continue
2051
2075
path = inv.id2path(file_id)
2052
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2076
if not os.access(osutils.abspath(path), os.F_OK):
2053
2077
continue
2054
2078
if null:
2055
2079
self.outf.write(path + '\0')
2255
2279
help='Show just the specified revision.'
2256
2280
' See also "help revisionspec".'),
2257
2281
'log-format',
2258
RegistryOption('authors',
2259
'What names to list as authors - first, all or committer.',
2260
title='Authors',
2261
lazy_registry=('bzrlib.log', 'author_list_registry'),
2262
),
2263
2282
Option('levels',
2264
2283
short_name='n',
2265
2284
help='Number of levels to display - 0 for all, 1 for flat.',
2280
2299
help='Show changes made in each revision as a patch.'),
2281
2300
Option('include-merges',
2282
2301
help='Show merged revisions like --levels 0 does.'),
2283
Option('exclude-common-ancestry',
2284
help='Display only the revisions that are not part'
2285
' of both ancestries (require -rX..Y)'
2286
)
2287
2302
]
2288
2303
encoding_type = 'replace'
2289
2304
2299
2314
message=None,
2300
2315
limit=None,
2301
2316
show_diff=False,
2302
include_merges=False,
2303
authors=None,
2304
exclude_common_ancestry=False,
2305
):
2317
include_merges=False):
2306
2318
from bzrlib.log import (
2307
2319
Logger,
2308
2320
make_log_request_dict,
2309
2321
_get_info_for_log_files,
2310
2322
)
2311
2323
direction = (forward and 'forward') or 'reverse'
2312
if (exclude_common_ancestry
2313
and (revision is None or len(revision) != 2)):
2314
raise errors.BzrCommandError(
2315
'--exclude-common-ancestry requires -r with two revisions')
2316
2324
if include_merges:
2317
2325
if levels is None:
2318
2326
levels = 0
2334
2342
if file_list:
2335
2343
# find the file ids to log and check for directory filtering
2336
2344
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2337
revision, file_list, self.add_cleanup)
2345
revision, file_list)
2346
self.add_cleanup(b.unlock)
2338
2347
for relpath, file_id, kind in file_info_list:
2339
2348
if file_id is None:
2340
2349
raise errors.BzrCommandError(
2358
2367
location = '.'
2359
2368
dir, relpath = bzrdir.BzrDir.open_containing(location)
2360
2369
b = dir.open_branch()
2361
self.add_cleanup(b.lock_read().unlock)
2370
b.lock_read()
2371
self.add_cleanup(b.unlock)
2362
2372
rev1, rev2 = _get_revision_range(revision, b, self.name())
2363
2373
2364
2374
# Decide on the type of delta & diff filtering to use
2384
2394
show_timezone=timezone,
2385
2395
delta_format=get_verbosity_level(),
2386
2396
levels=levels,
2387
show_advice=levels is None,
2388
author_list_handler=authors)
2397
show_advice=levels is None)
2389
2398
2390
2399
# Choose the algorithm for doing the logging. It's annoying
2391
2400
# having multiple code paths like this but necessary until
2410
2419
direction=direction, specific_fileids=file_ids,
2411
2420
start_revision=rev1, end_revision=rev2, limit=limit,
2412
2421
message_search=message, delta_type=delta_type,
2413
diff_type=diff_type, _match_using_deltas=match_using_deltas,
2414
exclude_common_ancestry=exclude_common_ancestry,
2415
)
2422
diff_type=diff_type, _match_using_deltas=match_using_deltas)
2416
2423
Logger(b, rqst).show(lf)
2417
2424
2418
2425
2489
2496
tree, relpath = WorkingTree.open_containing(filename)
2490
2497
file_id = tree.path2id(relpath)
2491
2498
b = tree.branch
2492
self.add_cleanup(b.lock_read().unlock)
2499
b.lock_read()
2500
self.add_cleanup(b.unlock)
2493
2501
touching_revs = log.find_touching_revisions(b, file_id)
2494
2502
for revno, revision_id, what in touching_revs:
2495
2503
self.outf.write("%6d %s\n" % (revno, what))
2508
2516
help='Recurse into subdirectories.'),
2509
2517
Option('from-root',
2510
2518
help='Print paths relative to the root of the branch.'),
2511
Option('unknown', short_name='u',
2512
help='Print unknown files.'),
2519
Option('unknown', help='Print unknown files.'),
2513
2520
Option('versioned', help='Print versioned files.',
2514
2521
short_name='V'),
2515
Option('ignored', short_name='i',
2516
help='Print ignored files.'),
2517
Option('kind', short_name='k',
2522
Option('ignored', help='Print ignored files.'),
2523
Option('null',
2524
help='Write an ascii NUL (\\0) separator '
2525
'between files rather than a newline.'),
2526
Option('kind',
2518
2527
help='List entries of a particular kind: file, directory, symlink.',
2519
2528
type=unicode),
2520
'null',
2521
2529
'show-ids',
2522
'directory',
2523
2530
]
2524
2531
@display_command
2525
2532
def run(self, revision=None, verbose=False,
2526
2533
recursive=False, from_root=False,
2527
2534
unknown=False, versioned=False, ignored=False,
2528
null=False, kind=None, show_ids=False, path=None, directory=None):
2535
null=False, kind=None, show_ids=False, path=None):
2529
2536
2530
2537
if kind and kind not in ('file', 'directory', 'symlink'):
2531
2538
raise errors.BzrCommandError('invalid kind specified')
2543
2550
raise errors.BzrCommandError('cannot specify both --from-root'
2544
2551
' and PATH')
2545
2552
fs_path = path
2546
tree, branch, relpath = \
2547
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2553
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2554
fs_path)
2548
2555
2549
2556
# Calculate the prefix to use
2550
2557
prefix = None
2565
2572
view_str = views.view_display_str(view_files)
2566
2573
note("Ignoring files outside view. View is %s" % view_str)
2567
2574
2568
self.add_cleanup(tree.lock_read().unlock)
2575
tree.lock_read()
2576
self.add_cleanup(tree.unlock)
2569
2577
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2570
2578
from_dir=relpath, recursive=recursive):
2571
2579
# Apply additional masking
2618
2626
2619
2627
hidden = True
2620
2628
_see_also = ['ls']
2621
takes_options = ['directory']
2622
2629
2623
2630
@display_command
2624
def run(self, directory=u'.'):
2625
for f in WorkingTree.open_containing(directory)[0].unknowns():
2631
def run(self):
2632
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2626
2633
self.outf.write(osutils.quotefn(f) + '\n')
2627
2634
2628
2635
2693
2700
2694
2701
_see_also = ['status', 'ignored', 'patterns']
2695
2702
takes_args = ['name_pattern*']
2696
takes_options = ['directory',
2703
takes_options = [
2697
2704
Option('default-rules',
2698
2705
help='Display the default ignore rules that bzr uses.')
2699
2706
]
2700
2707
2701
def run(self, name_pattern_list=None, default_rules=None,
2702
directory=u'.'):
2708
def run(self, name_pattern_list=None, default_rules=None):
2703
2709
from bzrlib import ignores
2704
2710
if default_rules is not None:
2705
2711
# dump the default rules and exit
2716
2722
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2717
2723
raise errors.BzrCommandError(
2718
2724
"NAME_PATTERN should not be an absolute path")
2719
tree, relpath = WorkingTree.open_containing(directory)
2725
tree, relpath = WorkingTree.open_containing(u'.')
2720
2726
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2721
2727
ignored = globbing.Globster(name_pattern_list)
2722
2728
matches = []
2748
2754
2749
2755
encoding_type = 'replace'
2750
2756
_see_also = ['ignore', 'ls']
2751
takes_options = ['directory']
2752
2757
2753
2758
@display_command
2754
def run(self, directory=u'.'):
2755
tree = WorkingTree.open_containing(directory)[0]
2756
self.add_cleanup(tree.lock_read().unlock)
2759
def run(self):
2760
tree = WorkingTree.open_containing(u'.')[0]
2761
tree.lock_read()
2762
self.add_cleanup(tree.unlock)
2757
2763
for path, file_class, kind, file_id, entry in tree.list_files():
2758
2764
if file_class != 'I':
2759
2765
continue
2770
2776
"""
2771
2777
hidden = True
2772
2778
takes_args = ['revno']
2773
takes_options = ['directory']
2774
2779
2775
2780
@display_command
2776
def run(self, revno, directory=u'.'):
2781
def run(self, revno):
2777
2782
try:
2778
2783
revno = int(revno)
2779
2784
except ValueError:
2780
2785
raise errors.BzrCommandError("not a valid revision-number: %r"
2781
2786
% revno)
2782
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2787
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2783
2788
self.outf.write("%s\n" % revid)
2784
2789
2785
2790
2812
2817
================= =========================
2813
2818
"""
2814
2819
takes_args = ['dest', 'branch_or_subdir?']
2815
takes_options = ['directory',
2820
takes_options = [
2816
2821
Option('format',
2817
2822
help="Type of file to export to.",
2818
2823
type=unicode),
2827
2832
'revision in which it was changed.'),
2828
2833
]
2829
2834
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2830
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2835
root=None, filters=False, per_file_timestamps=False):
2831
2836
from bzrlib.export import export
2832
2837
2833
2838
if branch_or_subdir is None:
2834
tree = WorkingTree.open_containing(directory)[0]
2839
tree = WorkingTree.open_containing(u'.')[0]
2835
2840
b = tree.branch
2836
2841
subdir = None
2837
2842
else:
2856
2861
"""
2857
2862
2858
2863
_see_also = ['ls']
2859
takes_options = ['directory',
2864
takes_options = [
2860
2865
Option('name-from-revision', help='The path name in the old tree.'),
2861
2866
Option('filters', help='Apply content filters to display the '
2862
2867
'convenience form.'),
2867
2872
2868
2873
@display_command
2869
2874
def run(self, filename, revision=None, name_from_revision=False,
2870
filters=False, directory=None):
2875
filters=False):
2871
2876
if revision is not None and len(revision) != 1:
2872
2877
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2873
2878
" one revision specifier")
2874
2879
tree, branch, relpath = \
2875
_open_directory_or_containing_tree_or_branch(filename, directory)
2876
self.add_cleanup(branch.lock_read().unlock)
2880
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2881
branch.lock_read()
2882
self.add_cleanup(branch.unlock)
2877
2883
return self._run(tree, branch, relpath, filename, revision,
2878
2884
name_from_revision, filters)
2879
2885
2882
2888
if tree is None:
2883
2889
tree = b.basis_tree()
2884
2890
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2885
self.add_cleanup(rev_tree.lock_read().unlock)
2891
rev_tree.lock_read()
2892
self.add_cleanup(rev_tree.unlock)
2886
2893
2887
2894
old_file_id = rev_tree.path2id(relpath)
2888
2895
3054
3061
"the master branch until a normal commit "
3055
3062
"is performed."
3056
3063
),
3057
Option('show-diff', short_name='p',
3064
Option('show-diff',
3058
3065
help='When no message is supplied, show the diff along'
3059
3066
' with the status summary in the message editor.'),
3060
3067
]
3361
3368
3362
3369
_see_also = ['info']
3363
3370
takes_args = ['nickname?']
3364
takes_options = ['directory']
3365
def run(self, nickname=None, directory=u'.'):
3366
branch = Branch.open_containing(directory)[0]
3371
def run(self, nickname=None):
3372
branch = Branch.open_containing(u'.')[0]
3367
3373
if nickname is None:
3368
3374
self.printme(branch)
3369
3375
else:
3672
3678
3673
3679
branch1 = Branch.open_containing(branch)[0]
3674
3680
branch2 = Branch.open_containing(other)[0]
3675
self.add_cleanup(branch1.lock_read().unlock)
3676
self.add_cleanup(branch2.lock_read().unlock)
3681
branch1.lock_read()
3682
self.add_cleanup(branch1.unlock)
3683
branch2.lock_read()
3684
self.add_cleanup(branch2.unlock)
3677
3685
last1 = ensure_null(branch1.last_revision())
3678
3686
last2 = ensure_null(branch2.last_revision())
3679
3687
3773
3781
' completely merged into the source, pull from the'
3774
3782
' source rather than merging. When this happens,'
3775
3783
' you do not need to commit the result.'),
3776
custom_help('directory',
3784
Option('directory',
3777
3785
help='Branch to merge into, '
3778
'rather than the one containing the working directory.'),
3786
'rather than the one containing the working directory.',
3787
short_name='d',
3788
type=unicode,
3789
),
3779
3790
Option('preview', help='Instead of merging, show a diff of the'
3780
3791
' merge.'),
3781
3792
Option('interactive', help='Select changes interactively.',
3814
3825
unversioned_filter=tree.is_ignored, view_info=view_info)
3815
3826
pb = ui.ui_factory.nested_progress_bar()
3816
3827
self.add_cleanup(pb.finished)
3817
self.add_cleanup(tree.lock_write().unlock)
3828
tree.lock_write()
3829
self.add_cleanup(tree.unlock)
3818
3830
if location is not None:
3819
3831
try:
3820
3832
mergeable = bundle.read_mergeable_from_url(location,
4076
4088
if merge_type is None:
4077
4089
merge_type = _mod_merge.Merge3Merger
4078
4090
tree, file_list = tree_files(file_list)
4079
self.add_cleanup(tree.lock_write().unlock)
4091
tree.lock_write()
4092
self.add_cleanup(tree.unlock)
4080
4093
parents = tree.get_parent_ids()
4081
4094
if len(parents) != 2:
4082
4095
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4192
4205
def run(self, revision=None, no_backup=False, file_list=None,
4193
4206
forget_merges=None):
4194
4207
tree, file_list = tree_files(file_list)
4195
self.add_cleanup(tree.lock_tree_write().unlock)
4208
tree.lock_tree_write()
4209
self.add_cleanup(tree.unlock)
4196
4210
if forget_merges:
4197
4211
tree.set_parent_ids(tree.get_parent_ids()[:1])
4198
4212
else:
4334
4348
restrict = 'remote'
4335
4349
4336
4350
local_branch = Branch.open_containing(u".")[0]
4337
self.add_cleanup(local_branch.lock_read().unlock)
4351
local_branch.lock_read()
4352
self.add_cleanup(local_branch.unlock)
4338
4353
4339
4354
parent = local_branch.get_parent()
4340
4355
if other_branch is None:
4351
4366
if remote_branch.base == local_branch.base:
4352
4367
remote_branch = local_branch
4353
4368
else:
4354
self.add_cleanup(remote_branch.lock_read().unlock)
4369
remote_branch.lock_read()
4370
self.add_cleanup(remote_branch.unlock)
4355
4371
4356
4372
local_revid_range = _revision_range_to_revid_range(
4357
4373
_get_revision_range(my_revision, local_branch,
4412
4428
message("Branches are up to date.\n")
4413
4429
self.cleanup_now()
4414
4430
if not status_code and parent is None and other_branch is not None:
4415
self.add_cleanup(local_branch.lock_write().unlock)
4431
local_branch.lock_write()
4432
self.add_cleanup(local_branch.unlock)
4416
4433
# handle race conditions - a parent might be set while we run.
4417
4434
if local_branch.get_parent() is None:
4418
4435
local_branch.set_parent(remote_branch.base)
4518
4535
b = Branch.open_containing(branch)[0]
4519
4536
else:
4520
4537
b = Branch.open(branch)
4521
self.add_cleanup(b.lock_read().unlock)
4538
b.lock_read()
4539
self.add_cleanup(b.unlock)
4522
4540
if revision is None:
4523
4541
rev_id = b.last_revision()
4524
4542
else:
4548
4566
Option('long', help='Show commit date in annotations.'),
4549
4567
'revision',
4550
4568
'show-ids',
4551
'directory',
4552
4569
]
4553
4570
encoding_type = 'exact'
4554
4571
4555
4572
@display_command
4556
4573
def run(self, filename, all=False, long=False, revision=None,
4557
show_ids=False, directory=None):
4574
show_ids=False):
4558
4575
from bzrlib.annotate import annotate_file, annotate_file_tree
4559
4576
wt, branch, relpath = \
4560
_open_directory_or_containing_tree_or_branch(filename, directory)
4577
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4561
4578
if wt is not None:
4562
self.add_cleanup(wt.lock_read().unlock)
4579
wt.lock_read()
4580
self.add_cleanup(wt.unlock)
4563
4581
else:
4564
self.add_cleanup(branch.lock_read().unlock)
4582
branch.lock_read()
4583
self.add_cleanup(branch.unlock)
4565
4584
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4566
self.add_cleanup(tree.lock_read().unlock)
4585
tree.lock_read()
4586
self.add_cleanup(tree.unlock)
4567
4587
if wt is not None:
4568
4588
file_id = wt.path2id(relpath)
4569
4589
else:
4587
4607
4588
4608
hidden = True # is this right ?
4589
4609
takes_args = ['revision_id*']
4590
takes_options = ['directory', 'revision']
4610
takes_options = ['revision']
4591
4611
4592
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4612
def run(self, revision_id_list=None, revision=None):
4593
4613
if revision_id_list is not None and revision is not None:
4594
4614
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4595
4615
if revision_id_list is None and revision is None:
4596
4616
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4597
b = WorkingTree.open_containing(directory)[0].branch
4598
self.add_cleanup(b.lock_write().unlock)
4617
b = WorkingTree.open_containing(u'.')[0].branch
4618
b.lock_write()
4619
self.add_cleanup(b.unlock)
4599
4620
return self._run(b, revision_id_list, revision)
4600
4621
4601
4622
def _run(self, b, revision_id_list, revision):
4648
4669
4649
4670
class cmd_bind(Command):
4650
4671
__doc__ = """Convert the current branch into a checkout of the supplied branch.
4651
If no branch is supplied, rebind to the last bound location.
4652
4672
4653
4673
Once converted into a checkout, commits must succeed on the master branch
4654
4674
before they will be applied to the local branch.
4660
4680
4661
4681
_see_also = ['checkouts', 'unbind']
4662
4682
takes_args = ['location?']
4663
takes_options = ['directory']
4683
takes_options = []
4664
4684
4665
def run(self, location=None, directory=u'.'):
4666
b, relpath = Branch.open_containing(directory)
4685
def run(self, location=None):
4686
b, relpath = Branch.open_containing(u'.')
4667
4687
if location is None:
4668
4688
try:
4669
4689
location = b.get_old_bound_location()
4696
4716
4697
4717
_see_also = ['checkouts', 'bind']
4698
4718
takes_args = []
4699
takes_options = ['directory']
4719
takes_options = []
4700
4720
4701
def run(self, directory=u'.'):
4702
b, relpath = Branch.open_containing(directory)
4721
def run(self):
4722
b, relpath = Branch.open_containing(u'.')
4703
4723
if not b.unbind():
4704
4724
raise errors.BzrCommandError('Local branch is not bound')
4705
4725
4751
4771
b = control.open_branch()
4752
4772
4753
4773
if tree is not None:
4754
self.add_cleanup(tree.lock_write().unlock)
4774
tree.lock_write()
4775
self.add_cleanup(tree.unlock)
4755
4776
else:
4756
self.add_cleanup(b.lock_write().unlock)
4777
b.lock_write()
4778
self.add_cleanup(b.unlock)
4757
4779
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4758
4780
4759
4781
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4867
4889
'result in a dynamically allocated port. The default port '
4868
4890
'depends on the protocol.',
4869
4891
type=str),
4870
custom_help('directory',
4871
help='Serve contents of this directory.'),
4892
Option('directory',
4893
help='Serve contents of this directory.',
4894
type=unicode),
4872
4895
Option('allow-writes',
4873
4896
help='By default the server is a readonly server. Supplying '
4874
4897
'--allow-writes enables write access to the contents of '
5303
5326
Option('delete',
5304
5327
help='Delete this tag rather than placing it.',
5305
5328
),
5306
custom_help('directory',
5307
help='Branch in which to place the tag.'),
5329
Option('directory',
5330
help='Branch in which to place the tag.',
5331
short_name='d',
5332
type=unicode,
5333
),
5308
5334
Option('force',
5309
5335
help='Replace existing tags.',
5310
5336
),
5318
5344
revision=None,
5319
5345
):
5320
5346
branch, relpath = Branch.open_containing(directory)
5321
self.add_cleanup(branch.lock_write().unlock)
5347
branch.lock_write()
5348
self.add_cleanup(branch.unlock)
5322
5349
if delete:
5323
5350
if tag_name is None:
5324
5351
raise errors.BzrCommandError("No tag specified to delete.")
5352
5379
5353
5380
_see_also = ['tag']
5354
5381
takes_options = [
5355
custom_help('directory',
5356
help='Branch whose tags should be displayed.'),
5382
Option('directory',
5383
help='Branch whose tags should be displayed.',
5384
short_name='d',
5385
type=unicode,
5386
),
5357
5387
RegistryOption.from_kwargs('sort',
5358
5388
'Sort tags by different criteria.', title='Sorting',
5359
5389
alpha='Sort tags lexicographically (default).',
5376
5406
if not tags:
5377
5407
return
5378
5408
5379
self.add_cleanup(branch.lock_read().unlock)
5409
branch.lock_read()
5410
self.add_cleanup(branch.unlock)
5380
5411
if revision:
5381
5412
graph = branch.repository.get_graph()
5382
5413
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5860
5891
5861
5892
def run_for_list(self):
5862
5893
tree = WorkingTree.open_containing('.')[0]
5863
self.add_cleanup(tree.lock_read().unlock)
5894
tree.lock_read()
5895
self.add_cleanup(tree.unlock)
5864
5896
manager = tree.get_shelf_manager()
5865
5897
shelves = manager.active_shelves()
5866
5898
if len(shelves) == 0:
5921
5953
5922
5954
To check what clean-tree will do, use --dry-run.
5923
5955
"""
5924
takes_options = ['directory',
5925
Option('ignored', help='Delete all ignored files.'),
5956
takes_options = [Option('ignored', help='Delete all ignored files.'),
5926
5957
Option('detritus', help='Delete conflict files, merge'
5927
5958
' backups, and failed selftest dirs.'),
5928
5959
Option('unknown',
5931
5962
' deleting them.'),
5932
5963
Option('force', help='Do not prompt before deleting.')]
5933
5964
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5934
force=False, directory=u'.'):
5965
force=False):
5935
5966
from bzrlib.clean_tree import clean_tree
5936
5967
if not (unknown or ignored or detritus):
5937
5968
unknown = True
5938
5969
if dry_run:
5939
5970
force = True
5940
clean_tree(directory, unknown=unknown, ignored=ignored,
5941
detritus=detritus, dry_run=dry_run, no_prompt=force)
5971
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5972
dry_run=dry_run, no_prompt=force)
5942
5973
5943
5974
5944
5975
class cmd_reference(Command):
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0