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)
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
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'
361
353
self.outf.write(revtext.decode('utf-8'))
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
373
365
revisions = b.repository.revisions
374
366
if revisions is None:
491
483
takes_options = [
493
485
help='Remove the working tree even if it has '
494
'uncommitted or shelved changes.'),
486
'uncommitted changes.'),
497
489
def run(self, location_list, force=False):
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)
517
507
if working.user_url != working.branch.user_url:
518
508
raise errors.BzrCommandError("You cannot remove the working tree"
540
530
wt = WorkingTree.open_containing(location)[0]
541
self.add_cleanup(wt.lock_read().unlock)
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()
546
537
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
549
540
revno = ".".join(str(n) for n in revno_t)
551
542
b = Branch.open_containing(location)[0]
552
self.add_cleanup(b.lock_read().unlock)
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 = [
565
custom_help('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.',
568
563
Option('tree', help='Show revno of working tree'),
576
571
wt = WorkingTree.open_containing(directory)[0]
578
self.add_cleanup(wt.lock_read().unlock)
574
self.add_cleanup(wt.unlock)
579
575
except (errors.NoWorkingTree, errors.NotLocalUrl):
581
577
b = Branch.open_containing(directory)[0]
582
self.add_cleanup(b.lock_read().unlock)
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()))
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)
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)
769
768
extra_trees = [work_tree]
770
self.add_cleanup(tree.lock_read().unlock)
770
self.add_cleanup(tree.unlock)
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)
839
840
def run_auto(self, names_list, after, dry_run):
844
845
raise errors.BzrCommandError('--after cannot be specified with'
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)
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',
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.',
965
970
help="Perform a local pull in a bound "
966
971
"branch. Local pulls are not applied to "
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)
990
self.add_cleanup(tree_to.unlock)
985
991
except errors.NoWorkingTree:
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)
990
997
if local and not branch_to.get_bound_location():
991
998
raise errors.LocalRequiresBoundBranch()
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)
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',
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.',
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(
1210
1221
revision = _get_one_revision('branch', revision)
1211
self.add_cleanup(br_from.lock_read().unlock)
1223
self.add_cleanup(br_from.unlock)
1212
1224
if revision is not None:
1213
1225
revision_id = revision.as_revision_id(br_from)
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)
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
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:
1404
1419
branch_location = master.base
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]
1534
self.add_cleanup(tree.lock_write().unlock)
1549
self.add_cleanup(tree.unlock)
1535
1550
# Heuristics should probably all move into tree.remove_smart or
1970
1985
old_branch, new_branch,
1971
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1972
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1973
# GNU diff on Windows uses ANSI encoding for filenames
1974
path_encoding = osutils.get_diff_header_encoding()
1975
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
1976
1989
specific_files=specific_files,
1977
1990
external_diff_options=diff_options,
1978
1991
old_label=old_label, new_label=new_label,
1979
extra_trees=extra_trees,
1980
path_encoding=path_encoding,
1992
extra_trees=extra_trees, using=using,
1982
1993
format_cls=format)
1992
2003
# level of effort but possibly much less IO. (Or possibly not,
1993
2004
# if the directories are very large...)
1994
2005
_see_also = ['status', 'ls']
1995
takes_options = ['directory', 'show-ids']
2006
takes_options = ['show-ids']
1997
2008
@display_command
1998
def run(self, show_ids=False, directory=u'.'):
1999
tree = WorkingTree.open_containing(directory)[0]
2000
self.add_cleanup(tree.lock_read().unlock)
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2001
2013
old = tree.basis_tree()
2002
self.add_cleanup(old.lock_read().unlock)
2015
self.add_cleanup(old.unlock)
2003
2016
for path, ie in old.inventory.iter_entries():
2004
2017
if not tree.has_id(ie.file_id):
2005
2018
self.outf.write(path)
2017
2030
_see_also = ['status', 'ls']
2018
takes_options = ['directory', 'null']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2020
2037
@display_command
2021
def run(self, null=False, directory=u'.'):
2022
tree = WorkingTree.open_containing(directory)[0]
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2023
2040
td = tree.changes_from(tree.basis_tree())
2024
2041
for path, id, kind, text_modified, meta_modified in td.modified:
2036
2053
_see_also = ['status', 'ls']
2037
takes_options = ['directory', 'null']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2039
2060
@display_command
2040
def run(self, null=False, directory=u'.'):
2041
wt = WorkingTree.open_containing(directory)[0]
2042
self.add_cleanup(wt.lock_read().unlock)
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2043
2065
basis = wt.basis_tree()
2044
self.add_cleanup(basis.lock_read().unlock)
2067
self.add_cleanup(basis.unlock)
2045
2068
basis_inv = basis.inventory
2046
2069
inv = wt.inventory
2047
2070
for file_id in inv:
2050
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2052
2075
path = inv.id2path(file_id)
2053
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2076
if not os.access(osutils.abspath(path), os.F_OK):
2056
2079
self.outf.write(path + '\0')
2256
2279
help='Show just the specified revision.'
2257
2280
' See also "help revisionspec".'),
2259
RegistryOption('authors',
2260
'What names to list as authors - first, all or committer.',
2262
lazy_registry=('bzrlib.log', 'author_list_registry'),
2264
2282
Option('levels',
2265
2283
short_name='n',
2266
2284
help='Number of levels to display - 0 for all, 1 for flat.',
2336
2353
# find the file ids to log and check for directory filtering
2337
2354
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2338
revision, file_list, self.add_cleanup)
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2339
2357
for relpath, file_id, kind in file_info_list:
2340
2358
if file_id is None:
2341
2359
raise errors.BzrCommandError(
2360
2378
dir, relpath = bzrdir.BzrDir.open_containing(location)
2361
2379
b = dir.open_branch()
2362
self.add_cleanup(b.lock_read().unlock)
2381
self.add_cleanup(b.unlock)
2363
2382
rev1, rev2 = _get_revision_range(revision, b, self.name())
2365
2384
# Decide on the type of delta & diff filtering to use
2385
2404
show_timezone=timezone,
2386
2405
delta_format=get_verbosity_level(),
2388
show_advice=levels is None,
2389
author_list_handler=authors)
2407
show_advice=levels is None)
2391
2409
# Choose the algorithm for doing the logging. It's annoying
2392
2410
# having multiple code paths like this but necessary until
2490
2508
tree, relpath = WorkingTree.open_containing(filename)
2491
2509
file_id = tree.path2id(relpath)
2492
2510
b = tree.branch
2493
self.add_cleanup(b.lock_read().unlock)
2512
self.add_cleanup(b.unlock)
2494
2513
touching_revs = log.find_touching_revisions(b, file_id)
2495
2514
for revno, revision_id, what in touching_revs:
2496
2515
self.outf.write("%6d %s\n" % (revno, what))
2509
2528
help='Recurse into subdirectories.'),
2510
2529
Option('from-root',
2511
2530
help='Print paths relative to the root of the branch.'),
2512
Option('unknown', short_name='u',
2513
help='Print unknown files.'),
2531
Option('unknown', help='Print unknown files.'),
2514
2532
Option('versioned', help='Print versioned files.',
2515
2533
short_name='V'),
2516
Option('ignored', short_name='i',
2517
help='Print ignored files.'),
2518
Option('kind', short_name='k',
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2519
2539
help='List entries of a particular kind: file, directory, symlink.',
2525
2543
@display_command
2526
2544
def run(self, revision=None, verbose=False,
2527
2545
recursive=False, from_root=False,
2528
2546
unknown=False, versioned=False, ignored=False,
2529
null=False, kind=None, show_ids=False, path=None, directory=None):
2547
null=False, kind=None, show_ids=False, path=None):
2531
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2532
2550
raise errors.BzrCommandError('invalid kind specified')
2544
2562
raise errors.BzrCommandError('cannot specify both --from-root'
2547
tree, branch, relpath = \
2548
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2565
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2550
2568
# Calculate the prefix to use
2566
2584
view_str = views.view_display_str(view_files)
2567
2585
note("Ignoring files outside view. View is %s" % view_str)
2569
self.add_cleanup(tree.lock_read().unlock)
2588
self.add_cleanup(tree.unlock)
2570
2589
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2571
2590
from_dir=relpath, recursive=recursive):
2572
2591
# Apply additional masking
2621
2640
_see_also = ['ls']
2622
takes_options = ['directory']
2624
2642
@display_command
2625
def run(self, directory=u'.'):
2626
for f in WorkingTree.open_containing(directory)[0].unknowns():
2644
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2627
2645
self.outf.write(osutils.quotefn(f) + '\n')
2695
2713
_see_also = ['status', 'ignored', 'patterns']
2696
2714
takes_args = ['name_pattern*']
2697
takes_options = ['directory',
2698
2716
Option('default-rules',
2699
2717
help='Display the default ignore rules that bzr uses.')
2702
def run(self, name_pattern_list=None, default_rules=None,
2720
def run(self, name_pattern_list=None, default_rules=None):
2704
2721
from bzrlib import ignores
2705
2722
if default_rules is not None:
2706
2723
# dump the default rules and exit
2717
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2718
2735
raise errors.BzrCommandError(
2719
2736
"NAME_PATTERN should not be an absolute path")
2720
tree, relpath = WorkingTree.open_containing(directory)
2737
tree, relpath = WorkingTree.open_containing(u'.')
2721
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2722
2739
ignored = globbing.Globster(name_pattern_list)
2750
2767
encoding_type = 'replace'
2751
2768
_see_also = ['ignore', 'ls']
2752
takes_options = ['directory']
2754
2770
@display_command
2755
def run(self, directory=u'.'):
2756
tree = WorkingTree.open_containing(directory)[0]
2757
self.add_cleanup(tree.lock_read().unlock)
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
2758
2775
for path, file_class, kind, file_id, entry in tree.list_files():
2759
2776
if file_class != 'I':
2773
2790
takes_args = ['revno']
2774
takes_options = ['directory']
2776
2792
@display_command
2777
def run(self, revno, directory=u'.'):
2793
def run(self, revno):
2779
2795
revno = int(revno)
2780
2796
except ValueError:
2781
2797
raise errors.BzrCommandError("not a valid revision-number: %r"
2783
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2784
2800
self.outf.write("%s\n" % revid)
2813
2829
================= =========================
2815
2831
takes_args = ['dest', 'branch_or_subdir?']
2816
takes_options = ['directory',
2817
2833
Option('format',
2818
2834
help="Type of file to export to.",
2828
2844
'revision in which it was changed.'),
2830
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2831
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2847
root=None, filters=False, per_file_timestamps=False):
2832
2848
from bzrlib.export import export
2834
2850
if branch_or_subdir is None:
2835
tree = WorkingTree.open_containing(directory)[0]
2851
tree = WorkingTree.open_containing(u'.')[0]
2836
2852
b = tree.branch
2859
2875
_see_also = ['ls']
2860
takes_options = ['directory',
2861
2877
Option('name-from-revision', help='The path name in the old tree.'),
2862
2878
Option('filters', help='Apply content filters to display the '
2863
2879
'convenience form.'),
2869
2885
@display_command
2870
2886
def run(self, filename, revision=None, name_from_revision=False,
2871
filters=False, directory=None):
2872
2888
if revision is not None and len(revision) != 1:
2873
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2874
2890
" one revision specifier")
2875
2891
tree, branch, relpath = \
2876
_open_directory_or_containing_tree_or_branch(filename, directory)
2877
self.add_cleanup(branch.lock_read().unlock)
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
2878
2895
return self._run(tree, branch, relpath, filename, revision,
2879
2896
name_from_revision, filters)
2883
2900
if tree is None:
2884
2901
tree = b.basis_tree()
2885
2902
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2886
self.add_cleanup(rev_tree.lock_read().unlock)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2888
2906
old_file_id = rev_tree.path2id(relpath)
3151
3169
def get_message(commit_obj):
3152
3170
"""Callback to get commit message"""
3154
f = codecs.open(file, 'rt', osutils.get_user_encoding())
3156
my_message = f.read()
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3159
3174
elif message is not None:
3160
3175
my_message = message
3316
3331
bzr whoami "Frank Chu <fchu@example.com>"
3318
takes_options = [ 'directory',
3333
takes_options = [ Option('email',
3320
3334
help='Display email address only.'),
3321
3335
Option('branch',
3322
3336
help='Set identity for the current branch instead of '
3326
3340
encoding_type = 'replace'
3328
3342
@display_command
3329
def run(self, email=False, branch=False, name=None, directory=None):
3343
def run(self, email=False, branch=False, name=None):
3330
3344
if name is None:
3331
if directory is None:
3332
# use branch if we're inside one; otherwise global config
3334
c = Branch.open_containing(u'.')[0].get_config()
3335
except errors.NotBranchError:
3336
c = config.GlobalConfig()
3338
c = Branch.open(directory).get_config()
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3340
3351
self.outf.write(c.user_email() + '\n')
3352
3363
# use global config unless --branch given
3354
if directory is None:
3355
c = Branch.open_containing(u'.')[0].get_config()
3357
c = Branch.open(directory).get_config()
3365
c = Branch.open_containing('.')[0].get_config()
3359
3367
c = config.GlobalConfig()
3360
3368
c.set_user_option('email', name)
3373
3381
_see_also = ['info']
3374
3382
takes_args = ['nickname?']
3375
takes_options = ['directory']
3376
def run(self, nickname=None, directory=u'.'):
3377
branch = Branch.open_containing(directory)[0]
3383
def run(self, nickname=None):
3384
branch = Branch.open_containing(u'.')[0]
3378
3385
if nickname is None:
3379
3386
self.printme(branch)
3605
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3606
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3607
3614
# stdout, which would corrupt the subunit stream.
3608
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3609
# following code can be deleted when it's sufficiently deployed
3610
# -- vila/mgz 20100514
3611
if (sys.platform == "win32"
3612
and getattr(sys.stdout, 'fileno', None) is not None):
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3614
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3688
3691
branch1 = Branch.open_containing(branch)[0]
3689
3692
branch2 = Branch.open_containing(other)[0]
3690
self.add_cleanup(branch1.lock_read().unlock)
3691
self.add_cleanup(branch2.lock_read().unlock)
3694
self.add_cleanup(branch1.unlock)
3696
self.add_cleanup(branch2.unlock)
3692
3697
last1 = ensure_null(branch1.last_revision())
3693
3698
last2 = ensure_null(branch2.last_revision())
3788
3793
' completely merged into the source, pull from the'
3789
3794
' source rather than merging. When this happens,'
3790
3795
' you do not need to commit the result.'),
3791
custom_help('directory',
3792
3797
help='Branch to merge into, '
3793
'rather than the one containing the working directory.'),
3798
'rather than the one containing the working directory.',
3794
3802
Option('preview', help='Instead of merging, show a diff of the'
3796
3804
Option('interactive', help='Select changes interactively.',
3829
3837
unversioned_filter=tree.is_ignored, view_info=view_info)
3830
3838
pb = ui.ui_factory.nested_progress_bar()
3831
3839
self.add_cleanup(pb.finished)
3832
self.add_cleanup(tree.lock_write().unlock)
3841
self.add_cleanup(tree.unlock)
3833
3842
if location is not None:
3835
3844
mergeable = bundle.read_mergeable_from_url(location,
3896
3905
def _do_preview(self, merger):
3897
3906
from bzrlib.diff import show_diff_trees
3898
3907
result_tree = self._get_preview(merger)
3899
path_encoding = osutils.get_diff_header_encoding()
3900
3908
show_diff_trees(merger.this_tree, result_tree, self.outf,
3901
old_label='', new_label='',
3902
path_encoding=path_encoding)
3909
old_label='', new_label='')
3904
3911
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3905
3912
merger.change_reporter = change_reporter
4093
4100
if merge_type is None:
4094
4101
merge_type = _mod_merge.Merge3Merger
4095
4102
tree, file_list = tree_files(file_list)
4096
self.add_cleanup(tree.lock_write().unlock)
4104
self.add_cleanup(tree.unlock)
4097
4105
parents = tree.get_parent_ids()
4098
4106
if len(parents) != 2:
4099
4107
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4209
4217
def run(self, revision=None, no_backup=False, file_list=None,
4210
4218
forget_merges=None):
4211
4219
tree, file_list = tree_files(file_list)
4212
self.add_cleanup(tree.lock_tree_write().unlock)
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4213
4222
if forget_merges:
4214
4223
tree.set_parent_ids(tree.get_parent_ids()[:1])
4304
4313
_see_also = ['merge', 'pull']
4305
4314
takes_args = ['other_branch?']
4306
4315
takes_options = [
4308
4316
Option('reverse', 'Reverse the order of revisions.'),
4309
4317
Option('mine-only',
4310
4318
'Display changes in the local branch only.'),
4332
4340
theirs_only=False,
4333
4341
log_format=None, long=False, short=False, line=False,
4334
4342
show_ids=False, verbose=False, this=False, other=False,
4335
include_merges=False, revision=None, my_revision=None,
4343
include_merges=False, revision=None, my_revision=None):
4337
4344
from bzrlib.missing import find_unmerged, iter_log_revisions
4338
4345
def message(s):
4339
4346
if not is_quiet():
4352
4359
elif theirs_only:
4353
4360
restrict = 'remote'
4355
local_branch = Branch.open_containing(directory)[0]
4356
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)
4358
4366
parent = local_branch.get_parent()
4359
4367
if other_branch is None:
4370
4378
if remote_branch.base == local_branch.base:
4371
4379
remote_branch = local_branch
4373
self.add_cleanup(remote_branch.lock_read().unlock)
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4375
4384
local_revid_range = _revision_range_to_revid_range(
4376
4385
_get_revision_range(my_revision, local_branch,
4431
4440
message("Branches are up to date.\n")
4432
4441
self.cleanup_now()
4433
4442
if not status_code and parent is None and other_branch is not None:
4434
self.add_cleanup(local_branch.lock_write().unlock)
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4435
4445
# handle race conditions - a parent might be set while we run.
4436
4446
if local_branch.get_parent() is None:
4437
4447
local_branch.set_parent(remote_branch.base)
4567
4578
Option('long', help='Show commit date in annotations.'),
4572
4582
encoding_type = 'exact'
4574
4584
@display_command
4575
4585
def run(self, filename, all=False, long=False, revision=None,
4576
show_ids=False, directory=None):
4577
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4578
4588
wt, branch, relpath = \
4579
_open_directory_or_containing_tree_or_branch(filename, directory)
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4580
4590
if wt is not None:
4581
self.add_cleanup(wt.lock_read().unlock)
4592
self.add_cleanup(wt.unlock)
4583
self.add_cleanup(branch.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4584
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4585
self.add_cleanup(tree.lock_read().unlock)
4598
self.add_cleanup(tree.unlock)
4586
4599
if wt is not None:
4587
4600
file_id = wt.path2id(relpath)
4607
4620
hidden = True # is this right ?
4608
4621
takes_args = ['revision_id*']
4609
takes_options = ['directory', 'revision']
4622
takes_options = ['revision']
4611
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4624
def run(self, revision_id_list=None, revision=None):
4612
4625
if revision_id_list is not None and revision is not None:
4613
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4614
4627
if revision_id_list is None and revision is None:
4615
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4616
b = WorkingTree.open_containing(directory)[0].branch
4617
self.add_cleanup(b.lock_write().unlock)
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
4618
4632
return self._run(b, revision_id_list, revision)
4620
4634
def _run(self, b, revision_id_list, revision):
4680
4694
_see_also = ['checkouts', 'unbind']
4681
4695
takes_args = ['location?']
4682
takes_options = ['directory']
4684
def run(self, location=None, directory=u'.'):
4685
b, relpath = Branch.open_containing(directory)
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4686
4700
if location is None:
4688
4702
location = b.get_old_bound_location()
4716
4730
_see_also = ['checkouts', 'bind']
4717
4731
takes_args = []
4718
takes_options = ['directory']
4720
def run(self, directory=u'.'):
4721
b, relpath = Branch.open_containing(directory)
4735
b, relpath = Branch.open_containing(u'.')
4722
4736
if not b.unbind():
4723
4737
raise errors.BzrCommandError('Local branch is not bound')
4770
4784
b = control.open_branch()
4772
4786
if tree is not None:
4773
self.add_cleanup(tree.lock_write().unlock)
4788
self.add_cleanup(tree.unlock)
4775
self.add_cleanup(b.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4776
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4778
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4886
4902
'result in a dynamically allocated port. The default port '
4887
4903
'depends on the protocol.',
4889
custom_help('directory',
4890
help='Serve contents of this directory.'),
4906
help='Serve contents of this directory.',
4891
4908
Option('allow-writes',
4892
4909
help='By default the server is a readonly server. Supplying '
4893
4910
'--allow-writes enables write access to the contents of '
5048
5064
encoding_type = 'exact'
5050
5066
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5051
sign=False, revision=None, mail_to=None, message=None,
5067
sign=False, revision=None, mail_to=None, message=None):
5053
5068
from bzrlib.revision import ensure_null, NULL_REVISION
5054
5069
include_patch, include_bundle = {
5055
5070
'plain': (False, False),
5056
5071
'diff': (True, False),
5057
5072
'bundle': (True, True),
5059
branch = Branch.open(directory)
5074
branch = Branch.open('.')
5060
5075
stored_submit_branch = branch.get_submit_branch()
5061
5076
if submit_branch is None:
5062
5077
submit_branch = stored_submit_branch
5147
5162
given, in which case it is sent to a file.
5149
5164
Mail is sent using your preferred mail program. This should be transparent
5150
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.
5151
5166
If the preferred client can't be found (or used), your editor will be used.
5153
5168
To use a specific mail program, set the mail_client configuration option.
5324
5339
Option('delete',
5325
5340
help='Delete this tag rather than placing it.',
5327
custom_help('directory',
5328
help='Branch in which to place the tag.'),
5343
help='Branch in which to place the tag.',
5329
5347
Option('force',
5330
5348
help='Replace existing tags.',
5341
5359
branch, relpath = Branch.open_containing(directory)
5342
self.add_cleanup(branch.lock_write().unlock)
5361
self.add_cleanup(branch.unlock)
5344
5363
if tag_name is None:
5345
5364
raise errors.BzrCommandError("No tag specified to delete.")
5374
5393
_see_also = ['tag']
5375
5394
takes_options = [
5376
custom_help('directory',
5377
help='Branch whose tags should be displayed.'),
5396
help='Branch whose tags should be displayed.',
5378
5400
RegistryOption.from_kwargs('sort',
5379
5401
'Sort tags by different criteria.', title='Sorting',
5380
5402
alpha='Sort tags lexicographically (default).',
5400
self.add_cleanup(branch.lock_read().unlock)
5423
self.add_cleanup(branch.unlock)
5402
5425
graph = branch.repository.get_graph()
5403
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5552
5575
takes_args = ['to_location?']
5553
takes_options = ['directory',
5576
takes_options = [Option('force',
5555
5577
help='Switch even if local commits will be lost.'),
5557
5579
Option('create-branch', short_name='b',
5562
5584
def run(self, to_location=None, force=False, create_branch=False,
5563
revision=None, directory=u'.'):
5564
5586
from bzrlib import switch
5565
tree_location = directory
5566
5588
revision = _get_one_revision('switch', revision)
5567
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5568
5590
if to_location is None:
5569
5591
if revision is None:
5570
5592
raise errors.BzrCommandError('You must supply either a'
5571
5593
' revision or a location')
5572
to_location = tree_location
5574
5596
branch = control_dir.open_branch()
5575
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
5865
5886
_see_also = ['unshelve']
5867
5888
def run(self, revision=None, all=False, file_list=None, message=None,
5868
writer=None, list=False, destroy=False, directory=u'.'):
5889
writer=None, list=False, destroy=False):
5870
5891
return self.run_for_list()
5871
5892
from bzrlib.shelf_ui import Shelver
5873
5894
writer = bzrlib.option.diff_writer_registry.get()
5875
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5876
file_list, message, destroy=destroy, directory=directory)
5897
file_list, message, destroy=destroy)
5884
5905
def run_for_list(self):
5885
5906
tree = WorkingTree.open_containing('.')[0]
5886
self.add_cleanup(tree.lock_read().unlock)
5908
self.add_cleanup(tree.unlock)
5887
5909
manager = tree.get_shelf_manager()
5888
5910
shelves = manager.active_shelves()
5889
5911
if len(shelves) == 0:
5908
5930
takes_args = ['shelf_id?']
5909
5931
takes_options = [
5911
5932
RegistryOption.from_kwargs(
5912
5933
'action', help="The action to perform.",
5913
5934
enum_switch=False, value_switches=True,
5922
5943
_see_also = ['shelve']
5924
def run(self, shelf_id=None, action='apply', directory=u'.'):
5945
def run(self, shelf_id=None, action='apply'):
5925
5946
from bzrlib.shelf_ui import Unshelver
5926
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5947
unshelver = Unshelver.from_args(shelf_id, action)
5928
5949
unshelver.run()
5946
5967
To check what clean-tree will do, use --dry-run.
5948
takes_options = ['directory',
5949
Option('ignored', help='Delete all ignored files.'),
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5950
5970
Option('detritus', help='Delete conflict files, merge'
5951
5971
' backups, and failed selftest dirs.'),
5952
5972
Option('unknown',
5955
5975
' deleting them.'),
5956
5976
Option('force', help='Do not prompt before deleting.')]
5957
5977
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5958
force=False, directory=u'.'):
5959
5979
from bzrlib.clean_tree import clean_tree
5960
5980
if not (unknown or ignored or detritus):
5964
clean_tree(directory, unknown=unknown, ignored=ignored,
5965
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)
5968
5988
class cmd_reference(Command):
added
removed
bzrlib/builtins.py
