73
71
_parse_revision_str,
75
73
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
79
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
80
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]))
82
return internal_tree_files(file_list, default_branch, canonicalize,
88
86
def tree_files_for_add(file_list):
153
151
# XXX: Bad function name; should possibly also be a class method of
154
152
# WorkingTree rather than a function.
153
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
155
154
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
155
apply_view=True):
157
156
"""Convert command-line paths to a WorkingTree and relative paths.
158
Deprecated: use WorkingTree.open_containing_paths instead.
159
160
This is typically used for command-line processors that take one or
160
161
more filenames, and infer the workingtree that contains them.
172
173
: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)
175
return WorkingTree.open_containing_paths(
176
file_list, default_directory='.',
223
181
def _get_view_info_for_change_reporter(tree):
193
def _open_directory_or_containing_tree_or_branch(filename, directory):
194
"""Open the tree or branch containing the specified file, unless
195
the --directory option is used to specify a different branch."""
196
if directory is not None:
197
return (None, Branch.open(directory), filename)
198
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
235
201
# TODO: Make sure no commands unconditionally use the working directory as a
236
202
# branch. If a filename argument is used, the first of them should be used to
237
203
# specify the branch. (Perhaps this can be factored out into some kind of
286
252
To skip the display of pending merge information altogether, use
287
253
the no-pending option or specify a file/directory.
289
If a revision argument is given, the status is calculated against
290
that revision, or between two revisions if two are provided.
255
To compare the working directory to a specific revision, pass a
256
single revision to the revision argument.
258
To see which files have changed in a specific revision, or between
259
two revisions, pass a revision range to the revision argument.
260
This will produce the same results as calling 'bzr diff --summarize'.
293
263
# TODO: --no-recurse, --recurse options
353
323
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
326
def run(self, revision_id=None, revision=None, directory=u'.'):
357
327
if revision_id is not None and revision is not None:
358
328
raise errors.BzrCommandError('You can only supply one of'
359
329
' revision_id or --revision')
360
330
if revision_id is None and revision is None:
361
331
raise errors.BzrCommandError('You must supply either'
362
332
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
334
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
365
336
revisions = b.repository.revisions
366
337
if revisions is None:
511
487
d.destroy_workingtree()
490
class cmd_repair_workingtree(Command):
491
__doc__ = """Reset the working tree state file.
493
This is not meant to be used normally, but more as a way to recover from
494
filesystem corruption, etc. This rebuilds the working inventory back to a
495
'known good' state. Any new modifications (adding a file, renaming, etc)
496
will be lost, though modified files will still be detected as such.
498
Most users will want something more like "bzr revert" or "bzr update"
499
unless the state file has become corrupted.
501
By default this attempts to recover the current state by looking at the
502
headers of the state file. If the state file is too corrupted to even do
503
that, you can supply --revision to force the state of the tree.
506
takes_options = ['revision', 'directory',
508
help='Reset the tree even if it doesn\'t appear to be'
513
def run(self, revision=None, directory='.', force=False):
514
tree, _ = WorkingTree.open_containing(directory)
515
self.add_cleanup(tree.lock_tree_write().unlock)
519
except errors.BzrError:
520
pass # There seems to be a real error here, so we'll reset
523
raise errors.BzrCommandError(
524
'The tree does not appear to be corrupt. You probably'
525
' want "bzr revert" instead. Use "--force" if you are'
526
' sure you want to reset the working tree.')
530
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
532
tree.reset_state(revision_ids)
533
except errors.BzrError, e:
534
if revision_ids is None:
535
extra = (', the header appears corrupt, try passing -r -1'
536
' to set the state to the last commit')
539
raise errors.BzrCommandError('failed to reset the tree state'
514
543
class cmd_revno(Command):
515
544
__doc__ = """Show current revision number.
937
964
match the remote one, use pull --overwrite. This will work even if the two
938
965
branches have diverged.
940
If there is no default location set, the first pull will set it. After
941
that, you can omit the location to use the default. To change the
942
default, use --remember. The value will only be saved if the remote
943
location can be accessed.
967
If there is no default location set, the first pull will set it (use
968
--no-remember to avoid settting it). After that, you can omit the
969
location to use the default. To change the default, use --remember. The
970
value will only be saved if the remote location can be accessed.
945
972
Note: The location can be specified either in the form of a branch,
946
973
or in the form of a path to a file containing a merge directive generated
951
978
takes_options = ['remember', 'overwrite', 'revision',
952
979
custom_help('verbose',
953
980
help='Show logs of pulled revisions.'),
981
custom_help('directory',
955
982
help='Branch to pull into, '
956
'rather than the one containing the working directory.',
983
'rather than the one containing the working directory.'),
961
985
help="Perform a local pull in a bound "
962
986
"branch. Local pulls are not applied to "
963
987
"the master branch."
990
help="Show base revision text in conflicts.")
966
992
takes_args = ['location?']
967
993
encoding_type = 'replace'
969
def run(self, location=None, remember=False, overwrite=False,
995
def run(self, location=None, remember=None, overwrite=False,
970
996
revision=None, verbose=False,
971
directory=None, local=False):
997
directory=None, local=False,
972
999
# FIXME: too much stuff is in the command class
973
1000
revision_id = None
974
1001
mergeable = None
1065
1101
do a merge (see bzr help merge) from the other branch, and commit that.
1066
1102
After that you will be able to do a push without '--overwrite'.
1068
If there is no default push location set, the first push will set it.
1069
After that, you can omit the location to use the default. To change the
1070
default, use --remember. The value will only be saved if the remote
1071
location can be accessed.
1104
If there is no default push location set, the first push will set it (use
1105
--no-remember to avoid settting it). After that, you can omit the
1106
location to use the default. To change the default, use --remember. The
1107
value will only be saved if the remote location can be accessed.
1074
1110
_see_also = ['pull', 'update', 'working-trees']
1076
1112
Option('create-prefix',
1077
1113
help='Create the path leading up to the branch '
1078
1114
'if it does not already exist.'),
1115
custom_help('directory',
1080
1116
help='Branch to push from, '
1081
'rather than the one containing the working directory.',
1117
'rather than the one containing the working directory.'),
1085
1118
Option('use-existing-dir',
1086
1119
help='By default push will fail if the target'
1087
1120
' directory exists, but does not already'
1098
1131
Option('strict',
1099
1132
help='Refuse to push if there are uncommitted changes in'
1100
1133
' the working tree, --no-strict disables the check.'),
1135
help="Don't populate the working tree, even for protocols"
1136
" that support it."),
1102
1138
takes_args = ['location?']
1103
1139
encoding_type = 'replace'
1105
def run(self, location=None, remember=False, overwrite=False,
1141
def run(self, location=None, remember=None, overwrite=False,
1106
1142
create_prefix=False, verbose=False, revision=None,
1107
1143
use_existing_dir=False, directory=None, stacked_on=None,
1108
stacked=False, strict=None):
1144
stacked=False, strict=None, no_tree=False):
1109
1145
from bzrlib.push import _show_push_branch
1111
1147
if directory is None:
1157
1193
_show_push_branch(br_from, revision_id, location, self.outf,
1158
1194
verbose=verbose, overwrite=overwrite, remember=remember,
1159
1195
stacked_on=stacked_on, create_prefix=create_prefix,
1160
use_existing_dir=use_existing_dir)
1196
use_existing_dir=use_existing_dir, no_tree=no_tree)
1163
1199
class cmd_branch(Command):
1173
1209
To retrieve the branch as of a particular revision, supply the --revision
1174
1210
parameter, as in "branch foo/bar -r 5".
1212
The synonyms 'clone' and 'get' for this command are deprecated.
1177
1215
_see_also = ['checkout']
1178
1216
takes_args = ['from_location', 'to_location?']
1179
takes_options = ['revision', Option('hardlink',
1180
help='Hard-link working tree files where possible.'),
1217
takes_options = ['revision',
1218
Option('hardlink', help='Hard-link working tree files where possible.'),
1219
Option('files-from', type=str,
1220
help="Get file contents from this tree."),
1181
1221
Option('no-tree',
1182
1222
help="Create a branch without a working-tree."),
1183
1223
Option('switch',
1202
1242
def run(self, from_location, to_location=None, revision=None,
1203
1243
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1244
use_existing_dir=False, switch=False, bind=False,
1205
1246
from bzrlib import switch as _mod_switch
1206
1247
from bzrlib.tag import _merge_tags_if_possible
1248
if self.invoked_as in ['get', 'clone']:
1249
ui.ui_factory.show_user_warning(
1250
'deprecated_command',
1251
deprecated_name=self.invoked_as,
1252
recommended_name='branch',
1253
deprecated_in_version='2.4')
1207
1254
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1256
if not (hardlink or files_from):
1257
# accelerator_tree is usually slower because you have to read N
1258
# files (no readahead, lots of seeks, etc), but allow the user to
1259
# explicitly request it
1260
accelerator_tree = None
1261
if files_from is not None and files_from != from_location:
1262
accelerator_tree = WorkingTree.open(files_from)
1209
1263
revision = _get_one_revision('branch', revision)
1210
1264
self.add_cleanup(br_from.lock_read().unlock)
1211
1265
if revision is not None:
1318
1372
to_location = branch_location
1319
1373
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1320
1374
branch_location)
1375
if not (hardlink or files_from):
1376
# accelerator_tree is usually slower because you have to read N
1377
# files (no readahead, lots of seeks, etc), but allow the user to
1378
# explicitly request it
1379
accelerator_tree = None
1321
1380
revision = _get_one_revision('checkout', revision)
1322
if files_from is not None:
1381
if files_from is not None and files_from != branch_location:
1323
1382
accelerator_tree = WorkingTree.open(files_from)
1324
1383
if revision is not None:
1325
1384
revision_id = revision.as_revision_id(source)
1381
1440
If you want to discard your local changes, you can just do a
1382
1441
'bzr revert' instead of 'bzr commit' after the update.
1443
If you want to restore a file that has been removed locally, use
1444
'bzr revert' instead of 'bzr update'.
1384
1446
If the tree's branch is bound to a master branch, it will also update
1385
1447
the branch from the master.
1388
1450
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1451
takes_args = ['dir?']
1390
takes_options = ['revision']
1452
takes_options = ['revision',
1454
help="Show base revision text in conflicts."),
1391
1456
aliases = ['up']
1393
def run(self, dir='.', revision=None):
1458
def run(self, dir='.', revision=None, show_base=None):
1394
1459
if revision is not None and len(revision) != 1:
1395
1460
raise errors.BzrCommandError(
1396
1461
"bzr update --revision takes exactly one revision")
1504
1570
class cmd_remove(Command):
1505
1571
__doc__ = """Remove files or directories.
1507
This makes bzr stop tracking changes to the specified files. bzr will delete
1508
them if they can easily be recovered using revert. If no options or
1509
parameters are given bzr will scan for files that are being tracked by bzr
1510
but missing in your tree and stop tracking them for you.
1573
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1574
delete them if they can easily be recovered using revert otherwise they
1575
will be backed up (adding an extention of the form .~#~). If no options or
1576
parameters are given Bazaar will scan for files that are being tracked by
1577
Bazaar but missing in your tree and stop tracking them for you.
1512
1579
takes_args = ['file*']
1513
1580
takes_options = ['verbose',
1515
1582
RegistryOption.from_kwargs('file-deletion-strategy',
1516
1583
'The file deletion mode to be used.',
1517
1584
title='Deletion Strategy', value_switches=True, enum_switch=False,
1518
safe='Only delete files if they can be'
1519
' safely recovered (default).',
1585
safe='Backup changed files (default).',
1520
1586
keep='Delete from bzr but leave the working copy.',
1587
no_backup='Don\'t backup changed files.',
1521
1588
force='Delete all the specified files, even if they can not be '
1522
'recovered and even if they are non-empty directories.')]
1589
'recovered and even if they are non-empty directories. '
1590
'(deprecated, use no-backup)')]
1523
1591
aliases = ['rm', 'del']
1524
1592
encoding_type = 'replace'
1526
1594
def run(self, file_list, verbose=False, new=False,
1527
1595
file_deletion_strategy='safe'):
1528
tree, file_list = tree_files(file_list)
1596
if file_deletion_strategy == 'force':
1597
note("(The --force option is deprecated, rather use --no-backup "
1599
file_deletion_strategy = 'no-backup'
1601
tree, file_list = WorkingTree.open_containing_paths(file_list)
1530
1603
if file_list is not None:
1531
1604
file_list = [f for f in file_list]
1620
1693
_see_also = ['check']
1621
1694
takes_args = ['branch?']
1696
Option('canonicalize-chks',
1697
help='Make sure CHKs are in canonical form (repairs '
1623
def run(self, branch="."):
1702
def run(self, branch=".", canonicalize_chks=False):
1624
1703
from bzrlib.reconcile import reconcile
1625
1704
dir = bzrdir.BzrDir.open(branch)
1705
reconcile(dir, canonicalize_chks=canonicalize_chks)
1629
1708
class cmd_revision_history(Command):
1662
1741
last_revision = wt.last_revision()
1664
revision_ids = b.repository.get_ancestry(last_revision)
1666
for revision_id in revision_ids:
1743
self.add_cleanup(b.repository.lock_read().unlock)
1744
graph = b.repository.get_graph()
1745
revisions = [revid for revid, parents in
1746
graph.iter_ancestry([last_revision])]
1747
for revision_id in reversed(revisions):
1748
if _mod_revision.is_null(revision_id):
1667
1750
self.outf.write(revision_id + '\n')
1707
1790
Option('append-revisions-only',
1708
1791
help='Never change revnos or the existing log.'
1709
' Append revisions to it only.')
1792
' Append revisions to it only.'),
1794
'Create a branch without a working tree.')
1711
1796
def run(self, location=None, format=None, append_revisions_only=False,
1712
create_prefix=False):
1797
create_prefix=False, no_tree=False):
1713
1798
if format is None:
1714
1799
format = bzrdir.format_registry.make_bzrdir('default')
1715
1800
if location is None:
1969
2077
old_branch, new_branch,
1970
2078
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
2079
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2080
# GNU diff on Windows uses ANSI encoding for filenames
2081
path_encoding = osutils.get_diff_header_encoding()
1972
2082
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
2083
specific_files=specific_files,
1974
2084
external_diff_options=diff_options,
1975
2085
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
2086
extra_trees=extra_trees,
2087
path_encoding=path_encoding,
1977
2089
format_cls=format)
1987
2099
# level of effort but possibly much less IO. (Or possibly not,
1988
2100
# if the directories are very large...)
1989
2101
_see_also = ['status', 'ls']
1990
takes_options = ['show-ids']
2102
takes_options = ['directory', 'show-ids']
1992
2104
@display_command
1993
def run(self, show_ids=False):
1994
tree = WorkingTree.open_containing(u'.')[0]
2105
def run(self, show_ids=False, directory=u'.'):
2106
tree = WorkingTree.open_containing(directory)[0]
1995
2107
self.add_cleanup(tree.lock_read().unlock)
1996
2108
old = tree.basis_tree()
1997
2109
self.add_cleanup(old.lock_read().unlock)
2012
2124
_see_also = ['status', 'ls']
2015
help='Write an ascii NUL (\\0) separator '
2016
'between files rather than a newline.')
2125
takes_options = ['directory', 'null']
2019
2127
@display_command
2020
def run(self, null=False):
2021
tree = WorkingTree.open_containing(u'.')[0]
2128
def run(self, null=False, directory=u'.'):
2129
tree = WorkingTree.open_containing(directory)[0]
2130
self.add_cleanup(tree.lock_read().unlock)
2022
2131
td = tree.changes_from(tree.basis_tree())
2023
2133
for path, id, kind, text_modified, meta_modified in td.modified:
2025
2135
self.outf.write(path + '\0')
2035
2145
_see_also = ['status', 'ls']
2038
help='Write an ascii NUL (\\0) separator '
2039
'between files rather than a newline.')
2146
takes_options = ['directory', 'null']
2042
2148
@display_command
2043
def run(self, null=False):
2044
wt = WorkingTree.open_containing(u'.')[0]
2149
def run(self, null=False, directory=u'.'):
2150
wt = WorkingTree.open_containing(directory)[0]
2045
2151
self.add_cleanup(wt.lock_read().unlock)
2046
2152
basis = wt.basis_tree()
2047
2153
self.add_cleanup(basis.lock_read().unlock)
2505
2618
help='Recurse into subdirectories.'),
2506
2619
Option('from-root',
2507
2620
help='Print paths relative to the root of the branch.'),
2508
Option('unknown', help='Print unknown files.'),
2621
Option('unknown', short_name='u',
2622
help='Print unknown files.'),
2509
2623
Option('versioned', help='Print versioned files.',
2510
2624
short_name='V'),
2511
Option('ignored', help='Print ignored files.'),
2513
help='Write an ascii NUL (\\0) separator '
2514
'between files rather than a newline.'),
2625
Option('ignored', short_name='i',
2626
help='Print ignored files.'),
2627
Option('kind', short_name='k',
2516
2628
help='List entries of a particular kind: file, directory, symlink.',
2520
2634
@display_command
2521
2635
def run(self, revision=None, verbose=False,
2522
2636
recursive=False, from_root=False,
2523
2637
unknown=False, versioned=False, ignored=False,
2524
null=False, kind=None, show_ids=False, path=None):
2638
null=False, kind=None, show_ids=False, path=None, directory=None):
2526
2640
if kind and kind not in ('file', 'directory', 'symlink'):
2527
2641
raise errors.BzrCommandError('invalid kind specified')
2689
2813
_see_also = ['status', 'ignored', 'patterns']
2690
2814
takes_args = ['name_pattern*']
2815
takes_options = ['directory',
2692
2816
Option('default-rules',
2693
2817
help='Display the default ignore rules that bzr uses.')
2696
def run(self, name_pattern_list=None, default_rules=None):
2820
def run(self, name_pattern_list=None, default_rules=None,
2697
2822
from bzrlib import ignores
2698
2823
if default_rules is not None:
2699
2824
# dump the default rules and exit
2705
2830
"NAME_PATTERN or --default-rules.")
2706
2831
name_pattern_list = [globbing.normalize_pattern(p)
2707
2832
for p in name_pattern_list]
2834
for p in name_pattern_list:
2835
if not globbing.Globster.is_pattern_valid(p):
2836
bad_patterns += ('\n %s' % p)
2838
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2839
ui.ui_factory.show_error(msg)
2840
raise errors.InvalidPattern('')
2708
2841
for name_pattern in name_pattern_list:
2709
2842
if (name_pattern[0] == '/' or
2710
2843
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2711
2844
raise errors.BzrCommandError(
2712
2845
"NAME_PATTERN should not be an absolute path")
2713
tree, relpath = WorkingTree.open_containing(u'.')
2846
tree, relpath = WorkingTree.open_containing(directory)
2714
2847
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2715
2848
ignored = globbing.Globster(name_pattern_list)
2850
self.add_cleanup(tree.lock_read().unlock)
2718
2851
for entry in tree.list_files():
2720
2853
if id is not None:
2721
2854
filename = entry[0]
2722
2855
if ignored.match(filename):
2723
2856
matches.append(filename)
2725
2857
if len(matches) > 0:
2726
2858
self.outf.write("Warning: the following files are version controlled and"
2727
2859
" match your ignore pattern:\n%s"
2743
2875
encoding_type = 'replace'
2744
2876
_see_also = ['ignore', 'ls']
2877
takes_options = ['directory']
2746
2879
@display_command
2748
tree = WorkingTree.open_containing(u'.')[0]
2880
def run(self, directory=u'.'):
2881
tree = WorkingTree.open_containing(directory)[0]
2749
2882
self.add_cleanup(tree.lock_read().unlock)
2750
2883
for path, file_class, kind, file_id, entry in tree.list_files():
2751
2884
if file_class != 'I':
2819
2954
'revision in which it was changed.'),
2821
2956
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2957
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2823
2958
from bzrlib.export import export
2825
2960
if branch_or_subdir is None:
2826
tree = WorkingTree.open_containing(u'.')[0]
2961
tree = WorkingTree.open_containing(directory)[0]
2827
2962
b = tree.branch
2860
2995
@display_command
2861
2996
def run(self, filename, revision=None, name_from_revision=False,
2997
filters=False, directory=None):
2863
2998
if revision is not None and len(revision) != 1:
2864
2999
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2865
3000
" one revision specifier")
2866
3001
tree, branch, relpath = \
2867
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
3002
_open_directory_or_containing_tree_or_branch(filename, directory)
2868
3003
self.add_cleanup(branch.lock_read().unlock)
2869
3004
return self._run(tree, branch, relpath, filename, revision,
2870
3005
name_from_revision, filters)
2986
3121
to trigger updates to external systems like bug trackers. The --fixes
2987
3122
option can be used to record the association between a revision and
2988
3123
one or more bugs. See ``bzr help bugs`` for details.
2990
A selective commit may fail in some cases where the committed
2991
tree would be invalid. Consider::
2996
bzr commit foo -m "committing foo"
2997
bzr mv foo/bar foo/baz
3000
bzr commit foo/bar -m "committing bar but not baz"
3002
In the example above, the last commit will fail by design. This gives
3003
the user the opportunity to decide whether they want to commit the
3004
rename at the same time, separately first, or not at all. (As a general
3005
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3007
# TODO: Run hooks on tree to-be-committed, and after commit.
3009
# TODO: Strict commit that fails if there are deleted files.
3010
# (what does "deleted files" mean ??)
3012
# TODO: Give better message for -s, --summary, used by tla people
3014
# XXX: verbose currently does nothing
3016
3126
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3017
3127
takes_args = ['selected*']
3074
3188
def run(self, message=None, file=None, verbose=False, selected_list=None,
3075
3189
unchanged=False, strict=False, local=False, fixes=None,
3076
author=None, show_diff=False, exclude=None, commit_time=None):
3190
author=None, show_diff=False, exclude=None, commit_time=None,
3077
3192
from bzrlib.errors import (
3078
3193
PointlessCommit,
3079
3194
ConflictsInTree,
3093
3209
raise errors.BzrCommandError(
3094
3210
"Could not parse --commit-time: " + str(e))
3096
# TODO: Need a blackbox test for invoking the external editor; may be
3097
# slightly problematic to run this cross-platform.
3099
# TODO: do more checks that the commit will succeed before
3100
# spending the user's valuable time typing a commit message.
3102
3212
properties = {}
3104
tree, selected_list = tree_files(selected_list)
3214
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3105
3215
if selected_list == ['']:
3106
3216
# workaround - commit of root of tree should be exactly the same
3107
3217
# as just default commit in that tree, and succeed even though
3157
3270
# make_commit_message_template_encoded returns user encoding.
3158
3271
# We probably want to be using edit_commit_message instead to
3160
start_message = generate_commit_message_template(commit_obj)
3161
my_message = edit_commit_message_encoded(text,
3162
start_message=start_message)
3273
my_message = set_commit_message(commit_obj)
3274
if my_message is None:
3275
start_message = generate_commit_message_template(commit_obj)
3276
my_message = edit_commit_message_encoded(text,
3277
start_message=start_message)
3163
3278
if my_message is None:
3164
3279
raise errors.BzrCommandError("please specify a commit"
3165
3280
" message with either --message or --file")
3178
3293
reporter=None, verbose=verbose, revprops=properties,
3179
3294
authors=author, timestamp=commit_stamp,
3180
3295
timezone=offset,
3181
exclude=safe_relpath_files(tree, exclude))
3296
exclude=tree.safe_relpath_files(exclude),
3182
3298
except PointlessCommit:
3183
3299
raise errors.BzrCommandError("No changes to commit."
3184
" Use --unchanged to commit anyhow.")
3300
" Please 'bzr add' the files you want to commit, or use"
3301
" --unchanged to force an empty commit.")
3185
3302
except ConflictsInTree:
3186
3303
raise errors.BzrCommandError('Conflicts detected in working '
3187
3304
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3270
3387
class cmd_upgrade(Command):
3271
__doc__ = """Upgrade branch storage to current format.
3273
The check command or bzr developers may sometimes advise you to run
3274
this command. When the default format has changed you may also be warned
3275
during other operations to upgrade.
3388
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3390
When the default format has changed after a major new release of
3391
Bazaar, you may be informed during certain operations that you
3392
should upgrade. Upgrading to a newer format may improve performance
3393
or make new features available. It may however limit interoperability
3394
with older repositories or with older versions of Bazaar.
3396
If you wish to upgrade to a particular format rather than the
3397
current default, that can be specified using the --format option.
3398
As a consequence, you can use the upgrade command this way to
3399
"downgrade" to an earlier format, though some conversions are
3400
a one way process (e.g. changing from the 1.x default to the
3401
2.x default) so downgrading is not always possible.
3403
A backup.bzr.~#~ directory is created at the start of the conversion
3404
process (where # is a number). By default, this is left there on
3405
completion. If the conversion fails, delete the new .bzr directory
3406
and rename this one back in its place. Use the --clean option to ask
3407
for the backup.bzr directory to be removed on successful conversion.
3408
Alternatively, you can delete it by hand if everything looks good
3411
If the location given is a shared repository, dependent branches
3412
are also converted provided the repository converts successfully.
3413
If the conversion of a branch fails, remaining branches are still
3416
For more information on upgrades, see the Bazaar Upgrade Guide,
3417
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3278
_see_also = ['check']
3420
_see_also = ['check', 'reconcile', 'formats']
3279
3421
takes_args = ['url?']
3280
3422
takes_options = [
3281
RegistryOption('format',
3282
help='Upgrade to a specific format. See "bzr help'
3283
' formats" for details.',
3284
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3285
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3286
value_switches=True, title='Branch format'),
3423
RegistryOption('format',
3424
help='Upgrade to a specific format. See "bzr help'
3425
' formats" for details.',
3426
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3427
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3428
value_switches=True, title='Branch format'),
3430
help='Remove the backup.bzr directory if successful.'),
3432
help="Show what would be done, but don't actually do anything."),
3289
def run(self, url='.', format=None):
3435
def run(self, url='.', format=None, clean=False, dry_run=False):
3290
3436
from bzrlib.upgrade import upgrade
3291
upgrade(url, format)
3437
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3439
if len(exceptions) == 1:
3440
# Compatibility with historical behavior
3294
3446
class cmd_whoami(Command):
3313
3466
encoding_type = 'replace'
3315
3468
@display_command
3316
def run(self, email=False, branch=False, name=None):
3469
def run(self, email=False, branch=False, name=None, directory=None):
3317
3470
if name is None:
3318
# use branch if we're inside one; otherwise global config
3320
c = Branch.open_containing('.')[0].get_config()
3321
except errors.NotBranchError:
3322
c = config.GlobalConfig()
3471
if directory is None:
3472
# use branch if we're inside one; otherwise global config
3474
c = Branch.open_containing(u'.')[0].get_config()
3475
except errors.NotBranchError:
3476
c = _mod_config.GlobalConfig()
3478
c = Branch.open(directory).get_config()
3324
3480
self.outf.write(c.user_email() + '\n')
3326
3482
self.outf.write(c.username() + '\n')
3486
raise errors.BzrCommandError("--email can only be used to display existing "
3329
3489
# display a warning if an email address isn't included in the given name.
3331
config.extract_email_address(name)
3491
_mod_config.extract_email_address(name)
3332
3492
except errors.NoEmailInUsername, e:
3333
3493
warning('"%s" does not seem to contain an email address. '
3334
3494
'This is allowed, but not recommended.', name)
3336
3496
# use global config unless --branch given
3338
c = Branch.open_containing('.')[0].get_config()
3498
if directory is None:
3499
c = Branch.open_containing(u'.')[0].get_config()
3501
c = Branch.open(directory).get_config()
3340
c = config.GlobalConfig()
3503
c = _mod_config.GlobalConfig()
3341
3504
c.set_user_option('email', name)
3409
3573
'bzr alias --remove expects an alias to remove.')
3410
3574
# If alias is not found, print something like:
3411
3575
# unalias: foo: not found
3412
c = config.GlobalConfig()
3576
c = _mod_config.GlobalConfig()
3413
3577
c.unset_alias(alias_name)
3415
3579
@display_command
3416
3580
def print_aliases(self):
3417
3581
"""Print out the defined aliases in a similar format to bash."""
3418
aliases = config.GlobalConfig().get_aliases()
3582
aliases = _mod_config.GlobalConfig().get_aliases()
3419
3583
for key, value in sorted(aliases.iteritems()):
3420
3584
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3488
3655
if typestring == "sftp":
3489
3656
from bzrlib.tests import stub_sftp
3490
3657
return stub_sftp.SFTPAbsoluteServer
3491
if typestring == "memory":
3658
elif typestring == "memory":
3492
3659
from bzrlib.tests import test_server
3493
3660
return memory.MemoryServer
3494
if typestring == "fakenfs":
3661
elif typestring == "fakenfs":
3495
3662
from bzrlib.tests import test_server
3496
3663
return test_server.FakeNFSServer
3497
3664
msg = "No known transport type %s. Supported types are: sftp\n" %\
3510
3677
'throughout the test suite.',
3511
3678
type=get_transport_type),
3512
3679
Option('benchmark',
3513
help='Run the benchmarks rather than selftests.'),
3680
help='Run the benchmarks rather than selftests.',
3514
3682
Option('lsprof-timed',
3515
3683
help='Generate lsprof output for benchmarked'
3516
3684
' sections of code.'),
3517
3685
Option('lsprof-tests',
3518
3686
help='Generate lsprof output for each test.'),
3519
Option('cache-dir', type=str,
3520
help='Cache intermediate benchmark output in this '
3522
3687
Option('first',
3523
3688
help='Run all tests, but run specified tests first.',
3524
3689
short_name='f',
3533
3698
Option('randomize', type=str, argname="SEED",
3534
3699
help='Randomize the order of tests using the given'
3535
3700
' seed or "now" for the current time.'),
3536
Option('exclude', type=str, argname="PATTERN",
3538
help='Exclude tests that match this regular'
3701
ListOption('exclude', type=str, argname="PATTERN",
3703
help='Exclude tests that match this regular'
3540
3705
Option('subunit',
3541
3706
help='Output test progress via subunit.'),
3542
3707
Option('strict', help='Fail on missing dependencies or '
3559
3724
def run(self, testspecs_list=None, verbose=False, one=False,
3560
3725
transport=None, benchmark=None,
3561
lsprof_timed=None, cache_dir=None,
3562
3727
first=False, list_only=False,
3563
3728
randomize=None, exclude=None, strict=False,
3564
3729
load_list=None, debugflag=None, starting_with=None, subunit=False,
3565
3730
parallel=None, lsprof_tests=False):
3566
from bzrlib.tests import selftest
3567
import bzrlib.benchmarks as benchmarks
3568
from bzrlib.benchmarks import tree_creator
3570
# Make deprecation warnings visible, unless -Werror is set
3571
symbol_versioning.activate_deprecation_warnings(override=False)
3573
if cache_dir is not None:
3574
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3731
from bzrlib import tests
3575
3733
if testspecs_list is not None:
3576
3734
pattern = '|'.join(testspecs_list)
3585
3743
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3586
3744
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
3745
# stdout, which would corrupt the subunit stream.
3588
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3746
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3747
# following code can be deleted when it's sufficiently deployed
3748
# -- vila/mgz 20100514
3749
if (sys.platform == "win32"
3750
and getattr(sys.stdout, 'fileno', None) is not None):
3590
3752
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3592
3754
self.additional_selftest_args.setdefault(
3593
3755
'suite_decorators', []).append(parallel)
3595
test_suite_factory = benchmarks.test_suite
3596
# Unless user explicitly asks for quiet, be verbose in benchmarks
3597
verbose = not is_quiet()
3598
# TODO: should possibly lock the history file...
3599
benchfile = open(".perf_history", "at", buffering=1)
3600
self.add_cleanup(benchfile.close)
3757
raise errors.BzrCommandError(
3758
"--benchmark is no longer supported from bzr 2.2; "
3759
"use bzr-usertest instead")
3760
test_suite_factory = None
3762
exclude_pattern = None
3602
test_suite_factory = None
3764
exclude_pattern = '(' + '|'.join(exclude) + ')'
3604
3765
selftest_kwargs = {"verbose": verbose,
3605
3766
"pattern": pattern,
3606
3767
"stop_on_failure": one,
3608
3769
"test_suite_factory": test_suite_factory,
3609
3770
"lsprof_timed": lsprof_timed,
3610
3771
"lsprof_tests": lsprof_tests,
3611
"bench_history": benchfile,
3612
3772
"matching_tests_first": first,
3613
3773
"list_only": list_only,
3614
3774
"random_seed": randomize,
3615
"exclude_pattern": exclude,
3775
"exclude_pattern": exclude_pattern,
3616
3776
"strict": strict,
3617
3777
"load_list": load_list,
3618
3778
"debug_flags": debugflag,
3619
3779
"starting_with": starting_with
3621
3781
selftest_kwargs.update(self.additional_selftest_args)
3622
result = selftest(**selftest_kwargs)
3783
# Make deprecation warnings visible, unless -Werror is set
3784
cleanup = symbol_versioning.activate_deprecation_warnings(
3787
result = tests.selftest(**selftest_kwargs)
3623
3790
return int(not result)
3680
3847
The source of the merge can be specified either in the form of a branch,
3681
3848
or in the form of a path to a file containing a merge directive generated
3682
3849
with bzr send. If neither is specified, the default is the upstream branch
3683
or the branch most recently merged using --remember.
3685
When merging a branch, by default the tip will be merged. To pick a different
3686
revision, pass --revision. If you specify two values, the first will be used as
3687
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3688
available revisions, like this is commonly referred to as "cherrypicking".
3690
Revision numbers are always relative to the branch being merged.
3692
By default, bzr will try to merge in all new work from the other
3693
branch, automatically determining an appropriate base. If this
3694
fails, you may need to give an explicit base.
3850
or the branch most recently merged using --remember. The source of the
3851
merge may also be specified in the form of a path to a file in another
3852
branch: in this case, only the modifications to that file are merged into
3853
the current working tree.
3855
When merging from a branch, by default bzr will try to merge in all new
3856
work from the other branch, automatically determining an appropriate base
3857
revision. If this fails, you may need to give an explicit base.
3859
To pick a different ending revision, pass "--revision OTHER". bzr will
3860
try to merge in all new work up to and including revision OTHER.
3862
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3863
through OTHER, excluding BASE but including OTHER, will be merged. If this
3864
causes some revisions to be skipped, i.e. if the destination branch does
3865
not already contain revision BASE, such a merge is commonly referred to as
3866
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
3867
cherrypicks. The changes look like a normal commit, and the history of the
3868
changes from the other branch is not stored in the commit.
3870
Revision numbers are always relative to the source branch.
3696
3872
Merge will do its best to combine the changes in two branches, but there
3697
3873
are some kinds of problems only a human can fix. When it encounters those,
3701
3877
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3703
If there is no default branch set, the first merge will set it. After
3704
that, you can omit the branch to use the default. To change the
3705
default, use --remember. The value will only be saved if the remote
3706
location can be accessed.
3879
If there is no default branch set, the first merge will set it (use
3880
--no-remember to avoid settting it). After that, you can omit the branch
3881
to use the default. To change the default, use --remember. The value will
3882
only be saved if the remote location can be accessed.
3708
3884
The results of the merge are placed into the destination working
3709
3885
directory, where they can be reviewed (with bzr diff), tested, and then
3710
3886
committed to record the result of the merge.
3712
3888
merge refuses to run if there are any uncommitted changes, unless
3713
--force is given. The --force option can also be used to create a
3889
--force is given. If --force is given, then the changes from the source
3890
will be merged with the current working tree, including any uncommitted
3891
changes in the tree. The --force option can also be used to create a
3714
3892
merge revision which has more than two parents.
3716
3894
If one would like to merge changes from the working tree of the other
3764
3942
' completely merged into the source, pull from the'
3765
3943
' source rather than merging. When this happens,'
3766
3944
' you do not need to commit the result.'),
3945
custom_help('directory',
3768
3946
help='Branch to merge into, '
3769
'rather than the one containing the working directory.',
3947
'rather than the one containing the working directory.'),
3773
3948
Option('preview', help='Instead of merging, show a diff of the'
3775
3950
Option('interactive', help='Select changes interactively.',
3779
3954
def run(self, location=None, revision=None, force=False,
3780
merge_type=None, show_base=False, reprocess=None, remember=False,
3955
merge_type=None, show_base=False, reprocess=None, remember=None,
3781
3956
uncommitted=False, pull=False,
3782
3957
directory=None,
3843
4022
self.sanity_check_merger(merger)
3844
4023
if (merger.base_rev_id == merger.other_rev_id and
3845
4024
merger.other_rev_id is not None):
4025
# check if location is a nonexistent file (and not a branch) to
4026
# disambiguate the 'Nothing to do'
4027
if merger.interesting_files:
4028
if not merger.other_tree.has_filename(
4029
merger.interesting_files[0]):
4030
note("merger: " + str(merger))
4031
raise errors.PathsDoNotExist([location])
3846
4032
note('Nothing to do.')
4034
if pull and not preview:
3849
4035
if merger.interesting_files is not None:
3850
4036
raise errors.BzrCommandError('Cannot pull individual files')
3851
4037
if (merger.base_rev_id == tree.last_revision()):
3875
4061
def _do_preview(self, merger):
3876
4062
from bzrlib.diff import show_diff_trees
3877
4063
result_tree = self._get_preview(merger)
4064
path_encoding = osutils.get_diff_header_encoding()
3878
4065
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
old_label='', new_label='')
4066
old_label='', new_label='',
4067
path_encoding=path_encoding)
3881
4069
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3882
4070
merger.change_reporter = change_reporter
3958
4146
if other_revision_id is None:
3959
4147
other_revision_id = _mod_revision.ensure_null(
3960
4148
other_branch.last_revision())
3961
# Remember where we merge from
3962
if ((remember or tree.branch.get_submit_branch() is None) and
3963
user_location is not None):
4149
# Remember where we merge from. We need to remember if:
4150
# - user specify a location (and we don't merge from the parent
4152
# - user ask to remember or there is no previous location set to merge
4153
# from and user didn't ask to *not* remember
4154
if (user_location is not None
4156
or (remember is None
4157
and tree.branch.get_submit_branch() is None)))):
3964
4158
tree.branch.set_submit_branch(other_branch.base)
3965
_merge_tags_if_possible(other_branch, tree.branch)
4159
# Merge tags (but don't set them in the master branch yet, the user
4160
# might revert this merge). Commit will propagate them.
4161
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3966
4162
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3967
4163
other_revision_id, base_revision_id, other_branch, base_branch)
3968
4164
if other_path != '':
4136
4332
last committed revision is used.
4138
4334
To remove only some changes, without reverting to a prior version, use
4139
merge instead. For example, "merge . --revision -2..-3" will remove the
4140
changes introduced by -2, without affecting the changes introduced by -1.
4141
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4335
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4336
will remove the changes introduced by the second last commit (-2), without
4337
affecting the changes introduced by the last commit (-1). To remove
4338
certain changes on a hunk-by-hunk basis, see the shelve command.
4143
4340
By default, any files that have been manually changed will be backed up
4144
4341
first. (Files changed only by merge are not backed up.) Backup files have
4308
4506
theirs_only=False,
4309
4507
log_format=None, long=False, short=False, line=False,
4310
4508
show_ids=False, verbose=False, this=False, other=False,
4311
include_merges=False, revision=None, my_revision=None):
4509
include_merges=False, revision=None, my_revision=None,
4312
4511
from bzrlib.missing import find_unmerged, iter_log_revisions
4313
4512
def message(s):
4314
4513
if not is_quiet():
4472
4671
@display_command
4473
4672
def run(self, verbose=False):
4474
import bzrlib.plugin
4475
from inspect import getdoc
4477
for name, plugin in bzrlib.plugin.plugins().items():
4478
version = plugin.__version__
4479
if version == 'unknown':
4481
name_ver = '%s %s' % (name, version)
4482
d = getdoc(plugin.module)
4484
doc = d.split('\n')[0]
4486
doc = '(no description)'
4487
result.append((name_ver, doc, plugin.path()))
4488
for name_ver, doc, path in sorted(result):
4489
self.outf.write("%s\n" % name_ver)
4490
self.outf.write(" %s\n" % doc)
4492
self.outf.write(" %s\n" % path)
4493
self.outf.write("\n")
4673
from bzrlib import plugin
4674
# Don't give writelines a generator as some codecs don't like that
4675
self.outf.writelines(
4676
list(plugin.describe_plugins(show_paths=verbose)))
4496
4679
class cmd_testament(Command):
4542
4725
Option('long', help='Show commit date in annotations.'),
4546
4730
encoding_type = 'exact'
4548
4732
@display_command
4549
4733
def run(self, filename, all=False, long=False, revision=None,
4551
from bzrlib.annotate import annotate_file, annotate_file_tree
4734
show_ids=False, directory=None):
4735
from bzrlib.annotate import (
4552
4738
wt, branch, relpath = \
4553
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4739
_open_directory_or_containing_tree_or_branch(filename, directory)
4554
4740
if wt is not None:
4555
4741
self.add_cleanup(wt.lock_read().unlock)
4557
4743
self.add_cleanup(branch.lock_read().unlock)
4558
4744
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
4745
self.add_cleanup(tree.lock_read().unlock)
4746
if wt is not None and revision is None:
4561
4747
file_id = wt.path2id(relpath)
4563
4749
file_id = tree.path2id(relpath)
4564
4750
if file_id is None:
4565
4751
raise errors.NotVersionedError(filename)
4566
file_version = tree.inventory[file_id].revision
4567
4752
if wt is not None and revision is None:
4568
4753
# If there is a tree and we're not annotating historical
4569
4754
# versions, annotate the working tree's content.
4570
4755
annotate_file_tree(wt, file_id, self.outf, long, all,
4571
4756
show_ids=show_ids)
4573
annotate_file(branch, file_version, file_id, long, all, self.outf,
4758
annotate_file_tree(tree, file_id, self.outf, long, all,
4759
show_ids=show_ids, branch=branch)
4577
4762
class cmd_re_sign(Command):
4581
4766
hidden = True # is this right ?
4582
4767
takes_args = ['revision_id*']
4583
takes_options = ['revision']
4768
takes_options = ['directory', 'revision']
4585
def run(self, revision_id_list=None, revision=None):
4770
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4586
4771
if revision_id_list is not None and revision is not None:
4587
4772
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4588
4773
if revision_id_list is None and revision is None:
4589
4774
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
b = WorkingTree.open_containing(u'.')[0].branch
4775
b = WorkingTree.open_containing(directory)[0].branch
4591
4776
self.add_cleanup(b.lock_write().unlock)
4592
4777
return self._run(b, revision_id_list, revision)
4654
4839
_see_also = ['checkouts', 'unbind']
4655
4840
takes_args = ['location?']
4841
takes_options = ['directory']
4658
def run(self, location=None):
4659
b, relpath = Branch.open_containing(u'.')
4843
def run(self, location=None, directory=u'.'):
4844
b, relpath = Branch.open_containing(directory)
4660
4845
if location is None:
4662
4847
location = b.get_old_bound_location()
4817
5008
bzr break-lock bzr+ssh://example.com/bzr/foo
5009
bzr break-lock --conf ~/.bazaar
4819
5012
takes_args = ['location?']
5015
help='LOCATION is the directory where the config lock is.'),
5017
help='Do not ask for confirmation before breaking the lock.'),
4821
def run(self, location=None, show=False):
5020
def run(self, location=None, config=False, force=False):
4822
5021
if location is None:
4823
5022
location = u'.'
4824
control, relpath = bzrdir.BzrDir.open_containing(location)
4826
control.break_lock()
4827
except NotImplementedError:
5024
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5026
{'bzrlib.lockdir.break': True})
5028
conf = _mod_config.LockableConfig(file_name=location)
5031
control, relpath = bzrdir.BzrDir.open_containing(location)
5033
control.break_lock()
5034
except NotImplementedError:
4831
5038
class cmd_wait_until_signalled(Command):
4896
5102
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4897
5103
protocol=None):
4898
from bzrlib.transport import get_transport, transport_server_registry
5104
from bzrlib import transport
4899
5105
if directory is None:
4900
5106
directory = os.getcwd()
4901
5107
if protocol is None:
4902
protocol = transport_server_registry.get()
5108
protocol = transport.transport_server_registry.get()
4903
5109
host, port = self.get_host_and_port(port)
4904
5110
url = urlutils.local_path_to_url(directory)
4905
5111
if not allow_writes:
4906
5112
url = 'readonly+' + url
4907
transport = get_transport(url)
4908
protocol(transport, host, port, inet)
5113
t = transport.get_transport(url)
5114
protocol(t, host, port, inet)
4911
5117
class cmd_join(Command):
5022
5229
encoding_type = 'exact'
5024
5231
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5025
sign=False, revision=None, mail_to=None, message=None):
5232
sign=False, revision=None, mail_to=None, message=None,
5026
5234
from bzrlib.revision import ensure_null, NULL_REVISION
5027
5235
include_patch, include_bundle = {
5028
5236
'plain': (False, False),
5029
5237
'diff': (True, False),
5030
5238
'bundle': (True, True),
5032
branch = Branch.open('.')
5240
branch = Branch.open(directory)
5033
5241
stored_submit_branch = branch.get_submit_branch()
5034
5242
if submit_branch is None:
5035
5243
submit_branch = stored_submit_branch
5111
5319
source branch defaults to that containing the working directory, but can
5112
5320
be changed using --from.
5322
Both the submit branch and the public branch follow the usual behavior with
5323
respect to --remember: If there is no default location set, the first send
5324
will set it (use --no-remember to avoid settting it). After that, you can
5325
omit the location to use the default. To change the default, use
5326
--remember. The value will only be saved if the location can be accessed.
5114
5328
In order to calculate those changes, bzr must analyse the submit branch.
5115
5329
Therefore it is most efficient for the submit branch to be a local mirror.
5116
5330
If a public location is known for the submit_branch, that location is used
5187
5401
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5188
no_patch=False, revision=None, remember=False, output=None,
5402
no_patch=False, revision=None, remember=None, output=None,
5189
5403
format=None, mail_to=None, message=None, body=None,
5190
5404
strict=None, **kwargs):
5191
5405
from bzrlib.send import send
5350
5561
_see_also = ['tag']
5351
5562
takes_options = [
5353
help='Branch whose tags should be displayed.',
5357
RegistryOption.from_kwargs('sort',
5563
custom_help('directory',
5564
help='Branch whose tags should be displayed.'),
5565
RegistryOption('sort',
5358
5566
'Sort tags by different criteria.', title='Sorting',
5359
alpha='Sort tags lexicographically (default).',
5360
time='Sort tags chronologically.',
5567
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5366
5573
@display_command
5574
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5575
from bzrlib.tag import tag_sort_methods
5373
5576
branch, relpath = Branch.open_containing(directory)
5375
5578
tags = branch.tags.get_tag_dict().items()
5384
5587
# only show revisions between revid1 and revid2 (inclusive)
5385
5588
tags = [(tag, revid) for tag, revid in tags if
5386
5589
graph.is_between(revid, revid1, revid2)]
5389
elif sort == 'time':
5391
for tag, revid in tags:
5393
revobj = branch.repository.get_revision(revid)
5394
except errors.NoSuchRevision:
5395
timestamp = sys.maxint # place them at the end
5397
timestamp = revobj.timestamp
5398
timestamps[revid] = timestamp
5399
tags.sort(key=lambda x: timestamps[x[1]])
5591
sort = tag_sort_methods.get()
5400
5593
if not show_ids:
5401
5594
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
5595
for index, (tag, revid) in enumerate(tags):
5540
5734
def run(self, to_location=None, force=False, create_branch=False,
5735
revision=None, directory=u'.'):
5542
5736
from bzrlib import switch
5737
tree_location = directory
5544
5738
revision = _get_one_revision('switch', revision)
5545
5739
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
5740
if to_location is None:
5547
5741
if revision is None:
5548
5742
raise errors.BzrCommandError('You must supply either a'
5549
5743
' revision or a location')
5744
to_location = tree_location
5552
5746
branch = control_dir.open_branch()
5553
5747
had_explicit_nick = branch.get_config().has_explicit_nickname()
5824
6019
You can put multiple items on the shelf, and by default, 'unshelve' will
5825
6020
restore the most recently shelved changes.
6022
For complicated changes, it is possible to edit the changes in a separate
6023
editor program to decide what the file remaining in the working copy
6024
should look like. To do this, add the configuration option
6026
change_editor = PROGRAM @new_path @old_path
6028
where @new_path is replaced with the path of the new version of the
6029
file and @old_path is replaced with the path of the old version of
6030
the file. The PROGRAM should save the new file with the desired
6031
contents of the file in the working tree.
5828
6035
takes_args = ['file*']
5830
6037
takes_options = [
5832
6040
Option('all', help='Shelve all changes.'),
5839
6047
Option('destroy',
5840
6048
help='Destroy removed changes instead of shelving them.'),
5842
_see_also = ['unshelve']
6050
_see_also = ['unshelve', 'configuration']
5844
6052
def run(self, revision=None, all=False, file_list=None, message=None,
5845
writer=None, list=False, destroy=False):
6053
writer=None, list=False, destroy=False, directory=None):
5847
return self.run_for_list()
6055
return self.run_for_list(directory=directory)
5848
6056
from bzrlib.shelf_ui import Shelver
5849
6057
if writer is None:
5850
6058
writer = bzrlib.option.diff_writer_registry.get()
5852
6060
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
6061
file_list, message, destroy=destroy, directory=directory)
5922
6133
To check what clean-tree will do, use --dry-run.
5924
takes_options = [Option('ignored', help='Delete all ignored files.'),
5925
Option('detritus', help='Delete conflict files, merge'
6135
takes_options = ['directory',
6136
Option('ignored', help='Delete all ignored files.'),
6137
Option('detritus', help='Delete conflict files, merge and revert'
5926
6138
' backups, and failed selftest dirs.'),
5927
6139
Option('unknown',
5928
6140
help='Delete files unknown to bzr (default).'),
5930
6142
' deleting them.'),
5931
6143
Option('force', help='Do not prompt before deleting.')]
5932
6144
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6145
force=False, directory=u'.'):
5934
6146
from bzrlib.clean_tree import clean_tree
5935
6147
if not (unknown or ignored or detritus):
5939
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5940
dry_run=dry_run, no_prompt=force)
6151
clean_tree(directory, unknown=unknown, ignored=ignored,
6152
detritus=detritus, dry_run=dry_run, no_prompt=force)
5943
6155
class cmd_reference(Command):
5987
6199
self.outf.write('%s %s\n' % (path, location))
6202
class cmd_export_pot(Command):
6203
__doc__ = """Export command helps and error messages in po format."""
6208
from bzrlib.export_pot import export_pot
6209
export_pot(self.outf)
5990
6212
def _register_lazy_builtins():
5991
6213
# register lazy builtins from other modules; called at startup and should
5992
6214
# be only called once.
5993
6215
for (name, aliases, module_name) in [
5994
6216
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6217
('cmd_config', [], 'bzrlib.config'),
5995
6218
('cmd_dpush', [], 'bzrlib.foreign'),
5996
6219
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
6220
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
6221
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
6222
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6223
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6001
6225
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
