72
73
_parse_revision_str,
74
75
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
80
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
81
78
def tree_files(file_list, default_branch=u'.', canonicalize=True,
83
return internal_tree_files(file_list, default_branch, canonicalize,
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]))
87
88
def tree_files_for_add(file_list):
152
153
# XXX: Bad function name; should possibly also be a class method of
153
154
# 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.
161
159
This is typically used for command-line processors that take one or
162
160
more filenames, and infer the workingtree that contains them.
174
172
:return: workingtree, [relative_paths]
176
return WorkingTree.open_containing_paths(
177
file_list, default_directory='.',
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)
182
223
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)
202
235
# TODO: Make sure no commands unconditionally use the working directory as a
203
236
# branch. If a filename argument is used, the first of them should be used to
204
237
# specify the branch. (Perhaps this can be factored out into some kind of
233
266
Not versioned and not matching an ignore pattern.
235
Additionally for directories, symlinks and files with a changed
236
executable bit, Bazaar indicates their type using a trailing
237
character: '/', '@' or '*' respectively. These decorations can be
238
disabled using the '--no-classify' option.
268
Additionally for directories, symlinks and files with an executable
269
bit, Bazaar indicates their type using a trailing character: '/', '@'
240
272
To see ignored files use 'bzr ignored'. For details on the
241
273
changes to file texts, use 'bzr diff'.
254
286
To skip the display of pending merge information altogether, use
255
287
the no-pending option or specify a file/directory.
257
To compare the working directory to a specific revision, pass a
258
single revision to the revision argument.
260
To see which files have changed in a specific revision, or between
261
two revisions, pass a revision range to the revision argument.
262
This will produce the same results as calling 'bzr diff --summarize'.
289
If a revision argument is given, the status is calculated against
290
that revision, or between two revisions if two are provided.
265
293
# TODO: --no-recurse, --recurse options
285
310
def run(self, show_ids=False, file_list=None, revision=None, short=False,
286
versioned=False, no_pending=False, verbose=False,
311
versioned=False, no_pending=False, verbose=False):
288
312
from bzrlib.status import show_tree_status
290
314
if revision and len(revision) > 2:
291
315
raise errors.BzrCommandError('bzr status --revision takes exactly'
292
316
' one or two revision specifiers')
294
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
318
tree, relfile_list = tree_files(file_list)
295
319
# Avoid asking for specific files when that is not needed.
296
320
if relfile_list == ['']:
297
321
relfile_list = None
304
328
show_tree_status(tree, show_ids=show_ids,
305
329
specific_files=relfile_list, revision=revision,
306
330
to_file=self.outf, short=short, versioned=versioned,
307
show_pending=(not no_pending), verbose=verbose,
308
classify=not no_classify)
331
show_pending=(not no_pending), verbose=verbose)
311
334
class cmd_cat_revision(Command):
330
353
self.outf.write(revtext.decode('utf-8'))
333
def run(self, revision_id=None, revision=None, directory=u'.'):
356
def run(self, revision_id=None, revision=None):
334
357
if revision_id is not None and revision is not None:
335
358
raise errors.BzrCommandError('You can only supply one of'
336
359
' revision_id or --revision')
337
360
if revision_id is None and revision is None:
338
361
raise errors.BzrCommandError('You must supply either'
339
362
' --revision or a revision_id')
341
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
363
b = WorkingTree.open_containing(u'.')[0].branch
343
365
revisions = b.repository.revisions
344
366
if revisions is None:
494
511
d.destroy_workingtree()
497
class cmd_repair_workingtree(Command):
498
__doc__ = """Reset the working tree state file.
500
This is not meant to be used normally, but more as a way to recover from
501
filesystem corruption, etc. This rebuilds the working inventory back to a
502
'known good' state. Any new modifications (adding a file, renaming, etc)
503
will be lost, though modified files will still be detected as such.
505
Most users will want something more like "bzr revert" or "bzr update"
506
unless the state file has become corrupted.
508
By default this attempts to recover the current state by looking at the
509
headers of the state file. If the state file is too corrupted to even do
510
that, you can supply --revision to force the state of the tree.
513
takes_options = ['revision', 'directory',
515
help='Reset the tree even if it doesn\'t appear to be'
520
def run(self, revision=None, directory='.', force=False):
521
tree, _ = WorkingTree.open_containing(directory)
522
self.add_cleanup(tree.lock_tree_write().unlock)
526
except errors.BzrError:
527
pass # There seems to be a real error here, so we'll reset
530
raise errors.BzrCommandError(
531
'The tree does not appear to be corrupt. You probably'
532
' want "bzr revert" instead. Use "--force" if you are'
533
' sure you want to reset the working tree.')
537
revision_ids = [r.as_revision_id(tree.branch) for r in revision]
539
tree.reset_state(revision_ids)
540
except errors.BzrError, e:
541
if revision_ids is None:
542
extra = (', the header appears corrupt, try passing -r -1'
543
' to set the state to the last commit')
546
raise errors.BzrCommandError('failed to reset the tree state'
550
514
class cmd_revno(Command):
551
515
__doc__ = """Show current revision number.
710
677
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
711
678
to_file=self.outf, should_print=(not is_quiet()))
713
action = bzrlib.add.AddWithSkipLargeAction(to_file=self.outf,
680
action = bzrlib.add.AddAction(to_file=self.outf,
714
681
should_print=(not is_quiet()))
717
self.add_cleanup(base_tree.lock_read().unlock)
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
718
686
tree, file_list = tree_files_for_add(file_list)
719
687
added, ignored = tree.smart_add(file_list, not
720
688
no_recurse, action=action, save=not dry_run)
791
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
793
761
revision = _get_one_revision('inventory', revision)
794
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
795
self.add_cleanup(work_tree.lock_read().unlock)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
796
765
if revision is not None:
797
766
tree = revision.as_tree(work_tree.branch)
799
768
extra_trees = [work_tree]
800
self.add_cleanup(tree.lock_read().unlock)
770
self.add_cleanup(tree.unlock)
864
833
if len(names_list) < 2:
865
834
raise errors.BzrCommandError("missing file argument")
866
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
867
self.add_cleanup(tree.lock_tree_write().unlock)
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
868
838
self._run(tree, names_list, rel_names, after)
870
840
def run_auto(self, names_list, after, dry_run):
875
845
raise errors.BzrCommandError('--after cannot be specified with'
877
work_tree, file_list = WorkingTree.open_containing_paths(
878
names_list, default_directory='.')
879
self.add_cleanup(work_tree.lock_tree_write().unlock)
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
880
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
882
852
def _run(self, tree, names_list, rel_names, after):
976
946
match the remote one, use pull --overwrite. This will work even if the two
977
947
branches have diverged.
979
If there is no default location set, the first pull will set it (use
980
--no-remember to avoid setting it). After that, you can omit the
981
location to use the default. To change the default, use --remember. The
982
value will only be saved if the remote location can be accessed.
949
If there is no default location set, the first pull will set it. After
950
that, you can omit the location to use the default. To change the
951
default, use --remember. The value will only be saved if the remote
952
location can be accessed.
984
954
Note: The location can be specified either in the form of a branch,
985
955
or in the form of a path to a file containing a merge directive generated
990
960
takes_options = ['remember', 'overwrite', 'revision',
991
961
custom_help('verbose',
992
962
help='Show logs of pulled revisions.'),
993
custom_help('directory',
994
964
help='Branch to pull into, '
995
'rather than the one containing the working directory.'),
965
'rather than the one containing the working directory.',
997
970
help="Perform a local pull in a bound "
998
971
"branch. Local pulls are not applied to "
999
972
"the master branch."
1002
help="Show base revision text in conflicts.")
1004
975
takes_args = ['location?']
1005
976
encoding_type = 'replace'
1007
def run(self, location=None, remember=None, overwrite=False,
978
def run(self, location=None, remember=False, overwrite=False,
1008
979
revision=None, verbose=False,
1009
directory=None, local=False,
980
directory=None, local=False):
1011
981
# FIXME: too much stuff is in the command class
1012
982
revision_id = None
1013
983
mergeable = None
1017
987
tree_to = WorkingTree.open_containing(directory)[0]
1018
988
branch_to = tree_to.branch
1019
self.add_cleanup(tree_to.lock_write().unlock)
990
self.add_cleanup(tree_to.unlock)
1020
991
except errors.NoWorkingTree:
1022
993
branch_to = Branch.open_containing(directory)[0]
1023
self.add_cleanup(branch_to.lock_write().unlock)
1025
if tree_to is None and show_base:
1026
raise errors.BzrCommandError("Need working tree for --show-base.")
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
1028
997
if local and not branch_to.get_bound_location():
1029
998
raise errors.LocalRequiresBoundBranch()
1112
1077
do a merge (see bzr help merge) from the other branch, and commit that.
1113
1078
After that you will be able to do a push without '--overwrite'.
1115
If there is no default push location set, the first push will set it (use
1116
--no-remember to avoid setting it). After that, you can omit the
1117
location to use the default. To change the default, use --remember. The
1118
value will only be saved if the remote location can be accessed.
1080
If there is no default push location set, the first push will set it.
1081
After that, you can omit the location to use the default. To change the
1082
default, use --remember. The value will only be saved if the remote
1083
location can be accessed.
1121
1086
_see_also = ['pull', 'update', 'working-trees']
1123
1088
Option('create-prefix',
1124
1089
help='Create the path leading up to the branch '
1125
1090
'if it does not already exist.'),
1126
custom_help('directory',
1127
1092
help='Branch to push from, '
1128
'rather than the one containing the working directory.'),
1093
'rather than the one containing the working directory.',
1129
1097
Option('use-existing-dir',
1130
1098
help='By default push will fail if the target'
1131
1099
' directory exists, but does not already'
1142
1110
Option('strict',
1143
1111
help='Refuse to push if there are uncommitted changes in'
1144
1112
' the working tree, --no-strict disables the check.'),
1146
help="Don't populate the working tree, even for protocols"
1147
" that support it."),
1149
1114
takes_args = ['location?']
1150
1115
encoding_type = 'replace'
1152
def run(self, location=None, remember=None, overwrite=False,
1117
def run(self, location=None, remember=False, overwrite=False,
1153
1118
create_prefix=False, verbose=False, revision=None,
1154
1119
use_existing_dir=False, directory=None, stacked_on=None,
1155
stacked=False, strict=None, no_tree=False):
1120
stacked=False, strict=None):
1156
1121
from bzrlib.push import _show_push_branch
1158
1123
if directory is None:
1199
1164
display_url = urlutils.unescape_for_display(stored_loc,
1200
1165
self.outf.encoding)
1201
note("Using saved push location: %s" % display_url)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1202
1167
location = stored_loc
1204
1169
_show_push_branch(br_from, revision_id, location, self.outf,
1205
1170
verbose=verbose, overwrite=overwrite, remember=remember,
1206
1171
stacked_on=stacked_on, create_prefix=create_prefix,
1207
use_existing_dir=use_existing_dir, no_tree=no_tree)
1172
use_existing_dir=use_existing_dir)
1210
1175
class cmd_branch(Command):
1220
1185
To retrieve the branch as of a particular revision, supply the --revision
1221
1186
parameter, as in "branch foo/bar -r 5".
1223
The synonyms 'clone' and 'get' for this command are deprecated.
1226
1189
_see_also = ['checkout']
1227
1190
takes_args = ['from_location', 'to_location?']
1228
takes_options = ['revision',
1229
Option('hardlink', help='Hard-link working tree files where possible.'),
1230
Option('files-from', type=str,
1231
help="Get file contents from this tree."),
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1232
1193
Option('no-tree',
1233
1194
help="Create a branch without a working-tree."),
1234
1195
Option('switch',
1253
1214
def run(self, from_location, to_location=None, revision=None,
1254
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1255
use_existing_dir=False, switch=False, bind=False,
1216
use_existing_dir=False, switch=False, bind=False):
1257
1217
from bzrlib import switch as _mod_switch
1258
1218
from bzrlib.tag import _merge_tags_if_possible
1259
if self.invoked_as in ['get', 'clone']:
1260
ui.ui_factory.show_user_warning(
1261
'deprecated_command',
1262
deprecated_name=self.invoked_as,
1263
recommended_name='branch',
1264
deprecated_in_version='2.4')
1265
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1267
if not (hardlink or files_from):
1268
# accelerator_tree is usually slower because you have to read N
1269
# files (no readahead, lots of seeks, etc), but allow the user to
1270
# explicitly request it
1271
accelerator_tree = None
1272
if files_from is not None and files_from != from_location:
1273
accelerator_tree = WorkingTree.open(files_from)
1274
1221
revision = _get_one_revision('branch', revision)
1275
self.add_cleanup(br_from.lock_read().unlock)
1223
self.add_cleanup(br_from.unlock)
1276
1224
if revision is not None:
1277
1225
revision_id = revision.as_revision_id(br_from)
1337
1285
urlutils.unescape_for_display(branch.base, 'utf-8'))
1340
class cmd_branches(Command):
1341
__doc__ = """List the branches available at the current location.
1343
This command will print the names of all the branches at the current location.
1346
takes_args = ['location?']
1348
def run(self, location="."):
1349
dir = bzrdir.BzrDir.open_containing(location)[0]
1350
for branch in dir.list_branches():
1351
if branch.name is None:
1352
self.outf.write(" (default)\n")
1354
self.outf.write(" %s\n" % branch.name.encode(self.outf.encoding))
1357
1288
class cmd_checkout(Command):
1358
1289
__doc__ = """Create a new checkout of an existing branch.
1400
1331
to_location = branch_location
1401
1332
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1402
1333
branch_location)
1403
if not (hardlink or files_from):
1404
# accelerator_tree is usually slower because you have to read N
1405
# files (no readahead, lots of seeks, etc), but allow the user to
1406
# explicitly request it
1407
accelerator_tree = None
1408
1334
revision = _get_one_revision('checkout', revision)
1409
if files_from is not None and files_from != branch_location:
1335
if files_from is not None:
1410
1336
accelerator_tree = WorkingTree.open(files_from)
1411
1337
if revision is not None:
1412
1338
revision_id = revision.as_revision_id(source)
1468
1396
If you want to discard your local changes, you can just do a
1469
1397
'bzr revert' instead of 'bzr commit' after the update.
1471
If you want to restore a file that has been removed locally, use
1472
'bzr revert' instead of 'bzr update'.
1474
1399
If the tree's branch is bound to a master branch, it will also update
1475
1400
the branch from the master.
1478
1403
_see_also = ['pull', 'working-trees', 'status-flags']
1479
1404
takes_args = ['dir?']
1480
takes_options = ['revision',
1482
help="Show base revision text in conflicts."),
1405
takes_options = ['revision']
1484
1406
aliases = ['up']
1486
def run(self, dir='.', revision=None, show_base=None):
1408
def run(self, dir='.', revision=None):
1487
1409
if revision is not None and len(revision) != 1:
1488
1410
raise errors.BzrCommandError(
1489
1411
"bzr update --revision takes exactly one revision")
1598
1519
class cmd_remove(Command):
1599
1520
__doc__ = """Remove files or directories.
1601
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1602
delete them if they can easily be recovered using revert otherwise they
1603
will be backed up (adding an extention of the form .~#~). If no options or
1604
parameters are given Bazaar will scan for files that are being tracked by
1605
Bazaar but missing in your tree and stop tracking them for you.
1522
This makes bzr stop tracking changes to the specified files. bzr will delete
1523
them if they can easily be recovered using revert. If no options or
1524
parameters are given bzr will scan for files that are being tracked by bzr
1525
but missing in your tree and stop tracking them for you.
1607
1527
takes_args = ['file*']
1608
1528
takes_options = ['verbose',
1610
1530
RegistryOption.from_kwargs('file-deletion-strategy',
1611
1531
'The file deletion mode to be used.',
1612
1532
title='Deletion Strategy', value_switches=True, enum_switch=False,
1613
safe='Backup changed files (default).',
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1614
1535
keep='Delete from bzr but leave the working copy.',
1615
no_backup='Don\'t backup changed files.',
1616
1536
force='Delete all the specified files, even if they can not be '
1617
'recovered and even if they are non-empty directories. '
1618
'(deprecated, use no-backup)')]
1537
'recovered and even if they are non-empty directories.')]
1619
1538
aliases = ['rm', 'del']
1620
1539
encoding_type = 'replace'
1622
1541
def run(self, file_list, verbose=False, new=False,
1623
1542
file_deletion_strategy='safe'):
1624
if file_deletion_strategy == 'force':
1625
note("(The --force option is deprecated, rather use --no-backup "
1627
file_deletion_strategy = 'no-backup'
1629
tree, file_list = WorkingTree.open_containing_paths(file_list)
1543
tree, file_list = tree_files(file_list)
1631
1545
if file_list is not None:
1632
1546
file_list = [f for f in file_list]
1634
self.add_cleanup(tree.lock_write().unlock)
1549
self.add_cleanup(tree.unlock)
1635
1550
# Heuristics should probably all move into tree.remove_smart or
1721
1636
_see_also = ['check']
1722
1637
takes_args = ['branch?']
1724
Option('canonicalize-chks',
1725
help='Make sure CHKs are in canonical form (repairs '
1730
def run(self, branch=".", canonicalize_chks=False):
1639
def run(self, branch="."):
1731
1640
from bzrlib.reconcile import reconcile
1732
1641
dir = bzrdir.BzrDir.open(branch)
1733
reconcile(dir, canonicalize_chks=canonicalize_chks)
1736
1645
class cmd_revision_history(Command):
1769
1678
last_revision = wt.last_revision()
1771
self.add_cleanup(b.repository.lock_read().unlock)
1772
graph = b.repository.get_graph()
1773
revisions = [revid for revid, parents in
1774
graph.iter_ancestry([last_revision])]
1775
for revision_id in reversed(revisions):
1776
if _mod_revision.is_null(revision_id):
1680
revision_ids = b.repository.get_ancestry(last_revision)
1682
for revision_id in revision_ids:
1778
1683
self.outf.write(revision_id + '\n')
1818
1723
Option('append-revisions-only',
1819
1724
help='Never change revnos or the existing log.'
1820
' Append revisions to it only.'),
1822
'Create a branch without a working tree.')
1725
' Append revisions to it only.')
1824
1727
def run(self, location=None, format=None, append_revisions_only=False,
1825
create_prefix=False, no_tree=False):
1728
create_prefix=False):
1826
1729
if format is None:
1827
1730
format = bzrdir.format_registry.make_bzrdir('default')
1828
1731
if location is None:
2105
1985
old_branch, new_branch,
2106
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2107
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2108
# GNU diff on Windows uses ANSI encoding for filenames
2109
path_encoding = osutils.get_diff_header_encoding()
2110
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2111
1989
specific_files=specific_files,
2112
1990
external_diff_options=diff_options,
2113
1991
old_label=old_label, new_label=new_label,
2114
extra_trees=extra_trees,
2115
path_encoding=path_encoding,
1992
extra_trees=extra_trees, using=using,
2117
1993
format_cls=format)
2127
2003
# level of effort but possibly much less IO. (Or possibly not,
2128
2004
# if the directories are very large...)
2129
2005
_see_also = ['status', 'ls']
2130
takes_options = ['directory', 'show-ids']
2006
takes_options = ['show-ids']
2132
2008
@display_command
2133
def run(self, show_ids=False, directory=u'.'):
2134
tree = WorkingTree.open_containing(directory)[0]
2135
self.add_cleanup(tree.lock_read().unlock)
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2136
2013
old = tree.basis_tree()
2137
self.add_cleanup(old.lock_read().unlock)
2015
self.add_cleanup(old.unlock)
2138
2016
for path, ie in old.inventory.iter_entries():
2139
2017
if not tree.has_id(ie.file_id):
2140
2018
self.outf.write(path)
2152
2030
_see_also = ['status', 'ls']
2153
takes_options = ['directory', 'null']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2155
2037
@display_command
2156
def run(self, null=False, directory=u'.'):
2157
tree = WorkingTree.open_containing(directory)[0]
2158
self.add_cleanup(tree.lock_read().unlock)
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2159
2040
td = tree.changes_from(tree.basis_tree())
2161
2041
for path, id, kind, text_modified, meta_modified in td.modified:
2163
2043
self.outf.write(path + '\0')
2173
2053
_see_also = ['status', 'ls']
2174
takes_options = ['directory', 'null']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2176
2060
@display_command
2177
def run(self, null=False, directory=u'.'):
2178
wt = WorkingTree.open_containing(directory)[0]
2179
self.add_cleanup(wt.lock_read().unlock)
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2180
2065
basis = wt.basis_tree()
2181
self.add_cleanup(basis.lock_read().unlock)
2067
self.add_cleanup(basis.unlock)
2182
2068
basis_inv = basis.inventory
2183
2069
inv = wt.inventory
2184
2070
for file_id in inv:
2185
if basis_inv.has_id(file_id):
2071
if file_id in basis_inv:
2187
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2189
2075
path = inv.id2path(file_id)
2190
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2076
if not os.access(osutils.abspath(path), os.F_OK):
2193
2079
self.outf.write(path + '\0')
2396
2279
help='Show just the specified revision.'
2397
2280
' See also "help revisionspec".'),
2399
RegistryOption('authors',
2400
'What names to list as authors - first, all or committer.',
2402
lazy_registry=('bzrlib.log', 'author_list_registry'),
2404
2282
Option('levels',
2405
2283
short_name='n',
2406
2284
help='Number of levels to display - 0 for all, 1 for flat.',
2408
2286
type=_parse_levels),
2409
2287
Option('message',
2410
2289
help='Show revisions whose message matches this '
2411
2290
'regular expression.',
2414
2292
Option('limit',
2415
2293
short_name='l',
2416
2294
help='Limit the output to the first N revisions.',
2424
2302
Option('exclude-common-ancestry',
2425
2303
help='Display only the revisions that are not part'
2426
2304
' of both ancestries (require -rX..Y)'
2428
Option('signatures',
2429
help='Show digital signature validity'),
2432
help='Show revisions whose properties match this '
2435
ListOption('match-message',
2436
help='Show revisions whose message matches this '
2439
ListOption('match-committer',
2440
help='Show revisions whose committer matches this '
2443
ListOption('match-author',
2444
help='Show revisions whose authors match this '
2447
ListOption('match-bugs',
2448
help='Show revisions whose bugs match this '
2452
2307
encoding_type = 'replace'
2529
2378
dir, relpath = bzrdir.BzrDir.open_containing(location)
2530
2379
b = dir.open_branch()
2531
self.add_cleanup(b.lock_read().unlock)
2381
self.add_cleanup(b.unlock)
2532
2382
rev1, rev2 = _get_revision_range(revision, b, self.name())
2534
if b.get_config().validate_signatures_in_log():
2538
if not gpg.GPGStrategy.verify_signatures_available():
2539
raise errors.GpgmeNotInstalled(None)
2541
2384
# Decide on the type of delta & diff filtering to use
2542
2385
# TODO: add an --all-files option to make this configurable & consistent
2543
2386
if not verbose:
2698
2528
help='Recurse into subdirectories.'),
2699
2529
Option('from-root',
2700
2530
help='Print paths relative to the root of the branch.'),
2701
Option('unknown', short_name='u',
2702
help='Print unknown files.'),
2531
Option('unknown', help='Print unknown files.'),
2703
2532
Option('versioned', help='Print versioned files.',
2704
2533
short_name='V'),
2705
Option('ignored', short_name='i',
2706
help='Print ignored files.'),
2707
Option('kind', short_name='k',
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2708
2539
help='List entries of a particular kind: file, directory, symlink.',
2714
2543
@display_command
2715
2544
def run(self, revision=None, verbose=False,
2716
2545
recursive=False, from_root=False,
2717
2546
unknown=False, versioned=False, ignored=False,
2718
null=False, kind=None, show_ids=False, path=None, directory=None):
2547
null=False, kind=None, show_ids=False, path=None):
2720
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2721
2550
raise errors.BzrCommandError('invalid kind specified')
2893
2713
_see_also = ['status', 'ignored', 'patterns']
2894
2714
takes_args = ['name_pattern*']
2895
takes_options = ['directory',
2896
2716
Option('default-rules',
2897
2717
help='Display the default ignore rules that bzr uses.')
2900
def run(self, name_pattern_list=None, default_rules=None,
2720
def run(self, name_pattern_list=None, default_rules=None):
2902
2721
from bzrlib import ignores
2903
2722
if default_rules is not None:
2904
2723
# dump the default rules and exit
2910
2729
"NAME_PATTERN or --default-rules.")
2911
2730
name_pattern_list = [globbing.normalize_pattern(p)
2912
2731
for p in name_pattern_list]
2914
for p in name_pattern_list:
2915
if not globbing.Globster.is_pattern_valid(p):
2916
bad_patterns += ('\n %s' % p)
2918
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2919
ui.ui_factory.show_error(msg)
2920
raise errors.InvalidPattern('')
2921
2732
for name_pattern in name_pattern_list:
2922
2733
if (name_pattern[0] == '/' or
2923
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2924
2735
raise errors.BzrCommandError(
2925
2736
"NAME_PATTERN should not be an absolute path")
2926
tree, relpath = WorkingTree.open_containing(directory)
2737
tree, relpath = WorkingTree.open_containing(u'.')
2927
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2928
2739
ignored = globbing.Globster(name_pattern_list)
2930
self.add_cleanup(tree.lock_read().unlock)
2931
2742
for entry in tree.list_files():
2933
2744
if id is not None:
2934
2745
filename = entry[0]
2935
2746
if ignored.match(filename):
2936
2747
matches.append(filename)
2937
2749
if len(matches) > 0:
2938
2750
self.outf.write("Warning: the following files are version controlled and"
2939
2751
" match your ignore pattern:\n%s"
2955
2767
encoding_type = 'replace'
2956
2768
_see_also = ['ignore', 'ls']
2957
takes_options = ['directory']
2959
2770
@display_command
2960
def run(self, directory=u'.'):
2961
tree = WorkingTree.open_containing(directory)[0]
2962
self.add_cleanup(tree.lock_read().unlock)
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
2963
2775
for path, file_class, kind, file_id, entry in tree.list_files():
2964
2776
if file_class != 'I':
3034
2844
'revision in which it was changed.'),
3036
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
3037
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2847
root=None, filters=False, per_file_timestamps=False):
3038
2848
from bzrlib.export import export
3040
2850
if branch_or_subdir is None:
3041
tree = WorkingTree.open_containing(directory)[0]
2851
tree = WorkingTree.open_containing(u'.')[0]
3042
2852
b = tree.branch
3075
2885
@display_command
3076
2886
def run(self, filename, revision=None, name_from_revision=False,
3077
filters=False, directory=None):
3078
2888
if revision is not None and len(revision) != 1:
3079
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
3080
2890
" one revision specifier")
3081
2891
tree, branch, relpath = \
3082
_open_directory_or_containing_tree_or_branch(filename, directory)
3083
self.add_cleanup(branch.lock_read().unlock)
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3084
2895
return self._run(tree, branch, relpath, filename, revision,
3085
2896
name_from_revision, filters)
3104
2912
"%r is not present in revision %s" % (
3105
2913
filename, rev_tree.get_revision_id()))
3107
actual_file_id = old_file_id
2915
content = rev_tree.get_file_text(old_file_id)
3109
2917
cur_file_id = tree.path2id(relpath)
3110
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3111
actual_file_id = cur_file_id
3112
elif old_file_id is not None:
3113
actual_file_id = old_file_id
2919
if cur_file_id is not None:
2920
# Then try with the actual file id
2922
content = rev_tree.get_file_text(cur_file_id)
2924
except errors.NoSuchId:
2925
# The actual file id didn't exist at that time
2927
if not found and old_file_id is not None:
2928
# Finally try with the old file id
2929
content = rev_tree.get_file_text(old_file_id)
2932
# Can't be found anywhere
3115
2933
raise errors.BzrCommandError(
3116
2934
"%r is not present in revision %s" % (
3117
2935
filename, rev_tree.get_revision_id()))
3119
from bzrlib.filter_tree import ContentFilterTree
3120
filter_tree = ContentFilterTree(rev_tree,
3121
rev_tree._content_filter_stack)
3122
content = filter_tree.get_file_text(actual_file_id)
2937
from bzrlib.filters import (
2938
ContentFilterContext,
2939
filtered_output_bytes,
2941
filters = rev_tree._content_filter_stack(relpath)
2942
chunks = content.splitlines(True)
2943
content = filtered_output_bytes(chunks, filters,
2944
ContentFilterContext(relpath, rev_tree))
2946
self.outf.writelines(content)
3124
content = rev_tree.get_file_text(actual_file_id)
3126
self.outf.write(content)
2949
self.outf.write(content)
3129
2952
class cmd_local_time_offset(Command):
3190
3013
to trigger updates to external systems like bug trackers. The --fixes
3191
3014
option can be used to record the association between a revision and
3192
3015
one or more bugs. See ``bzr help bugs`` for details.
3017
A selective commit may fail in some cases where the committed
3018
tree would be invalid. Consider::
3023
bzr commit foo -m "committing foo"
3024
bzr mv foo/bar foo/baz
3027
bzr commit foo/bar -m "committing bar but not baz"
3029
In the example above, the last commit will fail by design. This gives
3030
the user the opportunity to decide whether they want to commit the
3031
rename at the same time, separately first, or not at all. (As a general
3032
rule, when in doubt, Bazaar has a policy of Doing the Safe Thing.)
3034
# TODO: Run hooks on tree to-be-committed, and after commit.
3036
# TODO: Strict commit that fails if there are deleted files.
3037
# (what does "deleted files" mean ??)
3039
# TODO: Give better message for -s, --summary, used by tla people
3041
# XXX: verbose currently does nothing
3195
3043
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3196
3044
takes_args = ['selected*']
3228
3076
Option('show-diff', short_name='p',
3229
3077
help='When no message is supplied, show the diff along'
3230
3078
' with the status summary in the message editor.'),
3232
help='When committing to a foreign version control '
3233
'system do not push data that can not be natively '
3236
3080
aliases = ['ci', 'checkin']
3238
3082
def _iter_bug_fix_urls(self, fixes, branch):
3239
default_bugtracker = None
3240
3083
# Configure the properties for bug fixing attributes.
3241
3084
for fixed_bug in fixes:
3242
3085
tokens = fixed_bug.split(':')
3243
if len(tokens) == 1:
3244
if default_bugtracker is None:
3245
branch_config = branch.get_config()
3246
default_bugtracker = branch_config.get_user_option(
3248
if default_bugtracker is None:
3249
raise errors.BzrCommandError(
3250
"No tracker specified for bug %s. Use the form "
3251
"'tracker:id' or specify a default bug tracker "
3252
"using the `bugtracker` option.\nSee "
3253
"\"bzr help bugs\" for more information on this "
3254
"feature. Commit refused." % fixed_bug)
3255
tag = default_bugtracker
3257
elif len(tokens) != 2:
3086
if len(tokens) != 2:
3258
3087
raise errors.BzrCommandError(
3259
3088
"Invalid bug %s. Must be in the form of 'tracker:id'. "
3260
3089
"See \"bzr help bugs\" for more information on this "
3261
3090
"feature.\nCommit refused." % fixed_bug)
3263
tag, bug_id = tokens
3091
tag, bug_id = tokens
3265
3093
yield bugtracker.get_bug_url(tag, branch, bug_id)
3266
3094
except errors.UnknownBugTrackerAbbreviation:
3273
3101
def run(self, message=None, file=None, verbose=False, selected_list=None,
3274
3102
unchanged=False, strict=False, local=False, fixes=None,
3275
author=None, show_diff=False, exclude=None, commit_time=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3277
3104
from bzrlib.errors import (
3278
3105
PointlessCommit,
3279
3106
ConflictsInTree,
3294
3120
raise errors.BzrCommandError(
3295
3121
"Could not parse --commit-time: " + str(e))
3123
# TODO: Need a blackbox test for invoking the external editor; may be
3124
# slightly problematic to run this cross-platform.
3126
# TODO: do more checks that the commit will succeed before
3127
# spending the user's valuable time typing a commit message.
3297
3129
properties = {}
3299
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3131
tree, selected_list = tree_files(selected_list)
3300
3132
if selected_list == ['']:
3301
3133
# workaround - commit of root of tree should be exactly the same
3302
3134
# as just default commit in that tree, and succeed even though
3355
3184
# make_commit_message_template_encoded returns user encoding.
3356
3185
# We probably want to be using edit_commit_message instead to
3358
my_message = set_commit_message(commit_obj)
3359
if my_message is None:
3360
start_message = generate_commit_message_template(commit_obj)
3361
my_message = edit_commit_message_encoded(text,
3362
start_message=start_message)
3187
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3189
start_message=start_message)
3363
3190
if my_message is None:
3364
3191
raise errors.BzrCommandError("please specify a commit"
3365
3192
" message with either --message or --file")
3366
if my_message == "":
3367
raise errors.BzrCommandError("Empty commit message specified."
3368
" Please specify a commit message with either"
3369
" --message or --file or leave a blank message"
3370
" with --message \"\".")
3193
if my_message == "":
3194
raise errors.BzrCommandError("empty commit message specified")
3371
3195
return my_message
3373
3197
# The API permits a commit with a filter of [] to mean 'select nothing'
3381
3205
reporter=None, verbose=verbose, revprops=properties,
3382
3206
authors=author, timestamp=commit_stamp,
3383
3207
timezone=offset,
3384
exclude=tree.safe_relpath_files(exclude),
3208
exclude=safe_relpath_files(tree, exclude))
3386
3209
except PointlessCommit:
3387
3210
raise errors.BzrCommandError("No changes to commit."
3388
" Please 'bzr add' the files you want to commit, or use"
3389
" --unchanged to force an empty commit.")
3211
" Use --unchanged to commit anyhow.")
3390
3212
except ConflictsInTree:
3391
3213
raise errors.BzrCommandError('Conflicts detected in working '
3392
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3475
3297
class cmd_upgrade(Command):
3476
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3478
When the default format has changed after a major new release of
3479
Bazaar, you may be informed during certain operations that you
3480
should upgrade. Upgrading to a newer format may improve performance
3481
or make new features available. It may however limit interoperability
3482
with older repositories or with older versions of Bazaar.
3484
If you wish to upgrade to a particular format rather than the
3485
current default, that can be specified using the --format option.
3486
As a consequence, you can use the upgrade command this way to
3487
"downgrade" to an earlier format, though some conversions are
3488
a one way process (e.g. changing from the 1.x default to the
3489
2.x default) so downgrading is not always possible.
3491
A backup.bzr.~#~ directory is created at the start of the conversion
3492
process (where # is a number). By default, this is left there on
3493
completion. If the conversion fails, delete the new .bzr directory
3494
and rename this one back in its place. Use the --clean option to ask
3495
for the backup.bzr directory to be removed on successful conversion.
3496
Alternatively, you can delete it by hand if everything looks good
3499
If the location given is a shared repository, dependent branches
3500
are also converted provided the repository converts successfully.
3501
If the conversion of a branch fails, remaining branches are still
3504
For more information on upgrades, see the Bazaar Upgrade Guide,
3505
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3298
__doc__ = """Upgrade branch storage to current format.
3300
The check command or bzr developers may sometimes advise you to run
3301
this command. When the default format has changed you may also be warned
3302
during other operations to upgrade.
3508
_see_also = ['check', 'reconcile', 'formats']
3305
_see_also = ['check']
3509
3306
takes_args = ['url?']
3510
3307
takes_options = [
3511
RegistryOption('format',
3512
help='Upgrade to a specific format. See "bzr help'
3513
' formats" for details.',
3514
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3515
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3516
value_switches=True, title='Branch format'),
3518
help='Remove the backup.bzr directory if successful.'),
3520
help="Show what would be done, but don't actually do anything."),
3308
RegistryOption('format',
3309
help='Upgrade to a specific format. See "bzr help'
3310
' formats" for details.',
3311
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3312
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3313
value_switches=True, title='Branch format'),
3523
def run(self, url='.', format=None, clean=False, dry_run=False):
3316
def run(self, url='.', format=None):
3524
3317
from bzrlib.upgrade import upgrade
3525
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3527
if len(exceptions) == 1:
3528
# Compatibility with historical behavior
3318
upgrade(url, format)
3534
3321
class cmd_whoami(Command):
3554
3340
encoding_type = 'replace'
3556
3342
@display_command
3557
def run(self, email=False, branch=False, name=None, directory=None):
3343
def run(self, email=False, branch=False, name=None):
3558
3344
if name is None:
3559
if directory is None:
3560
# use branch if we're inside one; otherwise global config
3562
c = Branch.open_containing(u'.')[0].get_config()
3563
except errors.NotBranchError:
3564
c = _mod_config.GlobalConfig()
3566
c = Branch.open(directory).get_config()
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3568
3351
self.outf.write(c.user_email() + '\n')
3570
3353
self.outf.write(c.username() + '\n')
3574
raise errors.BzrCommandError("--email can only be used to display existing "
3577
3356
# display a warning if an email address isn't included in the given name.
3579
_mod_config.extract_email_address(name)
3358
config.extract_email_address(name)
3580
3359
except errors.NoEmailInUsername, e:
3581
3360
warning('"%s" does not seem to contain an email address. '
3582
3361
'This is allowed, but not recommended.', name)
3584
3363
# use global config unless --branch given
3586
if directory is None:
3587
c = Branch.open_containing(u'.')[0].get_config()
3589
c = Branch.open(directory).get_config()
3365
c = Branch.open_containing('.')[0].get_config()
3591
c = _mod_config.GlobalConfig()
3367
c = config.GlobalConfig()
3592
3368
c.set_user_option('email', name)
3661
3436
'bzr alias --remove expects an alias to remove.')
3662
3437
# If alias is not found, print something like:
3663
3438
# unalias: foo: not found
3664
c = _mod_config.GlobalConfig()
3439
c = config.GlobalConfig()
3665
3440
c.unset_alias(alias_name)
3667
3442
@display_command
3668
3443
def print_aliases(self):
3669
3444
"""Print out the defined aliases in a similar format to bash."""
3670
aliases = _mod_config.GlobalConfig().get_aliases()
3445
aliases = config.GlobalConfig().get_aliases()
3671
3446
for key, value in sorted(aliases.iteritems()):
3672
3447
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3743
3515
if typestring == "sftp":
3744
3516
from bzrlib.tests import stub_sftp
3745
3517
return stub_sftp.SFTPAbsoluteServer
3746
elif typestring == "memory":
3518
if typestring == "memory":
3747
3519
from bzrlib.tests import test_server
3748
3520
return memory.MemoryServer
3749
elif typestring == "fakenfs":
3521
if typestring == "fakenfs":
3750
3522
from bzrlib.tests import test_server
3751
3523
return test_server.FakeNFSServer
3752
3524
msg = "No known transport type %s. Supported types are: sftp\n" %\
3765
3537
'throughout the test suite.',
3766
3538
type=get_transport_type),
3767
3539
Option('benchmark',
3768
help='Run the benchmarks rather than selftests.',
3540
help='Run the benchmarks rather than selftests.'),
3770
3541
Option('lsprof-timed',
3771
3542
help='Generate lsprof output for benchmarked'
3772
3543
' sections of code.'),
3773
3544
Option('lsprof-tests',
3774
3545
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3775
3549
Option('first',
3776
3550
help='Run all tests, but run specified tests first.',
3777
3551
short_name='f',
3786
3560
Option('randomize', type=str, argname="SEED",
3787
3561
help='Randomize the order of tests using the given'
3788
3562
' seed or "now" for the current time.'),
3789
ListOption('exclude', type=str, argname="PATTERN",
3791
help='Exclude tests that match this regular'
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
3793
3567
Option('subunit',
3794
3568
help='Output test progress via subunit.'),
3795
3569
Option('strict', help='Fail on missing dependencies or '
3815
3586
def run(self, testspecs_list=None, verbose=False, one=False,
3816
3587
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3818
3589
first=False, list_only=False,
3819
3590
randomize=None, exclude=None, strict=False,
3820
3591
load_list=None, debugflag=None, starting_with=None, subunit=False,
3821
parallel=None, lsprof_tests=False,
3823
from bzrlib import tests
3592
parallel=None, lsprof_tests=False):
3593
from bzrlib.tests import selftest
3594
import bzrlib.benchmarks as benchmarks
3595
from bzrlib.benchmarks import tree_creator
3597
# Make deprecation warnings visible, unless -Werror is set
3598
symbol_versioning.activate_deprecation_warnings(override=False)
3600
if cache_dir is not None:
3601
tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
3825
3602
if testspecs_list is not None:
3826
3603
pattern = '|'.join(testspecs_list)
3835
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3836
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3837
3614
# stdout, which would corrupt the subunit stream.
3838
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3839
# following code can be deleted when it's sufficiently deployed
3840
# -- vila/mgz 20100514
3841
if (sys.platform == "win32"
3842
and getattr(sys.stdout, 'fileno', None) is not None):
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3844
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3846
3619
self.additional_selftest_args.setdefault(
3847
3620
'suite_decorators', []).append(parallel)
3849
raise errors.BzrCommandError(
3850
"--benchmark is no longer supported from bzr 2.2; "
3851
"use bzr-usertest instead")
3852
test_suite_factory = None
3854
exclude_pattern = None
3622
test_suite_factory = benchmarks.test_suite
3623
# Unless user explicitly asks for quiet, be verbose in benchmarks
3624
verbose = not is_quiet()
3625
# TODO: should possibly lock the history file...
3626
benchfile = open(".perf_history", "at", buffering=1)
3627
self.add_cleanup(benchfile.close)
3856
exclude_pattern = '(' + '|'.join(exclude) + ')'
3858
self._disable_fsync()
3629
test_suite_factory = None
3859
3631
selftest_kwargs = {"verbose": verbose,
3860
3632
"pattern": pattern,
3861
3633
"stop_on_failure": one,
3863
3635
"test_suite_factory": test_suite_factory,
3864
3636
"lsprof_timed": lsprof_timed,
3865
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3866
3639
"matching_tests_first": first,
3867
3640
"list_only": list_only,
3868
3641
"random_seed": randomize,
3869
"exclude_pattern": exclude_pattern,
3642
"exclude_pattern": exclude,
3870
3643
"strict": strict,
3871
3644
"load_list": load_list,
3872
3645
"debug_flags": debugflag,
3873
3646
"starting_with": starting_with
3875
3648
selftest_kwargs.update(self.additional_selftest_args)
3877
# Make deprecation warnings visible, unless -Werror is set
3878
cleanup = symbol_versioning.activate_deprecation_warnings(
3881
result = tests.selftest(**selftest_kwargs)
3649
result = selftest(**selftest_kwargs)
3884
3650
return int(not result)
3886
def _disable_fsync(self):
3887
"""Change the 'os' functionality to not synchronize."""
3888
self._orig_fsync = getattr(os, 'fsync', None)
3889
if self._orig_fsync is not None:
3890
os.fsync = lambda filedes: None
3891
self._orig_fdatasync = getattr(os, 'fdatasync', None)
3892
if self._orig_fdatasync is not None:
3893
os.fdatasync = lambda filedes: None
3896
3653
class cmd_version(Command):
3897
3654
__doc__ = """Show version of bzr."""
3950
3709
The source of the merge can be specified either in the form of a branch,
3951
3710
or in the form of a path to a file containing a merge directive generated
3952
3711
with bzr send. If neither is specified, the default is the upstream branch
3953
or the branch most recently merged using --remember. The source of the
3954
merge may also be specified in the form of a path to a file in another
3955
branch: in this case, only the modifications to that file are merged into
3956
the current working tree.
3958
When merging from a branch, by default bzr will try to merge in all new
3959
work from the other branch, automatically determining an appropriate base
3960
revision. If this fails, you may need to give an explicit base.
3962
To pick a different ending revision, pass "--revision OTHER". bzr will
3963
try to merge in all new work up to and including revision OTHER.
3965
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3966
through OTHER, excluding BASE but including OTHER, will be merged. If this
3967
causes some revisions to be skipped, i.e. if the destination branch does
3968
not already contain revision BASE, such a merge is commonly referred to as
3969
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
3970
cherrypicks. The changes look like a normal commit, and the history of the
3971
changes from the other branch is not stored in the commit.
3973
Revision numbers are always relative to the source branch.
3712
or the branch most recently merged using --remember.
3714
When merging a branch, by default the tip will be merged. To pick a different
3715
revision, pass --revision. If you specify two values, the first will be used as
3716
BASE and the second one as OTHER. Merging individual revisions, or a subset of
3717
available revisions, like this is commonly referred to as "cherrypicking".
3719
Revision numbers are always relative to the branch being merged.
3721
By default, bzr will try to merge in all new work from the other
3722
branch, automatically determining an appropriate base. If this
3723
fails, you may need to give an explicit base.
3975
3725
Merge will do its best to combine the changes in two branches, but there
3976
3726
are some kinds of problems only a human can fix. When it encounters those,
3980
3730
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3982
If there is no default branch set, the first merge will set it (use
3983
--no-remember to avoid setting it). After that, you can omit the branch
3984
to use the default. To change the default, use --remember. The value will
3985
only be saved if the remote location can be accessed.
3732
If there is no default branch set, the first merge will set it. After
3733
that, you can omit the branch to use the default. To change the
3734
default, use --remember. The value will only be saved if the remote
3735
location can be accessed.
3987
3737
The results of the merge are placed into the destination working
3988
3738
directory, where they can be reviewed (with bzr diff), tested, and then
3989
3739
committed to record the result of the merge.
3991
3741
merge refuses to run if there are any uncommitted changes, unless
3992
--force is given. If --force is given, then the changes from the source
3993
will be merged with the current working tree, including any uncommitted
3994
changes in the tree. The --force option can also be used to create a
3742
--force is given. The --force option can also be used to create a
3995
3743
merge revision which has more than two parents.
3997
3745
If one would like to merge changes from the working tree of the other
4045
3793
' completely merged into the source, pull from the'
4046
3794
' source rather than merging. When this happens,'
4047
3795
' you do not need to commit the result.'),
4048
custom_help('directory',
4049
3797
help='Branch to merge into, '
4050
'rather than the one containing the working directory.'),
3798
'rather than the one containing the working directory.',
4051
3802
Option('preview', help='Instead of merging, show a diff of the'
4053
3804
Option('interactive', help='Select changes interactively.',
4057
3808
def run(self, location=None, revision=None, force=False,
4058
merge_type=None, show_base=False, reprocess=None, remember=None,
3809
merge_type=None, show_base=False, reprocess=None, remember=False,
4059
3810
uncommitted=False, pull=False,
4060
3811
directory=None,
4125
3873
self.sanity_check_merger(merger)
4126
3874
if (merger.base_rev_id == merger.other_rev_id and
4127
3875
merger.other_rev_id is not None):
4128
# check if location is a nonexistent file (and not a branch) to
4129
# disambiguate the 'Nothing to do'
4130
if merger.interesting_files:
4131
if not merger.other_tree.has_filename(
4132
merger.interesting_files[0]):
4133
note("merger: " + str(merger))
4134
raise errors.PathsDoNotExist([location])
4135
3876
note('Nothing to do.')
4137
if pull and not preview:
4138
3879
if merger.interesting_files is not None:
4139
3880
raise errors.BzrCommandError('Cannot pull individual files')
4140
3881
if (merger.base_rev_id == tree.last_revision()):
4164
3905
def _do_preview(self, merger):
4165
3906
from bzrlib.diff import show_diff_trees
4166
3907
result_tree = self._get_preview(merger)
4167
path_encoding = osutils.get_diff_header_encoding()
4168
3908
show_diff_trees(merger.this_tree, result_tree, self.outf,
4169
old_label='', new_label='',
4170
path_encoding=path_encoding)
3909
old_label='', new_label='')
4172
3911
def _do_merge(self, merger, change_reporter, allow_pending, verified):
4173
3912
merger.change_reporter = change_reporter
4249
3988
if other_revision_id is None:
4250
3989
other_revision_id = _mod_revision.ensure_null(
4251
3990
other_branch.last_revision())
4252
# Remember where we merge from. We need to remember if:
4253
# - user specify a location (and we don't merge from the parent
4255
# - user ask to remember or there is no previous location set to merge
4256
# from and user didn't ask to *not* remember
4257
if (user_location is not None
4259
or (remember is None
4260
and tree.branch.get_submit_branch() is None)))):
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4261
3994
tree.branch.set_submit_branch(other_branch.base)
4262
# Merge tags (but don't set them in the master branch yet, the user
4263
# might revert this merge). Commit will propagate them.
4264
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4265
3996
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4266
3997
other_revision_id, base_revision_id, other_branch, base_branch)
4267
3998
if other_path != '':
4435
4167
last committed revision is used.
4437
4169
To remove only some changes, without reverting to a prior version, use
4438
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4439
will remove the changes introduced by the second last commit (-2), without
4440
affecting the changes introduced by the last commit (-1). To remove
4441
certain changes on a hunk-by-hunk basis, see the shelve command.
4170
merge instead. For example, "merge . --revision -2..-3" will remove the
4171
changes introduced by -2, without affecting the changes introduced by -1.
4172
Or to remove certain changes on a hunk-by-hunk basis, see the Shelf plugin.
4443
4174
By default, any files that have been manually changed will be backed up
4444
4175
first. (Files changed only by merge are not backed up.) Backup files have
4609
4340
theirs_only=False,
4610
4341
log_format=None, long=False, short=False, line=False,
4611
4342
show_ids=False, verbose=False, this=False, other=False,
4612
include_merges=False, revision=None, my_revision=None,
4343
include_merges=False, revision=None, my_revision=None):
4614
4344
from bzrlib.missing import find_unmerged, iter_log_revisions
4615
4345
def message(s):
4616
4346
if not is_quiet():
4698
4430
if mine_only and not local_extra:
4699
4431
# We checked local, and found nothing extra
4700
message('This branch has no new revisions.\n')
4432
message('This branch is up to date.\n')
4701
4433
elif theirs_only and not remote_extra:
4702
4434
# We checked remote, and found nothing extra
4703
message('Other branch has no new revisions.\n')
4435
message('Other branch is up to date.\n')
4704
4436
elif not (mine_only or theirs_only or local_extra or
4706
4438
# We checked both branches, and neither one had extra
4774
4507
@display_command
4775
4508
def run(self, verbose=False):
4776
from bzrlib import plugin
4777
# Don't give writelines a generator as some codecs don't like that
4778
self.outf.writelines(
4779
list(plugin.describe_plugins(show_paths=verbose)))
4509
import bzrlib.plugin
4510
from inspect import getdoc
4512
for name, plugin in bzrlib.plugin.plugins().items():
4513
version = plugin.__version__
4514
if version == 'unknown':
4516
name_ver = '%s %s' % (name, version)
4517
d = getdoc(plugin.module)
4519
doc = d.split('\n')[0]
4521
doc = '(no description)'
4522
result.append((name_ver, doc, plugin.path()))
4523
for name_ver, doc, path in sorted(result):
4524
self.outf.write("%s\n" % name_ver)
4525
self.outf.write(" %s\n" % doc)
4527
self.outf.write(" %s\n" % path)
4528
self.outf.write("\n")
4782
4531
class cmd_testament(Command):
4828
4578
Option('long', help='Show commit date in annotations.'),
4833
4582
encoding_type = 'exact'
4835
4584
@display_command
4836
4585
def run(self, filename, all=False, long=False, revision=None,
4837
show_ids=False, directory=None):
4838
from bzrlib.annotate import (
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4841
4588
wt, branch, relpath = \
4842
_open_directory_or_containing_tree_or_branch(filename, directory)
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4843
4590
if wt is not None:
4844
self.add_cleanup(wt.lock_read().unlock)
4592
self.add_cleanup(wt.unlock)
4846
self.add_cleanup(branch.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4847
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4848
self.add_cleanup(tree.lock_read().unlock)
4849
if wt is not None and revision is None:
4598
self.add_cleanup(tree.unlock)
4850
4600
file_id = wt.path2id(relpath)
4852
4602
file_id = tree.path2id(relpath)
4853
4603
if file_id is None:
4854
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4855
4606
if wt is not None and revision is None:
4856
4607
# If there is a tree and we're not annotating historical
4857
4608
# versions, annotate the working tree's content.
4858
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
4859
4610
show_ids=show_ids)
4861
annotate_file_tree(tree, file_id, self.outf, long, all,
4862
show_ids=show_ids, branch=branch)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4865
4616
class cmd_re_sign(Command):
4869
4620
hidden = True # is this right ?
4870
4621
takes_args = ['revision_id*']
4871
takes_options = ['directory', 'revision']
4622
takes_options = ['revision']
4873
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4624
def run(self, revision_id_list=None, revision=None):
4874
4625
if revision_id_list is not None and revision is not None:
4875
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4876
4627
if revision_id_list is None and revision is None:
4877
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4878
b = WorkingTree.open_containing(directory)[0].branch
4879
self.add_cleanup(b.lock_write().unlock)
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
4880
4632
return self._run(b, revision_id_list, revision)
4882
4634
def _run(self, b, revision_id_list, revision):
4942
4694
_see_also = ['checkouts', 'unbind']
4943
4695
takes_args = ['location?']
4944
takes_options = ['directory']
4946
def run(self, location=None, directory=u'.'):
4947
b, relpath = Branch.open_containing(directory)
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4948
4700
if location is None:
4950
4702
location = b.get_old_bound_location()
5021
4771
encoding_type = 'replace'
5023
def run(self, location=None, dry_run=False, verbose=False,
5024
revision=None, force=False, local=False, keep_tags=False):
4773
def run(self, location=None,
4774
dry_run=False, verbose=False,
4775
revision=None, force=False, local=False):
5025
4776
if location is None:
5026
4777
location = u'.'
5027
4778
control, relpath = bzrdir.BzrDir.open_containing(location)
5033
4784
b = control.open_branch()
5035
4786
if tree is not None:
5036
self.add_cleanup(tree.lock_write().unlock)
4788
self.add_cleanup(tree.unlock)
5038
self.add_cleanup(b.lock_write().unlock)
5039
return self._run(b, tree, dry_run, verbose, revision, force,
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5042
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5044
4795
from bzrlib.log import log_formatter, show_log
5045
4796
from bzrlib.uncommit import uncommit
5082
4833
self.outf.write('The above revision(s) will be removed.\n')
5085
if not ui.ui_factory.confirm_action(
5086
u'Uncommit these revisions',
5087
'bzrlib.builtins.uncommit',
5089
self.outf.write('Canceled\n')
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5092
4840
mutter('Uncommitting from {%s} to {%s}',
5093
4841
last_rev_id, rev_id)
5094
4842
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
5095
revno=revno, local=local, keep_tags=keep_tags)
4843
revno=revno, local=local)
5096
4844
self.outf.write('You can restore the old tip by running:\n'
5097
4845
' bzr pull . -r revid:%s\n' % last_rev_id)
5100
4848
class cmd_break_lock(Command):
5101
__doc__ = """Break a dead lock.
5103
This command breaks a lock on a repository, branch, working directory or
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5106
4851
CAUTION: Locks should only be broken when you are sure that the process
5107
4852
holding the lock has been stopped.
5114
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
5115
bzr break-lock --conf ~/.bazaar
5118
4861
takes_args = ['location?']
5121
help='LOCATION is the directory where the config lock is.'),
5123
help='Do not ask for confirmation before breaking the lock.'),
5126
def run(self, location=None, config=False, force=False):
4863
def run(self, location=None, show=False):
5127
4864
if location is None:
5128
4865
location = u'.'
5130
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5132
{'bzrlib.lockdir.break': True})
5134
conf = _mod_config.LockableConfig(file_name=location)
5137
control, relpath = bzrdir.BzrDir.open_containing(location)
5139
control.break_lock()
5140
except NotImplementedError:
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5144
4873
class cmd_wait_until_signalled(Command):
5208
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5209
4939
protocol=None):
5210
from bzrlib import transport
4940
from bzrlib.transport import get_transport, transport_server_registry
5211
4941
if directory is None:
5212
4942
directory = os.getcwd()
5213
4943
if protocol is None:
5214
protocol = transport.transport_server_registry.get()
4944
protocol = transport_server_registry.get()
5215
4945
host, port = self.get_host_and_port(port)
5216
4946
url = urlutils.local_path_to_url(directory)
5217
4947
if not allow_writes:
5218
4948
url = 'readonly+' + url
5219
t = transport.get_transport(url)
5220
protocol(t, host, port, inet)
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5223
4953
class cmd_join(Command):
5335
5064
encoding_type = 'exact'
5337
5066
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5338
sign=False, revision=None, mail_to=None, message=None,
5067
sign=False, revision=None, mail_to=None, message=None):
5340
5068
from bzrlib.revision import ensure_null, NULL_REVISION
5341
5069
include_patch, include_bundle = {
5342
5070
'plain': (False, False),
5343
5071
'diff': (True, False),
5344
5072
'bundle': (True, True),
5346
branch = Branch.open(directory)
5074
branch = Branch.open('.')
5347
5075
stored_submit_branch = branch.get_submit_branch()
5348
5076
if submit_branch is None:
5349
5077
submit_branch = stored_submit_branch
5425
5153
source branch defaults to that containing the working directory, but can
5426
5154
be changed using --from.
5428
Both the submit branch and the public branch follow the usual behavior with
5429
respect to --remember: If there is no default location set, the first send
5430
will set it (use --no-remember to avoid setting it). After that, you can
5431
omit the location to use the default. To change the default, use
5432
--remember. The value will only be saved if the location can be accessed.
5434
5156
In order to calculate those changes, bzr must analyse the submit branch.
5435
5157
Therefore it is most efficient for the submit branch to be a local mirror.
5436
5158
If a public location is known for the submit_branch, that location is used
5507
5229
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5508
no_patch=False, revision=None, remember=None, output=None,
5230
no_patch=False, revision=None, remember=False, output=None,
5509
5231
format=None, mail_to=None, message=None, body=None,
5510
5232
strict=None, **kwargs):
5511
5233
from bzrlib.send import send
5652
5378
if tag_name is None:
5653
5379
raise errors.BzrCommandError(
5654
5380
"Please specify a tag name.")
5656
existing_target = branch.tags.lookup_tag(tag_name)
5657
except errors.NoSuchTag:
5658
existing_target = None
5659
if not force and existing_target not in (None, revision_id):
5381
if (not force) and branch.tags.has_tag(tag_name):
5660
5382
raise errors.TagAlreadyExists(tag_name)
5661
if existing_target == revision_id:
5662
note('Tag %s already exists for that revision.' % tag_name)
5664
branch.tags.set_tag(tag_name, revision_id)
5665
if existing_target is None:
5666
note('Created tag %s.' % tag_name)
5668
note('Updated tag %s.' % tag_name)
5383
branch.tags.set_tag(tag_name, revision_id)
5384
self.outf.write('Created tag %s.\n' % tag_name)
5671
5387
class cmd_tags(Command):
5677
5393
_see_also = ['tag']
5678
5394
takes_options = [
5679
custom_help('directory',
5680
help='Branch whose tags should be displayed.'),
5681
RegistryOption('sort',
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5682
5401
'Sort tags by different criteria.', title='Sorting',
5683
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5689
5409
@display_command
5690
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5691
from bzrlib.tag import tag_sort_methods
5692
5416
branch, relpath = Branch.open_containing(directory)
5694
5418
tags = branch.tags.get_tag_dict().items()
5698
self.add_cleanup(branch.lock_read().unlock)
5423
self.add_cleanup(branch.unlock)
5700
5425
graph = branch.repository.get_graph()
5701
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5703
5428
# only show revisions between revid1 and revid2 (inclusive)
5704
5429
tags = [(tag, revid) for tag, revid in tags if
5705
5430
graph.is_between(revid, revid1, revid2)]
5707
sort = tag_sort_methods.get()
5433
elif sort == 'time':
5435
for tag, revid in tags:
5437
revobj = branch.repository.get_revision(revid)
5438
except errors.NoSuchRevision:
5439
timestamp = sys.maxint # place them at the end
5441
timestamp = revobj.timestamp
5442
timestamps[revid] = timestamp
5443
tags.sort(key=lambda x: timestamps[x[1]])
5709
5444
if not show_ids:
5710
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5711
5446
for index, (tag, revid) in enumerate(tags):
5741
5476
takes_args = ['location?']
5742
5477
takes_options = [
5743
5478
RegistryOption.from_kwargs(
5746
help='The relation between branch and tree.',
5480
title='Target type',
5481
help='The type to reconfigure the directory to.',
5747
5482
value_switches=True, enum_switch=False,
5748
5483
branch='Reconfigure to be an unbound branch with no working tree.',
5749
5484
tree='Reconfigure to be an unbound branch with a working tree.',
5750
5485
checkout='Reconfigure to be a bound branch with a working tree.',
5751
5486
lightweight_checkout='Reconfigure to be a lightweight'
5752
5487
' checkout (with no local history).',
5754
RegistryOption.from_kwargs(
5756
title='Repository type',
5757
help='Location fo the repository.',
5758
value_switches=True, enum_switch=False,
5759
5488
standalone='Reconfigure to be a standalone branch '
5760
5489
'(i.e. stop using shared repository).',
5761
5490
use_shared='Reconfigure to use a shared repository.',
5763
RegistryOption.from_kwargs(
5765
title='Trees in Repository',
5766
help='Whether new branches in the repository have trees.',
5767
value_switches=True, enum_switch=False,
5768
5491
with_trees='Reconfigure repository to create '
5769
5492
'working trees on branches by default.',
5770
5493
with_no_trees='Reconfigure repository to not create '
5787
def run(self, location=None, bind_to=None, force=False,
5788
tree_type=None, repository_type=None, repository_trees=None,
5789
stacked_on=None, unstacked=None):
5510
def run(self, location=None, target_type=None, bind_to=None, force=False,
5790
5513
directory = bzrdir.BzrDir.open(location)
5791
5514
if stacked_on and unstacked:
5792
raise errors.BzrCommandError("Can't use both --stacked-on and --unstacked")
5515
raise BzrCommandError("Can't use both --stacked-on and --unstacked")
5793
5516
elif stacked_on is not None:
5794
5517
reconfigure.ReconfigureStackedOn().apply(directory, stacked_on)
5795
5518
elif unstacked:
5797
5520
# At the moment you can use --stacked-on and a different
5798
5521
# reconfiguration shape at the same time; there seems no good reason
5800
if (tree_type is None and
5801
repository_type is None and
5802
repository_trees is None):
5523
if target_type is None:
5803
5524
if stacked_on or unstacked:
5806
5527
raise errors.BzrCommandError('No target configuration '
5808
reconfiguration = None
5809
if tree_type == 'branch':
5529
elif target_type == 'branch':
5810
5530
reconfiguration = reconfigure.Reconfigure.to_branch(directory)
5811
elif tree_type == 'tree':
5531
elif target_type == 'tree':
5812
5532
reconfiguration = reconfigure.Reconfigure.to_tree(directory)
5813
elif tree_type == 'checkout':
5533
elif target_type == 'checkout':
5814
5534
reconfiguration = reconfigure.Reconfigure.to_checkout(
5815
5535
directory, bind_to)
5816
elif tree_type == 'lightweight-checkout':
5536
elif target_type == 'lightweight-checkout':
5817
5537
reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
5818
5538
directory, bind_to)
5820
reconfiguration.apply(force)
5821
reconfiguration = None
5822
if repository_type == 'use-shared':
5539
elif target_type == 'use-shared':
5823
5540
reconfiguration = reconfigure.Reconfigure.to_use_shared(directory)
5824
elif repository_type == 'standalone':
5541
elif target_type == 'standalone':
5825
5542
reconfiguration = reconfigure.Reconfigure.to_standalone(directory)
5827
reconfiguration.apply(force)
5828
reconfiguration = None
5829
if repository_trees == 'with-trees':
5543
elif target_type == 'with-trees':
5830
5544
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5831
5545
directory, True)
5832
elif repository_trees == 'with-no-trees':
5546
elif target_type == 'with-no-trees':
5833
5547
reconfiguration = reconfigure.Reconfigure.set_repository_trees(
5834
5548
directory, False)
5836
reconfiguration.apply(force)
5837
reconfiguration = None
5549
reconfiguration.apply(force)
5840
5552
class cmd_switch(Command):
5873
5584
def run(self, to_location=None, force=False, create_branch=False,
5874
revision=None, directory=u'.'):
5875
5586
from bzrlib import switch
5876
tree_location = directory
5877
5588
revision = _get_one_revision('switch', revision)
5878
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5879
5590
if to_location is None:
5880
5591
if revision is None:
5881
5592
raise errors.BzrCommandError('You must supply either a'
5882
5593
' revision or a location')
5883
to_location = tree_location
5885
5596
branch = control_dir.open_branch()
5886
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
6158
5868
You can put multiple items on the shelf, and by default, 'unshelve' will
6159
5869
restore the most recently shelved changes.
6161
For complicated changes, it is possible to edit the changes in a separate
6162
editor program to decide what the file remaining in the working copy
6163
should look like. To do this, add the configuration option
6165
change_editor = PROGRAM @new_path @old_path
6167
where @new_path is replaced with the path of the new version of the
6168
file and @old_path is replaced with the path of the old version of
6169
the file. The PROGRAM should save the new file with the desired
6170
contents of the file in the working tree.
6174
5872
takes_args = ['file*']
6176
5874
takes_options = [
6179
5876
Option('all', help='Shelve all changes.'),
6186
5883
Option('destroy',
6187
5884
help='Destroy removed changes instead of shelving them.'),
6189
_see_also = ['unshelve', 'configuration']
5886
_see_also = ['unshelve']
6191
5888
def run(self, revision=None, all=False, file_list=None, message=None,
6192
writer=None, list=False, destroy=False, directory=None):
5889
writer=None, list=False, destroy=False):
6194
return self.run_for_list(directory=directory)
5891
return self.run_for_list()
6195
5892
from bzrlib.shelf_ui import Shelver
6196
5893
if writer is None:
6197
5894
writer = bzrlib.option.diff_writer_registry.get()
6199
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6200
file_list, message, destroy=destroy, directory=directory)
5897
file_list, message, destroy=destroy)
6272
5967
To check what clean-tree will do, use --dry-run.
6274
takes_options = ['directory',
6275
Option('ignored', help='Delete all ignored files.'),
6276
Option('detritus', help='Delete conflict files, merge and revert'
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5970
Option('detritus', help='Delete conflict files, merge'
6277
5971
' backups, and failed selftest dirs.'),
6278
5972
Option('unknown',
6279
5973
help='Delete files unknown to bzr (default).'),
6281
5975
' deleting them.'),
6282
5976
Option('force', help='Do not prompt before deleting.')]
6283
5977
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6284
force=False, directory=u'.'):
6285
5979
from bzrlib.clean_tree import clean_tree
6286
5980
if not (unknown or ignored or detritus):
6290
clean_tree(directory, unknown=unknown, ignored=ignored,
6291
detritus=detritus, dry_run=dry_run, no_prompt=force)
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6294
5988
class cmd_reference(Command):
6338
6032
self.outf.write('%s %s\n' % (path, location))
6341
class cmd_export_pot(Command):
6342
__doc__ = """Export command helps and error messages in po format."""
6347
from bzrlib.export_pot import export_pot
6348
export_pot(self.outf)
6351
6035
def _register_lazy_builtins():
6352
6036
# register lazy builtins from other modules; called at startup and should
6353
6037
# be only called once.
6354
6038
for (name, aliases, module_name) in [
6355
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6356
('cmd_config', [], 'bzrlib.config'),
6357
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6358
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6359
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6360
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6361
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6362
('cmd_verify_signatures', [],
6363
'bzrlib.commit_signature_commands'),
6364
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6366
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
