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.
787
759
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
789
761
revision = _get_one_revision('inventory', revision)
790
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
791
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)
792
765
if revision is not None:
793
766
tree = revision.as_tree(work_tree.branch)
795
768
extra_trees = [work_tree]
796
self.add_cleanup(tree.lock_read().unlock)
770
self.add_cleanup(tree.unlock)
860
833
if len(names_list) < 2:
861
834
raise errors.BzrCommandError("missing file argument")
862
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
863
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)
864
838
self._run(tree, names_list, rel_names, after)
866
840
def run_auto(self, names_list, after, dry_run):
871
845
raise errors.BzrCommandError('--after cannot be specified with'
873
work_tree, file_list = WorkingTree.open_containing_paths(
874
names_list, default_directory='.')
875
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)
876
850
rename_map.RenameMap.guess_renames(work_tree, dry_run)
878
852
def _run(self, tree, names_list, rel_names, after):
972
946
match the remote one, use pull --overwrite. This will work even if the two
973
947
branches have diverged.
975
If there is no default location set, the first pull will set it (use
976
--no-remember to avoid settting it). After that, you can omit the
977
location to use the default. To change the default, use --remember. The
978
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.
980
954
Note: The location can be specified either in the form of a branch,
981
955
or in the form of a path to a file containing a merge directive generated
986
960
takes_options = ['remember', 'overwrite', 'revision',
987
961
custom_help('verbose',
988
962
help='Show logs of pulled revisions.'),
989
custom_help('directory',
990
964
help='Branch to pull into, '
991
'rather than the one containing the working directory.'),
965
'rather than the one containing the working directory.',
993
970
help="Perform a local pull in a bound "
994
971
"branch. Local pulls are not applied to "
995
972
"the master branch."
998
help="Show base revision text in conflicts.")
1000
975
takes_args = ['location?']
1001
976
encoding_type = 'replace'
1003
def run(self, location=None, remember=None, overwrite=False,
978
def run(self, location=None, remember=False, overwrite=False,
1004
979
revision=None, verbose=False,
1005
directory=None, local=False,
980
directory=None, local=False):
1007
981
# FIXME: too much stuff is in the command class
1008
982
revision_id = None
1009
983
mergeable = None
1013
987
tree_to = WorkingTree.open_containing(directory)[0]
1014
988
branch_to = tree_to.branch
1015
self.add_cleanup(tree_to.lock_write().unlock)
990
self.add_cleanup(tree_to.unlock)
1016
991
except errors.NoWorkingTree:
1018
993
branch_to = Branch.open_containing(directory)[0]
1019
self.add_cleanup(branch_to.lock_write().unlock)
1021
if tree_to is None and show_base:
1022
raise errors.BzrCommandError("Need working tree for --show-base.")
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
1024
997
if local and not branch_to.get_bound_location():
1025
998
raise errors.LocalRequiresBoundBranch()
1109
1077
do a merge (see bzr help merge) from the other branch, and commit that.
1110
1078
After that you will be able to do a push without '--overwrite'.
1112
If there is no default push location set, the first push will set it (use
1113
--no-remember to avoid settting it). After that, you can omit the
1114
location to use the default. To change the default, use --remember. The
1115
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.
1118
1086
_see_also = ['pull', 'update', 'working-trees']
1120
1088
Option('create-prefix',
1121
1089
help='Create the path leading up to the branch '
1122
1090
'if it does not already exist.'),
1123
custom_help('directory',
1124
1092
help='Branch to push from, '
1125
'rather than the one containing the working directory.'),
1093
'rather than the one containing the working directory.',
1126
1097
Option('use-existing-dir',
1127
1098
help='By default push will fail if the target'
1128
1099
' directory exists, but does not already'
1139
1110
Option('strict',
1140
1111
help='Refuse to push if there are uncommitted changes in'
1141
1112
' the working tree, --no-strict disables the check.'),
1143
help="Don't populate the working tree, even for protocols"
1144
" that support it."),
1146
1114
takes_args = ['location?']
1147
1115
encoding_type = 'replace'
1149
def run(self, location=None, remember=None, overwrite=False,
1117
def run(self, location=None, remember=False, overwrite=False,
1150
1118
create_prefix=False, verbose=False, revision=None,
1151
1119
use_existing_dir=False, directory=None, stacked_on=None,
1152
stacked=False, strict=None, no_tree=False):
1120
stacked=False, strict=None):
1153
1121
from bzrlib.push import _show_push_branch
1155
1123
if directory is None:
1201
1169
_show_push_branch(br_from, revision_id, location, self.outf,
1202
1170
verbose=verbose, overwrite=overwrite, remember=remember,
1203
1171
stacked_on=stacked_on, create_prefix=create_prefix,
1204
use_existing_dir=use_existing_dir, no_tree=no_tree)
1172
use_existing_dir=use_existing_dir)
1207
1175
class cmd_branch(Command):
1217
1185
To retrieve the branch as of a particular revision, supply the --revision
1218
1186
parameter, as in "branch foo/bar -r 5".
1220
The synonyms 'clone' and 'get' for this command are deprecated.
1223
1189
_see_also = ['checkout']
1224
1190
takes_args = ['from_location', 'to_location?']
1225
takes_options = ['revision',
1226
Option('hardlink', help='Hard-link working tree files where possible.'),
1227
Option('files-from', type=str,
1228
help="Get file contents from this tree."),
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1229
1193
Option('no-tree',
1230
1194
help="Create a branch without a working-tree."),
1231
1195
Option('switch',
1250
1214
def run(self, from_location, to_location=None, revision=None,
1251
1215
hardlink=False, stacked=False, standalone=False, no_tree=False,
1252
use_existing_dir=False, switch=False, bind=False,
1216
use_existing_dir=False, switch=False, bind=False):
1254
1217
from bzrlib import switch as _mod_switch
1255
1218
from bzrlib.tag import _merge_tags_if_possible
1256
if self.invoked_as in ['get', 'clone']:
1257
ui.ui_factory.show_user_warning(
1258
'deprecated_command',
1259
deprecated_name=self.invoked_as,
1260
recommended_name='branch',
1261
deprecated_in_version='2.4')
1262
1219
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1264
if not (hardlink or files_from):
1265
# accelerator_tree is usually slower because you have to read N
1266
# files (no readahead, lots of seeks, etc), but allow the user to
1267
# explicitly request it
1268
accelerator_tree = None
1269
if files_from is not None and files_from != from_location:
1270
accelerator_tree = WorkingTree.open(files_from)
1271
1221
revision = _get_one_revision('branch', revision)
1272
self.add_cleanup(br_from.lock_read().unlock)
1223
self.add_cleanup(br_from.unlock)
1273
1224
if revision is not None:
1274
1225
revision_id = revision.as_revision_id(br_from)
1380
1331
to_location = branch_location
1381
1332
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1382
1333
branch_location)
1383
if not (hardlink or files_from):
1384
# accelerator_tree is usually slower because you have to read N
1385
# files (no readahead, lots of seeks, etc), but allow the user to
1386
# explicitly request it
1387
accelerator_tree = None
1388
1334
revision = _get_one_revision('checkout', revision)
1389
if files_from is not None and files_from != branch_location:
1335
if files_from is not None:
1390
1336
accelerator_tree = WorkingTree.open(files_from)
1391
1337
if revision is not None:
1392
1338
revision_id = revision.as_revision_id(source)
1448
1396
If you want to discard your local changes, you can just do a
1449
1397
'bzr revert' instead of 'bzr commit' after the update.
1451
If you want to restore a file that has been removed locally, use
1452
'bzr revert' instead of 'bzr update'.
1454
1399
If the tree's branch is bound to a master branch, it will also update
1455
1400
the branch from the master.
1458
1403
_see_also = ['pull', 'working-trees', 'status-flags']
1459
1404
takes_args = ['dir?']
1460
takes_options = ['revision',
1462
help="Show base revision text in conflicts."),
1405
takes_options = ['revision']
1464
1406
aliases = ['up']
1466
def run(self, dir='.', revision=None, show_base=None):
1408
def run(self, dir='.', revision=None):
1467
1409
if revision is not None and len(revision) != 1:
1468
1410
raise errors.BzrCommandError(
1469
1411
"bzr update --revision takes exactly one revision")
1578
1519
class cmd_remove(Command):
1579
1520
__doc__ = """Remove files or directories.
1581
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1582
delete them if they can easily be recovered using revert otherwise they
1583
will be backed up (adding an extention of the form .~#~). If no options or
1584
parameters are given Bazaar will scan for files that are being tracked by
1585
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.
1587
1527
takes_args = ['file*']
1588
1528
takes_options = ['verbose',
1590
1530
RegistryOption.from_kwargs('file-deletion-strategy',
1591
1531
'The file deletion mode to be used.',
1592
1532
title='Deletion Strategy', value_switches=True, enum_switch=False,
1593
safe='Backup changed files (default).',
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1594
1535
keep='Delete from bzr but leave the working copy.',
1595
no_backup='Don\'t backup changed files.',
1596
1536
force='Delete all the specified files, even if they can not be '
1597
'recovered and even if they are non-empty directories. '
1598
'(deprecated, use no-backup)')]
1537
'recovered and even if they are non-empty directories.')]
1599
1538
aliases = ['rm', 'del']
1600
1539
encoding_type = 'replace'
1602
1541
def run(self, file_list, verbose=False, new=False,
1603
1542
file_deletion_strategy='safe'):
1604
if file_deletion_strategy == 'force':
1605
note("(The --force option is deprecated, rather use --no-backup "
1607
file_deletion_strategy = 'no-backup'
1609
tree, file_list = WorkingTree.open_containing_paths(file_list)
1543
tree, file_list = tree_files(file_list)
1611
1545
if file_list is not None:
1612
1546
file_list = [f for f in file_list]
1614
self.add_cleanup(tree.lock_write().unlock)
1549
self.add_cleanup(tree.unlock)
1615
1550
# Heuristics should probably all move into tree.remove_smart or
1701
1636
_see_also = ['check']
1702
1637
takes_args = ['branch?']
1704
Option('canonicalize-chks',
1705
help='Make sure CHKs are in canonical form (repairs '
1710
def run(self, branch=".", canonicalize_chks=False):
1639
def run(self, branch="."):
1711
1640
from bzrlib.reconcile import reconcile
1712
1641
dir = bzrdir.BzrDir.open(branch)
1713
reconcile(dir, canonicalize_chks=canonicalize_chks)
1716
1645
class cmd_revision_history(Command):
1749
1678
last_revision = wt.last_revision()
1751
self.add_cleanup(b.repository.lock_read().unlock)
1752
graph = b.repository.get_graph()
1753
revisions = [revid for revid, parents in
1754
graph.iter_ancestry([last_revision])]
1755
for revision_id in reversed(revisions):
1756
if _mod_revision.is_null(revision_id):
1680
revision_ids = b.repository.get_ancestry(last_revision)
1682
for revision_id in revision_ids:
1758
1683
self.outf.write(revision_id + '\n')
1798
1723
Option('append-revisions-only',
1799
1724
help='Never change revnos or the existing log.'
1800
' Append revisions to it only.'),
1802
'Create a branch without a working tree.')
1725
' Append revisions to it only.')
1804
1727
def run(self, location=None, format=None, append_revisions_only=False,
1805
create_prefix=False, no_tree=False):
1728
create_prefix=False):
1806
1729
if format is None:
1807
1730
format = bzrdir.format_registry.make_bzrdir('default')
1808
1731
if location is None:
2085
1985
old_branch, new_branch,
2086
1986
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
2087
1987
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2088
# GNU diff on Windows uses ANSI encoding for filenames
2089
path_encoding = osutils.get_diff_header_encoding()
2090
1988
return show_diff_trees(old_tree, new_tree, sys.stdout,
2091
1989
specific_files=specific_files,
2092
1990
external_diff_options=diff_options,
2093
1991
old_label=old_label, new_label=new_label,
2094
extra_trees=extra_trees,
2095
path_encoding=path_encoding,
1992
extra_trees=extra_trees, using=using,
2097
1993
format_cls=format)
2107
2003
# level of effort but possibly much less IO. (Or possibly not,
2108
2004
# if the directories are very large...)
2109
2005
_see_also = ['status', 'ls']
2110
takes_options = ['directory', 'show-ids']
2006
takes_options = ['show-ids']
2112
2008
@display_command
2113
def run(self, show_ids=False, directory=u'.'):
2114
tree = WorkingTree.open_containing(directory)[0]
2115
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)
2116
2013
old = tree.basis_tree()
2117
self.add_cleanup(old.lock_read().unlock)
2015
self.add_cleanup(old.unlock)
2118
2016
for path, ie in old.inventory.iter_entries():
2119
2017
if not tree.has_id(ie.file_id):
2120
2018
self.outf.write(path)
2132
2030
_see_also = ['status', 'ls']
2133
takes_options = ['directory', 'null']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2135
2037
@display_command
2136
def run(self, null=False, directory=u'.'):
2137
tree = WorkingTree.open_containing(directory)[0]
2138
self.add_cleanup(tree.lock_read().unlock)
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2139
2040
td = tree.changes_from(tree.basis_tree())
2141
2041
for path, id, kind, text_modified, meta_modified in td.modified:
2143
2043
self.outf.write(path + '\0')
2153
2053
_see_also = ['status', 'ls']
2154
takes_options = ['directory', 'null']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2156
2060
@display_command
2157
def run(self, null=False, directory=u'.'):
2158
wt = WorkingTree.open_containing(directory)[0]
2159
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)
2160
2065
basis = wt.basis_tree()
2161
self.add_cleanup(basis.lock_read().unlock)
2067
self.add_cleanup(basis.unlock)
2162
2068
basis_inv = basis.inventory
2163
2069
inv = wt.inventory
2164
2070
for file_id in inv:
2165
if basis_inv.has_id(file_id):
2071
if file_id in basis_inv:
2167
2073
if inv.is_root(file_id) and len(basis_inv) == 0:
2169
2075
path = inv.id2path(file_id)
2170
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2076
if not os.access(osutils.abspath(path), os.F_OK):
2173
2079
self.outf.write(path + '\0')
2480
2378
dir, relpath = bzrdir.BzrDir.open_containing(location)
2481
2379
b = dir.open_branch()
2482
self.add_cleanup(b.lock_read().unlock)
2381
self.add_cleanup(b.unlock)
2483
2382
rev1, rev2 = _get_revision_range(revision, b, self.name())
2485
if b.get_config().validate_signatures_in_log():
2489
if not gpg.GPGStrategy.verify_signatures_available():
2490
raise errors.GpgmeNotInstalled(None)
2492
2384
# Decide on the type of delta & diff filtering to use
2493
2385
# TODO: add an --all-files option to make this configurable & consistent
2494
2386
if not verbose:
2637
2528
help='Recurse into subdirectories.'),
2638
2529
Option('from-root',
2639
2530
help='Print paths relative to the root of the branch.'),
2640
Option('unknown', short_name='u',
2641
help='Print unknown files.'),
2531
Option('unknown', help='Print unknown files.'),
2642
2532
Option('versioned', help='Print versioned files.',
2643
2533
short_name='V'),
2644
Option('ignored', short_name='i',
2645
help='Print ignored files.'),
2646
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.'),
2647
2539
help='List entries of a particular kind: file, directory, symlink.',
2653
2543
@display_command
2654
2544
def run(self, revision=None, verbose=False,
2655
2545
recursive=False, from_root=False,
2656
2546
unknown=False, versioned=False, ignored=False,
2657
null=False, kind=None, show_ids=False, path=None, directory=None):
2547
null=False, kind=None, show_ids=False, path=None):
2659
2549
if kind and kind not in ('file', 'directory', 'symlink'):
2660
2550
raise errors.BzrCommandError('invalid kind specified')
2832
2713
_see_also = ['status', 'ignored', 'patterns']
2833
2714
takes_args = ['name_pattern*']
2834
takes_options = ['directory',
2835
2716
Option('default-rules',
2836
2717
help='Display the default ignore rules that bzr uses.')
2839
def run(self, name_pattern_list=None, default_rules=None,
2720
def run(self, name_pattern_list=None, default_rules=None):
2841
2721
from bzrlib import ignores
2842
2722
if default_rules is not None:
2843
2723
# dump the default rules and exit
2849
2729
"NAME_PATTERN or --default-rules.")
2850
2730
name_pattern_list = [globbing.normalize_pattern(p)
2851
2731
for p in name_pattern_list]
2853
for p in name_pattern_list:
2854
if not globbing.Globster.is_pattern_valid(p):
2855
bad_patterns += ('\n %s' % p)
2857
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2858
ui.ui_factory.show_error(msg)
2859
raise errors.InvalidPattern('')
2860
2732
for name_pattern in name_pattern_list:
2861
2733
if (name_pattern[0] == '/' or
2862
2734
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2863
2735
raise errors.BzrCommandError(
2864
2736
"NAME_PATTERN should not be an absolute path")
2865
tree, relpath = WorkingTree.open_containing(directory)
2737
tree, relpath = WorkingTree.open_containing(u'.')
2866
2738
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2867
2739
ignored = globbing.Globster(name_pattern_list)
2869
self.add_cleanup(tree.lock_read().unlock)
2870
2742
for entry in tree.list_files():
2872
2744
if id is not None:
2873
2745
filename = entry[0]
2874
2746
if ignored.match(filename):
2875
2747
matches.append(filename)
2876
2749
if len(matches) > 0:
2877
2750
self.outf.write("Warning: the following files are version controlled and"
2878
2751
" match your ignore pattern:\n%s"
2894
2767
encoding_type = 'replace'
2895
2768
_see_also = ['ignore', 'ls']
2896
takes_options = ['directory']
2898
2770
@display_command
2899
def run(self, directory=u'.'):
2900
tree = WorkingTree.open_containing(directory)[0]
2901
self.add_cleanup(tree.lock_read().unlock)
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
2902
2775
for path, file_class, kind, file_id, entry in tree.list_files():
2903
2776
if file_class != 'I':
2973
2844
'revision in which it was changed.'),
2975
2846
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2976
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2847
root=None, filters=False, per_file_timestamps=False):
2977
2848
from bzrlib.export import export
2979
2850
if branch_or_subdir is None:
2980
tree = WorkingTree.open_containing(directory)[0]
2851
tree = WorkingTree.open_containing(u'.')[0]
2981
2852
b = tree.branch
3014
2885
@display_command
3015
2886
def run(self, filename, revision=None, name_from_revision=False,
3016
filters=False, directory=None):
3017
2888
if revision is not None and len(revision) != 1:
3018
2889
raise errors.BzrCommandError("bzr cat --revision takes exactly"
3019
2890
" one revision specifier")
3020
2891
tree, branch, relpath = \
3021
_open_directory_or_containing_tree_or_branch(filename, directory)
3022
self.add_cleanup(branch.lock_read().unlock)
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3023
2895
return self._run(tree, branch, relpath, filename, revision,
3024
2896
name_from_revision, filters)
3140
3013
to trigger updates to external systems like bug trackers. The --fixes
3141
3014
option can be used to record the association between a revision and
3142
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
3145
3043
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3146
3044
takes_args = ['selected*']
3207
3101
def run(self, message=None, file=None, verbose=False, selected_list=None,
3208
3102
unchanged=False, strict=False, local=False, fixes=None,
3209
author=None, show_diff=False, exclude=None, commit_time=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3211
3104
from bzrlib.errors import (
3212
3105
PointlessCommit,
3213
3106
ConflictsInTree,
3228
3120
raise errors.BzrCommandError(
3229
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.
3231
3129
properties = {}
3233
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3131
tree, selected_list = tree_files(selected_list)
3234
3132
if selected_list == ['']:
3235
3133
# workaround - commit of root of tree should be exactly the same
3236
3134
# as just default commit in that tree, and succeed even though
3289
3184
# make_commit_message_template_encoded returns user encoding.
3290
3185
# We probably want to be using edit_commit_message instead to
3292
my_message = set_commit_message(commit_obj)
3293
if my_message is None:
3294
start_message = generate_commit_message_template(commit_obj)
3295
my_message = edit_commit_message_encoded(text,
3296
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)
3297
3190
if my_message is None:
3298
3191
raise errors.BzrCommandError("please specify a commit"
3299
3192
" message with either --message or --file")
3312
3205
reporter=None, verbose=verbose, revprops=properties,
3313
3206
authors=author, timestamp=commit_stamp,
3314
3207
timezone=offset,
3315
exclude=tree.safe_relpath_files(exclude),
3208
exclude=safe_relpath_files(tree, exclude))
3317
3209
except PointlessCommit:
3318
3210
raise errors.BzrCommandError("No changes to commit."
3319
" Please 'bzr add' the files you want to commit, or use"
3320
" --unchanged to force an empty commit.")
3211
" Use --unchanged to commit anyhow.")
3321
3212
except ConflictsInTree:
3322
3213
raise errors.BzrCommandError('Conflicts detected in working '
3323
3214
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3406
3297
class cmd_upgrade(Command):
3407
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3409
When the default format has changed after a major new release of
3410
Bazaar, you may be informed during certain operations that you
3411
should upgrade. Upgrading to a newer format may improve performance
3412
or make new features available. It may however limit interoperability
3413
with older repositories or with older versions of Bazaar.
3415
If you wish to upgrade to a particular format rather than the
3416
current default, that can be specified using the --format option.
3417
As a consequence, you can use the upgrade command this way to
3418
"downgrade" to an earlier format, though some conversions are
3419
a one way process (e.g. changing from the 1.x default to the
3420
2.x default) so downgrading is not always possible.
3422
A backup.bzr.~#~ directory is created at the start of the conversion
3423
process (where # is a number). By default, this is left there on
3424
completion. If the conversion fails, delete the new .bzr directory
3425
and rename this one back in its place. Use the --clean option to ask
3426
for the backup.bzr directory to be removed on successful conversion.
3427
Alternatively, you can delete it by hand if everything looks good
3430
If the location given is a shared repository, dependent branches
3431
are also converted provided the repository converts successfully.
3432
If the conversion of a branch fails, remaining branches are still
3435
For more information on upgrades, see the Bazaar Upgrade Guide,
3436
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.
3439
_see_also = ['check', 'reconcile', 'formats']
3305
_see_also = ['check']
3440
3306
takes_args = ['url?']
3441
3307
takes_options = [
3442
RegistryOption('format',
3443
help='Upgrade to a specific format. See "bzr help'
3444
' formats" for details.',
3445
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3446
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3447
value_switches=True, title='Branch format'),
3449
help='Remove the backup.bzr directory if successful.'),
3451
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'),
3454
def run(self, url='.', format=None, clean=False, dry_run=False):
3316
def run(self, url='.', format=None):
3455
3317
from bzrlib.upgrade import upgrade
3456
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3458
if len(exceptions) == 1:
3459
# Compatibility with historical behavior
3318
upgrade(url, format)
3465
3321
class cmd_whoami(Command):
3485
3340
encoding_type = 'replace'
3487
3342
@display_command
3488
def run(self, email=False, branch=False, name=None, directory=None):
3343
def run(self, email=False, branch=False, name=None):
3489
3344
if name is None:
3490
if directory is None:
3491
# use branch if we're inside one; otherwise global config
3493
c = Branch.open_containing(u'.')[0].get_config()
3494
except errors.NotBranchError:
3495
c = _mod_config.GlobalConfig()
3497
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()
3499
3351
self.outf.write(c.user_email() + '\n')
3501
3353
self.outf.write(c.username() + '\n')
3505
raise errors.BzrCommandError("--email can only be used to display existing "
3508
3356
# display a warning if an email address isn't included in the given name.
3510
_mod_config.extract_email_address(name)
3358
config.extract_email_address(name)
3511
3359
except errors.NoEmailInUsername, e:
3512
3360
warning('"%s" does not seem to contain an email address. '
3513
3361
'This is allowed, but not recommended.', name)
3515
3363
# use global config unless --branch given
3517
if directory is None:
3518
c = Branch.open_containing(u'.')[0].get_config()
3520
c = Branch.open(directory).get_config()
3365
c = Branch.open_containing('.')[0].get_config()
3522
c = _mod_config.GlobalConfig()
3367
c = config.GlobalConfig()
3523
3368
c.set_user_option('email', name)
3592
3436
'bzr alias --remove expects an alias to remove.')
3593
3437
# If alias is not found, print something like:
3594
3438
# unalias: foo: not found
3595
c = _mod_config.GlobalConfig()
3439
c = config.GlobalConfig()
3596
3440
c.unset_alias(alias_name)
3598
3442
@display_command
3599
3443
def print_aliases(self):
3600
3444
"""Print out the defined aliases in a similar format to bash."""
3601
aliases = _mod_config.GlobalConfig().get_aliases()
3445
aliases = config.GlobalConfig().get_aliases()
3602
3446
for key, value in sorted(aliases.iteritems()):
3603
3447
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3674
3515
if typestring == "sftp":
3675
3516
from bzrlib.tests import stub_sftp
3676
3517
return stub_sftp.SFTPAbsoluteServer
3677
elif typestring == "memory":
3518
if typestring == "memory":
3678
3519
from bzrlib.tests import test_server
3679
3520
return memory.MemoryServer
3680
elif typestring == "fakenfs":
3521
if typestring == "fakenfs":
3681
3522
from bzrlib.tests import test_server
3682
3523
return test_server.FakeNFSServer
3683
3524
msg = "No known transport type %s. Supported types are: sftp\n" %\
3696
3537
'throughout the test suite.',
3697
3538
type=get_transport_type),
3698
3539
Option('benchmark',
3699
help='Run the benchmarks rather than selftests.',
3540
help='Run the benchmarks rather than selftests.'),
3701
3541
Option('lsprof-timed',
3702
3542
help='Generate lsprof output for benchmarked'
3703
3543
' sections of code.'),
3704
3544
Option('lsprof-tests',
3705
3545
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3706
3549
Option('first',
3707
3550
help='Run all tests, but run specified tests first.',
3708
3551
short_name='f',
3717
3560
Option('randomize', type=str, argname="SEED",
3718
3561
help='Randomize the order of tests using the given'
3719
3562
' seed or "now" for the current time.'),
3720
ListOption('exclude', type=str, argname="PATTERN",
3722
help='Exclude tests that match this regular'
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
3724
3567
Option('subunit',
3725
3568
help='Output test progress via subunit.'),
3726
3569
Option('strict', help='Fail on missing dependencies or '
3746
3586
def run(self, testspecs_list=None, verbose=False, one=False,
3747
3587
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3749
3589
first=False, list_only=False,
3750
3590
randomize=None, exclude=None, strict=False,
3751
3591
load_list=None, debugflag=None, starting_with=None, subunit=False,
3752
parallel=None, lsprof_tests=False,
3754
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)
3756
3602
if testspecs_list is not None:
3757
3603
pattern = '|'.join(testspecs_list)
3766
3612
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3767
3613
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3768
3614
# stdout, which would corrupt the subunit stream.
3769
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3770
# following code can be deleted when it's sufficiently deployed
3771
# -- vila/mgz 20100514
3772
if (sys.platform == "win32"
3773
and getattr(sys.stdout, 'fileno', None) is not None):
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3775
3617
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3777
3619
self.additional_selftest_args.setdefault(
3778
3620
'suite_decorators', []).append(parallel)
3780
raise errors.BzrCommandError(
3781
"--benchmark is no longer supported from bzr 2.2; "
3782
"use bzr-usertest instead")
3783
test_suite_factory = None
3785
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)
3787
exclude_pattern = '(' + '|'.join(exclude) + ')'
3789
self._disable_fsync()
3629
test_suite_factory = None
3790
3631
selftest_kwargs = {"verbose": verbose,
3791
3632
"pattern": pattern,
3792
3633
"stop_on_failure": one,
3794
3635
"test_suite_factory": test_suite_factory,
3795
3636
"lsprof_timed": lsprof_timed,
3796
3637
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3797
3639
"matching_tests_first": first,
3798
3640
"list_only": list_only,
3799
3641
"random_seed": randomize,
3800
"exclude_pattern": exclude_pattern,
3642
"exclude_pattern": exclude,
3801
3643
"strict": strict,
3802
3644
"load_list": load_list,
3803
3645
"debug_flags": debugflag,
3804
3646
"starting_with": starting_with
3806
3648
selftest_kwargs.update(self.additional_selftest_args)
3808
# Make deprecation warnings visible, unless -Werror is set
3809
cleanup = symbol_versioning.activate_deprecation_warnings(
3812
result = tests.selftest(**selftest_kwargs)
3649
result = selftest(**selftest_kwargs)
3815
3650
return int(not result)
3817
def _disable_fsync(self):
3818
"""Change the 'os' functionality to not synchronize."""
3819
self._orig_fsync = getattr(os, 'fsync', None)
3820
if self._orig_fsync is not None:
3821
os.fsync = lambda filedes: None
3822
self._orig_fdatasync = getattr(os, 'fdatasync', None)
3823
if self._orig_fdatasync is not None:
3824
os.fdatasync = lambda filedes: None
3827
3653
class cmd_version(Command):
3828
3654
__doc__ = """Show version of bzr."""
3881
3709
The source of the merge can be specified either in the form of a branch,
3882
3710
or in the form of a path to a file containing a merge directive generated
3883
3711
with bzr send. If neither is specified, the default is the upstream branch
3884
or the branch most recently merged using --remember. The source of the
3885
merge may also be specified in the form of a path to a file in another
3886
branch: in this case, only the modifications to that file are merged into
3887
the current working tree.
3889
When merging from a branch, by default bzr will try to merge in all new
3890
work from the other branch, automatically determining an appropriate base
3891
revision. If this fails, you may need to give an explicit base.
3893
To pick a different ending revision, pass "--revision OTHER". bzr will
3894
try to merge in all new work up to and including revision OTHER.
3896
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3897
through OTHER, excluding BASE but including OTHER, will be merged. If this
3898
causes some revisions to be skipped, i.e. if the destination branch does
3899
not already contain revision BASE, such a merge is commonly referred to as
3900
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
3901
cherrypicks. The changes look like a normal commit, and the history of the
3902
changes from the other branch is not stored in the commit.
3904
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.
3906
3725
Merge will do its best to combine the changes in two branches, but there
3907
3726
are some kinds of problems only a human can fix. When it encounters those,
3911
3730
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
3913
If there is no default branch set, the first merge will set it (use
3914
--no-remember to avoid settting it). After that, you can omit the branch
3915
to use the default. To change the default, use --remember. The value will
3916
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.
3918
3737
The results of the merge are placed into the destination working
3919
3738
directory, where they can be reviewed (with bzr diff), tested, and then
3920
3739
committed to record the result of the merge.
3922
3741
merge refuses to run if there are any uncommitted changes, unless
3923
--force is given. If --force is given, then the changes from the source
3924
will be merged with the current working tree, including any uncommitted
3925
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
3926
3743
merge revision which has more than two parents.
3928
3745
If one would like to merge changes from the working tree of the other
3976
3793
' completely merged into the source, pull from the'
3977
3794
' source rather than merging. When this happens,'
3978
3795
' you do not need to commit the result.'),
3979
custom_help('directory',
3980
3797
help='Branch to merge into, '
3981
'rather than the one containing the working directory.'),
3798
'rather than the one containing the working directory.',
3982
3802
Option('preview', help='Instead of merging, show a diff of the'
3984
3804
Option('interactive', help='Select changes interactively.',
3988
3808
def run(self, location=None, revision=None, force=False,
3989
merge_type=None, show_base=False, reprocess=None, remember=None,
3809
merge_type=None, show_base=False, reprocess=None, remember=False,
3990
3810
uncommitted=False, pull=False,
3991
3811
directory=None,
4056
3873
self.sanity_check_merger(merger)
4057
3874
if (merger.base_rev_id == merger.other_rev_id and
4058
3875
merger.other_rev_id is not None):
4059
# check if location is a nonexistent file (and not a branch) to
4060
# disambiguate the 'Nothing to do'
4061
if merger.interesting_files:
4062
if not merger.other_tree.has_filename(
4063
merger.interesting_files[0]):
4064
note("merger: " + str(merger))
4065
raise errors.PathsDoNotExist([location])
4066
3876
note('Nothing to do.')
4068
if pull and not preview:
4069
3879
if merger.interesting_files is not None:
4070
3880
raise errors.BzrCommandError('Cannot pull individual files')
4071
3881
if (merger.base_rev_id == tree.last_revision()):
4095
3905
def _do_preview(self, merger):
4096
3906
from bzrlib.diff import show_diff_trees
4097
3907
result_tree = self._get_preview(merger)
4098
path_encoding = osutils.get_diff_header_encoding()
4099
3908
show_diff_trees(merger.this_tree, result_tree, self.outf,
4100
old_label='', new_label='',
4101
path_encoding=path_encoding)
3909
old_label='', new_label='')
4103
3911
def _do_merge(self, merger, change_reporter, allow_pending, verified):
4104
3912
merger.change_reporter = change_reporter
4180
3988
if other_revision_id is None:
4181
3989
other_revision_id = _mod_revision.ensure_null(
4182
3990
other_branch.last_revision())
4183
# Remember where we merge from. We need to remember if:
4184
# - user specify a location (and we don't merge from the parent
4186
# - user ask to remember or there is no previous location set to merge
4187
# from and user didn't ask to *not* remember
4188
if (user_location is not None
4190
or (remember is None
4191
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):
4192
3994
tree.branch.set_submit_branch(other_branch.base)
4193
# Merge tags (but don't set them in the master branch yet, the user
4194
# might revert this merge). Commit will propagate them.
4195
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4196
3996
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
4197
3997
other_revision_id, base_revision_id, other_branch, base_branch)
4198
3998
if other_path != '':
4366
4167
last committed revision is used.
4368
4169
To remove only some changes, without reverting to a prior version, use
4369
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4370
will remove the changes introduced by the second last commit (-2), without
4371
affecting the changes introduced by the last commit (-1). To remove
4372
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.
4374
4174
By default, any files that have been manually changed will be backed up
4375
4175
first. (Files changed only by merge are not backed up.) Backup files have
4540
4340
theirs_only=False,
4541
4341
log_format=None, long=False, short=False, line=False,
4542
4342
show_ids=False, verbose=False, this=False, other=False,
4543
include_merges=False, revision=None, my_revision=None,
4343
include_merges=False, revision=None, my_revision=None):
4545
4344
from bzrlib.missing import find_unmerged, iter_log_revisions
4546
4345
def message(s):
4547
4346
if not is_quiet():
4705
4507
@display_command
4706
4508
def run(self, verbose=False):
4707
from bzrlib import plugin
4708
# Don't give writelines a generator as some codecs don't like that
4709
self.outf.writelines(
4710
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")
4713
4531
class cmd_testament(Command):
4759
4578
Option('long', help='Show commit date in annotations.'),
4764
4582
encoding_type = 'exact'
4766
4584
@display_command
4767
4585
def run(self, filename, all=False, long=False, revision=None,
4768
show_ids=False, directory=None):
4769
from bzrlib.annotate import (
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4772
4588
wt, branch, relpath = \
4773
_open_directory_or_containing_tree_or_branch(filename, directory)
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4774
4590
if wt is not None:
4775
self.add_cleanup(wt.lock_read().unlock)
4592
self.add_cleanup(wt.unlock)
4777
self.add_cleanup(branch.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4778
4596
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4779
self.add_cleanup(tree.lock_read().unlock)
4780
if wt is not None and revision is None:
4598
self.add_cleanup(tree.unlock)
4781
4600
file_id = wt.path2id(relpath)
4783
4602
file_id = tree.path2id(relpath)
4784
4603
if file_id is None:
4785
4604
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4786
4606
if wt is not None and revision is None:
4787
4607
# If there is a tree and we're not annotating historical
4788
4608
# versions, annotate the working tree's content.
4789
4609
annotate_file_tree(wt, file_id, self.outf, long, all,
4790
4610
show_ids=show_ids)
4792
annotate_file_tree(tree, file_id, self.outf, long, all,
4793
show_ids=show_ids, branch=branch)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4796
4616
class cmd_re_sign(Command):
4800
4620
hidden = True # is this right ?
4801
4621
takes_args = ['revision_id*']
4802
takes_options = ['directory', 'revision']
4622
takes_options = ['revision']
4804
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4624
def run(self, revision_id_list=None, revision=None):
4805
4625
if revision_id_list is not None and revision is not None:
4806
4626
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4807
4627
if revision_id_list is None and revision is None:
4808
4628
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4809
b = WorkingTree.open_containing(directory)[0].branch
4810
self.add_cleanup(b.lock_write().unlock)
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
4811
4632
return self._run(b, revision_id_list, revision)
4813
4634
def _run(self, b, revision_id_list, revision):
4873
4694
_see_also = ['checkouts', 'unbind']
4874
4695
takes_args = ['location?']
4875
takes_options = ['directory']
4877
def run(self, location=None, directory=u'.'):
4878
b, relpath = Branch.open_containing(directory)
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4879
4700
if location is None:
4881
4702
location = b.get_old_bound_location()
4963
4784
b = control.open_branch()
4965
4786
if tree is not None:
4966
self.add_cleanup(tree.lock_write().unlock)
4788
self.add_cleanup(tree.unlock)
4968
self.add_cleanup(b.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4969
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
4971
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5042
4859
bzr break-lock bzr+ssh://example.com/bzr/foo
5043
bzr break-lock --conf ~/.bazaar
5046
4861
takes_args = ['location?']
5049
help='LOCATION is the directory where the config lock is.'),
5051
help='Do not ask for confirmation before breaking the lock.'),
5054
def run(self, location=None, config=False, force=False):
4863
def run(self, location=None, show=False):
5055
4864
if location is None:
5056
4865
location = u'.'
5058
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5060
{'bzrlib.lockdir.break': True})
5062
conf = _mod_config.LockableConfig(file_name=location)
5065
control, relpath = bzrdir.BzrDir.open_containing(location)
5067
control.break_lock()
5068
except NotImplementedError:
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5072
4873
class cmd_wait_until_signalled(Command):
5136
4938
def run(self, port=None, inet=False, directory=None, allow_writes=False,
5137
4939
protocol=None):
5138
from bzrlib import transport
4940
from bzrlib.transport import get_transport, transport_server_registry
5139
4941
if directory is None:
5140
4942
directory = os.getcwd()
5141
4943
if protocol is None:
5142
protocol = transport.transport_server_registry.get()
4944
protocol = transport_server_registry.get()
5143
4945
host, port = self.get_host_and_port(port)
5144
4946
url = urlutils.local_path_to_url(directory)
5145
4947
if not allow_writes:
5146
4948
url = 'readonly+' + url
5147
t = transport.get_transport(url)
5148
protocol(t, host, port, inet)
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5151
4953
class cmd_join(Command):
5263
5064
encoding_type = 'exact'
5265
5066
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5266
sign=False, revision=None, mail_to=None, message=None,
5067
sign=False, revision=None, mail_to=None, message=None):
5268
5068
from bzrlib.revision import ensure_null, NULL_REVISION
5269
5069
include_patch, include_bundle = {
5270
5070
'plain': (False, False),
5271
5071
'diff': (True, False),
5272
5072
'bundle': (True, True),
5274
branch = Branch.open(directory)
5074
branch = Branch.open('.')
5275
5075
stored_submit_branch = branch.get_submit_branch()
5276
5076
if submit_branch is None:
5277
5077
submit_branch = stored_submit_branch
5353
5153
source branch defaults to that containing the working directory, but can
5354
5154
be changed using --from.
5356
Both the submit branch and the public branch follow the usual behavior with
5357
respect to --remember: If there is no default location set, the first send
5358
will set it (use --no-remember to avoid settting it). After that, you can
5359
omit the location to use the default. To change the default, use
5360
--remember. The value will only be saved if the location can be accessed.
5362
5156
In order to calculate those changes, bzr must analyse the submit branch.
5363
5157
Therefore it is most efficient for the submit branch to be a local mirror.
5364
5158
If a public location is known for the submit_branch, that location is used
5435
5229
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5436
no_patch=False, revision=None, remember=None, output=None,
5230
no_patch=False, revision=None, remember=False, output=None,
5437
5231
format=None, mail_to=None, message=None, body=None,
5438
5232
strict=None, **kwargs):
5439
5233
from bzrlib.send import send
5595
5393
_see_also = ['tag']
5596
5394
takes_options = [
5597
custom_help('directory',
5598
help='Branch whose tags should be displayed.'),
5599
RegistryOption('sort',
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5600
5401
'Sort tags by different criteria.', title='Sorting',
5601
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5607
5409
@display_command
5608
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5609
from bzrlib.tag import tag_sort_methods
5610
5416
branch, relpath = Branch.open_containing(directory)
5612
5418
tags = branch.tags.get_tag_dict().items()
5616
self.add_cleanup(branch.lock_read().unlock)
5423
self.add_cleanup(branch.unlock)
5618
# Restrict to the specified range
5619
tags = self._tags_for_range(branch, revision)
5621
sort = tag_sort_methods.get()
5425
graph = branch.repository.get_graph()
5426
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5427
revid1, revid2 = rev1.rev_id, rev2.rev_id
5428
# only show revisions between revid1 and revid2 (inclusive)
5429
tags = [(tag, revid) for tag, revid in tags if
5430
graph.is_between(revid, revid1, revid2)]
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]])
5623
5444
if not show_ids:
5624
5445
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5625
5446
for index, (tag, revid) in enumerate(tags):
5636
5457
for tag, revspec in tags:
5637
5458
self.outf.write('%-20s %s\n' % (tag, revspec))
5639
def _tags_for_range(self, branch, revision):
5641
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5642
revid1, revid2 = rev1.rev_id, rev2.rev_id
5643
# _get_revision_range will always set revid2 if it's not specified.
5644
# If revid1 is None, it means we want to start from the branch
5645
# origin which is always a valid ancestor. If revid1 == revid2, the
5646
# ancestry check is useless.
5647
if revid1 and revid1 != revid2:
5648
# FIXME: We really want to use the same graph than
5649
# branch.iter_merge_sorted_revisions below, but this is not
5650
# easily available -- vila 2011-09-23
5651
if branch.repository.get_graph().is_ancestor(revid2, revid1):
5652
# We don't want to output anything in this case...
5654
# only show revisions between revid1 and revid2 (inclusive)
5655
tagged_revids = branch.tags.get_reverse_tag_dict()
5657
for r in branch.iter_merge_sorted_revisions(
5658
start_revision_id=revid2, stop_revision_id=revid1,
5659
stop_rule='include'):
5660
revid_tags = tagged_revids.get(r[0], None)
5662
found.extend([(tag, r[0]) for tag in revid_tags])
5666
5461
class cmd_reconfigure(Command):
5667
5462
__doc__ = """Reconfigure the type of a bzr directory.
5790
5584
def run(self, to_location=None, force=False, create_branch=False,
5791
revision=None, directory=u'.'):
5792
5586
from bzrlib import switch
5793
tree_location = directory
5794
5588
revision = _get_one_revision('switch', revision)
5795
5589
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5796
5590
if to_location is None:
5797
5591
if revision is None:
5798
5592
raise errors.BzrCommandError('You must supply either a'
5799
5593
' revision or a location')
5800
to_location = tree_location
5802
5596
branch = control_dir.open_branch()
5803
5597
had_explicit_nick = branch.get_config().has_explicit_nickname()
6075
5868
You can put multiple items on the shelf, and by default, 'unshelve' will
6076
5869
restore the most recently shelved changes.
6078
For complicated changes, it is possible to edit the changes in a separate
6079
editor program to decide what the file remaining in the working copy
6080
should look like. To do this, add the configuration option
6082
change_editor = PROGRAM @new_path @old_path
6084
where @new_path is replaced with the path of the new version of the
6085
file and @old_path is replaced with the path of the old version of
6086
the file. The PROGRAM should save the new file with the desired
6087
contents of the file in the working tree.
6091
5872
takes_args = ['file*']
6093
5874
takes_options = [
6096
5876
Option('all', help='Shelve all changes.'),
6103
5883
Option('destroy',
6104
5884
help='Destroy removed changes instead of shelving them.'),
6106
_see_also = ['unshelve', 'configuration']
5886
_see_also = ['unshelve']
6108
5888
def run(self, revision=None, all=False, file_list=None, message=None,
6109
writer=None, list=False, destroy=False, directory=None):
5889
writer=None, list=False, destroy=False):
6111
return self.run_for_list(directory=directory)
5891
return self.run_for_list()
6112
5892
from bzrlib.shelf_ui import Shelver
6113
5893
if writer is None:
6114
5894
writer = bzrlib.option.diff_writer_registry.get()
6116
5896
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
6117
file_list, message, destroy=destroy, directory=directory)
5897
file_list, message, destroy=destroy)
6189
5967
To check what clean-tree will do, use --dry-run.
6191
takes_options = ['directory',
6192
Option('ignored', help='Delete all ignored files.'),
6193
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'
6194
5971
' backups, and failed selftest dirs.'),
6195
5972
Option('unknown',
6196
5973
help='Delete files unknown to bzr (default).'),
6198
5975
' deleting them.'),
6199
5976
Option('force', help='Do not prompt before deleting.')]
6200
5977
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6201
force=False, directory=u'.'):
6202
5979
from bzrlib.clean_tree import clean_tree
6203
5980
if not (unknown or ignored or detritus):
6207
clean_tree(directory, unknown=unknown, ignored=ignored,
6208
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)
6211
5988
class cmd_reference(Command):
6255
6032
self.outf.write('%s %s\n' % (path, location))
6258
class cmd_export_pot(Command):
6259
__doc__ = """Export command helps and error messages in po format."""
6264
from bzrlib.export_pot import export_pot
6265
export_pot(self.outf)
6268
6035
def _register_lazy_builtins():
6269
6036
# register lazy builtins from other modules; called at startup and should
6270
6037
# be only called once.
6271
6038
for (name, aliases, module_name) in [
6272
6039
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6273
('cmd_config', [], 'bzrlib.config'),
6274
6040
('cmd_dpush', [], 'bzrlib.foreign'),
6275
6041
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6276
6042
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6277
6043
('cmd_conflicts', [], 'bzrlib.conflicts'),
6278
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6279
('cmd_verify_signatures', [],
6280
'bzrlib.commit_signature_commands'),
6281
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6283
6046
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
