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 5200.3.2
- compare with another revision
- download diff
- download tarball
- view history from revision 5200.3.2
- Committer: Robert Collins
- Date: 2010-05-06 11:08:10 UTC
- mto: This revision was merged to the branch mainline in revision 5223.
- Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.
- files added:
- contrib/bash/bzr
- files removed:
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- files modified:
- INSTALL
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:
491
483
takes_options = [
492
484
Option('force',
493
485
help='Remove the working tree even if it has '
494
'uncommitted or shelved changes.'),
486
'uncommitted changes.'),
495
487
]
496
488
497
489
def run(self, location_list, force=False):
511
503
if not force:
512
504
if (working.has_changes()):
513
505
raise errors.UncommittedChanges(working)
514
if working.get_shelf_manager().last_shelf() is not None:
515
raise errors.ShelvedChanges(working)
516
506
517
507
if working.user_url != working.branch.user_url:
518
508
raise errors.BzrCommandError("You cannot remove the working tree"
538
528
if tree:
539
529
try:
540
530
wt = WorkingTree.open_containing(location)[0]
541
self.add_cleanup(wt.lock_read().unlock)
531
wt.lock_read()
542
532
except (errors.NoWorkingTree, errors.NotLocalUrl):
543
533
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
544
535
revid = wt.last_revision()
545
536
try:
546
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
549
540
revno = ".".join(str(n) for n in revno_t)
550
541
else:
551
542
b = Branch.open_containing(location)[0]
552
self.add_cleanup(b.lock_read().unlock)
543
b.lock_read()
544
self.add_cleanup(b.unlock)
553
545
revno = b.revno()
554
546
self.cleanup_now()
555
547
self.outf.write(str(revno) + '\n')
562
554
takes_args = ['revision_info*']
563
555
takes_options = [
564
556
'revision',
565
custom_help('directory',
557
Option('directory',
566
558
help='Branch to examine, '
567
'rather than the one containing the working directory.'),
559
'rather than the one containing the working directory.',
560
short_name='d',
561
type=unicode,
562
),
568
563
Option('tree', help='Show revno of working tree'),
569
564
]
570
565
575
570
try:
576
571
wt = WorkingTree.open_containing(directory)[0]
577
572
b = wt.branch
578
self.add_cleanup(wt.lock_read().unlock)
573
wt.lock_read()
574
self.add_cleanup(wt.unlock)
579
575
except (errors.NoWorkingTree, errors.NotLocalUrl):
580
576
wt = None
581
577
b = Branch.open_containing(directory)[0]
582
self.add_cleanup(b.lock_read().unlock)
578
b.lock_read()
579
self.add_cleanup(b.unlock)
583
580
revision_ids = []
584
581
if revision is not None:
585
582
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
684
681
should_print=(not is_quiet()))
685
682
686
683
if base_tree:
687
self.add_cleanup(base_tree.lock_read().unlock)
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
688
686
tree, file_list = tree_files_for_add(file_list)
689
687
added, ignored = tree.smart_add(file_list, not
690
688
no_recurse, action=action, save=not dry_run)
762
760
763
761
revision = _get_one_revision('inventory', revision)
764
762
work_tree, file_list = tree_files(file_list)
765
self.add_cleanup(work_tree.lock_read().unlock)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
766
765
if revision is not None:
767
766
tree = revision.as_tree(work_tree.branch)
768
767
769
768
extra_trees = [work_tree]
770
self.add_cleanup(tree.lock_read().unlock)
769
tree.lock_read()
770
self.add_cleanup(tree.unlock)
771
771
else:
772
772
tree = work_tree
773
773
extra_trees = []
833
833
if len(names_list) < 2:
834
834
raise errors.BzrCommandError("missing file argument")
835
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
self.add_cleanup(tree.lock_tree_write().unlock)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
837
838
self._run(tree, names_list, rel_names, after)
838
839
839
840
def run_auto(self, names_list, after, dry_run):
844
845
raise errors.BzrCommandError('--after cannot be specified with'
845
846
' --auto.')
846
847
work_tree, file_list = tree_files(names_list, default_branch='.')
847
self.add_cleanup(work_tree.lock_tree_write().unlock)
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
848
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
849
851
850
852
def _run(self, tree, names_list, rel_names, after):
958
960
takes_options = ['remember', 'overwrite', 'revision',
959
961
custom_help('verbose',
960
962
help='Show logs of pulled revisions.'),
961
custom_help('directory',
963
Option('directory',
962
964
help='Branch to pull into, '
963
'rather than the one containing the working directory.'),
965
'rather than the one containing the working directory.',
966
short_name='d',
967
type=unicode,
968
),
964
969
Option('local',
965
970
help="Perform a local pull in a bound "
966
971
"branch. Local pulls are not applied to "
981
986
try:
982
987
tree_to = WorkingTree.open_containing(directory)[0]
983
988
branch_to = tree_to.branch
984
self.add_cleanup(tree_to.lock_write().unlock)
989
tree_to.lock_write()
990
self.add_cleanup(tree_to.unlock)
985
991
except errors.NoWorkingTree:
986
992
tree_to = None
987
993
branch_to = Branch.open_containing(directory)[0]
988
self.add_cleanup(branch_to.lock_write().unlock)
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
989
996
990
997
if local and not branch_to.get_bound_location():
991
998
raise errors.LocalRequiresBoundBranch()
1022
1029
else:
1023
1030
branch_from = Branch.open(location,
1024
1031
possible_transports=possible_transports)
1025
self.add_cleanup(branch_from.lock_read().unlock)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
1026
1034
1027
1035
if branch_to.get_parent() is None or remember:
1028
1036
branch_to.set_parent(branch_from.base)
1080
1088
Option('create-prefix',
1081
1089
help='Create the path leading up to the branch '
1082
1090
'if it does not already exist.'),
1083
custom_help('directory',
1091
Option('directory',
1084
1092
help='Branch to push from, '
1085
'rather than the one containing the working directory.'),
1093
'rather than the one containing the working directory.',
1094
short_name='d',
1095
type=unicode,
1096
),
1086
1097
Option('use-existing-dir',
1087
1098
help='By default push will fail if the target'
1088
1099
' directory exists, but does not already'
1208
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1209
1220
from_location)
1210
1221
revision = _get_one_revision('branch', revision)
1211
self.add_cleanup(br_from.lock_read().unlock)
1222
br_from.lock_read()
1223
self.add_cleanup(br_from.unlock)
1212
1224
if revision is not None:
1213
1225
revision_id = revision.as_revision_id(br_from)
1214
1226
else:
1354
1366
@display_command
1355
1367
def run(self, dir=u'.'):
1356
1368
tree = WorkingTree.open_containing(dir)[0]
1357
self.add_cleanup(tree.lock_read().unlock)
1369
tree.lock_read()
1370
self.add_cleanup(tree.unlock)
1358
1371
new_inv = tree.inventory
1359
1372
old_tree = tree.basis_tree()
1360
self.add_cleanup(old_tree.lock_read().unlock)
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1361
1375
old_inv = old_tree.inventory
1362
1376
renames = []
1363
1377
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1401
1415
master = branch.get_master_branch(
1402
1416
possible_transports=possible_transports)
1403
1417
if master is not None:
1418
tree.lock_write()
1404
1419
branch_location = master.base
1405
tree.lock_write()
1406
1420
else:
1421
tree.lock_tree_write()
1407
1422
branch_location = tree.branch.base
1408
tree.lock_tree_write()
1409
1423
self.add_cleanup(tree.unlock)
1410
1424
# get rid of the final '/' and be ready for display
1411
1425
branch_location = urlutils.unescape_for_display(
1531
1545
if file_list is not None:
1532
1546
file_list = [f for f in file_list]
1533
1547
1534
self.add_cleanup(tree.lock_write().unlock)
1548
tree.lock_write()
1549
self.add_cleanup(tree.unlock)
1535
1550
# Heuristics should probably all move into tree.remove_smart or
1536
1551
# some such?
1537
1552
if new:
1988
2003
# level of effort but possibly much less IO. (Or possibly not,
1989
2004
# if the directories are very large...)
1990
2005
_see_also = ['status', 'ls']
1991
takes_options = ['directory', 'show-ids']
2006
takes_options = ['show-ids']
1992
2007
1993
2008
@display_command
1994
def run(self, show_ids=False, directory=u'.'):
1995
tree = WorkingTree.open_containing(directory)[0]
1996
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)
1997
2013
old = tree.basis_tree()
1998
self.add_cleanup(old.lock_read().unlock)
2014
old.lock_read()
2015
self.add_cleanup(old.unlock)
1999
2016
for path, ie in old.inventory.iter_entries():
2000
2017
if not tree.has_id(ie.file_id):
2001
2018
self.outf.write(path)
2011
2028
2012
2029
hidden = True
2013
2030
_see_also = ['status', 'ls']
2014
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
]
2015
2036
2016
2037
@display_command
2017
def run(self, null=False, directory=u'.'):
2018
tree = WorkingTree.open_containing(directory)[0]
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2019
2040
td = tree.changes_from(tree.basis_tree())
2020
2041
for path, id, kind, text_modified, meta_modified in td.modified:
2021
2042
if null:
2030
2051
2031
2052
hidden = True
2032
2053
_see_also = ['status', 'ls']
2033
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
]
2034
2059
2035
2060
@display_command
2036
def run(self, null=False, directory=u'.'):
2037
wt = WorkingTree.open_containing(directory)[0]
2038
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)
2039
2065
basis = wt.basis_tree()
2040
self.add_cleanup(basis.lock_read().unlock)
2066
basis.lock_read()
2067
self.add_cleanup(basis.unlock)
2041
2068
basis_inv = basis.inventory
2042
2069
inv = wt.inventory
2043
2070
for file_id in inv:
2046
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2047
2074
continue
2048
2075
path = inv.id2path(file_id)
2049
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2076
if not os.access(osutils.abspath(path), os.F_OK):
2050
2077
continue
2051
2078
if null:
2052
2079
self.outf.write(path + '\0')
2252
2279
help='Show just the specified revision.'
2253
2280
' See also "help revisionspec".'),
2254
2281
'log-format',
2255
RegistryOption('authors',
2256
'What names to list as authors - first, all or committer.',
2257
title='Authors',
2258
lazy_registry=('bzrlib.log', 'author_list_registry'),
2259
),
2260
2282
Option('levels',
2261
2283
short_name='n',
2262
2284
help='Number of levels to display - 0 for all, 1 for flat.',
2297
2319
limit=None,
2298
2320
show_diff=False,
2299
2321
include_merges=False,
2300
authors=None,
2301
2322
exclude_common_ancestry=False,
2302
2323
):
2303
2324
from bzrlib.log import (
2331
2352
if file_list:
2332
2353
# find the file ids to log and check for directory filtering
2333
2354
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2334
revision, file_list, self.add_cleanup)
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2335
2357
for relpath, file_id, kind in file_info_list:
2336
2358
if file_id is None:
2337
2359
raise errors.BzrCommandError(
2355
2377
location = '.'
2356
2378
dir, relpath = bzrdir.BzrDir.open_containing(location)
2357
2379
b = dir.open_branch()
2358
self.add_cleanup(b.lock_read().unlock)
2380
b.lock_read()
2381
self.add_cleanup(b.unlock)
2359
2382
rev1, rev2 = _get_revision_range(revision, b, self.name())
2360
2383
2361
2384
# Decide on the type of delta & diff filtering to use
2381
2404
show_timezone=timezone,
2382
2405
delta_format=get_verbosity_level(),
2383
2406
levels=levels,
2384
show_advice=levels is None,
2385
author_list_handler=authors)
2407
show_advice=levels is None)
2386
2408
2387
2409
# Choose the algorithm for doing the logging. It's annoying
2388
2410
# having multiple code paths like this but necessary until
2486
2508
tree, relpath = WorkingTree.open_containing(filename)
2487
2509
file_id = tree.path2id(relpath)
2488
2510
b = tree.branch
2489
self.add_cleanup(b.lock_read().unlock)
2511
b.lock_read()
2512
self.add_cleanup(b.unlock)
2490
2513
touching_revs = log.find_touching_revisions(b, file_id)
2491
2514
for revno, revision_id, what in touching_revs:
2492
2515
self.outf.write("%6d %s\n" % (revno, what))
2505
2528
help='Recurse into subdirectories.'),
2506
2529
Option('from-root',
2507
2530
help='Print paths relative to the root of the branch.'),
2508
Option('unknown', short_name='u',
2509
help='Print unknown files.'),
2531
Option('unknown', help='Print unknown files.'),
2510
2532
Option('versioned', help='Print versioned files.',
2511
2533
short_name='V'),
2512
Option('ignored', short_name='i',
2513
help='Print ignored files.'),
2514
Option('kind', short_name='k',
2534
Option('ignored', help='Print ignored files.'),
2535
Option('null',
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2538
Option('kind',
2515
2539
help='List entries of a particular kind: file, directory, symlink.',
2516
2540
type=unicode),
2517
'null',
2518
2541
'show-ids',
2519
'directory',
2520
2542
]
2521
2543
@display_command
2522
2544
def run(self, revision=None, verbose=False,
2523
2545
recursive=False, from_root=False,
2524
2546
unknown=False, versioned=False, ignored=False,
2525
null=False, kind=None, show_ids=False, path=None, directory=None):
2547
null=False, kind=None, show_ids=False, path=None):
2526
2548
2527
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2528
2550
raise errors.BzrCommandError('invalid kind specified')
2540
2562
raise errors.BzrCommandError('cannot specify both --from-root'
2541
2563
' and PATH')
2542
2564
fs_path = path
2543
tree, branch, relpath = \
2544
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2565
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2566
fs_path)
2545
2567
2546
2568
# Calculate the prefix to use
2547
2569
prefix = None
2562
2584
view_str = views.view_display_str(view_files)
2563
2585
note("Ignoring files outside view. View is %s" % view_str)
2564
2586
2565
self.add_cleanup(tree.lock_read().unlock)
2587
tree.lock_read()
2588
self.add_cleanup(tree.unlock)
2566
2589
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2567
2590
from_dir=relpath, recursive=recursive):
2568
2591
# Apply additional masking
2615
2638
2616
2639
hidden = True
2617
2640
_see_also = ['ls']
2618
takes_options = ['directory']
2619
2641
2620
2642
@display_command
2621
def run(self, directory=u'.'):
2622
for f in WorkingTree.open_containing(directory)[0].unknowns():
2643
def run(self):
2644
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2623
2645
self.outf.write(osutils.quotefn(f) + '\n')
2624
2646
2625
2647
2690
2712
2691
2713
_see_also = ['status', 'ignored', 'patterns']
2692
2714
takes_args = ['name_pattern*']
2693
takes_options = ['directory',
2715
takes_options = [
2694
2716
Option('default-rules',
2695
2717
help='Display the default ignore rules that bzr uses.')
2696
2718
]
2697
2719
2698
def run(self, name_pattern_list=None, default_rules=None,
2699
directory=u'.'):
2720
def run(self, name_pattern_list=None, default_rules=None):
2700
2721
from bzrlib import ignores
2701
2722
if default_rules is not None:
2702
2723
# dump the default rules and exit
2713
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2714
2735
raise errors.BzrCommandError(
2715
2736
"NAME_PATTERN should not be an absolute path")
2716
tree, relpath = WorkingTree.open_containing(directory)
2737
tree, relpath = WorkingTree.open_containing(u'.')
2717
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2718
2739
ignored = globbing.Globster(name_pattern_list)
2719
2740
matches = []
2745
2766
2746
2767
encoding_type = 'replace'
2747
2768
_see_also = ['ignore', 'ls']
2748
takes_options = ['directory']
2749
2769
2750
2770
@display_command
2751
def run(self, directory=u'.'):
2752
tree = WorkingTree.open_containing(directory)[0]
2753
self.add_cleanup(tree.lock_read().unlock)
2771
def run(self):
2772
tree = WorkingTree.open_containing(u'.')[0]
2773
tree.lock_read()
2774
self.add_cleanup(tree.unlock)
2754
2775
for path, file_class, kind, file_id, entry in tree.list_files():
2755
2776
if file_class != 'I':
2756
2777
continue
2767
2788
"""
2768
2789
hidden = True
2769
2790
takes_args = ['revno']
2770
takes_options = ['directory']
2771
2791
2772
2792
@display_command
2773
def run(self, revno, directory=u'.'):
2793
def run(self, revno):
2774
2794
try:
2775
2795
revno = int(revno)
2776
2796
except ValueError:
2777
2797
raise errors.BzrCommandError("not a valid revision-number: %r"
2778
2798
% revno)
2779
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2780
2800
self.outf.write("%s\n" % revid)
2781
2801
2782
2802
2809
2829
================= =========================
2810
2830
"""
2811
2831
takes_args = ['dest', 'branch_or_subdir?']
2812
takes_options = ['directory',
2832
takes_options = [
2813
2833
Option('format',
2814
2834
help="Type of file to export to.",
2815
2835
type=unicode),
2824
2844
'revision in which it was changed.'),
2825
2845
]
2826
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2827
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2847
root=None, filters=False, per_file_timestamps=False):
2828
2848
from bzrlib.export import export
2829
2849
2830
2850
if branch_or_subdir is None:
2831
tree = WorkingTree.open_containing(directory)[0]
2851
tree = WorkingTree.open_containing(u'.')[0]
2832
2852
b = tree.branch
2833
2853
subdir = None
2834
2854
else:
2853
2873
"""
2854
2874
2855
2875
_see_also = ['ls']
2856
takes_options = ['directory',
2876
takes_options = [
2857
2877
Option('name-from-revision', help='The path name in the old tree.'),
2858
2878
Option('filters', help='Apply content filters to display the '
2859
2879
'convenience form.'),
2864
2884
2865
2885
@display_command
2866
2886
def run(self, filename, revision=None, name_from_revision=False,
2867
filters=False, directory=None):
2887
filters=False):
2868
2888
if revision is not None and len(revision) != 1:
2869
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2870
2890
" one revision specifier")
2871
2891
tree, branch, relpath = \
2872
_open_directory_or_containing_tree_or_branch(filename, directory)
2873
self.add_cleanup(branch.lock_read().unlock)
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2893
branch.lock_read()
2894
self.add_cleanup(branch.unlock)
2874
2895
return self._run(tree, branch, relpath, filename, revision,
2875
2896
name_from_revision, filters)
2876
2897
2879
2900
if tree is None:
2880
2901
tree = b.basis_tree()
2881
2902
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2882
self.add_cleanup(rev_tree.lock_read().unlock)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2883
2905
2884
2906
old_file_id = rev_tree.path2id(relpath)
2885
2907
3147
3169
def get_message(commit_obj):
3148
3170
"""Callback to get commit message"""
3149
3171
if file:
3150
f = codecs.open(file, 'rt', osutils.get_user_encoding())
3151
try:
3152
my_message = f.read()
3153
finally:
3154
f.close()
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3155
3174
elif message is not None:
3156
3175
my_message = message
3157
3176
else:
3311
3330
3312
3331
bzr whoami "Frank Chu <fchu@example.com>"
3313
3332
"""
3314
takes_options = [ 'directory',
3315
Option('email',
3333
takes_options = [ Option('email',
3316
3334
help='Display email address only.'),
3317
3335
Option('branch',
3318
3336
help='Set identity for the current branch instead of '
3322
3340
encoding_type = 'replace'
3323
3341
3324
3342
@display_command
3325
def run(self, email=False, branch=False, name=None, directory=None):
3343
def run(self, email=False, branch=False, name=None):
3326
3344
if name is None:
3327
if directory is None:
3328
# use branch if we're inside one; otherwise global config
3329
try:
3330
c = Branch.open_containing(u'.')[0].get_config()
3331
except errors.NotBranchError:
3332
c = config.GlobalConfig()
3333
else:
3334
c = Branch.open(directory).get_config()
3345
# use branch if we're inside one; otherwise global config
3346
try:
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3335
3350
if email:
3336
3351
self.outf.write(c.user_email() + '\n')
3337
3352
else:
3347
3362
3348
3363
# use global config unless --branch given
3349
3364
if branch:
3350
if directory is None:
3351
c = Branch.open_containing(u'.')[0].get_config()
3352
else:
3353
c = Branch.open(directory).get_config()
3365
c = Branch.open_containing('.')[0].get_config()
3354
3366
else:
3355
3367
c = config.GlobalConfig()
3356
3368
c.set_user_option('email', name)
3368
3380
3369
3381
_see_also = ['info']
3370
3382
takes_args = ['nickname?']
3371
takes_options = ['directory']
3372
def run(self, nickname=None, directory=u'.'):
3373
branch = Branch.open_containing(directory)[0]
3383
def run(self, nickname=None):
3384
branch = Branch.open_containing(u'.')[0]
3374
3385
if nickname is None:
3375
3386
self.printme(branch)
3376
3387
else:
3601
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3602
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3603
3614
# stdout, which would corrupt the subunit stream.
3604
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3605
# following code can be deleted when it's sufficiently deployed
3606
# -- vila/mgz 20100514
3607
if (sys.platform == "win32"
3608
and getattr(sys.stdout, 'fileno', None) is not None):
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3609
3616
import msvcrt
3610
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3611
3618
if parallel:
3683
3690
3684
3691
branch1 = Branch.open_containing(branch)[0]
3685
3692
branch2 = Branch.open_containing(other)[0]
3686
self.add_cleanup(branch1.lock_read().unlock)
3687
self.add_cleanup(branch2.lock_read().unlock)
3693
branch1.lock_read()
3694
self.add_cleanup(branch1.unlock)
3695
branch2.lock_read()
3696
self.add_cleanup(branch2.unlock)
3688
3697
last1 = ensure_null(branch1.last_revision())
3689
3698
last2 = ensure_null(branch2.last_revision())
3690
3699
3784
3793
' completely merged into the source, pull from the'
3785
3794
' source rather than merging. When this happens,'
3786
3795
' you do not need to commit the result.'),
3787
custom_help('directory',
3796
Option('directory',
3788
3797
help='Branch to merge into, '
3789
'rather than the one containing the working directory.'),
3798
'rather than the one containing the working directory.',
3799
short_name='d',
3800
type=unicode,
3801
),
3790
3802
Option('preview', help='Instead of merging, show a diff of the'
3791
3803
' merge.'),
3792
3804
Option('interactive', help='Select changes interactively.',
3825
3837
unversioned_filter=tree.is_ignored, view_info=view_info)
3826
3838
pb = ui.ui_factory.nested_progress_bar()
3827
3839
self.add_cleanup(pb.finished)
3828
self.add_cleanup(tree.lock_write().unlock)
3840
tree.lock_write()
3841
self.add_cleanup(tree.unlock)
3829
3842
if location is not None:
3830
3843
try:
3831
3844
mergeable = bundle.read_mergeable_from_url(location,
4087
4100
if merge_type is None:
4088
4101
merge_type = _mod_merge.Merge3Merger
4089
4102
tree, file_list = tree_files(file_list)
4090
self.add_cleanup(tree.lock_write().unlock)
4103
tree.lock_write()
4104
self.add_cleanup(tree.unlock)
4091
4105
parents = tree.get_parent_ids()
4092
4106
if len(parents) != 2:
4093
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4203
4217
def run(self, revision=None, no_backup=False, file_list=None,
4204
4218
forget_merges=None):
4205
4219
tree, file_list = tree_files(file_list)
4206
self.add_cleanup(tree.lock_tree_write().unlock)
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4207
4222
if forget_merges:
4208
4223
tree.set_parent_ids(tree.get_parent_ids()[:1])
4209
4224
else:
4298
4313
_see_also = ['merge', 'pull']
4299
4314
takes_args = ['other_branch?']
4300
4315
takes_options = [
4301
'directory',
4302
4316
Option('reverse', 'Reverse the order of revisions.'),
4303
4317
Option('mine-only',
4304
4318
'Display changes in the local branch only.'),
4326
4340
theirs_only=False,
4327
4341
log_format=None, long=False, short=False, line=False,
4328
4342
show_ids=False, verbose=False, this=False, other=False,
4329
include_merges=False, revision=None, my_revision=None,
4330
directory=u'.'):
4343
include_merges=False, revision=None, my_revision=None):
4331
4344
from bzrlib.missing import find_unmerged, iter_log_revisions
4332
4345
def message(s):
4333
4346
if not is_quiet():
4346
4359
elif theirs_only:
4347
4360
restrict = 'remote'
4348
4361
4349
local_branch = Branch.open_containing(directory)[0]
4350
self.add_cleanup(local_branch.lock_read().unlock)
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4351
4365
4352
4366
parent = local_branch.get_parent()
4353
4367
if other_branch is None:
4364
4378
if remote_branch.base == local_branch.base:
4365
4379
remote_branch = local_branch
4366
4380
else:
4367
self.add_cleanup(remote_branch.lock_read().unlock)
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4368
4383
4369
4384
local_revid_range = _revision_range_to_revid_range(
4370
4385
_get_revision_range(my_revision, local_branch,
4425
4440
message("Branches are up to date.\n")
4426
4441
self.cleanup_now()
4427
4442
if not status_code and parent is None and other_branch is not None:
4428
self.add_cleanup(local_branch.lock_write().unlock)
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4429
4445
# handle race conditions - a parent might be set while we run.
4430
4446
if local_branch.get_parent() is None:
4431
4447
local_branch.set_parent(remote_branch.base)
4531
4547
b = Branch.open_containing(branch)[0]
4532
4548
else:
4533
4549
b = Branch.open(branch)
4534
self.add_cleanup(b.lock_read().unlock)
4550
b.lock_read()
4551
self.add_cleanup(b.unlock)
4535
4552
if revision is None:
4536
4553
rev_id = b.last_revision()
4537
4554
else:
4561
4578
Option('long', help='Show commit date in annotations.'),
4562
4579
'revision',
4563
4580
'show-ids',
4564
'directory',
4565
4581
]
4566
4582
encoding_type = 'exact'
4567
4583
4568
4584
@display_command
4569
4585
def run(self, filename, all=False, long=False, revision=None,
4570
show_ids=False, directory=None):
4586
show_ids=False):
4571
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4572
4588
wt, branch, relpath = \
4573
_open_directory_or_containing_tree_or_branch(filename, directory)
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4574
4590
if wt is not None:
4575
self.add_cleanup(wt.lock_read().unlock)
4591
wt.lock_read()
4592
self.add_cleanup(wt.unlock)
4576
4593
else:
4577
self.add_cleanup(branch.lock_read().unlock)
4594
branch.lock_read()
4595
self.add_cleanup(branch.unlock)
4578
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4579
self.add_cleanup(tree.lock_read().unlock)
4597
tree.lock_read()
4598
self.add_cleanup(tree.unlock)
4580
4599
if wt is not None:
4581
4600
file_id = wt.path2id(relpath)
4582
4601
else:
4600
4619
4601
4620
hidden = True # is this right ?
4602
4621
takes_args = ['revision_id*']
4603
takes_options = ['directory', 'revision']
4622
takes_options = ['revision']
4604
4623
4605
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4624
def run(self, revision_id_list=None, revision=None):
4606
4625
if revision_id_list is not None and revision is not None:
4607
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4608
4627
if revision_id_list is None and revision is None:
4609
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4610
b = WorkingTree.open_containing(directory)[0].branch
4611
self.add_cleanup(b.lock_write().unlock)
4629
b = WorkingTree.open_containing(u'.')[0].branch
4630
b.lock_write()
4631
self.add_cleanup(b.unlock)
4612
4632
return self._run(b, revision_id_list, revision)
4613
4633
4614
4634
def _run(self, b, revision_id_list, revision):
4673
4693
4674
4694
_see_also = ['checkouts', 'unbind']
4675
4695
takes_args = ['location?']
4676
takes_options = ['directory']
4696
takes_options = []
4677
4697
4678
def run(self, location=None, directory=u'.'):
4679
b, relpath = Branch.open_containing(directory)
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4680
4700
if location is None:
4681
4701
try:
4682
4702
location = b.get_old_bound_location()
4709
4729
4710
4730
_see_also = ['checkouts', 'bind']
4711
4731
takes_args = []
4712
takes_options = ['directory']
4732
takes_options = []
4713
4733
4714
def run(self, directory=u'.'):
4715
b, relpath = Branch.open_containing(directory)
4734
def run(self):
4735
b, relpath = Branch.open_containing(u'.')
4716
4736
if not b.unbind():
4717
4737
raise errors.BzrCommandError('Local branch is not bound')
4718
4738
4764
4784
b = control.open_branch()
4765
4785
4766
4786
if tree is not None:
4767
self.add_cleanup(tree.lock_write().unlock)
4787
tree.lock_write()
4788
self.add_cleanup(tree.unlock)
4768
4789
else:
4769
self.add_cleanup(b.lock_write().unlock)
4790
b.lock_write()
4791
self.add_cleanup(b.unlock)
4770
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4771
4793
4772
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4880
4902
'result in a dynamically allocated port. The default port '
4881
4903
'depends on the protocol.',
4882
4904
type=str),
4883
custom_help('directory',
4884
help='Serve contents of this directory.'),
4905
Option('directory',
4906
help='Serve contents of this directory.',
4907
type=unicode),
4885
4908
Option('allow-writes',
4886
4909
help='By default the server is a readonly server. Supplying '
4887
4910
'--allow-writes enables write access to the contents of '
5023
5046
_see_also = ['send']
5024
5047
5025
5048
takes_options = [
5026
'directory',
5027
5049
RegistryOption.from_kwargs('patch-type',
5028
5050
'The type of patch to include in the directive.',
5029
5051
title='Patch type',
5042
5064
encoding_type = 'exact'
5043
5065
5044
5066
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5045
sign=False, revision=None, mail_to=None, message=None,
5046
directory=u'.'):
5067
sign=False, revision=None, mail_to=None, message=None):
5047
5068
from bzrlib.revision import ensure_null, NULL_REVISION
5048
5069
include_patch, include_bundle = {
5049
5070
'plain': (False, False),
5050
5071
'diff': (True, False),
5051
5072
'bundle': (True, True),
5052
5073
}[patch_type]
5053
branch = Branch.open(directory)
5074
branch = Branch.open('.')
5054
5075
stored_submit_branch = branch.get_submit_branch()
5055
5076
if submit_branch is None:
5056
5077
submit_branch = stored_submit_branch
5141
5162
given, in which case it is sent to a file.
5142
5163
5143
5164
Mail is sent using your preferred mail program. This should be transparent
5144
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5165
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5145
5166
If the preferred client can't be found (or used), your editor will be used.
5146
5167
5147
5168
To use a specific mail program, set the mail_client configuration option.
5318
5339
Option('delete',
5319
5340
help='Delete this tag rather than placing it.',
5320
5341
),
5321
custom_help('directory',
5322
help='Branch in which to place the tag.'),
5342
Option('directory',
5343
help='Branch in which to place the tag.',
5344
short_name='d',
5345
type=unicode,
5346
),
5323
5347
Option('force',
5324
5348
help='Replace existing tags.',
5325
5349
),
5333
5357
revision=None,
5334
5358
):
5335
5359
branch, relpath = Branch.open_containing(directory)
5336
self.add_cleanup(branch.lock_write().unlock)
5360
branch.lock_write()
5361
self.add_cleanup(branch.unlock)
5337
5362
if delete:
5338
5363
if tag_name is None:
5339
5364
raise errors.BzrCommandError("No tag specified to delete.")
5367
5392
5368
5393
_see_also = ['tag']
5369
5394
takes_options = [
5370
custom_help('directory',
5371
help='Branch whose tags should be displayed.'),
5395
Option('directory',
5396
help='Branch whose tags should be displayed.',
5397
short_name='d',
5398
type=unicode,
5399
),
5372
5400
RegistryOption.from_kwargs('sort',
5373
5401
'Sort tags by different criteria.', title='Sorting',
5374
5402
alpha='Sort tags lexicographically (default).',
5391
5419
if not tags:
5392
5420
return
5393
5421
5394
self.add_cleanup(branch.lock_read().unlock)
5422
branch.lock_read()
5423
self.add_cleanup(branch.unlock)
5395
5424
if revision:
5396
5425
graph = branch.repository.get_graph()
5397
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5544
5573
"""
5545
5574
5546
5575
takes_args = ['to_location?']
5547
takes_options = ['directory',
5548
Option('force',
5576
takes_options = [Option('force',
5549
5577
help='Switch even if local commits will be lost.'),
5550
5578
'revision',
5551
5579
Option('create-branch', short_name='b',
5554
5582
]
5555
5583
5556
5584
def run(self, to_location=None, force=False, create_branch=False,
5557
revision=None, directory=u'.'):
5585
revision=None):
5558
5586
from bzrlib import switch
5559
tree_location = directory
5587
tree_location = '.'
5560
5588
revision = _get_one_revision('switch', revision)
5561
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5562
5590
if to_location is None:
5563
5591
if revision is None:
5564
5592
raise errors.BzrCommandError('You must supply either a'
5565
5593
' revision or a location')
5566
to_location = tree_location
5594
to_location = '.'
5567
5595
try:
5568
5596
branch = control_dir.open_branch()
5569
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
5844
5872
takes_args = ['file*']
5845
5873
5846
5874
takes_options = [
5847
'directory',
5848
5875
'revision',
5849
5876
Option('all', help='Shelve all changes.'),
5850
5877
'message',
5859
5886
_see_also = ['unshelve']
5860
5887
5861
5888
def run(self, revision=None, all=False, file_list=None, message=None,
5862
writer=None, list=False, destroy=False, directory=u'.'):
5889
writer=None, list=False, destroy=False):
5863
5890
if list:
5864
5891
return self.run_for_list()
5865
5892
from bzrlib.shelf_ui import Shelver
5867
5894
writer = bzrlib.option.diff_writer_registry.get()
5868
5895
try:
5869
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5870
file_list, message, destroy=destroy, directory=directory)
5897
file_list, message, destroy=destroy)
5871
5898
try:
5872
5899
shelver.run()
5873
5900
finally:
5877
5904
5878
5905
def run_for_list(self):
5879
5906
tree = WorkingTree.open_containing('.')[0]
5880
self.add_cleanup(tree.lock_read().unlock)
5907
tree.lock_read()
5908
self.add_cleanup(tree.unlock)
5881
5909
manager = tree.get_shelf_manager()
5882
5910
shelves = manager.active_shelves()
5883
5911
if len(shelves) == 0:
5901
5929
5902
5930
takes_args = ['shelf_id?']
5903
5931
takes_options = [
5904
'directory',
5905
5932
RegistryOption.from_kwargs(
5906
5933
'action', help="The action to perform.",
5907
5934
enum_switch=False, value_switches=True,
5915
5942
]
5916
5943
_see_also = ['shelve']
5917
5944
5918
def run(self, shelf_id=None, action='apply', directory=u'.'):
5945
def run(self, shelf_id=None, action='apply'):
5919
5946
from bzrlib.shelf_ui import Unshelver
5920
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5947
unshelver = Unshelver.from_args(shelf_id, action)
5921
5948
try:
5922
5949
unshelver.run()
5923
5950
finally:
5939
5966
5940
5967
To check what clean-tree will do, use --dry-run.
5941
5968
"""
5942
takes_options = ['directory',
5943
Option('ignored', help='Delete all ignored files.'),
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5944
5970
Option('detritus', help='Delete conflict files, merge'
5945
5971
' backups, and failed selftest dirs.'),
5946
5972
Option('unknown',
5949
5975
' deleting them.'),
5950
5976
Option('force', help='Do not prompt before deleting.')]
5951
5977
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5952
force=False, directory=u'.'):
5978
force=False):
5953
5979
from bzrlib.clean_tree import clean_tree
5954
5980
if not (unknown or ignored or detritus):
5955
5981
unknown = True
5956
5982
if dry_run:
5957
5983
force = True
5958
clean_tree(directory, unknown=unknown, ignored=ignored,
5959
detritus=detritus, dry_run=dry_run, no_prompt=force)
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
5960
5986
5961
5987
5962
5988
class cmd_reference(Command):
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0