73
72
_parse_revision_str,
75
74
from bzrlib.trace import mutter, note, warning, is_quiet, get_verbosity_level
80
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
78
81
def tree_files(file_list, default_branch=u'.', canonicalize=True,
81
return internal_tree_files(file_list, default_branch, canonicalize,
83
except errors.FileInWrongBranch, e:
84
raise errors.BzrCommandError("%s is not in the same branch as %s" %
85
(e.path, file_list[0]))
83
return internal_tree_files(file_list, default_branch, canonicalize,
88
87
def tree_files_for_add(file_list):
153
152
# XXX: Bad function name; should possibly also be a class method of
154
153
# WorkingTree rather than a function.
154
@symbol_versioning.deprecated_function(symbol_versioning.deprecated_in((2, 3, 0)))
155
155
def internal_tree_files(file_list, default_branch=u'.', canonicalize=True,
156
156
apply_view=True):
157
157
"""Convert command-line paths to a WorkingTree and relative paths.
159
Deprecated: use WorkingTree.open_containing_paths instead.
159
161
This is typically used for command-line processors that take one or
160
162
more filenames, and infer the workingtree that contains them.
172
174
:return: workingtree, [relative_paths]
174
if file_list is None or len(file_list) == 0:
175
tree = WorkingTree.open_containing(default_branch)[0]
176
if tree.supports_views() and apply_view:
177
view_files = tree.views.lookup_view()
179
file_list = view_files
180
view_str = views.view_display_str(view_files)
181
note("Ignoring files outside view. View is %s" % view_str)
182
return tree, file_list
183
tree = WorkingTree.open_containing(osutils.realpath(file_list[0]))[0]
184
return tree, safe_relpath_files(tree, file_list, canonicalize,
185
apply_view=apply_view)
188
def safe_relpath_files(tree, file_list, canonicalize=True, apply_view=True):
189
"""Convert file_list into a list of relpaths in tree.
191
:param tree: A tree to operate on.
192
:param file_list: A list of user provided paths or None.
193
:param apply_view: if True and a view is set, apply it or check that
194
specified files are within it
195
:return: A list of relative paths.
196
:raises errors.PathNotChild: When a provided path is in a different tree
199
if file_list is None:
201
if tree.supports_views() and apply_view:
202
view_files = tree.views.lookup_view()
206
# tree.relpath exists as a "thunk" to osutils, but canonical_relpath
207
# doesn't - fix that up here before we enter the loop.
209
fixer = lambda p: osutils.canonical_relpath(tree.basedir, p)
212
for filename in file_list:
214
relpath = fixer(osutils.dereference_path(filename))
215
if view_files and not osutils.is_inside_any(view_files, relpath):
216
raise errors.FileOutsideView(filename, view_files)
217
new_list.append(relpath)
218
except errors.PathNotChild:
219
raise errors.FileInWrongBranch(tree.branch, filename)
176
return WorkingTree.open_containing_paths(
177
file_list, default_directory='.',
223
182
def _get_view_info_for_change_reporter(tree):
194
def _open_directory_or_containing_tree_or_branch(filename, directory):
195
"""Open the tree or branch containing the specified file, unless
196
the --directory option is used to specify a different branch."""
197
if directory is not None:
198
return (None, Branch.open(directory), filename)
199
return bzrdir.BzrDir.open_containing_tree_or_branch(filename)
235
202
# TODO: Make sure no commands unconditionally use the working directory as a
236
203
# branch. If a filename argument is used, the first of them should be used to
237
204
# specify the branch. (Perhaps this can be factored out into some kind of
266
233
Not versioned and not matching an ignore pattern.
268
Additionally for directories, symlinks and files with an executable
269
bit, Bazaar indicates their type using a trailing character: '/', '@'
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.
272
240
To see ignored files use 'bzr ignored'. For details on the
273
241
changes to file texts, use 'bzr diff'.
286
254
To skip the display of pending merge information altogether, use
287
255
the no-pending option or specify a file/directory.
289
If a revision argument is given, the status is calculated against
290
that revision, or between two revisions if two are provided.
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'.
293
265
# TODO: --no-recurse, --recurse options
310
285
def run(self, show_ids=False, file_list=None, revision=None, short=False,
311
versioned=False, no_pending=False, verbose=False):
286
versioned=False, no_pending=False, verbose=False,
312
288
from bzrlib.status import show_tree_status
314
290
if revision and len(revision) > 2:
315
291
raise errors.BzrCommandError('bzr status --revision takes exactly'
316
292
' one or two revision specifiers')
318
tree, relfile_list = tree_files(file_list)
294
tree, relfile_list = WorkingTree.open_containing_paths(file_list)
319
295
# Avoid asking for specific files when that is not needed.
320
296
if relfile_list == ['']:
321
297
relfile_list = None
328
304
show_tree_status(tree, show_ids=show_ids,
329
305
specific_files=relfile_list, revision=revision,
330
306
to_file=self.outf, short=short, versioned=versioned,
331
show_pending=(not no_pending), verbose=verbose)
307
show_pending=(not no_pending), verbose=verbose,
308
classify=not no_classify)
334
311
class cmd_cat_revision(Command):
353
330
self.outf.write(revtext.decode('utf-8'))
356
def run(self, revision_id=None, revision=None):
333
def run(self, revision_id=None, revision=None, directory=u'.'):
357
334
if revision_id is not None and revision is not None:
358
335
raise errors.BzrCommandError('You can only supply one of'
359
336
' revision_id or --revision')
360
337
if revision_id is None and revision is None:
361
338
raise errors.BzrCommandError('You must supply either'
362
339
' --revision or a revision_id')
363
b = WorkingTree.open_containing(u'.')[0].branch
341
b = bzrdir.BzrDir.open_containing_tree_or_branch(directory)[1]
365
343
revisions = b.repository.revisions
366
344
if revisions is None:
511
494
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'
514
550
class cmd_revno(Command):
515
551
__doc__ = """Show current revision number.
677
710
action = bzrlib.add.AddFromBaseAction(base_tree, base_path,
678
711
to_file=self.outf, should_print=(not is_quiet()))
680
action = bzrlib.add.AddAction(to_file=self.outf,
713
action = bzrlib.add.AddWithSkipLargeAction(to_file=self.outf,
681
714
should_print=(not is_quiet()))
684
base_tree.lock_read()
685
self.add_cleanup(base_tree.unlock)
717
self.add_cleanup(base_tree.lock_read().unlock)
686
718
tree, file_list = tree_files_for_add(file_list)
687
719
added, ignored = tree.smart_add(file_list, not
688
720
no_recurse, action=action, save=not dry_run)
759
791
raise errors.BzrCommandError('invalid kind %r specified' % (kind,))
761
793
revision = _get_one_revision('inventory', revision)
762
work_tree, file_list = tree_files(file_list)
763
work_tree.lock_read()
764
self.add_cleanup(work_tree.unlock)
794
work_tree, file_list = WorkingTree.open_containing_paths(file_list)
795
self.add_cleanup(work_tree.lock_read().unlock)
765
796
if revision is not None:
766
797
tree = revision.as_tree(work_tree.branch)
768
799
extra_trees = [work_tree]
770
self.add_cleanup(tree.unlock)
800
self.add_cleanup(tree.lock_read().unlock)
833
864
if len(names_list) < 2:
834
865
raise errors.BzrCommandError("missing file argument")
835
tree, rel_names = tree_files(names_list, canonicalize=False)
836
tree.lock_tree_write()
837
self.add_cleanup(tree.unlock)
866
tree, rel_names = WorkingTree.open_containing_paths(names_list, canonicalize=False)
867
self.add_cleanup(tree.lock_tree_write().unlock)
838
868
self._run(tree, names_list, rel_names, after)
840
870
def run_auto(self, names_list, after, dry_run):
845
875
raise errors.BzrCommandError('--after cannot be specified with'
847
work_tree, file_list = tree_files(names_list, default_branch='.')
848
work_tree.lock_tree_write()
849
self.add_cleanup(work_tree.unlock)
877
work_tree, file_list = WorkingTree.open_containing_paths(
878
names_list, default_directory='.')
879
self.add_cleanup(work_tree.lock_tree_write().unlock)
850
880
rename_map.RenameMap.guess_renames(work_tree, dry_run)
852
882
def _run(self, tree, names_list, rel_names, after):
946
976
match the remote one, use pull --overwrite. This will work even if the two
947
977
branches have diverged.
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.
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.
954
984
Note: The location can be specified either in the form of a branch,
955
985
or in the form of a path to a file containing a merge directive generated
960
990
takes_options = ['remember', 'overwrite', 'revision',
961
991
custom_help('verbose',
962
992
help='Show logs of pulled revisions.'),
993
custom_help('directory',
964
994
help='Branch to pull into, '
965
'rather than the one containing the working directory.',
995
'rather than the one containing the working directory.'),
970
997
help="Perform a local pull in a bound "
971
998
"branch. Local pulls are not applied to "
972
999
"the master branch."
1002
help="Show base revision text in conflicts.")
975
1004
takes_args = ['location?']
976
1005
encoding_type = 'replace'
978
def run(self, location=None, remember=False, overwrite=False,
1007
def run(self, location=None, remember=None, overwrite=False,
979
1008
revision=None, verbose=False,
980
directory=None, local=False):
1009
directory=None, local=False,
981
1011
# FIXME: too much stuff is in the command class
982
1012
revision_id = None
983
1013
mergeable = None
987
1017
tree_to = WorkingTree.open_containing(directory)[0]
988
1018
branch_to = tree_to.branch
990
self.add_cleanup(tree_to.unlock)
1019
self.add_cleanup(tree_to.lock_write().unlock)
991
1020
except errors.NoWorkingTree:
993
1022
branch_to = Branch.open_containing(directory)[0]
994
branch_to.lock_write()
995
self.add_cleanup(branch_to.unlock)
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.")
997
1028
if local and not branch_to.get_bound_location():
998
1029
raise errors.LocalRequiresBoundBranch()
1077
1112
do a merge (see bzr help merge) from the other branch, and commit that.
1078
1113
After that you will be able to do a push without '--overwrite'.
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.
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.
1086
1121
_see_also = ['pull', 'update', 'working-trees']
1088
1123
Option('create-prefix',
1089
1124
help='Create the path leading up to the branch '
1090
1125
'if it does not already exist.'),
1126
custom_help('directory',
1092
1127
help='Branch to push from, '
1093
'rather than the one containing the working directory.',
1128
'rather than the one containing the working directory.'),
1097
1129
Option('use-existing-dir',
1098
1130
help='By default push will fail if the target'
1099
1131
' directory exists, but does not already'
1110
1142
Option('strict',
1111
1143
help='Refuse to push if there are uncommitted changes in'
1112
1144
' the working tree, --no-strict disables the check.'),
1146
help="Don't populate the working tree, even for protocols"
1147
" that support it."),
1114
1149
takes_args = ['location?']
1115
1150
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1152
def run(self, location=None, remember=None, overwrite=False,
1118
1153
create_prefix=False, verbose=False, revision=None,
1119
1154
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1155
stacked=False, strict=None, no_tree=False):
1121
1156
from bzrlib.push import _show_push_branch
1123
1158
if directory is None:
1164
1199
display_url = urlutils.unescape_for_display(stored_loc,
1165
1200
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1201
note("Using saved push location: %s" % display_url)
1167
1202
location = stored_loc
1169
1204
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1205
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1206
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1207
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1210
class cmd_branch(Command):
1185
1220
To retrieve the branch as of a particular revision, supply the --revision
1186
1221
parameter, as in "branch foo/bar -r 5".
1223
The synonyms 'clone' and 'get' for this command are deprecated.
1189
1226
_see_also = ['checkout']
1190
1227
takes_args = ['from_location', 'to_location?']
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
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."),
1193
1232
Option('no-tree',
1194
1233
help="Create a branch without a working-tree."),
1195
1234
Option('switch',
1214
1253
def run(self, from_location, to_location=None, revision=None,
1215
1254
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1255
use_existing_dir=False, switch=False, bind=False,
1217
1257
from bzrlib import switch as _mod_switch
1218
1258
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')
1219
1265
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)
1221
1274
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1275
self.add_cleanup(br_from.lock_read().unlock)
1224
1276
if revision is not None:
1225
1277
revision_id = revision.as_revision_id(br_from)
1285
1337
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))
1288
1357
class cmd_checkout(Command):
1289
1358
__doc__ = """Create a new checkout of an existing branch.
1331
1400
to_location = branch_location
1332
1401
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1333
1402
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
1334
1408
revision = _get_one_revision('checkout', revision)
1335
if files_from is not None:
1409
if files_from is not None and files_from != branch_location:
1336
1410
accelerator_tree = WorkingTree.open(files_from)
1337
1411
if revision is not None:
1338
1412
revision_id = revision.as_revision_id(source)
1396
1468
If you want to discard your local changes, you can just do a
1397
1469
'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'.
1399
1474
If the tree's branch is bound to a master branch, it will also update
1400
1475
the branch from the master.
1403
1478
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1479
takes_args = ['dir?']
1405
takes_options = ['revision']
1480
takes_options = ['revision',
1482
help="Show base revision text in conflicts."),
1406
1484
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1486
def run(self, dir='.', revision=None, show_base=None):
1409
1487
if revision is not None and len(revision) != 1:
1410
1488
raise errors.BzrCommandError(
1411
1489
"bzr update --revision takes exactly one revision")
1519
1598
class cmd_remove(Command):
1520
1599
__doc__ = """Remove files or directories.
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.
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.
1527
1607
takes_args = ['file*']
1528
1608
takes_options = ['verbose',
1530
1610
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1611
'The file deletion mode to be used.',
1532
1612
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1613
safe='Backup changed files (default).',
1535
1614
keep='Delete from bzr but leave the working copy.',
1615
no_backup='Don\'t backup changed files.',
1536
1616
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1617
'recovered and even if they are non-empty directories. '
1618
'(deprecated, use no-backup)')]
1538
1619
aliases = ['rm', 'del']
1539
1620
encoding_type = 'replace'
1541
1622
def run(self, file_list, verbose=False, new=False,
1542
1623
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
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)
1545
1631
if file_list is not None:
1546
1632
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1634
self.add_cleanup(tree.lock_write().unlock)
1550
1635
# Heuristics should probably all move into tree.remove_smart or
1636
1721
_see_also = ['check']
1637
1722
takes_args = ['branch?']
1724
Option('canonicalize-chks',
1725
help='Make sure CHKs are in canonical form (repairs '
1639
def run(self, branch="."):
1730
def run(self, branch=".", canonicalize_chks=False):
1640
1731
from bzrlib.reconcile import reconcile
1641
1732
dir = bzrdir.BzrDir.open(branch)
1733
reconcile(dir, canonicalize_chks=canonicalize_chks)
1645
1736
class cmd_revision_history(Command):
1678
1769
last_revision = wt.last_revision()
1680
revision_ids = b.repository.get_ancestry(last_revision)
1682
for revision_id in revision_ids:
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):
1683
1778
self.outf.write(revision_id + '\n')
1723
1818
Option('append-revisions-only',
1724
1819
help='Never change revnos or the existing log.'
1725
' Append revisions to it only.')
1820
' Append revisions to it only.'),
1822
'Create a branch without a working tree.')
1727
1824
def run(self, location=None, format=None, append_revisions_only=False,
1728
create_prefix=False):
1825
create_prefix=False, no_tree=False):
1729
1826
if format is None:
1730
1827
format = bzrdir.format_registry.make_bzrdir('default')
1731
1828
if location is None:
1985
2105
old_branch, new_branch,
1986
2106
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2107
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()
1988
2110
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2111
specific_files=specific_files,
1990
2112
external_diff_options=diff_options,
1991
2113
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2114
extra_trees=extra_trees,
2115
path_encoding=path_encoding,
1993
2117
format_cls=format)
2003
2127
# level of effort but possibly much less IO. (Or possibly not,
2004
2128
# if the directories are very large...)
2005
2129
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2130
takes_options = ['directory', 'show-ids']
2008
2132
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2133
def run(self, show_ids=False, directory=u'.'):
2134
tree = WorkingTree.open_containing(directory)[0]
2135
self.add_cleanup(tree.lock_read().unlock)
2013
2136
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
2137
self.add_cleanup(old.lock_read().unlock)
2016
2138
for path, ie in old.inventory.iter_entries():
2017
2139
if not tree.has_id(ie.file_id):
2018
2140
self.outf.write(path)
2030
2152
_see_also = ['status', 'ls']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2153
takes_options = ['directory', 'null']
2037
2155
@display_command
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2156
def run(self, null=False, directory=u'.'):
2157
tree = WorkingTree.open_containing(directory)[0]
2158
self.add_cleanup(tree.lock_read().unlock)
2040
2159
td = tree.changes_from(tree.basis_tree())
2041
2161
for path, id, kind, text_modified, meta_modified in td.modified:
2043
2163
self.outf.write(path + '\0')
2053
2173
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2174
takes_options = ['directory', 'null']
2060
2176
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2177
def run(self, null=False, directory=u'.'):
2178
wt = WorkingTree.open_containing(directory)[0]
2179
self.add_cleanup(wt.lock_read().unlock)
2065
2180
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2181
self.add_cleanup(basis.lock_read().unlock)
2068
2182
basis_inv = basis.inventory
2069
2183
inv = wt.inventory
2070
2184
for file_id in inv:
2071
if file_id in basis_inv:
2185
if basis_inv.has_id(file_id):
2073
2187
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2189
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2190
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2193
self.outf.write(path + '\0')
2279
2396
help='Show just the specified revision.'
2280
2397
' 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'),
2282
2404
Option('levels',
2283
2405
short_name='n',
2284
2406
help='Number of levels to display - 0 for all, 1 for flat.',
2286
2408
type=_parse_levels),
2287
2409
Option('message',
2289
2410
help='Show revisions whose message matches this '
2290
2411
'regular expression.',
2292
2414
Option('limit',
2293
2415
short_name='l',
2294
2416
help='Limit the output to the first N revisions.',
2302
2424
Option('exclude-common-ancestry',
2303
2425
help='Display only the revisions that are not part'
2304
2426
' 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 '
2307
2452
encoding_type = 'replace'
2378
2529
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
2530
b = dir.open_branch()
2381
self.add_cleanup(b.unlock)
2531
self.add_cleanup(b.lock_read().unlock)
2382
2532
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)
2384
2541
# Decide on the type of delta & diff filtering to use
2385
2542
# TODO: add an --all-files option to make this configurable & consistent
2386
2543
if not verbose:
2528
2698
help='Recurse into subdirectories.'),
2529
2699
Option('from-root',
2530
2700
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2701
Option('unknown', short_name='u',
2702
help='Print unknown files.'),
2532
2703
Option('versioned', help='Print versioned files.',
2533
2704
short_name='V'),
2534
Option('ignored', help='Print ignored files.'),
2536
help='Write an ascii NUL (\\0) separator '
2537
'between files rather than a newline.'),
2705
Option('ignored', short_name='i',
2706
help='Print ignored files.'),
2707
Option('kind', short_name='k',
2539
2708
help='List entries of a particular kind: file, directory, symlink.',
2543
2714
@display_command
2544
2715
def run(self, revision=None, verbose=False,
2545
2716
recursive=False, from_root=False,
2546
2717
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2718
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2720
if kind and kind not in ('file', 'directory', 'symlink'):
2550
2721
raise errors.BzrCommandError('invalid kind specified')
2713
2893
_see_also = ['status', 'ignored', 'patterns']
2714
2894
takes_args = ['name_pattern*']
2895
takes_options = ['directory',
2716
2896
Option('default-rules',
2717
2897
help='Display the default ignore rules that bzr uses.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2900
def run(self, name_pattern_list=None, default_rules=None,
2721
2902
from bzrlib import ignores
2722
2903
if default_rules is not None:
2723
2904
# dump the default rules and exit
2729
2910
"NAME_PATTERN or --default-rules.")
2730
2911
name_pattern_list = [globbing.normalize_pattern(p)
2731
2912
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('')
2732
2921
for name_pattern in name_pattern_list:
2733
2922
if (name_pattern[0] == '/' or
2734
2923
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
2924
raise errors.BzrCommandError(
2736
2925
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
2926
tree, relpath = WorkingTree.open_containing(directory)
2738
2927
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
2928
ignored = globbing.Globster(name_pattern_list)
2930
self.add_cleanup(tree.lock_read().unlock)
2742
2931
for entry in tree.list_files():
2744
2933
if id is not None:
2745
2934
filename = entry[0]
2746
2935
if ignored.match(filename):
2747
2936
matches.append(filename)
2749
2937
if len(matches) > 0:
2750
2938
self.outf.write("Warning: the following files are version controlled and"
2751
2939
" match your ignore pattern:\n%s"
2767
2955
encoding_type = 'replace'
2768
2956
_see_also = ['ignore', 'ls']
2957
takes_options = ['directory']
2770
2959
@display_command
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
2960
def run(self, directory=u'.'):
2961
tree = WorkingTree.open_containing(directory)[0]
2962
self.add_cleanup(tree.lock_read().unlock)
2775
2963
for path, file_class, kind, file_id, entry in tree.list_files():
2776
2964
if file_class != 'I':
2844
3034
'revision in which it was changed.'),
2846
3036
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
3037
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2848
3038
from bzrlib.export import export
2850
3040
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3041
tree = WorkingTree.open_containing(directory)[0]
2852
3042
b = tree.branch
2885
3075
@display_command
2886
3076
def run(self, filename, revision=None, name_from_revision=False,
3077
filters=False, directory=None):
2888
3078
if revision is not None and len(revision) != 1:
2889
3079
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
3080
" one revision specifier")
2891
3081
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3082
_open_directory_or_containing_tree_or_branch(filename, directory)
3083
self.add_cleanup(branch.lock_read().unlock)
2895
3084
return self._run(tree, branch, relpath, filename, revision,
2896
3085
name_from_revision, filters)
2912
3104
"%r is not present in revision %s" % (
2913
3105
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3107
actual_file_id = old_file_id
2917
3109
cur_file_id = tree.path2id(relpath)
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
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
2933
3115
raise errors.BzrCommandError(
2934
3116
"%r is not present in revision %s" % (
2935
3117
filename, rev_tree.get_revision_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)
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)
2949
self.outf.write(content)
3124
content = rev_tree.get_file_text(actual_file_id)
3126
self.outf.write(content)
2952
3129
class cmd_local_time_offset(Command):
3013
3190
to trigger updates to external systems like bug trackers. The --fixes
3014
3191
option can be used to record the association between a revision and
3015
3192
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
3043
3195
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3196
takes_args = ['selected*']
3101
3257
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3258
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3259
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3261
from bzrlib.errors import (
3105
3262
PointlessCommit,
3106
3263
ConflictsInTree,
3120
3278
raise errors.BzrCommandError(
3121
3279
"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.
3129
3281
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3283
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3284
if selected_list == ['']:
3133
3285
# workaround - commit of root of tree should be exactly the same
3134
3286
# as just default commit in that tree, and succeed even though
3184
3339
# make_commit_message_template_encoded returns user encoding.
3185
3340
# We probably want to be using edit_commit_message instead to
3187
start_message = generate_commit_message_template(commit_obj)
3188
my_message = edit_commit_message_encoded(text,
3189
start_message=start_message)
3342
my_message = set_commit_message(commit_obj)
3343
if my_message is None:
3344
start_message = generate_commit_message_template(commit_obj)
3345
my_message = edit_commit_message_encoded(text,
3346
start_message=start_message)
3190
3347
if my_message is None:
3191
3348
raise errors.BzrCommandError("please specify a commit"
3192
3349
" message with either --message or --file")
3193
if my_message == "":
3194
raise errors.BzrCommandError("empty commit message specified")
3350
if my_message == "":
3351
raise errors.BzrCommandError("Empty commit message specified."
3352
" Please specify a commit message with either"
3353
" --message or --file or leave a blank message"
3354
" with --message \"\".")
3195
3355
return my_message
3197
3357
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3365
reporter=None, verbose=verbose, revprops=properties,
3206
3366
authors=author, timestamp=commit_stamp,
3207
3367
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3368
exclude=tree.safe_relpath_files(exclude),
3209
3370
except PointlessCommit:
3210
3371
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3372
" Please 'bzr add' the files you want to commit, or use"
3373
" --unchanged to force an empty commit.")
3212
3374
except ConflictsInTree:
3213
3375
raise errors.BzrCommandError('Conflicts detected in working '
3214
3376
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3297
3459
class cmd_upgrade(Command):
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.
3460
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3462
When the default format has changed after a major new release of
3463
Bazaar, you may be informed during certain operations that you
3464
should upgrade. Upgrading to a newer format may improve performance
3465
or make new features available. It may however limit interoperability
3466
with older repositories or with older versions of Bazaar.
3468
If you wish to upgrade to a particular format rather than the
3469
current default, that can be specified using the --format option.
3470
As a consequence, you can use the upgrade command this way to
3471
"downgrade" to an earlier format, though some conversions are
3472
a one way process (e.g. changing from the 1.x default to the
3473
2.x default) so downgrading is not always possible.
3475
A backup.bzr.~#~ directory is created at the start of the conversion
3476
process (where # is a number). By default, this is left there on
3477
completion. If the conversion fails, delete the new .bzr directory
3478
and rename this one back in its place. Use the --clean option to ask
3479
for the backup.bzr directory to be removed on successful conversion.
3480
Alternatively, you can delete it by hand if everything looks good
3483
If the location given is a shared repository, dependent branches
3484
are also converted provided the repository converts successfully.
3485
If the conversion of a branch fails, remaining branches are still
3488
For more information on upgrades, see the Bazaar Upgrade Guide,
3489
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3492
_see_also = ['check', 'reconcile', 'formats']
3306
3493
takes_args = ['url?']
3307
3494
takes_options = [
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'),
3495
RegistryOption('format',
3496
help='Upgrade to a specific format. See "bzr help'
3497
' formats" for details.',
3498
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3499
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3500
value_switches=True, title='Branch format'),
3502
help='Remove the backup.bzr directory if successful.'),
3504
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3507
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3508
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3509
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3511
if len(exceptions) == 1:
3512
# Compatibility with historical behavior
3321
3518
class cmd_whoami(Command):
3340
3538
encoding_type = 'replace'
3342
3540
@display_command
3343
def run(self, email=False, branch=False, name=None):
3541
def run(self, email=False, branch=False, name=None, directory=None):
3344
3542
if name is None:
3345
# use branch if we're inside one; otherwise global config
3347
c = Branch.open_containing('.')[0].get_config()
3348
except errors.NotBranchError:
3349
c = config.GlobalConfig()
3543
if directory is None:
3544
# use branch if we're inside one; otherwise global config
3546
c = Branch.open_containing(u'.')[0].get_config()
3547
except errors.NotBranchError:
3548
c = _mod_config.GlobalConfig()
3550
c = Branch.open(directory).get_config()
3351
3552
self.outf.write(c.user_email() + '\n')
3353
3554
self.outf.write(c.username() + '\n')
3558
raise errors.BzrCommandError("--email can only be used to display existing "
3356
3561
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3563
_mod_config.extract_email_address(name)
3359
3564
except errors.NoEmailInUsername, e:
3360
3565
warning('"%s" does not seem to contain an email address. '
3361
3566
'This is allowed, but not recommended.', name)
3363
3568
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3570
if directory is None:
3571
c = Branch.open_containing(u'.')[0].get_config()
3573
c = Branch.open(directory).get_config()
3367
c = config.GlobalConfig()
3575
c = _mod_config.GlobalConfig()
3368
3576
c.set_user_option('email', name)
3436
3645
'bzr alias --remove expects an alias to remove.')
3437
3646
# If alias is not found, print something like:
3438
3647
# unalias: foo: not found
3439
c = config.GlobalConfig()
3648
c = _mod_config.GlobalConfig()
3440
3649
c.unset_alias(alias_name)
3442
3651
@display_command
3443
3652
def print_aliases(self):
3444
3653
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3654
aliases = _mod_config.GlobalConfig().get_aliases()
3446
3655
for key, value in sorted(aliases.iteritems()):
3447
3656
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3515
3727
if typestring == "sftp":
3516
3728
from bzrlib.tests import stub_sftp
3517
3729
return stub_sftp.SFTPAbsoluteServer
3518
if typestring == "memory":
3730
elif typestring == "memory":
3519
3731
from bzrlib.tests import test_server
3520
3732
return memory.MemoryServer
3521
if typestring == "fakenfs":
3733
elif typestring == "fakenfs":
3522
3734
from bzrlib.tests import test_server
3523
3735
return test_server.FakeNFSServer
3524
3736
msg = "No known transport type %s. Supported types are: sftp\n" %\
3537
3749
'throughout the test suite.',
3538
3750
type=get_transport_type),
3539
3751
Option('benchmark',
3540
help='Run the benchmarks rather than selftests.'),
3752
help='Run the benchmarks rather than selftests.',
3541
3754
Option('lsprof-timed',
3542
3755
help='Generate lsprof output for benchmarked'
3543
3756
' sections of code.'),
3544
3757
Option('lsprof-tests',
3545
3758
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3549
3759
Option('first',
3550
3760
help='Run all tests, but run specified tests first.',
3551
3761
short_name='f',
3560
3770
Option('randomize', type=str, argname="SEED",
3561
3771
help='Randomize the order of tests using the given'
3562
3772
' seed or "now" for the current time.'),
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
3773
ListOption('exclude', type=str, argname="PATTERN",
3775
help='Exclude tests that match this regular'
3567
3777
Option('subunit',
3568
3778
help='Output test progress via subunit.'),
3569
3779
Option('strict', help='Fail on missing dependencies or '
3586
3796
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3797
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
3799
first=False, list_only=False,
3590
3800
randomize=None, exclude=None, strict=False,
3591
3801
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
3802
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)
3803
from bzrlib import tests
3602
3805
if testspecs_list is not None:
3603
3806
pattern = '|'.join(testspecs_list)
3612
3815
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3816
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3817
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3818
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3819
# following code can be deleted when it's sufficiently deployed
3820
# -- vila/mgz 20100514
3821
if (sys.platform == "win32"
3822
and getattr(sys.stdout, 'fileno', None) is not None):
3617
3824
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3826
self.additional_selftest_args.setdefault(
3620
3827
'suite_decorators', []).append(parallel)
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)
3829
raise errors.BzrCommandError(
3830
"--benchmark is no longer supported from bzr 2.2; "
3831
"use bzr-usertest instead")
3832
test_suite_factory = None
3834
exclude_pattern = None
3629
test_suite_factory = None
3836
exclude_pattern = '(' + '|'.join(exclude) + ')'
3631
3837
selftest_kwargs = {"verbose": verbose,
3632
3838
"pattern": pattern,
3633
3839
"stop_on_failure": one,
3635
3841
"test_suite_factory": test_suite_factory,
3636
3842
"lsprof_timed": lsprof_timed,
3637
3843
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
3844
"matching_tests_first": first,
3640
3845
"list_only": list_only,
3641
3846
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3847
"exclude_pattern": exclude_pattern,
3643
3848
"strict": strict,
3644
3849
"load_list": load_list,
3645
3850
"debug_flags": debugflag,
3646
3851
"starting_with": starting_with
3648
3853
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3855
# Make deprecation warnings visible, unless -Werror is set
3856
cleanup = symbol_versioning.activate_deprecation_warnings(
3859
result = tests.selftest(**selftest_kwargs)
3650
3862
return int(not result)
3709
3919
The source of the merge can be specified either in the form of a branch,
3710
3920
or in the form of a path to a file containing a merge directive generated
3711
3921
with bzr send. If neither is specified, the default is the upstream 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.
3922
or the branch most recently merged using --remember. The source of the
3923
merge may also be specified in the form of a path to a file in another
3924
branch: in this case, only the modifications to that file are merged into
3925
the current working tree.
3927
When merging from a branch, by default bzr will try to merge in all new
3928
work from the other branch, automatically determining an appropriate base
3929
revision. If this fails, you may need to give an explicit base.
3931
To pick a different ending revision, pass "--revision OTHER". bzr will
3932
try to merge in all new work up to and including revision OTHER.
3934
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3935
through OTHER, excluding BASE but including OTHER, will be merged. If this
3936
causes some revisions to be skipped, i.e. if the destination branch does
3937
not already contain revision BASE, such a merge is commonly referred to as
3938
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
3939
cherrypicks. The changes look like a normal commit, and the history of the
3940
changes from the other branch is not stored in the commit.
3942
Revision numbers are always relative to the source branch.
3725
3944
Merge will do its best to combine the changes in two branches, but there
3726
3945
are some kinds of problems only a human can fix. When it encounters those,
3730
3949
Use bzr resolve when you have fixed a problem. See also bzr conflicts.
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.
3951
If there is no default branch set, the first merge will set it (use
3952
--no-remember to avoid setting it). After that, you can omit the branch
3953
to use the default. To change the default, use --remember. The value will
3954
only be saved if the remote location can be accessed.
3737
3956
The results of the merge are placed into the destination working
3738
3957
directory, where they can be reviewed (with bzr diff), tested, and then
3739
3958
committed to record the result of the merge.
3741
3960
merge refuses to run if there are any uncommitted changes, unless
3742
--force is given. The --force option can also be used to create a
3961
--force is given. If --force is given, then the changes from the source
3962
will be merged with the current working tree, including any uncommitted
3963
changes in the tree. The --force option can also be used to create a
3743
3964
merge revision which has more than two parents.
3745
3966
If one would like to merge changes from the working tree of the other
3793
4014
' completely merged into the source, pull from the'
3794
4015
' source rather than merging. When this happens,'
3795
4016
' you do not need to commit the result.'),
4017
custom_help('directory',
3797
4018
help='Branch to merge into, '
3798
'rather than the one containing the working directory.',
4019
'rather than the one containing the working directory.'),
3802
4020
Option('preview', help='Instead of merging, show a diff of the'
3804
4022
Option('interactive', help='Select changes interactively.',
3808
4026
def run(self, location=None, revision=None, force=False,
3809
merge_type=None, show_base=False, reprocess=None, remember=False,
4027
merge_type=None, show_base=False, reprocess=None, remember=None,
3810
4028
uncommitted=False, pull=False,
3811
4029
directory=None,
3873
4094
self.sanity_check_merger(merger)
3874
4095
if (merger.base_rev_id == merger.other_rev_id and
3875
4096
merger.other_rev_id is not None):
4097
# check if location is a nonexistent file (and not a branch) to
4098
# disambiguate the 'Nothing to do'
4099
if merger.interesting_files:
4100
if not merger.other_tree.has_filename(
4101
merger.interesting_files[0]):
4102
note("merger: " + str(merger))
4103
raise errors.PathsDoNotExist([location])
3876
4104
note('Nothing to do.')
4106
if pull and not preview:
3879
4107
if merger.interesting_files is not None:
3880
4108
raise errors.BzrCommandError('Cannot pull individual files')
3881
4109
if (merger.base_rev_id == tree.last_revision()):
3905
4133
def _do_preview(self, merger):
3906
4134
from bzrlib.diff import show_diff_trees
3907
4135
result_tree = self._get_preview(merger)
4136
path_encoding = osutils.get_diff_header_encoding()
3908
4137
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
4138
old_label='', new_label='',
4139
path_encoding=path_encoding)
3911
4141
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
4142
merger.change_reporter = change_reporter
3988
4218
if other_revision_id is None:
3989
4219
other_revision_id = _mod_revision.ensure_null(
3990
4220
other_branch.last_revision())
3991
# Remember where we merge from
3992
if ((remember or tree.branch.get_submit_branch() is None) and
3993
user_location is not None):
4221
# Remember where we merge from. We need to remember if:
4222
# - user specify a location (and we don't merge from the parent
4224
# - user ask to remember or there is no previous location set to merge
4225
# from and user didn't ask to *not* remember
4226
if (user_location is not None
4228
or (remember is None
4229
and tree.branch.get_submit_branch() is None)))):
3994
4230
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4231
# Merge tags (but don't set them in the master branch yet, the user
4232
# might revert this merge). Commit will propagate them.
4233
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4234
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4235
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4236
if other_path != '':
4167
4404
last committed revision is used.
4169
4406
To remove only some changes, without reverting to a prior version, use
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.
4407
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4408
will remove the changes introduced by the second last commit (-2), without
4409
affecting the changes introduced by the last commit (-1). To remove
4410
certain changes on a hunk-by-hunk basis, see the shelve command.
4174
4412
By default, any files that have been manually changed will be backed up
4175
4413
first. (Files changed only by merge are not backed up.) Backup files have
4340
4578
theirs_only=False,
4341
4579
log_format=None, long=False, short=False, line=False,
4342
4580
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4581
include_merges=False, revision=None, my_revision=None,
4344
4583
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4584
def message(s):
4346
4585
if not is_quiet():
4430
4667
if mine_only and not local_extra:
4431
4668
# We checked local, and found nothing extra
4432
message('This branch is up to date.\n')
4669
message('This branch has no new revisions.\n')
4433
4670
elif theirs_only and not remote_extra:
4434
4671
# We checked remote, and found nothing extra
4435
message('Other branch is up to date.\n')
4672
message('Other branch has no new revisions.\n')
4436
4673
elif not (mine_only or theirs_only or local_extra or
4438
4675
# We checked both branches, and neither one had extra
4507
4743
@display_command
4508
4744
def run(self, verbose=False):
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")
4745
from bzrlib import plugin
4746
# Don't give writelines a generator as some codecs don't like that
4747
self.outf.writelines(
4748
list(plugin.describe_plugins(show_paths=verbose)))
4531
4751
class cmd_testament(Command):
4578
4797
Option('long', help='Show commit date in annotations.'),
4582
4802
encoding_type = 'exact'
4584
4804
@display_command
4585
4805
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4806
show_ids=False, directory=None):
4807
from bzrlib.annotate import (
4588
4810
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4811
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4812
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4813
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4815
self.add_cleanup(branch.lock_read().unlock)
4596
4816
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4817
self.add_cleanup(tree.lock_read().unlock)
4818
if wt is not None and revision is None:
4600
4819
file_id = wt.path2id(relpath)
4602
4821
file_id = tree.path2id(relpath)
4603
4822
if file_id is None:
4604
4823
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
4824
if wt is not None and revision is None:
4607
4825
# If there is a tree and we're not annotating historical
4608
4826
# versions, annotate the working tree's content.
4609
4827
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
4828
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4830
annotate_file_tree(tree, file_id, self.outf, long, all,
4831
show_ids=show_ids, branch=branch)
4616
4834
class cmd_re_sign(Command):
4620
4838
hidden = True # is this right ?
4621
4839
takes_args = ['revision_id*']
4622
takes_options = ['revision']
4840
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
4842
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4843
if revision_id_list is not None and revision is not None:
4626
4844
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4627
4845
if revision_id_list is None and revision is None:
4628
4846
raise errors.BzrCommandError('You must supply either --revision or a revision_id')
4629
b = WorkingTree.open_containing(u'.')[0].branch
4631
self.add_cleanup(b.unlock)
4847
b = WorkingTree.open_containing(directory)[0].branch
4848
self.add_cleanup(b.lock_write().unlock)
4632
4849
return self._run(b, revision_id_list, revision)
4634
4851
def _run(self, b, revision_id_list, revision):
4694
4911
_see_also = ['checkouts', 'unbind']
4695
4912
takes_args = ['location?']
4913
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4915
def run(self, location=None, directory=u'.'):
4916
b, relpath = Branch.open_containing(directory)
4700
4917
if location is None:
4702
4919
location = b.get_old_bound_location()
4771
4990
encoding_type = 'replace'
4773
def run(self, location=None,
4774
dry_run=False, verbose=False,
4775
revision=None, force=False, local=False):
4992
def run(self, location=None, dry_run=False, verbose=False,
4993
revision=None, force=False, local=False, keep_tags=False):
4776
4994
if location is None:
4777
4995
location = u'.'
4778
4996
control, relpath = bzrdir.BzrDir.open_containing(location)
4784
5002
b = control.open_branch()
4786
5004
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5005
self.add_cleanup(tree.lock_write().unlock)
4791
self.add_cleanup(b.unlock)
4792
return self._run(b, tree, dry_run, verbose, revision, force, local=local)
5007
self.add_cleanup(b.lock_write().unlock)
5008
return self._run(b, tree, dry_run, verbose, revision, force,
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5011
def _run(self, b, tree, dry_run, verbose, revision, force, local,
4795
5013
from bzrlib.log import log_formatter, show_log
4796
5014
from bzrlib.uncommit import uncommit
4833
5051
self.outf.write('The above revision(s) will be removed.\n')
4836
if not ui.ui_factory.get_boolean('Are you sure'):
4837
self.outf.write('Canceled')
5054
if not ui.ui_factory.confirm_action(
5055
u'Uncommit these revisions',
5056
'bzrlib.builtins.uncommit',
5058
self.outf.write('Canceled\n')
4840
5061
mutter('Uncommitting from {%s} to {%s}',
4841
5062
last_rev_id, rev_id)
4842
5063
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
revno=revno, local=local)
5064
revno=revno, local=local, keep_tags=keep_tags)
4844
5065
self.outf.write('You can restore the old tip by running:\n'
4845
5066
' bzr pull . -r revid:%s\n' % last_rev_id)
4848
5069
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5070
__doc__ = """Break a dead lock.
5072
This command breaks a lock on a repository, branch, working directory or
4851
5075
CAUTION: Locks should only be broken when you are sure that the process
4852
5076
holding the lock has been stopped.
4859
5083
bzr break-lock bzr+ssh://example.com/bzr/foo
5084
bzr break-lock --conf ~/.bazaar
4861
5087
takes_args = ['location?']
5090
help='LOCATION is the directory where the config lock is.'),
5092
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5095
def run(self, location=None, config=False, force=False):
4864
5096
if location is None:
4865
5097
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5099
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5101
{'bzrlib.lockdir.break': True})
5103
conf = _mod_config.LockableConfig(file_name=location)
5106
control, relpath = bzrdir.BzrDir.open_containing(location)
5108
control.break_lock()
5109
except NotImplementedError:
4873
5113
class cmd_wait_until_signalled(Command):
4938
5177
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4939
5178
protocol=None):
4940
from bzrlib.transport import get_transport, transport_server_registry
5179
from bzrlib import transport
4941
5180
if directory is None:
4942
5181
directory = os.getcwd()
4943
5182
if protocol is None:
4944
protocol = transport_server_registry.get()
5183
protocol = transport.transport_server_registry.get()
4945
5184
host, port = self.get_host_and_port(port)
4946
5185
url = urlutils.local_path_to_url(directory)
4947
5186
if not allow_writes:
4948
5187
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5188
t = transport.get_transport(url)
5189
protocol(t, host, port, inet)
4953
5192
class cmd_join(Command):
5064
5304
encoding_type = 'exact'
5066
5306
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5067
sign=False, revision=None, mail_to=None, message=None):
5307
sign=False, revision=None, mail_to=None, message=None,
5068
5309
from bzrlib.revision import ensure_null, NULL_REVISION
5069
5310
include_patch, include_bundle = {
5070
5311
'plain': (False, False),
5071
5312
'diff': (True, False),
5072
5313
'bundle': (True, True),
5074
branch = Branch.open('.')
5315
branch = Branch.open(directory)
5075
5316
stored_submit_branch = branch.get_submit_branch()
5076
5317
if submit_branch is None:
5077
5318
submit_branch = stored_submit_branch
5153
5394
source branch defaults to that containing the working directory, but can
5154
5395
be changed using --from.
5397
Both the submit branch and the public branch follow the usual behavior with
5398
respect to --remember: If there is no default location set, the first send
5399
will set it (use --no-remember to avoid setting it). After that, you can
5400
omit the location to use the default. To change the default, use
5401
--remember. The value will only be saved if the location can be accessed.
5156
5403
In order to calculate those changes, bzr must analyse the submit branch.
5157
5404
Therefore it is most efficient for the submit branch to be a local mirror.
5158
5405
If a public location is known for the submit_branch, that location is used
5229
5476
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
no_patch=False, revision=None, remember=False, output=None,
5477
no_patch=False, revision=None, remember=None, output=None,
5231
5478
format=None, mail_to=None, message=None, body=None,
5232
5479
strict=None, **kwargs):
5233
5480
from bzrlib.send import send
5393
5636
_see_also = ['tag']
5394
5637
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5638
custom_help('directory',
5639
help='Branch whose tags should be displayed.'),
5640
RegistryOption('sort',
5401
5641
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5642
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
5648
@display_command
5649
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5650
from bzrlib.tag import tag_sort_methods
5416
5651
branch, relpath = Branch.open_containing(directory)
5418
5653
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
5657
self.add_cleanup(branch.lock_read().unlock)
5425
5659
graph = branch.repository.get_graph()
5426
5660
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5428
5662
# only show revisions between revid1 and revid2 (inclusive)
5429
5663
tags = [(tag, revid) for tag, revid in tags if
5430
5664
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]])
5666
sort = tag_sort_methods.get()
5444
5668
if not show_ids:
5445
5669
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
5670
for index, (tag, revid) in enumerate(tags):
5584
5809
def run(self, to_location=None, force=False, create_branch=False,
5810
revision=None, directory=u'.'):
5586
5811
from bzrlib import switch
5812
tree_location = directory
5588
5813
revision = _get_one_revision('switch', revision)
5589
5814
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
5815
if to_location is None:
5591
5816
if revision is None:
5592
5817
raise errors.BzrCommandError('You must supply either a'
5593
5818
' revision or a location')
5819
to_location = tree_location
5596
5821
branch = control_dir.open_branch()
5597
5822
had_explicit_nick = branch.get_config().has_explicit_nickname()
5868
6094
You can put multiple items on the shelf, and by default, 'unshelve' will
5869
6095
restore the most recently shelved changes.
6097
For complicated changes, it is possible to edit the changes in a separate
6098
editor program to decide what the file remaining in the working copy
6099
should look like. To do this, add the configuration option
6101
change_editor = PROGRAM @new_path @old_path
6103
where @new_path is replaced with the path of the new version of the
6104
file and @old_path is replaced with the path of the old version of
6105
the file. The PROGRAM should save the new file with the desired
6106
contents of the file in the working tree.
5872
6110
takes_args = ['file*']
5874
6112
takes_options = [
5876
6115
Option('all', help='Shelve all changes.'),
5883
6122
Option('destroy',
5884
6123
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6125
_see_also = ['unshelve', 'configuration']
5888
6127
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6128
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6130
return self.run_for_list(directory=directory)
5892
6131
from bzrlib.shelf_ui import Shelver
5893
6132
if writer is None:
5894
6133
writer = bzrlib.option.diff_writer_registry.get()
5896
6135
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6136
file_list, message, destroy=destroy, directory=directory)
5967
6208
To check what clean-tree will do, use --dry-run.
5969
takes_options = [Option('ignored', help='Delete all ignored files.'),
5970
Option('detritus', help='Delete conflict files, merge'
6210
takes_options = ['directory',
6211
Option('ignored', help='Delete all ignored files.'),
6212
Option('detritus', help='Delete conflict files, merge and revert'
5971
6213
' backups, and failed selftest dirs.'),
5972
6214
Option('unknown',
5973
6215
help='Delete files unknown to bzr (default).'),
5975
6217
' deleting them.'),
5976
6218
Option('force', help='Do not prompt before deleting.')]
5977
6219
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6220
force=False, directory=u'.'):
5979
6221
from bzrlib.clean_tree import clean_tree
5980
6222
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6226
clean_tree(directory, unknown=unknown, ignored=ignored,
6227
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6230
class cmd_reference(Command):
6032
6274
self.outf.write('%s %s\n' % (path, location))
6277
class cmd_export_pot(Command):
6278
__doc__ = """Export command helps and error messages in po format."""
6283
from bzrlib.export_pot import export_pot
6284
export_pot(self.outf)
6035
6287
def _register_lazy_builtins():
6036
6288
# register lazy builtins from other modules; called at startup and should
6037
6289
# be only called once.
6038
6290
for (name, aliases, module_name) in [
6039
6291
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6292
('cmd_config', [], 'bzrlib.config'),
6040
6293
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6294
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6295
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6296
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6297
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6298
('cmd_verify_signatures', [],
6299
'bzrlib.commit_signature_commands'),
6300
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6302
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
