73
72
_parse_revision_str,
75
74
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
80
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
81
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]))
83
return internal_tree_files(file_list, default_branch, canonicalize,
88
87
def tree_files_for_add(file_list):
153
152
# XXX: Bad function name; should possibly also be a class method of
154
153
# WorkingTree rather than a function.
154
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
155
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
156
apply_view=True):
157
157
"""Convert command-line paths to a WorkingTree and relative paths.
159
Deprecated: use WorkingTree.open_containing_paths instead.
159
161
This is typically used for command-line processors that take one or
160
162
more filenames, and infer the workingtree that contains them.
172
174
: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)
176
return WorkingTree.open_containing_paths(
177
file_list, default_directory='.',
223
182
def _get_view_info_for_change_reporter(tree):
194
def _open_directory_or_containing_tree_or_branch(filename, directory):
195
"""Open the tree or branch containing the specified file, unless
196
the --directory option is used to specify a different branch."""
197
if directory is not None:
198
return (None, Branch.open(directory), filename)
199
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
235
202
# TODO: Make sure no commands unconditionally use the working directory as a
236
203
# branch. If a filename argument is used, the first of them should be used to
237
204
# specify the branch. (Perhaps this can be factored out into some kind of
286
253
To skip the display of pending merge information altogether, use
287
254
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.
256
To compare the working directory to a specific revision, pass a
257
single revision to the revision argument.
259
To see which files have changed in a specific revision, or between
260
two revisions, pass a revision range to the revision argument.
261
This will produce the same results as calling 'bzr diff --summarize'.
293
264
# TODO: --no-recurse, --recurse options
353
324
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
327
def run(self, revision_id=None, revision=None, directory=u'.'):
357
328
if revision_id is not None and revision is not None:
358
329
raise errors.BzrCommandError('You can only supply one of'
359
330
' revision_id or --revision')
360
331
if revision_id is None and revision is None:
361
332
raise errors.BzrCommandError('You must supply either'
362
333
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
335
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
365
337
revisions = b.repository.revisions
366
338
if revisions is None:
511
488
d.destroy_workingtree()
491
class cmd_repair_workingtree(Command):
492
__doc__ = """Reset the working tree state file.
494
This is not meant to be used normally, but more as a way to recover from
495
filesystem corruption, etc. This rebuilds the working inventory back to a
496
'known good' state. Any new modifications (adding a file, renaming, etc)
497
will be lost, though modified files will still be detected as such.
499
Most users will want something more like "bzr revert" or "bzr update"
500
unless the state file has become corrupted.
502
By default this attempts to recover the current state by looking at the
503
headers of the state file. If the state file is too corrupted to even do
504
that, you can supply --revision to force the state of the tree.
507
takes_options = ['revision', 'directory',
509
help='Reset the tree even if it doesn\'t appear to be'
514
def run(self, revision=None, directory='.', force=False):
515
tree, _ = WorkingTree.open_containing(directory)
516
self.add_cleanup(tree.lock_tree_write().unlock)
520
except errors.BzrError:
521
pass # There seems to be a real error here, so we'll reset
524
raise errors.BzrCommandError(
525
'The tree does not appear to be corrupt. You probably'
526
' want "bzr revert" instead. Use "--force" if you are'
527
' sure you want to reset the working tree.')
531
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
533
tree.reset_state(revision_ids)
534
except errors.BzrError, e:
535
if revision_ids is None:
536
extra = (', the header appears corrupt, try passing -r -1'
537
' to set the state to the last commit')
540
raise errors.BzrCommandError('failed to reset the tree state'
514
544
class cmd_revno(Command):
515
545
__doc__ = """Show current revision number.
937
966
match the remote one, use pull --overwrite. This will work even if the two
938
967
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.
969
If there is no default location set, the first pull will set it (use
970
--no-remember to avoid settting it). After that, you can omit the
971
location to use the default. To change the default, use --remember. The
972
value will only be saved if the remote location can be accessed.
945
974
Note: The location can be specified either in the form of a branch,
946
975
or in the form of a path to a file containing a merge directive generated
951
980
takes_options = ['remember', 'overwrite', 'revision',
952
981
custom_help('verbose',
953
982
help='Show logs of pulled revisions.'),
983
custom_help('directory',
955
984
help='Branch to pull into, '
956
'rather than the one containing the working directory.',
985
'rather than the one containing the working directory.'),
961
987
help="Perform a local pull in a bound "
962
988
"branch. Local pulls are not applied to "
963
989
"the master branch."
992
help="Show base revision text in conflicts.")
966
994
takes_args = ['location?']
967
995
encoding_type = 'replace'
969
def run(self, location=None, remember=False, overwrite=False,
997
def run(self, location=None, remember=None, overwrite=False,
970
998
revision=None, verbose=False,
971
directory=None, local=False):
999
directory=None, local=False,
972
1001
# FIXME: too much stuff is in the command class
973
1002
revision_id = None
974
1003
mergeable = None
1065
1103
do a merge (see bzr help merge) from the other branch, and commit that.
1066
1104
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.
1106
If there is no default push location set, the first push will set it (use
1107
--no-remember to avoid settting it). After that, you can omit the
1108
location to use the default. To change the default, use --remember. The
1109
value will only be saved if the remote location can be accessed.
1074
1112
_see_also = ['pull', 'update', 'working-trees']
1076
1114
Option('create-prefix',
1077
1115
help='Create the path leading up to the branch '
1078
1116
'if it does not already exist.'),
1117
custom_help('directory',
1080
1118
help='Branch to push from, '
1081
'rather than the one containing the working directory.',
1119
'rather than the one containing the working directory.'),
1085
1120
Option('use-existing-dir',
1086
1121
help='By default push will fail if the target'
1087
1122
' directory exists, but does not already'
1098
1133
Option('strict',
1099
1134
help='Refuse to push if there are uncommitted changes in'
1100
1135
' the working tree, --no-strict disables the check.'),
1137
help="Don't populate the working tree, even for protocols"
1138
" that support it."),
1102
1140
takes_args = ['location?']
1103
1141
encoding_type = 'replace'
1105
def run(self, location=None, remember=False, overwrite=False,
1143
def run(self, location=None, remember=None, overwrite=False,
1106
1144
create_prefix=False, verbose=False, revision=None,
1107
1145
use_existing_dir=False, directory=None, stacked_on=None,
1108
stacked=False, strict=None):
1146
stacked=False, strict=None, no_tree=False):
1109
1147
from bzrlib.push import _show_push_branch
1111
1149
if directory is None:
1157
1195
_show_push_branch(br_from, revision_id, location, self.outf,
1158
1196
verbose=verbose, overwrite=overwrite, remember=remember,
1159
1197
stacked_on=stacked_on, create_prefix=create_prefix,
1160
use_existing_dir=use_existing_dir)
1198
use_existing_dir=use_existing_dir, no_tree=no_tree)
1163
1201
class cmd_branch(Command):
1173
1211
To retrieve the branch as of a particular revision, supply the --revision
1174
1212
parameter, as in "branch foo/bar -r 5".
1214
The synonyms 'clone' and 'get' for this command are deprecated.
1177
1217
_see_also = ['checkout']
1178
1218
takes_args = ['from_location', 'to_location?']
1179
takes_options = ['revision', Option('hardlink',
1180
help='Hard-link working tree files where possible.'),
1219
takes_options = ['revision',
1220
Option('hardlink', help='Hard-link working tree files where possible.'),
1221
Option('files-from', type=str,
1222
help="Get file contents from this tree."),
1181
1223
Option('no-tree',
1182
1224
help="Create a branch without a working-tree."),
1183
1225
Option('switch',
1202
1244
def run(self, from_location, to_location=None, revision=None,
1203
1245
hardlink=False, stacked=False, standalone=False, no_tree=False,
1204
use_existing_dir=False, switch=False, bind=False):
1246
use_existing_dir=False, switch=False, bind=False,
1205
1248
from bzrlib import switch as _mod_switch
1206
1249
from bzrlib.tag import _merge_tags_if_possible
1250
if self.invoked_as in ['get', 'clone']:
1251
ui.ui_factory.show_user_warning(
1252
'deprecated_command',
1253
deprecated_name=self.invoked_as,
1254
recommended_name='branch',
1255
deprecated_in_version='2.4')
1207
1256
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1258
if not (hardlink or files_from):
1259
# accelerator_tree is usually slower because you have to read N
1260
# files (no readahead, lots of seeks, etc), but allow the user to
1261
# explicitly request it
1262
accelerator_tree = None
1263
if files_from is not None and files_from != from_location:
1264
accelerator_tree = WorkingTree.open(files_from)
1209
1265
revision = _get_one_revision('branch', revision)
1210
1266
self.add_cleanup(br_from.lock_read().unlock)
1211
1267
if revision is not None:
1318
1374
to_location = branch_location
1319
1375
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1320
1376
branch_location)
1377
if not (hardlink or files_from):
1378
# accelerator_tree is usually slower because you have to read N
1379
# files (no readahead, lots of seeks, etc), but allow the user to
1380
# explicitly request it
1381
accelerator_tree = None
1321
1382
revision = _get_one_revision('checkout', revision)
1322
if files_from is not None:
1383
if files_from is not None and files_from != branch_location:
1323
1384
accelerator_tree = WorkingTree.open(files_from)
1324
1385
if revision is not None:
1325
1386
revision_id = revision.as_revision_id(source)
1381
1442
If you want to discard your local changes, you can just do a
1382
1443
'bzr revert' instead of 'bzr commit' after the update.
1445
If you want to restore a file that has been removed locally, use
1446
'bzr revert' instead of 'bzr update'.
1384
1448
If the tree's branch is bound to a master branch, it will also update
1385
1449
the branch from the master.
1388
1452
_see_also = ['pull', 'working-trees', 'status-flags']
1389
1453
takes_args = ['dir?']
1390
takes_options = ['revision']
1454
takes_options = ['revision',
1456
help="Show base revision text in conflicts."),
1391
1458
aliases = ['up']
1393
def run(self, dir='.', revision=None):
1460
def run(self, dir='.', revision=None, show_base=None):
1394
1461
if revision is not None and len(revision) != 1:
1395
1462
raise errors.BzrCommandError(
1396
1463
"bzr update --revision takes exactly one revision")
1504
1572
class cmd_remove(Command):
1505
1573
__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.
1575
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1576
delete them if they can easily be recovered using revert otherwise they
1577
will be backed up (adding an extention of the form .~#~). If no options or
1578
parameters are given Bazaar will scan for files that are being tracked by
1579
Bazaar but missing in your tree and stop tracking them for you.
1512
1581
takes_args = ['file*']
1513
1582
takes_options = ['verbose',
1515
1584
RegistryOption.from_kwargs('file-deletion-strategy',
1516
1585
'The file deletion mode to be used.',
1517
1586
title='Deletion Strategy', value_switches=True, enum_switch=False,
1518
safe='Only delete files if they can be'
1519
' safely recovered (default).',
1587
safe='Backup changed files (default).',
1520
1588
keep='Delete from bzr but leave the working copy.',
1589
no_backup='Don\'t backup changed files.',
1521
1590
force='Delete all the specified files, even if they can not be '
1522
'recovered and even if they are non-empty directories.')]
1591
'recovered and even if they are non-empty directories. '
1592
'(deprecated, use no-backup)')]
1523
1593
aliases = ['rm', 'del']
1524
1594
encoding_type = 'replace'
1526
1596
def run(self, file_list, verbose=False, new=False,
1527
1597
file_deletion_strategy='safe'):
1528
tree, file_list = tree_files(file_list)
1598
if file_deletion_strategy == 'force':
1599
note("(The --force option is deprecated, rather use --no-backup "
1601
file_deletion_strategy = 'no-backup'
1603
tree, file_list = WorkingTree.open_containing_paths(file_list)
1530
1605
if file_list is not None:
1531
1606
file_list = [f for f in file_list]
1620
1695
_see_also = ['check']
1621
1696
takes_args = ['branch?']
1698
Option('canonicalize-chks',
1699
help='Make sure CHKs are in canonical form (repairs '
1623
def run(self, branch="."):
1704
def run(self, branch=".", canonicalize_chks=False):
1624
1705
from bzrlib.reconcile import reconcile
1625
1706
dir = bzrdir.BzrDir.open(branch)
1707
reconcile(dir, canonicalize_chks=canonicalize_chks)
1629
1710
class cmd_revision_history(Command):
1662
1743
last_revision = wt.last_revision()
1664
revision_ids = b.repository.get_ancestry(last_revision)
1666
for revision_id in revision_ids:
1745
self.add_cleanup(b.repository.lock_read().unlock)
1746
graph = b.repository.get_graph()
1747
revisions = [revid for revid, parents in
1748
graph.iter_ancestry([last_revision])]
1749
for revision_id in reversed(revisions):
1750
if _mod_revision.is_null(revision_id):
1667
1752
self.outf.write(revision_id + '\n')
1707
1792
Option('append-revisions-only',
1708
1793
help='Never change revnos or the existing log.'
1709
' Append revisions to it only.')
1794
' Append revisions to it only.'),
1796
'Create a branch without a working tree.')
1711
1798
def run(self, location=None, format=None, append_revisions_only=False,
1712
create_prefix=False):
1799
create_prefix=False, no_tree=False):
1713
1800
if format is None:
1714
1801
format = bzrdir.format_registry.make_bzrdir('default')
1715
1802
if location is None:
1969
2079
old_branch, new_branch,
1970
2080
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1971
2081
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2082
# GNU diff on Windows uses ANSI encoding for filenames
2083
path_encoding = osutils.get_diff_header_encoding()
1972
2084
return show_diff_trees(old_tree, new_tree, sys.stdout,
1973
2085
specific_files=specific_files,
1974
2086
external_diff_options=diff_options,
1975
2087
old_label=old_label, new_label=new_label,
1976
extra_trees=extra_trees, using=using,
2088
extra_trees=extra_trees,
2089
path_encoding=path_encoding,
1977
2091
format_cls=format)
1987
2101
# level of effort but possibly much less IO. (Or possibly not,
1988
2102
# if the directories are very large...)
1989
2103
_see_also = ['status', 'ls']
1990
takes_options = ['show-ids']
2104
takes_options = ['directory', 'show-ids']
1992
2106
@display_command
1993
def run(self, show_ids=False):
1994
tree = WorkingTree.open_containing(u'.')[0]
2107
def run(self, show_ids=False, directory=u'.'):
2108
tree = WorkingTree.open_containing(directory)[0]
1995
2109
self.add_cleanup(tree.lock_read().unlock)
1996
2110
old = tree.basis_tree()
1997
2111
self.add_cleanup(old.lock_read().unlock)
2012
2126
_see_also = ['status', 'ls']
2015
help='Write an ascii NUL (\\0) separator '
2016
'between files rather than a newline.')
2127
takes_options = ['directory', 'null']
2019
2129
@display_command
2020
def run(self, null=False):
2021
tree = WorkingTree.open_containing(u'.')[0]
2130
def run(self, null=False, directory=u'.'):
2131
tree = WorkingTree.open_containing(directory)[0]
2132
self.add_cleanup(tree.lock_read().unlock)
2022
2133
td = tree.changes_from(tree.basis_tree())
2023
2135
for path, id, kind, text_modified, meta_modified in td.modified:
2025
2137
self.outf.write(path + '\0')
2035
2147
_see_also = ['status', 'ls']
2038
help='Write an ascii NUL (\\0) separator '
2039
'between files rather than a newline.')
2148
takes_options = ['directory', 'null']
2042
2150
@display_command
2043
def run(self, null=False):
2044
wt = WorkingTree.open_containing(u'.')[0]
2151
def run(self, null=False, directory=u'.'):
2152
wt = WorkingTree.open_containing(directory)[0]
2045
2153
self.add_cleanup(wt.lock_read().unlock)
2046
2154
basis = wt.basis_tree()
2047
2155
self.add_cleanup(basis.lock_read().unlock)
2048
2156
basis_inv = basis.inventory
2049
2157
inv = wt.inventory
2050
2158
for file_id in inv:
2051
if file_id in basis_inv:
2159
if basis_inv.has_id(file_id):
2053
2161
if inv.is_root(file_id) and len(basis_inv) == 0:
2055
2163
path = inv.id2path(file_id)
2056
if not os.access(osutils.abspath(path), os.F_OK):
2164
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2059
2167
self.outf.write(path + '\0')
2505
2631
help='Recurse into subdirectories.'),
2506
2632
Option('from-root',
2507
2633
help='Print paths relative to the root of the branch.'),
2508
Option('unknown', help='Print unknown files.'),
2634
Option('unknown', short_name='u',
2635
help='Print unknown files.'),
2509
2636
Option('versioned', help='Print versioned files.',
2510
2637
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.'),
2638
Option('ignored', short_name='i',
2639
help='Print ignored files.'),
2640
Option('kind', short_name='k',
2516
2641
help='List entries of a particular kind: file, directory, symlink.',
2520
2647
@display_command
2521
2648
def run(self, revision=None, verbose=False,
2522
2649
recursive=False, from_root=False,
2523
2650
unknown=False, versioned=False, ignored=False,
2524
null=False, kind=None, show_ids=False, path=None):
2651
null=False, kind=None, show_ids=False, path=None, directory=None):
2526
2653
if kind and kind not in ('file', 'directory', 'symlink'):
2527
2654
raise errors.BzrCommandError('invalid kind specified')
2689
2826
_see_also = ['status', 'ignored', 'patterns']
2690
2827
takes_args = ['name_pattern*']
2828
takes_options = ['directory',
2692
2829
Option('default-rules',
2693
2830
help='Display the default ignore rules that bzr uses.')
2696
def run(self, name_pattern_list=None, default_rules=None):
2833
def run(self, name_pattern_list=None, default_rules=None,
2697
2835
from bzrlib import ignores
2698
2836
if default_rules is not None:
2699
2837
# dump the default rules and exit
2705
2843
"NAME_PATTERN or --default-rules.")
2706
2844
name_pattern_list = [globbing.normalize_pattern(p)
2707
2845
for p in name_pattern_list]
2847
for p in name_pattern_list:
2848
if not globbing.Globster.is_pattern_valid(p):
2849
bad_patterns += ('\n %s' % p)
2851
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2852
ui.ui_factory.show_error(msg)
2853
raise errors.InvalidPattern('')
2708
2854
for name_pattern in name_pattern_list:
2709
2855
if (name_pattern[0] == '/' or
2710
2856
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2711
2857
raise errors.BzrCommandError(
2712
2858
"NAME_PATTERN should not be an absolute path")
2713
tree, relpath = WorkingTree.open_containing(u'.')
2859
tree, relpath = WorkingTree.open_containing(directory)
2714
2860
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2715
2861
ignored = globbing.Globster(name_pattern_list)
2863
self.add_cleanup(tree.lock_read().unlock)
2718
2864
for entry in tree.list_files():
2720
2866
if id is not None:
2721
2867
filename = entry[0]
2722
2868
if ignored.match(filename):
2723
2869
matches.append(filename)
2725
2870
if len(matches) > 0:
2726
2871
self.outf.write("Warning: the following files are version controlled and"
2727
2872
" match your ignore pattern:\n%s"
2743
2888
encoding_type = 'replace'
2744
2889
_see_also = ['ignore', 'ls']
2890
takes_options = ['directory']
2746
2892
@display_command
2748
tree = WorkingTree.open_containing(u'.')[0]
2893
def run(self, directory=u'.'):
2894
tree = WorkingTree.open_containing(directory)[0]
2749
2895
self.add_cleanup(tree.lock_read().unlock)
2750
2896
for path, file_class, kind, file_id, entry in tree.list_files():
2751
2897
if file_class != 'I':
2819
2967
'revision in which it was changed.'),
2821
2969
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2822
root=None, filters=False, per_file_timestamps=False):
2970
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2823
2971
from bzrlib.export import export
2825
2973
if branch_or_subdir is None:
2826
tree = WorkingTree.open_containing(u'.')[0]
2974
tree = WorkingTree.open_containing(directory)[0]
2827
2975
b = tree.branch
2860
3008
@display_command
2861
3009
def run(self, filename, revision=None, name_from_revision=False,
3010
filters=False, directory=None):
2863
3011
if revision is not None and len(revision) != 1:
2864
3012
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2865
3013
" one revision specifier")
2866
3014
tree, branch, relpath = \
2867
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
3015
_open_directory_or_containing_tree_or_branch(filename, directory)
2868
3016
self.add_cleanup(branch.lock_read().unlock)
2869
3017
return self._run(tree, branch, relpath, filename, revision,
2870
3018
name_from_revision, filters)
2986
3134
to trigger updates to external systems like bug trackers. The --fixes
2987
3135
option can be used to record the association between a revision and
2988
3136
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
3139
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3017
3140
takes_args = ['selected*']
3074
3201
def run(self, message=None, file=None, verbose=False, selected_list=None,
3075
3202
unchanged=False, strict=False, local=False, fixes=None,
3076
author=None, show_diff=False, exclude=None, commit_time=None):
3203
author=None, show_diff=False, exclude=None, commit_time=None,
3077
3205
from bzrlib.errors import (
3078
3206
PointlessCommit,
3079
3207
ConflictsInTree,
3093
3222
raise errors.BzrCommandError(
3094
3223
"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
3225
properties = {}
3104
tree, selected_list = tree_files(selected_list)
3227
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3105
3228
if selected_list == ['']:
3106
3229
# workaround - commit of root of tree should be exactly the same
3107
3230
# as just default commit in that tree, and succeed even though
3157
3283
# make_commit_message_template_encoded returns user encoding.
3158
3284
# 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)
3286
my_message = set_commit_message(commit_obj)
3287
if my_message is None:
3288
start_message = generate_commit_message_template(commit_obj)
3289
my_message = edit_commit_message_encoded(text,
3290
start_message=start_message)
3163
3291
if my_message is None:
3164
3292
raise errors.BzrCommandError("please specify a commit"
3165
3293
" message with either --message or --file")
3178
3306
reporter=None, verbose=verbose, revprops=properties,
3179
3307
authors=author, timestamp=commit_stamp,
3180
3308
timezone=offset,
3181
exclude=safe_relpath_files(tree, exclude))
3309
exclude=tree.safe_relpath_files(exclude),
3182
3311
except PointlessCommit:
3183
3312
raise errors.BzrCommandError("No changes to commit."
3184
" Use --unchanged to commit anyhow.")
3313
" Please 'bzr add' the files you want to commit, or use"
3314
" --unchanged to force an empty commit.")
3185
3315
except ConflictsInTree:
3186
3316
raise errors.BzrCommandError('Conflicts detected in working '
3187
3317
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3270
3400
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.
3401
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3403
When the default format has changed after a major new release of
3404
Bazaar, you may be informed during certain operations that you
3405
should upgrade. Upgrading to a newer format may improve performance
3406
or make new features available. It may however limit interoperability
3407
with older repositories or with older versions of Bazaar.
3409
If you wish to upgrade to a particular format rather than the
3410
current default, that can be specified using the --format option.
3411
As a consequence, you can use the upgrade command this way to
3412
"downgrade" to an earlier format, though some conversions are
3413
a one way process (e.g. changing from the 1.x default to the
3414
2.x default) so downgrading is not always possible.
3416
A backup.bzr.~#~ directory is created at the start of the conversion
3417
process (where # is a number). By default, this is left there on
3418
completion. If the conversion fails, delete the new .bzr directory
3419
and rename this one back in its place. Use the --clean option to ask
3420
for the backup.bzr directory to be removed on successful conversion.
3421
Alternatively, you can delete it by hand if everything looks good
3424
If the location given is a shared repository, dependent branches
3425
are also converted provided the repository converts successfully.
3426
If the conversion of a branch fails, remaining branches are still
3429
For more information on upgrades, see the Bazaar Upgrade Guide,
3430
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3278
_see_also = ['check']
3433
_see_also = ['check', 'reconcile', 'formats']
3279
3434
takes_args = ['url?']
3280
3435
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'),
3436
RegistryOption('format',
3437
help='Upgrade to a specific format. See "bzr help'
3438
' formats" for details.',
3439
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3440
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3441
value_switches=True, title='Branch format'),
3443
help='Remove the backup.bzr directory if successful.'),
3445
help="Show what would be done, but don't actually do anything."),
3289
def run(self, url='.', format=None):
3448
def run(self, url='.', format=None, clean=False, dry_run=False):
3290
3449
from bzrlib.upgrade import upgrade
3291
upgrade(url, format)
3450
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3452
if len(exceptions) == 1:
3453
# Compatibility with historical behavior
3294
3459
class cmd_whoami(Command):
3313
3479
encoding_type = 'replace'
3315
3481
@display_command
3316
def run(self, email=False, branch=False, name=None):
3482
def run(self, email=False, branch=False, name=None, directory=None):
3317
3483
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()
3484
if directory is None:
3485
# use branch if we're inside one; otherwise global config
3487
c = Branch.open_containing(u'.')[0].get_config()
3488
except errors.NotBranchError:
3489
c = _mod_config.GlobalConfig()
3491
c = Branch.open(directory).get_config()
3324
3493
self.outf.write(c.user_email() + '\n')
3326
3495
self.outf.write(c.username() + '\n')
3499
raise errors.BzrCommandError("--email can only be used to display existing "
3329
3502
# display a warning if an email address isn't included in the given name.
3331
config.extract_email_address(name)
3504
_mod_config.extract_email_address(name)
3332
3505
except errors.NoEmailInUsername, e:
3333
3506
warning('"%s" does not seem to contain an email address. '
3334
3507
'This is allowed, but not recommended.', name)
3336
3509
# use global config unless --branch given
3338
c = Branch.open_containing('.')[0].get_config()
3511
if directory is None:
3512
c = Branch.open_containing(u'.')[0].get_config()
3514
c = Branch.open(directory).get_config()
3340
c = config.GlobalConfig()
3516
c = _mod_config.GlobalConfig()
3341
3517
c.set_user_option('email', name)
3409
3586
'bzr alias --remove expects an alias to remove.')
3410
3587
# If alias is not found, print something like:
3411
3588
# unalias: foo: not found
3412
c = config.GlobalConfig()
3589
c = _mod_config.GlobalConfig()
3413
3590
c.unset_alias(alias_name)
3415
3592
@display_command
3416
3593
def print_aliases(self):
3417
3594
"""Print out the defined aliases in a similar format to bash."""
3418
aliases = config.GlobalConfig().get_aliases()
3595
aliases = _mod_config.GlobalConfig().get_aliases()
3419
3596
for key, value in sorted(aliases.iteritems()):
3420
3597
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3488
3668
if typestring == "sftp":
3489
3669
from bzrlib.tests import stub_sftp
3490
3670
return stub_sftp.SFTPAbsoluteServer
3491
if typestring == "memory":
3671
elif typestring == "memory":
3492
3672
from bzrlib.tests import test_server
3493
3673
return memory.MemoryServer
3494
if typestring == "fakenfs":
3674
elif typestring == "fakenfs":
3495
3675
from bzrlib.tests import test_server
3496
3676
return test_server.FakeNFSServer
3497
3677
msg = "No known transport type %s. Supported types are: sftp\n" %\
3510
3690
'throughout the test suite.',
3511
3691
type=get_transport_type),
3512
3692
Option('benchmark',
3513
help='Run the benchmarks rather than selftests.'),
3693
help='Run the benchmarks rather than selftests.',
3514
3695
Option('lsprof-timed',
3515
3696
help='Generate lsprof output for benchmarked'
3516
3697
' sections of code.'),
3517
3698
Option('lsprof-tests',
3518
3699
help='Generate lsprof output for each test.'),
3519
Option('cache-dir', type=str,
3520
help='Cache intermediate benchmark output in this '
3522
3700
Option('first',
3523
3701
help='Run all tests, but run specified tests first.',
3524
3702
short_name='f',
3533
3711
Option('randomize', type=str, argname="SEED",
3534
3712
help='Randomize the order of tests using the given'
3535
3713
' seed or "now" for the current time.'),
3536
Option('exclude', type=str, argname="PATTERN",
3538
help='Exclude tests that match this regular'
3714
ListOption('exclude', type=str, argname="PATTERN",
3716
help='Exclude tests that match this regular'
3540
3718
Option('subunit',
3541
3719
help='Output test progress via subunit.'),
3542
3720
Option('strict', help='Fail on missing dependencies or '
3559
3737
def run(self, testspecs_list=None, verbose=False, one=False,
3560
3738
transport=None, benchmark=None,
3561
lsprof_timed=None, cache_dir=None,
3562
3740
first=False, list_only=False,
3563
3741
randomize=None, exclude=None, strict=False,
3564
3742
load_list=None, debugflag=None, starting_with=None, subunit=False,
3565
3743
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)
3744
from bzrlib import tests
3575
3746
if testspecs_list is not None:
3576
3747
pattern = '|'.join(testspecs_list)
3585
3756
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3586
3757
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3587
3758
# stdout, which would corrupt the subunit stream.
3588
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3759
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3760
# following code can be deleted when it's sufficiently deployed
3761
# -- vila/mgz 20100514
3762
if (sys.platform == "win32"
3763
and getattr(sys.stdout, 'fileno', None) is not None):
3590
3765
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3592
3767
self.additional_selftest_args.setdefault(
3593
3768
'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)
3770
raise errors.BzrCommandError(
3771
"--benchmark is no longer supported from bzr 2.2; "
3772
"use bzr-usertest instead")
3773
test_suite_factory = None
3775
exclude_pattern = None
3602
test_suite_factory = None
3777
exclude_pattern = '(' + '|'.join(exclude) + ')'
3604
3778
selftest_kwargs = {"verbose": verbose,
3605
3779
"pattern": pattern,
3606
3780
"stop_on_failure": one,
3608
3782
"test_suite_factory": test_suite_factory,
3609
3783
"lsprof_timed": lsprof_timed,
3610
3784
"lsprof_tests": lsprof_tests,
3611
"bench_history": benchfile,
3612
3785
"matching_tests_first": first,
3613
3786
"list_only": list_only,
3614
3787
"random_seed": randomize,
3615
"exclude_pattern": exclude,
3788
"exclude_pattern": exclude_pattern,
3616
3789
"strict": strict,
3617
3790
"load_list": load_list,
3618
3791
"debug_flags": debugflag,
3619
3792
"starting_with": starting_with
3621
3794
selftest_kwargs.update(self.additional_selftest_args)
3622
result = selftest(**selftest_kwargs)
3796
# Make deprecation warnings visible, unless -Werror is set
3797
cleanup = symbol_versioning.activate_deprecation_warnings(
3800
result = tests.selftest(**selftest_kwargs)
3623
3803
return int(not result)
3680
3860
The source of the merge can be specified either in the form of a branch,
3681
3861
or in the form of a path to a file containing a merge directive generated
3682
3862
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.
3863
or the branch most recently merged using --remember. The source of the
3864
merge may also be specified in the form of a path to a file in another
3865
branch: in this case, only the modifications to that file are merged into
3866
the current working tree.
3868
When merging from a branch, by default bzr will try to merge in all new
3869
work from the other branch, automatically determining an appropriate base
3870
revision. If this fails, you may need to give an explicit base.
3872
To pick a different ending revision, pass "--revision OTHER". bzr will
3873
try to merge in all new work up to and including revision OTHER.
3875
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3876
through OTHER, excluding BASE but including OTHER, will be merged. If this
3877
causes some revisions to be skipped, i.e. if the destination branch does
3878
not already contain revision BASE, such a merge is commonly referred to as
3879
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
3880
cherrypicks. The changes look like a normal commit, and the history of the
3881
changes from the other branch is not stored in the commit.
3883
Revision numbers are always relative to the source branch.
3696
3885
Merge will do its best to combine the changes in two branches, but there
3697
3886
are some kinds of problems only a human can fix. When it encounters those,
3701
3890
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.
3892
If there is no default branch set, the first merge will set it (use
3893
--no-remember to avoid settting it). After that, you can omit the branch
3894
to use the default. To change the default, use --remember. The value will
3895
only be saved if the remote location can be accessed.
3708
3897
The results of the merge are placed into the destination working
3709
3898
directory, where they can be reviewed (with bzr diff), tested, and then
3710
3899
committed to record the result of the merge.
3712
3901
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
3902
--force is given. If --force is given, then the changes from the source
3903
will be merged with the current working tree, including any uncommitted
3904
changes in the tree. The --force option can also be used to create a
3714
3905
merge revision which has more than two parents.
3716
3907
If one would like to merge changes from the working tree of the other
3764
3955
' completely merged into the source, pull from the'
3765
3956
' source rather than merging. When this happens,'
3766
3957
' you do not need to commit the result.'),
3958
custom_help('directory',
3768
3959
help='Branch to merge into, '
3769
'rather than the one containing the working directory.',
3960
'rather than the one containing the working directory.'),
3773
3961
Option('preview', help='Instead of merging, show a diff of the'
3775
3963
Option('interactive', help='Select changes interactively.',
3779
3967
def run(self, location=None, revision=None, force=False,
3780
merge_type=None, show_base=False, reprocess=None, remember=False,
3968
merge_type=None, show_base=False, reprocess=None, remember=None,
3781
3969
uncommitted=False, pull=False,
3782
3970
directory=None,
3843
4035
self.sanity_check_merger(merger)
3844
4036
if (merger.base_rev_id == merger.other_rev_id and
3845
4037
merger.other_rev_id is not None):
4038
# check if location is a nonexistent file (and not a branch) to
4039
# disambiguate the 'Nothing to do'
4040
if merger.interesting_files:
4041
if not merger.other_tree.has_filename(
4042
merger.interesting_files[0]):
4043
note("merger: " + str(merger))
4044
raise errors.PathsDoNotExist([location])
3846
4045
note('Nothing to do.')
4047
if pull and not preview:
3849
4048
if merger.interesting_files is not None:
3850
4049
raise errors.BzrCommandError('Cannot pull individual files')
3851
4050
if (merger.base_rev_id == tree.last_revision()):
3875
4074
def _do_preview(self, merger):
3876
4075
from bzrlib.diff import show_diff_trees
3877
4076
result_tree = self._get_preview(merger)
4077
path_encoding = osutils.get_diff_header_encoding()
3878
4078
show_diff_trees(merger.this_tree, result_tree, self.outf,
3879
old_label='', new_label='')
4079
old_label='', new_label='',
4080
path_encoding=path_encoding)
3881
4082
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3882
4083
merger.change_reporter = change_reporter
3958
4159
if other_revision_id is None:
3959
4160
other_revision_id = _mod_revision.ensure_null(
3960
4161
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):
4162
# Remember where we merge from. We need to remember if:
4163
# - user specify a location (and we don't merge from the parent
4165
# - user ask to remember or there is no previous location set to merge
4166
# from and user didn't ask to *not* remember
4167
if (user_location is not None
4169
or (remember is None
4170
and tree.branch.get_submit_branch() is None)))):
3964
4171
tree.branch.set_submit_branch(other_branch.base)
3965
_merge_tags_if_possible(other_branch, tree.branch)
4172
# Merge tags (but don't set them in the master branch yet, the user
4173
# might revert this merge). Commit will propagate them.
4174
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3966
4175
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3967
4176
other_revision_id, base_revision_id, other_branch, base_branch)
3968
4177
if other_path != '':
4136
4345
last committed revision is used.
4138
4347
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.
4348
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4349
will remove the changes introduced by the second last commit (-2), without
4350
affecting the changes introduced by the last commit (-1). To remove
4351
certain changes on a hunk-by-hunk basis, see the shelve command.
4143
4353
By default, any files that have been manually changed will be backed up
4144
4354
first. (Files changed only by merge are not backed up.) Backup files have
4308
4519
theirs_only=False,
4309
4520
log_format=None, long=False, short=False, line=False,
4310
4521
show_ids=False, verbose=False, this=False, other=False,
4311
include_merges=False, revision=None, my_revision=None):
4522
include_merges=False, revision=None, my_revision=None,
4312
4524
from bzrlib.missing import find_unmerged, iter_log_revisions
4313
4525
def message(s):
4314
4526
if not is_quiet():
4472
4684
@display_command
4473
4685
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")
4686
from bzrlib import plugin
4687
# Don't give writelines a generator as some codecs don't like that
4688
self.outf.writelines(
4689
list(plugin.describe_plugins(show_paths=verbose)))
4496
4692
class cmd_testament(Command):
4542
4738
Option('long', help='Show commit date in annotations.'),
4546
4743
encoding_type = 'exact'
4548
4745
@display_command
4549
4746
def run(self, filename, all=False, long=False, revision=None,
4551
from bzrlib.annotate import annotate_file, annotate_file_tree
4747
show_ids=False, directory=None):
4748
from bzrlib.annotate import (
4552
4751
wt, branch, relpath = \
4553
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4752
_open_directory_or_containing_tree_or_branch(filename, directory)
4554
4753
if wt is not None:
4555
4754
self.add_cleanup(wt.lock_read().unlock)
4557
4756
self.add_cleanup(branch.lock_read().unlock)
4558
4757
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4559
4758
self.add_cleanup(tree.lock_read().unlock)
4759
if wt is not None and revision is None:
4561
4760
file_id = wt.path2id(relpath)
4563
4762
file_id = tree.path2id(relpath)
4564
4763
if file_id is None:
4565
4764
raise errors.NotVersionedError(filename)
4566
file_version = tree.inventory[file_id].revision
4567
4765
if wt is not None and revision is None:
4568
4766
# If there is a tree and we're not annotating historical
4569
4767
# versions, annotate the working tree's content.
4570
4768
annotate_file_tree(wt, file_id, self.outf, long, all,
4571
4769
show_ids=show_ids)
4573
annotate_file(branch, file_version, file_id, long, all, self.outf,
4771
annotate_file_tree(tree, file_id, self.outf, long, all,
4772
show_ids=show_ids, branch=branch)
4577
4775
class cmd_re_sign(Command):
4581
4779
hidden = True # is this right ?
4582
4780
takes_args = ['revision_id*']
4583
takes_options = ['revision']
4781
takes_options = ['directory', 'revision']
4585
def run(self, revision_id_list=None, revision=None):
4783
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4586
4784
if revision_id_list is not None and revision is not None:
4587
4785
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4588
4786
if revision_id_list is None and revision is None:
4589
4787
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4590
b = WorkingTree.open_containing(u'.')[0].branch
4788
b = WorkingTree.open_containing(directory)[0].branch
4591
4789
self.add_cleanup(b.lock_write().unlock)
4592
4790
return self._run(b, revision_id_list, revision)
4654
4852
_see_also = ['checkouts', 'unbind']
4655
4853
takes_args = ['location?']
4854
takes_options = ['directory']
4658
def run(self, location=None):
4659
b, relpath = Branch.open_containing(u'.')
4856
def run(self, location=None, directory=u'.'):
4857
b, relpath = Branch.open_containing(directory)
4660
4858
if location is None:
4662
4860
location = b.get_old_bound_location()
4817
5021
bzr break-lock bzr+ssh://example.com/bzr/foo
5022
bzr break-lock --conf ~/.bazaar
4819
5025
takes_args = ['location?']
5028
help='LOCATION is the directory where the config lock is.'),
5030
help='Do not ask for confirmation before breaking the lock.'),
4821
def run(self, location=None, show=False):
5033
def run(self, location=None, config=False, force=False):
4822
5034
if location is None:
4823
5035
location = u'.'
4824
control, relpath = bzrdir.BzrDir.open_containing(location)
4826
control.break_lock()
4827
except NotImplementedError:
5037
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5039
{'bzrlib.lockdir.break': True})
5041
conf = _mod_config.LockableConfig(file_name=location)
5044
control, relpath = bzrdir.BzrDir.open_containing(location)
5046
control.break_lock()
5047
except NotImplementedError:
4831
5051
class cmd_wait_until_signalled(Command):
4896
5115
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4897
5116
protocol=None):
4898
from bzrlib.transport import get_transport, transport_server_registry
5117
from bzrlib import transport
4899
5118
if directory is None:
4900
5119
directory = os.getcwd()
4901
5120
if protocol is None:
4902
protocol = transport_server_registry.get()
5121
protocol = transport.transport_server_registry.get()
4903
5122
host, port = self.get_host_and_port(port)
4904
5123
url = urlutils.local_path_to_url(directory)
4905
5124
if not allow_writes:
4906
5125
url = 'readonly+' + url
4907
transport = get_transport(url)
4908
protocol(transport, host, port, inet)
5126
t = transport.get_transport(url)
5127
protocol(t, host, port, inet)
4911
5130
class cmd_join(Command):
5022
5242
encoding_type = 'exact'
5024
5244
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5025
sign=False, revision=None, mail_to=None, message=None):
5245
sign=False, revision=None, mail_to=None, message=None,
5026
5247
from bzrlib.revision import ensure_null, NULL_REVISION
5027
5248
include_patch, include_bundle = {
5028
5249
'plain': (False, False),
5029
5250
'diff': (True, False),
5030
5251
'bundle': (True, True),
5032
branch = Branch.open('.')
5253
branch = Branch.open(directory)
5033
5254
stored_submit_branch = branch.get_submit_branch()
5034
5255
if submit_branch is None:
5035
5256
submit_branch = stored_submit_branch
5111
5332
source branch defaults to that containing the working directory, but can
5112
5333
be changed using --from.
5335
Both the submit branch and the public branch follow the usual behavior with
5336
respect to --remember: If there is no default location set, the first send
5337
will set it (use --no-remember to avoid settting it). After that, you can
5338
omit the location to use the default. To change the default, use
5339
--remember. The value will only be saved if the location can be accessed.
5114
5341
In order to calculate those changes, bzr must analyse the submit branch.
5115
5342
Therefore it is most efficient for the submit branch to be a local mirror.
5116
5343
If a public location is known for the submit_branch, that location is used
5187
5414
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5188
no_patch=False, revision=None, remember=False, output=None,
5415
no_patch=False, revision=None, remember=None, output=None,
5189
5416
format=None, mail_to=None, message=None, body=None,
5190
5417
strict=None, **kwargs):
5191
5418
from bzrlib.send import send
5350
5574
_see_also = ['tag']
5351
5575
takes_options = [
5353
help='Branch whose tags should be displayed.',
5357
RegistryOption.from_kwargs('sort',
5576
custom_help('directory',
5577
help='Branch whose tags should be displayed.'),
5578
RegistryOption('sort',
5358
5579
'Sort tags by different criteria.', title='Sorting',
5359
alpha='Sort tags lexicographically (default).',
5360
time='Sort tags chronologically.',
5580
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5366
5586
@display_command
5587
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5588
from bzrlib.tag import tag_sort_methods
5373
5589
branch, relpath = Branch.open_containing(directory)
5375
5591
tags = branch.tags.get_tag_dict().items()
5384
5600
# only show revisions between revid1 and revid2 (inclusive)
5385
5601
tags = [(tag, revid) for tag, revid in tags if
5386
5602
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]])
5604
sort = tag_sort_methods.get()
5400
5606
if not show_ids:
5401
5607
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5402
5608
for index, (tag, revid) in enumerate(tags):
5540
5747
def run(self, to_location=None, force=False, create_branch=False,
5748
revision=None, directory=u'.'):
5542
5749
from bzrlib import switch
5750
tree_location = directory
5544
5751
revision = _get_one_revision('switch', revision)
5545
5752
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5546
5753
if to_location is None:
5547
5754
if revision is None:
5548
5755
raise errors.BzrCommandError('You must supply either a'
5549
5756
' revision or a location')
5757
to_location = tree_location
5552
5759
branch = control_dir.open_branch()
5553
5760
had_explicit_nick = branch.get_config().has_explicit_nickname()
5824
6032
You can put multiple items on the shelf, and by default, 'unshelve' will
5825
6033
restore the most recently shelved changes.
6035
For complicated changes, it is possible to edit the changes in a separate
6036
editor program to decide what the file remaining in the working copy
6037
should look like. To do this, add the configuration option
6039
change_editor = PROGRAM @new_path @old_path
6041
where @new_path is replaced with the path of the new version of the
6042
file and @old_path is replaced with the path of the old version of
6043
the file. The PROGRAM should save the new file with the desired
6044
contents of the file in the working tree.
5828
6048
takes_args = ['file*']
5830
6050
takes_options = [
5832
6053
Option('all', help='Shelve all changes.'),
5839
6060
Option('destroy',
5840
6061
help='Destroy removed changes instead of shelving them.'),
5842
_see_also = ['unshelve']
6063
_see_also = ['unshelve', 'configuration']
5844
6065
def run(self, revision=None, all=False, file_list=None, message=None,
5845
writer=None, list=False, destroy=False):
6066
writer=None, list=False, destroy=False, directory=None):
5847
return self.run_for_list()
6068
return self.run_for_list(directory=directory)
5848
6069
from bzrlib.shelf_ui import Shelver
5849
6070
if writer is None:
5850
6071
writer = bzrlib.option.diff_writer_registry.get()
5852
6073
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5853
file_list, message, destroy=destroy)
6074
file_list, message, destroy=destroy, directory=directory)
5922
6146
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'
6148
takes_options = ['directory',
6149
Option('ignored', help='Delete all ignored files.'),
6150
Option('detritus', help='Delete conflict files, merge and revert'
5926
6151
' backups, and failed selftest dirs.'),
5927
6152
Option('unknown',
5928
6153
help='Delete files unknown to bzr (default).'),
5930
6155
' deleting them.'),
5931
6156
Option('force', help='Do not prompt before deleting.')]
5932
6157
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6158
force=False, directory=u'.'):
5934
6159
from bzrlib.clean_tree import clean_tree
5935
6160
if not (unknown or ignored or detritus):
5939
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5940
dry_run=dry_run, no_prompt=force)
6164
clean_tree(directory, unknown=unknown, ignored=ignored,
6165
detritus=detritus, dry_run=dry_run, no_prompt=force)
5943
6168
class cmd_reference(Command):
5987
6212
self.outf.write('%s %s\n' % (path, location))
6215
class cmd_export_pot(Command):
6216
__doc__ = """Export command helps and error messages in po format."""
6221
from bzrlib.export_pot import export_pot
6222
export_pot(self.outf)
5990
6225
def _register_lazy_builtins():
5991
6226
# register lazy builtins from other modules; called at startup and should
5992
6227
# be only called once.
5993
6228
for (name, aliases, module_name) in [
5994
6229
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6230
('cmd_config', [], 'bzrlib.config'),
5995
6231
('cmd_dpush', [], 'bzrlib.foreign'),
5996
6232
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
5997
6233
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
5998
6234
('cmd_conflicts', [], 'bzrlib.conflicts'),
5999
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6235
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6236
('cmd_verify_signatures', [],
6237
'bzrlib.commit_signature_commands'),
6238
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6001
6240
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
