75
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
78
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
79
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
81
return internal_tree_files(file_list, default_branch, canonicalize,
88
85
def tree_files_for_add(file_list):
153
150
# XXX: Bad function name; should possibly also be a class method of
154
151
# WorkingTree rather than a function.
152
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
155
153
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
154
apply_view=True):
157
155
"""Convert command-line paths to a WorkingTree and relative paths.
157
Deprecated: use WorkingTree.open_containing_paths instead.
159
159
This is typically used for command-line processors that take one or
160
160
more filenames, and infer the workingtree that contains them.
172
172
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
174
return WorkingTree.open_containing_paths(
175
file_list, default_directory='.',
223
180
def _get_view_info_for_change_reporter(tree):
192
def _open_directory_or_containing_tree_or_branch(filename, directory):
193
"""Open the tree or branch containing the specified file, unless
194
the --directory option is used to specify a different branch."""
195
if directory is not None:
196
return (None, Branch.open(directory), filename)
197
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
235
200
# TODO: Make sure no commands unconditionally use the working directory as a
236
201
# branch. If a filename argument is used, the first of them should be used to
237
202
# specify the branch. (Perhaps this can be factored out into some kind of
315
280
raise errors.BzrCommandError('bzr status --revision takes exactly'
316
281
' one or two revision specifiers')
318
tree, relfile_list = tree_files(file_list)
283
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
319
284
# Avoid asking for specific files when that is not needed.
320
285
if relfile_list == ['']:
321
286
relfile_list = None
353
318
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
321
def run(self, revision_id=None, revision=None, directory=u'.'):
357
322
if revision_id is not None and revision is not None:
358
323
raise errors.BzrCommandError('You can only supply one of'
359
324
' revision_id or --revision')
360
325
if revision_id is None and revision is None:
361
326
raise errors.BzrCommandError('You must supply either'
362
327
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
328
b = WorkingTree.open_containing(directory)[0].branch
365
330
revisions = b.repository.revisions
366
331
if revisions is None:
504
469
if (working.has_changes()):
505
470
raise errors.UncommittedChanges(working)
471
if working.get_shelf_manager().last_shelf() is not None:
472
raise errors.ShelvedChanges(working)
507
474
if working.user_url != working.branch.user_url:
508
475
raise errors.BzrCommandError("You cannot remove the working tree"
530
497
wt = WorkingTree.open_containing(location)[0]
498
self.add_cleanup(wt.lock_read().unlock)
532
499
except (errors.NoWorkingTree, errors.NotLocalUrl):
533
500
raise errors.NoWorkingTree(location)
534
self.add_cleanup(wt.unlock)
535
501
revid = wt.last_revision()
537
503
revno_t = wt.branch.revision_id_to_dotted_revno(revid)
540
506
revno = ".".join(str(n) for n in revno_t)
542
508
b = Branch.open_containing(location)[0]
544
self.add_cleanup(b.unlock)
509
self.add_cleanup(b.lock_read().unlock)
545
510
revno = b.revno()
546
511
self.cleanup_now()
547
512
self.outf.write(str(revno) + '\n')
554
519
takes_args = ['revision_info*']
555
520
takes_options = [
522
custom_help('directory',
558
523
help='Branch to examine, '
559
'rather than the one containing the working directory.',
524
'rather than the one containing the working directory.'),
563
525
Option('tree', help='Show revno of working tree'),
571
533
wt = WorkingTree.open_containing(directory)[0]
574
self.add_cleanup(wt.unlock)
535
self.add_cleanup(wt.lock_read().unlock)
575
536
except (errors.NoWorkingTree, errors.NotLocalUrl):
577
538
b = Branch.open_containing(directory)[0]
579
self.add_cleanup(b.unlock)
539
self.add_cleanup(b.lock_read().unlock)
580
540
revision_ids = []
581
541
if revision is not None:
582
542
revision_ids.extend(rev.as_revision_id(b) for rev in revision)
681
641
should_print=(not is_quiet()))
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
644
self.add_cleanup(base_tree.lock_read().unlock)
686
645
tree, file_list = tree_files_for_add(file_list)
687
646
added, ignored = tree.smart_add(file_list, not
688
647
no_recurse, action=action, save=not dry_run)
759
718
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
761
720
revision = _get_one_revision('inventory', revision)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
721
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
722
self.add_cleanup(work_tree.lock_read().unlock)
765
723
if revision is not None:
766
724
tree = revision.as_tree(work_tree.branch)
768
726
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
727
self.add_cleanup(tree.lock_read().unlock)
833
790
if len(names_list) < 2:
834
791
raise errors.BzrCommandError("missing file argument")
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
792
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
793
self.add_cleanup(tree.lock_tree_write().unlock)
838
794
self._run(tree, names_list, rel_names, after)
840
796
def run_auto(self, names_list, after, dry_run):
845
801
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
803
work_tree, file_list = WorkingTree.open_containing_paths(
804
names_list, default_directory='.')
805
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
806
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
808
def _run(self, tree, names_list, rel_names, after):
960
916
takes_options = ['remember', 'overwrite', 'revision',
961
917
custom_help('verbose',
962
918
help='Show logs of pulled revisions.'),
919
custom_help('directory',
964
920
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
921
'rather than the one containing the working directory.'),
970
923
help="Perform a local pull in a bound "
971
924
"branch. Local pulls are not applied to "
987
940
tree_to = WorkingTree.open_containing(directory)[0]
988
941
branch_to = tree_to.branch
990
self.add_cleanup(tree_to.unlock)
942
self.add_cleanup(tree_to.lock_write().unlock)
991
943
except errors.NoWorkingTree:
993
945
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
946
self.add_cleanup(branch_to.lock_write().unlock)
997
948
if local and not branch_to.get_bound_location():
998
949
raise errors.LocalRequiresBoundBranch()
1030
981
branch_from = Branch.open(location,
1031
982
possible_transports=possible_transports)
1032
branch_from.lock_read()
1033
self.add_cleanup(branch_from.unlock)
983
self.add_cleanup(branch_from.lock_read().unlock)
1035
985
if branch_to.get_parent() is None or remember:
1036
986
branch_to.set_parent(branch_from.base)
1088
1038
Option('create-prefix',
1089
1039
help='Create the path leading up to the branch '
1090
1040
'if it does not already exist.'),
1041
custom_help('directory',
1092
1042
help='Branch to push from, '
1093
'rather than the one containing the working directory.',
1043
'rather than the one containing the working directory.'),
1097
1044
Option('use-existing-dir',
1098
1045
help='By default push will fail if the target'
1099
1046
' directory exists, but does not already'
1219
1166
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1221
1168
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1169
self.add_cleanup(br_from.lock_read().unlock)
1224
1170
if revision is not None:
1225
1171
revision_id = revision.as_revision_id(br_from)
1366
1312
@display_command
1367
1313
def run(self, dir=u'.'):
1368
1314
tree = WorkingTree.open_containing(dir)[0]
1370
self.add_cleanup(tree.unlock)
1315
self.add_cleanup(tree.lock_read().unlock)
1371
1316
new_inv = tree.inventory
1372
1317
old_tree = tree.basis_tree()
1373
old_tree.lock_read()
1374
self.add_cleanup(old_tree.unlock)
1318
self.add_cleanup(old_tree.lock_read().unlock)
1375
1319
old_inv = old_tree.inventory
1377
1321
iterator = tree.iter_changes(old_tree, include_unchanged=True)
1415
1359
master = branch.get_master_branch(
1416
1360
possible_transports=possible_transports)
1417
1361
if master is not None:
1419
1362
branch_location = master.base
1365
branch_location = tree.branch.base
1421
1366
tree.lock_tree_write()
1422
branch_location = tree.branch.base
1423
1367
self.add_cleanup(tree.unlock)
1424
1368
# get rid of the final '/' and be ready for display
1425
1369
branch_location = urlutils.unescape_for_display(
1541
1485
def run(self, file_list, verbose=False, new=False,
1542
1486
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1487
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1489
if file_list is not None:
1546
1490
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1492
self.add_cleanup(tree.lock_write().unlock)
1550
1493
# Heuristics should probably all move into tree.remove_smart or
1985
1928
old_branch, new_branch,
1986
1929
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
1930
file_list, revision, old, new, self.add_cleanup, apply_view=True)
1931
# GNU diff on Windows uses ANSI encoding for filenames
1932
path_encoding = osutils.get_diff_header_encoding()
1988
1933
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
1934
specific_files=specific_files,
1990
1935
external_diff_options=diff_options,
1991
1936
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
1937
extra_trees=extra_trees,
1938
path_encoding=path_encoding,
1993
1940
format_cls=format)
2003
1950
# level of effort but possibly much less IO. (Or possibly not,
2004
1951
# if the directories are very large...)
2005
1952
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
1953
takes_options = ['directory', 'show-ids']
2008
1955
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
1956
def run(self, show_ids=False, directory=u'.'):
1957
tree = WorkingTree.open_containing(directory)[0]
1958
self.add_cleanup(tree.lock_read().unlock)
2013
1959
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
1960
self.add_cleanup(old.lock_read().unlock)
2016
1961
for path, ie in old.inventory.iter_entries():
2017
1962
if not tree.has_id(ie.file_id):
2018
1963
self.outf.write(path)
2030
1975
_see_also = ['status', 'ls']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
1976
takes_options = ['directory', 'null']
2037
1978
@display_command
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
1979
def run(self, null=False, directory=u'.'):
1980
tree = WorkingTree.open_containing(directory)[0]
2040
1981
td = tree.changes_from(tree.basis_tree())
2041
1982
for path, id, kind, text_modified, meta_modified in td.modified:
2053
1994
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
1995
takes_options = ['directory', 'null']
2060
1997
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
1998
def run(self, null=False, directory=u'.'):
1999
wt = WorkingTree.open_containing(directory)[0]
2000
self.add_cleanup(wt.lock_read().unlock)
2065
2001
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2002
self.add_cleanup(basis.lock_read().unlock)
2068
2003
basis_inv = basis.inventory
2069
2004
inv = wt.inventory
2070
2005
for file_id in inv:
2073
2008
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2010
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2011
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2014
self.outf.write(path + '\0')
2279
2214
help='Show just the specified revision.'
2280
2215
' See also "help revisionspec".'),
2217
RegistryOption('authors',
2218
'What names to list as authors - first, all or committer.',
2220
lazy_registry=('bzrlib.log', 'author_list_registry'),
2282
2222
Option('levels',
2283
2223
short_name='n',
2284
2224
help='Number of levels to display - 0 for all, 1 for flat.',
2353
2294
# find the file ids to log and check for directory filtering
2354
2295
b, file_info_list, rev1, rev2 = _get_info_for_log_files(
2355
revision, file_list)
2356
self.add_cleanup(b.unlock)
2296
revision, file_list, self.add_cleanup)
2357
2297
for relpath, file_id, kind in file_info_list:
2358
2298
if file_id is None:
2359
2299
raise errors.BzrCommandError(
2378
2318
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
2319
b = dir.open_branch()
2381
self.add_cleanup(b.unlock)
2320
self.add_cleanup(b.lock_read().unlock)
2382
2321
rev1, rev2 = _get_revision_range(revision, b, self.name())
2384
2323
# Decide on the type of delta & diff filtering to use
2404
2343
show_timezone=timezone,
2405
2344
delta_format=get_verbosity_level(),
2407
show_advice=levels is None)
2346
show_advice=levels is None,
2347
author_list_handler=authors)
2409
2349
# Choose the algorithm for doing the logging. It's annoying
2410
2350
# having multiple code paths like this but necessary until
2508
2448
tree, relpath = WorkingTree.open_containing(filename)
2509
2449
file_id = tree.path2id(relpath)
2510
2450
b = tree.branch
2512
self.add_cleanup(b.unlock)
2451
self.add_cleanup(b.lock_read().unlock)
2513
2452
touching_revs = log.find_touching_revisions(b, file_id)
2514
2453
for revno, revision_id, what in touching_revs:
2515
2454
self.outf.write("%6d %s\n" % (revno, what))
2528
2467
help='Recurse into subdirectories.'),
2529
2468
Option('from-root',
2530
2469
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2470
Option('unknown', short_name='u',
2471
help='Print unknown files.'),
2532
2472
Option('versioned', help='Print versioned files.',
2533
2473
short_name='V'),
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2474
Option('ignored', short_name='i',
2475
help='Print ignored files.'),
2476
Option('kind', short_name='k',
2539
2477
help='List entries of a particular kind: file, directory, symlink.',
2543
2483
@display_command
2544
2484
def run(self, revision=None, verbose=False,
2545
2485
recursive=False, from_root=False,
2546
2486
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2487
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2489
if kind and kind not in ('file', 'directory', 'symlink'):
2550
2490
raise errors.BzrCommandError('invalid kind specified')
2562
2502
raise errors.BzrCommandError('cannot specify both --from-root'
2565
tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
2505
tree, branch, relpath = \
2506
_open_directory_or_containing_tree_or_branch(fs_path, directory)
2568
2508
# Calculate the prefix to use
2584
2524
view_str = views.view_display_str(view_files)
2585
2525
note("Ignoring files outside view. View is %s" % view_str)
2588
self.add_cleanup(tree.unlock)
2527
self.add_cleanup(tree.lock_read().unlock)
2589
2528
for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
2590
2529
from_dir=relpath, recursive=recursive):
2591
2530
# Apply additional masking
2640
2579
_see_also = ['ls']
2580
takes_options = ['directory']
2642
2582
@display_command
2644
for f in WorkingTree.open_containing(u'.')[0].unknowns():
2583
def run(self, directory=u'.'):
2584
for f in WorkingTree.open_containing(directory)[0].unknowns():
2645
2585
self.outf.write(osutils.quotefn(f) + '\n')
2713
2653
_see_also = ['status', 'ignored', 'patterns']
2714
2654
takes_args = ['name_pattern*']
2655
takes_options = ['directory',
2716
2656
Option('default-rules',
2717
2657
help='Display the default ignore rules that bzr uses.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2660
def run(self, name_pattern_list=None, default_rules=None,
2721
2662
from bzrlib import ignores
2722
2663
if default_rules is not None:
2723
2664
# dump the default rules and exit
2734
2675
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
2676
raise errors.BzrCommandError(
2736
2677
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
2678
tree, relpath = WorkingTree.open_containing(directory)
2738
2679
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
2680
ignored = globbing.Globster(name_pattern_list)
2682
self.add_cleanup(tree.lock_read().unlock)
2742
2683
for entry in tree.list_files():
2744
2685
if id is not None:
2745
2686
filename = entry[0]
2746
2687
if ignored.match(filename):
2747
2688
matches.append(filename)
2749
2689
if len(matches) > 0:
2750
2690
self.outf.write("Warning: the following files are version controlled and"
2751
2691
" match your ignore pattern:\n%s"
2767
2707
encoding_type = 'replace'
2768
2708
_see_also = ['ignore', 'ls']
2709
takes_options = ['directory']
2770
2711
@display_command
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
2712
def run(self, directory=u'.'):
2713
tree = WorkingTree.open_containing(directory)[0]
2714
self.add_cleanup(tree.lock_read().unlock)
2775
2715
for path, file_class, kind, file_id, entry in tree.list_files():
2776
2716
if file_class != 'I':
2790
2730
takes_args = ['revno']
2731
takes_options = ['directory']
2792
2733
@display_command
2793
def run(self, revno):
2734
def run(self, revno, directory=u'.'):
2795
2736
revno = int(revno)
2796
2737
except ValueError:
2797
2738
raise errors.BzrCommandError("not a valid revision-number: %r"
2799
revid = WorkingTree.open_containing(u'.')[0].branch.get_rev_id(revno)
2740
revid = WorkingTree.open_containing(directory)[0].branch.get_rev_id(revno)
2800
2741
self.outf.write("%s\n" % revid)
2829
2770
================= =========================
2831
2772
takes_args = ['dest', 'branch_or_subdir?']
2773
takes_options = ['directory',
2833
2774
Option('format',
2834
2775
help="Type of file to export to.",
2844
2785
'revision in which it was changed.'),
2846
2787
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
2788
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2848
2789
from bzrlib.export import export
2850
2791
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
2792
tree = WorkingTree.open_containing(directory)[0]
2852
2793
b = tree.branch
2875
2816
_see_also = ['ls']
2817
takes_options = ['directory',
2877
2818
Option('name-from-revision', help='The path name in the old tree.'),
2878
2819
Option('filters', help='Apply content filters to display the '
2879
2820
'convenience form.'),
2885
2826
@display_command
2886
2827
def run(self, filename, revision=None, name_from_revision=False,
2828
filters=False, directory=None):
2888
2829
if revision is not None and len(revision) != 1:
2889
2830
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
2831
" one revision specifier")
2891
2832
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
2833
_open_directory_or_containing_tree_or_branch(filename, directory)
2834
self.add_cleanup(branch.lock_read().unlock)
2895
2835
return self._run(tree, branch, relpath, filename, revision,
2896
2836
name_from_revision, filters)
2900
2840
if tree is None:
2901
2841
tree = b.basis_tree()
2902
2842
rev_tree = _get_one_revision_tree('cat', revision, branch=b)
2903
rev_tree.lock_read()
2904
self.add_cleanup(rev_tree.unlock)
2843
self.add_cleanup(rev_tree.lock_read().unlock)
2906
2845
old_file_id = rev_tree.path2id(relpath)
3129
3068
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3070
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3071
if selected_list == ['']:
3133
3072
# workaround - commit of root of tree should be exactly the same
3134
3073
# as just default commit in that tree, and succeed even though
3169
3108
def get_message(commit_obj):
3170
3109
"""Callback to get commit message"""
3172
my_message = codecs.open(
3173
file, 'rt', osutils.get_user_encoding()).read()
3111
f = codecs.open(file, 'rt', osutils.get_user_encoding())
3113
my_message = f.read()
3174
3116
elif message is not None:
3175
3117
my_message = message
3205
3147
reporter=None, verbose=verbose, revprops=properties,
3206
3148
authors=author, timestamp=commit_stamp,
3207
3149
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3150
exclude=tree.safe_relpath_files(exclude))
3209
3151
except PointlessCommit:
3210
3152
raise errors.BzrCommandError("No changes to commit."
3211
3153
" Use --unchanged to commit anyhow.")
3331
3273
bzr whoami "Frank Chu <fchu@example.com>"
3333
takes_options = [ Option('email',
3275
takes_options = [ 'directory',
3334
3277
help='Display email address only.'),
3335
3278
Option('branch',
3336
3279
help='Set identity for the current branch instead of '
3340
3283
encoding_type = 'replace'
3342
3285
@display_command
3343
def run(self, email=False, branch=False, name=None):
3286
def run(self, email=False, branch=False, name=None, directory=None):
3344
3287
if name is None:
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()
3288
if directory is None:
3289
# use branch if we're inside one; otherwise global config
3291
c = Branch.open_containing(u'.')[0].get_config()
3292
except errors.NotBranchError:
3293
c = config.GlobalConfig()
3295
c = Branch.open(directory).get_config()
3351
3297
self.outf.write(c.user_email() + '\n')
3363
3309
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3311
if directory is None:
3312
c = Branch.open_containing(u'.')[0].get_config()
3314
c = Branch.open(directory).get_config()
3367
3316
c = config.GlobalConfig()
3368
3317
c.set_user_option('email', name)
3381
3330
_see_also = ['info']
3382
3331
takes_args = ['nickname?']
3383
def run(self, nickname=None):
3384
branch = Branch.open_containing(u'.')[0]
3332
takes_options = ['directory']
3333
def run(self, nickname=None, directory=u'.'):
3334
branch = Branch.open_containing(directory)[0]
3385
3335
if nickname is None:
3386
3336
self.printme(branch)
3612
3562
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3563
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3564
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3565
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3566
# following code can be deleted when it's sufficiently deployed
3567
# -- vila/mgz 20100514
3568
if (sys.platform == "win32"
3569
and getattr(sys.stdout, 'fileno', None) is not None):
3617
3571
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3691
3645
branch1 = Branch.open_containing(branch)[0]
3692
3646
branch2 = Branch.open_containing(other)[0]
3694
self.add_cleanup(branch1.unlock)
3696
self.add_cleanup(branch2.unlock)
3647
self.add_cleanup(branch1.lock_read().unlock)
3648
self.add_cleanup(branch2.lock_read().unlock)
3697
3649
last1 = ensure_null(branch1.last_revision())
3698
3650
last2 = ensure_null(branch2.last_revision())
3793
3745
' completely merged into the source, pull from the'
3794
3746
' source rather than merging. When this happens,'
3795
3747
' you do not need to commit the result.'),
3748
custom_help('directory',
3797
3749
help='Branch to merge into, '
3798
'rather than the one containing the working directory.',
3750
'rather than the one containing the working directory.'),
3802
3751
Option('preview', help='Instead of merging, show a diff of the'
3804
3753
Option('interactive', help='Select changes interactively.',
3837
3786
unversioned_filter=tree.is_ignored, view_info=view_info)
3838
3787
pb = ui.ui_factory.nested_progress_bar()
3839
3788
self.add_cleanup(pb.finished)
3841
self.add_cleanup(tree.unlock)
3789
self.add_cleanup(tree.lock_write().unlock)
3842
3790
if location is not None:
3844
3792
mergeable = bundle.read_mergeable_from_url(location,
3905
3853
def _do_preview(self, merger):
3906
3854
from bzrlib.diff import show_diff_trees
3907
3855
result_tree = self._get_preview(merger)
3856
path_encoding = osutils.get_diff_header_encoding()
3908
3857
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
3858
old_label='', new_label='',
3859
path_encoding=path_encoding)
3911
3861
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
3862
merger.change_reporter = change_reporter
4099
4049
from bzrlib.conflicts import restore
4100
4050
if merge_type is None:
4101
4051
merge_type = _mod_merge.Merge3Merger
4102
tree, file_list = tree_files(file_list)
4104
self.add_cleanup(tree.unlock)
4052
tree, file_list = WorkingTree.open_containing_paths(file_list)
4053
self.add_cleanup(tree.lock_write().unlock)
4105
4054
parents = tree.get_parent_ids()
4106
4055
if len(parents) != 2:
4107
4056
raise errors.BzrCommandError("Sorry, remerge only works after normal"
4217
4166
def run(self, revision=None, no_backup=False, file_list=None,
4218
4167
forget_merges=None):
4219
tree, file_list = tree_files(file_list)
4220
tree.lock_tree_write()
4221
self.add_cleanup(tree.unlock)
4168
tree, file_list = WorkingTree.open_containing_paths(file_list)
4169
self.add_cleanup(tree.lock_tree_write().unlock)
4222
4170
if forget_merges:
4223
4171
tree.set_parent_ids(tree.get_parent_ids()[:1])
4313
4261
_see_also = ['merge', 'pull']
4314
4262
takes_args = ['other_branch?']
4315
4263
takes_options = [
4316
4265
Option('reverse', 'Reverse the order of revisions.'),
4317
4266
Option('mine-only',
4318
4267
'Display changes in the local branch only.'),
4340
4289
theirs_only=False,
4341
4290
log_format=None, long=False, short=False, line=False,
4342
4291
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4292
include_merges=False, revision=None, my_revision=None,
4344
4294
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4295
def message(s):
4346
4296
if not is_quiet():
4359
4309
elif theirs_only:
4360
4310
restrict = 'remote'
4362
local_branch = Branch.open_containing(u".")[0]
4363
local_branch.lock_read()
4364
self.add_cleanup(local_branch.unlock)
4312
local_branch = Branch.open_containing(directory)[0]
4313
self.add_cleanup(local_branch.lock_read().unlock)
4366
4315
parent = local_branch.get_parent()
4367
4316
if other_branch is None:
4378
4327
if remote_branch.base == local_branch.base:
4379
4328
remote_branch = local_branch
4381
remote_branch.lock_read()
4382
self.add_cleanup(remote_branch.unlock)
4330
self.add_cleanup(remote_branch.lock_read().unlock)
4384
4332
local_revid_range = _revision_range_to_revid_range(
4385
4333
_get_revision_range(my_revision, local_branch,
4440
4388
message("Branches are up to date.\n")
4441
4389
self.cleanup_now()
4442
4390
if not status_code and parent is None and other_branch is not None:
4443
local_branch.lock_write()
4444
self.add_cleanup(local_branch.unlock)
4391
self.add_cleanup(local_branch.lock_write().unlock)
4445
4392
# handle race conditions - a parent might be set while we run.
4446
4393
if local_branch.get_parent() is None:
4447
4394
local_branch.set_parent(remote_branch.base)
4578
4524
Option('long', help='Show commit date in annotations.'),
4582
4529
encoding_type = 'exact'
4584
4531
@display_command
4585
4532
def run(self, filename, all=False, long=False, revision=None,
4533
show_ids=False, directory=None):
4587
4534
from bzrlib.annotate import annotate_file, annotate_file_tree
4588
4535
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4536
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4537
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4538
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4540
self.add_cleanup(branch.lock_read().unlock)
4596
4541
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4542
self.add_cleanup(tree.lock_read().unlock)
4599
4543
if wt is not None:
4600
4544
file_id = wt.path2id(relpath)
4620
4564
hidden = True # is this right ?
4621
4565
takes_args = ['revision_id*']
4622
takes_options = ['revision']
4566
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
4568
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4569
if revision_id_list is not None and revision is not None:
4626
4570
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4627
4571
if revision_id_list is None and revision is None:
4628
4572
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
4573
b = WorkingTree.open_containing(directory)[0].branch
4574
self.add_cleanup(b.lock_write().unlock)
4632
4575
return self._run(b, revision_id_list, revision)
4634
4577
def _run(self, b, revision_id_list, revision):
4694
4637
_see_also = ['checkouts', 'unbind']
4695
4638
takes_args = ['location?']
4639
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4641
def run(self, location=None, directory=u'.'):
4642
b, relpath = Branch.open_containing(directory)
4700
4643
if location is None:
4702
4645
location = b.get_old_bound_location()
4730
4673
_see_also = ['checkouts', 'bind']
4731
4674
takes_args = []
4675
takes_options = ['directory']
4735
b, relpath = Branch.open_containing(u'.')
4677
def run(self, directory=u'.'):
4678
b, relpath = Branch.open_containing(directory)
4736
4679
if not b.unbind():
4737
4680
raise errors.BzrCommandError('Local branch is not bound')
4784
4727
b = control.open_branch()
4786
4729
if tree is not None:
4788
self.add_cleanup(tree.unlock)
4730
self.add_cleanup(tree.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4732
self.add_cleanup(b.lock_write().unlock)
4792
4733
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4794
4735
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
4902
4843
'result in a dynamically allocated port. The default port '
4903
4844
'depends on the protocol.',
4906
help='Serve contents of this directory.',
4846
custom_help('directory',
4847
help='Serve contents of this directory.'),
4908
4848
Option('allow-writes',
4909
4849
help='By default the server is a readonly server. Supplying '
4910
4850
'--allow-writes enables write access to the contents of '
4938
4878
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4939
4879
protocol=None):
4940
from bzrlib.transport import get_transport, transport_server_registry
4880
from bzrlib import transport
4941
4881
if directory is None:
4942
4882
directory = os.getcwd()
4943
4883
if protocol is None:
4944
protocol = transport_server_registry.get()
4884
protocol = transport.transport_server_registry.get()
4945
4885
host, port = self.get_host_and_port(port)
4946
4886
url = urlutils.local_path_to_url(directory)
4947
4887
if not allow_writes:
4948
4888
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
4889
t = transport.get_transport(url)
4890
protocol(t, host, port, inet)
4953
4893
class cmd_join(Command):
5064
5005
encoding_type = 'exact'
5066
5007
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5067
sign=False, revision=None, mail_to=None, message=None):
5008
sign=False, revision=None, mail_to=None, message=None,
5068
5010
from bzrlib.revision import ensure_null, NULL_REVISION
5069
5011
include_patch, include_bundle = {
5070
5012
'plain': (False, False),
5071
5013
'diff': (True, False),
5072
5014
'bundle': (True, True),
5074
branch = Branch.open('.')
5016
branch = Branch.open(directory)
5075
5017
stored_submit_branch = branch.get_submit_branch()
5076
5018
if submit_branch is None:
5077
5019
submit_branch = stored_submit_branch
5162
5104
given, in which case it is sent to a file.
5164
5106
Mail is sent using your preferred mail program. This should be transparent
5165
on Windows (it uses MAPI). On Linux, it requires the xdg-email utility.
5107
on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.
5166
5108
If the preferred client can't be found (or used), your editor will be used.
5168
5110
To use a specific mail program, set the mail_client configuration option.
5339
5281
Option('delete',
5340
5282
help='Delete this tag rather than placing it.',
5343
help='Branch in which to place the tag.',
5284
custom_help('directory',
5285
help='Branch in which to place the tag.'),
5347
5286
Option('force',
5348
5287
help='Replace existing tags.',
5359
5298
branch, relpath = Branch.open_containing(directory)
5361
self.add_cleanup(branch.unlock)
5299
self.add_cleanup(branch.lock_write().unlock)
5363
5301
if tag_name is None:
5364
5302
raise errors.BzrCommandError("No tag specified to delete.")
5393
5331
_see_also = ['tag']
5394
5332
takes_options = [
5396
help='Branch whose tags should be displayed.',
5333
custom_help('directory',
5334
help='Branch whose tags should be displayed.'),
5400
5335
RegistryOption.from_kwargs('sort',
5401
5336
'Sort tags by different criteria.', title='Sorting',
5402
5337
alpha='Sort tags lexicographically (default).',
5423
self.add_cleanup(branch.unlock)
5357
self.add_cleanup(branch.lock_read().unlock)
5425
5359
graph = branch.repository.get_graph()
5426
5360
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5575
5509
takes_args = ['to_location?']
5576
takes_options = [Option('force',
5510
takes_options = ['directory',
5577
5512
help='Switch even if local commits will be lost.'),
5579
5514
Option('create-branch', short_name='b',
5584
5519
def run(self, to_location=None, force=False, create_branch=False,
5520
revision=None, directory=u'.'):
5586
5521
from bzrlib import switch
5522
tree_location = directory
5588
5523
revision = _get_one_revision('switch', revision)
5589
5524
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
5525
if to_location is None:
5591
5526
if revision is None:
5592
5527
raise errors.BzrCommandError('You must supply either a'
5593
5528
' revision or a location')
5529
to_location = tree_location
5596
5531
branch = control_dir.open_branch()
5597
5532
had_explicit_nick = branch.get_config().has_explicit_nickname()
5735
tree, file_list = tree_files(file_list, apply_view=False)
5670
tree, file_list = WorkingTree.open_containing_paths(file_list,
5736
5672
current_view, view_dict = tree.views.get_view_info()
5737
5673
if name is None:
5738
5674
name = current_view
5886
5823
_see_also = ['unshelve']
5888
5825
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
5826
writer=None, list=False, destroy=False, directory=u'.'):
5891
5828
return self.run_for_list()
5892
5829
from bzrlib.shelf_ui import Shelver
5894
5831
writer = bzrlib.option.diff_writer_registry.get()
5896
5833
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
5834
file_list, message, destroy=destroy, directory=directory)
5905
5842
def run_for_list(self):
5906
5843
tree = WorkingTree.open_containing('.')[0]
5908
self.add_cleanup(tree.unlock)
5844
self.add_cleanup(tree.lock_read().unlock)
5909
5845
manager = tree.get_shelf_manager()
5910
5846
shelves = manager.active_shelves()
5911
5847
if len(shelves) == 0:
5930
5866
takes_args = ['shelf_id?']
5931
5867
takes_options = [
5932
5869
RegistryOption.from_kwargs(
5933
5870
'action', help="The action to perform.",
5934
5871
enum_switch=False, value_switches=True,
5943
5880
_see_also = ['shelve']
5945
def run(self, shelf_id=None, action='apply'):
5882
def run(self, shelf_id=None, action='apply', directory=u'.'):
5946
5883
from bzrlib.shelf_ui import Unshelver
5947
unshelver = Unshelver.from_args(shelf_id, action)
5884
unshelver = Unshelver.from_args(shelf_id, action, directory=directory)
5949
5886
unshelver.run()
5967
5904
To check what clean-tree will do, use --dry-run.
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5906
takes_options = ['directory',
5907
Option('ignored', help='Delete all ignored files.'),
5970
5908
Option('detritus', help='Delete conflict files, merge'
5971
5909
' backups, and failed selftest dirs.'),
5972
5910
Option('unknown',
5975
5913
' deleting them.'),
5976
5914
Option('force', help='Do not prompt before deleting.')]
5977
5915
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
5916
force=False, directory=u'.'):
5979
5917
from bzrlib.clean_tree import clean_tree
5980
5918
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
5922
clean_tree(directory, unknown=unknown, ignored=ignored,
5923
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
5926
class cmd_reference(Command):
added
removed
bzrlib/builtins.py
