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 settting 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
1113
do a merge (see bzr help merge) from the other branch, and commit that.
1078
1114
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.
1116
If there is no default push location set, the first push will set it (use
1117
--no-remember to avoid settting it). After that, you can omit the
1118
location to use the default. To change the default, use --remember. The
1119
value will only be saved if the remote location can be accessed.
1086
1122
_see_also = ['pull', 'update', 'working-trees']
1088
1124
Option('create-prefix',
1089
1125
help='Create the path leading up to the branch '
1090
1126
'if it does not already exist.'),
1127
custom_help('directory',
1092
1128
help='Branch to push from, '
1093
'rather than the one containing the working directory.',
1129
'rather than the one containing the working directory.'),
1097
1130
Option('use-existing-dir',
1098
1131
help='By default push will fail if the target'
1099
1132
' directory exists, but does not already'
1110
1143
Option('strict',
1111
1144
help='Refuse to push if there are uncommitted changes in'
1112
1145
' the working tree, --no-strict disables the check.'),
1147
help="Don't populate the working tree, even for protocols"
1148
" that support it."),
1114
1150
takes_args = ['location?']
1115
1151
encoding_type = 'replace'
1117
def run(self, location=None, remember=False, overwrite=False,
1153
def run(self, location=None, remember=None, overwrite=False,
1118
1154
create_prefix=False, verbose=False, revision=None,
1119
1155
use_existing_dir=False, directory=None, stacked_on=None,
1120
stacked=False, strict=None):
1156
stacked=False, strict=None, no_tree=False):
1121
1157
from bzrlib.push import _show_push_branch
1123
1159
if directory is None:
1164
1200
display_url = urlutils.unescape_for_display(stored_loc,
1165
1201
self.outf.encoding)
1166
self.outf.write("Using saved push location: %s\n" % display_url)
1202
note("Using saved push location: %s" % display_url)
1167
1203
location = stored_loc
1169
1205
_show_push_branch(br_from, revision_id, location, self.outf,
1170
1206
verbose=verbose, overwrite=overwrite, remember=remember,
1171
1207
stacked_on=stacked_on, create_prefix=create_prefix,
1172
use_existing_dir=use_existing_dir)
1208
use_existing_dir=use_existing_dir, no_tree=no_tree)
1175
1211
class cmd_branch(Command):
1185
1221
To retrieve the branch as of a particular revision, supply the --revision
1186
1222
parameter, as in "branch foo/bar -r 5".
1224
The synonyms 'clone' and 'get' for this command are deprecated.
1189
1227
_see_also = ['checkout']
1190
1228
takes_args = ['from_location', 'to_location?']
1191
takes_options = ['revision', Option('hardlink',
1192
help='Hard-link working tree files where possible.'),
1229
takes_options = ['revision',
1230
Option('hardlink', help='Hard-link working tree files where possible.'),
1231
Option('files-from', type=str,
1232
help="Get file contents from this tree."),
1193
1233
Option('no-tree',
1194
1234
help="Create a branch without a working-tree."),
1195
1235
Option('switch',
1214
1254
def run(self, from_location, to_location=None, revision=None,
1215
1255
hardlink=False, stacked=False, standalone=False, no_tree=False,
1216
use_existing_dir=False, switch=False, bind=False):
1256
use_existing_dir=False, switch=False, bind=False,
1217
1258
from bzrlib import switch as _mod_switch
1218
1259
from bzrlib.tag import _merge_tags_if_possible
1260
if self.invoked_as in ['get', 'clone']:
1261
ui.ui_factory.show_user_warning(
1262
'deprecated_command',
1263
deprecated_name=self.invoked_as,
1264
recommended_name='branch',
1265
deprecated_in_version='2.4')
1219
1266
accelerator_tree, br_from = bzrdir.BzrDir.open_tree_or_branch(
1268
if not (hardlink or files_from):
1269
# accelerator_tree is usually slower because you have to read N
1270
# files (no readahead, lots of seeks, etc), but allow the user to
1271
# explicitly request it
1272
accelerator_tree = None
1273
if files_from is not None and files_from != from_location:
1274
accelerator_tree = WorkingTree.open(files_from)
1221
1275
revision = _get_one_revision('branch', revision)
1223
self.add_cleanup(br_from.unlock)
1276
self.add_cleanup(br_from.lock_read().unlock)
1224
1277
if revision is not None:
1225
1278
revision_id = revision.as_revision_id(br_from)
1285
1338
urlutils.unescape_for_display(branch.base, 'utf-8'))
1341
class cmd_branches(Command):
1342
__doc__ = """List the branches available at the current location.
1344
This command will print the names of all the branches at the current location.
1347
takes_args = ['location?']
1349
def run(self, location="."):
1350
dir = bzrdir.BzrDir.open_containing(location)[0]
1351
for branch in dir.list_branches():
1352
if branch.name is None:
1353
self.outf.write(" (default)\n")
1355
self.outf.write(" %s\n" % branch.name.encode(self.outf.encoding))
1288
1358
class cmd_checkout(Command):
1289
1359
__doc__ = """Create a new checkout of an existing branch.
1331
1401
to_location = branch_location
1332
1402
accelerator_tree, source = bzrdir.BzrDir.open_tree_or_branch(
1333
1403
branch_location)
1404
if not (hardlink or files_from):
1405
# accelerator_tree is usually slower because you have to read N
1406
# files (no readahead, lots of seeks, etc), but allow the user to
1407
# explicitly request it
1408
accelerator_tree = None
1334
1409
revision = _get_one_revision('checkout', revision)
1335
if files_from is not None:
1410
if files_from is not None and files_from != branch_location:
1336
1411
accelerator_tree = WorkingTree.open(files_from)
1337
1412
if revision is not None:
1338
1413
revision_id = revision.as_revision_id(source)
1396
1469
If you want to discard your local changes, you can just do a
1397
1470
'bzr revert' instead of 'bzr commit' after the update.
1472
If you want to restore a file that has been removed locally, use
1473
'bzr revert' instead of 'bzr update'.
1399
1475
If the tree's branch is bound to a master branch, it will also update
1400
1476
the branch from the master.
1403
1479
_see_also = ['pull', 'working-trees', 'status-flags']
1404
1480
takes_args = ['dir?']
1405
takes_options = ['revision']
1481
takes_options = ['revision',
1483
help="Show base revision text in conflicts."),
1406
1485
aliases = ['up']
1408
def run(self, dir='.', revision=None):
1487
def run(self, dir='.', revision=None, show_base=None):
1409
1488
if revision is not None and len(revision) != 1:
1410
1489
raise errors.BzrCommandError(
1411
1490
"bzr update --revision takes exactly one revision")
1519
1599
class cmd_remove(Command):
1520
1600
__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.
1602
This makes Bazaar stop tracking changes to the specified files. Bazaar will
1603
delete them if they can easily be recovered using revert otherwise they
1604
will be backed up (adding an extention of the form .~#~). If no options or
1605
parameters are given Bazaar will scan for files that are being tracked by
1606
Bazaar but missing in your tree and stop tracking them for you.
1527
1608
takes_args = ['file*']
1528
1609
takes_options = ['verbose',
1530
1611
RegistryOption.from_kwargs('file-deletion-strategy',
1531
1612
'The file deletion mode to be used.',
1532
1613
title='Deletion Strategy', value_switches=True, enum_switch=False,
1533
safe='Only delete files if they can be'
1534
' safely recovered (default).',
1614
safe='Backup changed files (default).',
1535
1615
keep='Delete from bzr but leave the working copy.',
1616
no_backup='Don\'t backup changed files.',
1536
1617
force='Delete all the specified files, even if they can not be '
1537
'recovered and even if they are non-empty directories.')]
1618
'recovered and even if they are non-empty directories. '
1619
'(deprecated, use no-backup)')]
1538
1620
aliases = ['rm', 'del']
1539
1621
encoding_type = 'replace'
1541
1623
def run(self, file_list, verbose=False, new=False,
1542
1624
file_deletion_strategy='safe'):
1543
tree, file_list = tree_files(file_list)
1625
if file_deletion_strategy == 'force':
1626
note("(The --force option is deprecated, rather use --no-backup "
1628
file_deletion_strategy = 'no-backup'
1630
tree, file_list = WorkingTree.open_containing_paths(file_list)
1545
1632
if file_list is not None:
1546
1633
file_list = [f for f in file_list]
1549
self.add_cleanup(tree.unlock)
1635
self.add_cleanup(tree.lock_write().unlock)
1550
1636
# Heuristics should probably all move into tree.remove_smart or
1636
1722
_see_also = ['check']
1637
1723
takes_args = ['branch?']
1725
Option('canonicalize-chks',
1726
help='Make sure CHKs are in canonical form (repairs '
1639
def run(self, branch="."):
1731
def run(self, branch=".", canonicalize_chks=False):
1640
1732
from bzrlib.reconcile import reconcile
1641
1733
dir = bzrdir.BzrDir.open(branch)
1734
reconcile(dir, canonicalize_chks=canonicalize_chks)
1645
1737
class cmd_revision_history(Command):
1678
1770
last_revision = wt.last_revision()
1680
revision_ids = b.repository.get_ancestry(last_revision)
1682
for revision_id in revision_ids:
1772
self.add_cleanup(b.repository.lock_read().unlock)
1773
graph = b.repository.get_graph()
1774
revisions = [revid for revid, parents in
1775
graph.iter_ancestry([last_revision])]
1776
for revision_id in reversed(revisions):
1777
if _mod_revision.is_null(revision_id):
1683
1779
self.outf.write(revision_id + '\n')
1723
1819
Option('append-revisions-only',
1724
1820
help='Never change revnos or the existing log.'
1725
' Append revisions to it only.')
1821
' Append revisions to it only.'),
1823
'Create a branch without a working tree.')
1727
1825
def run(self, location=None, format=None, append_revisions_only=False,
1728
create_prefix=False):
1826
create_prefix=False, no_tree=False):
1729
1827
if format is None:
1730
1828
format = bzrdir.format_registry.make_bzrdir('default')
1731
1829
if location is None:
1985
2106
old_branch, new_branch,
1986
2107
specific_files, extra_trees) = get_trees_and_branches_to_diff_locked(
1987
2108
file_list, revision, old, new, self.add_cleanup, apply_view=True)
2109
# GNU diff on Windows uses ANSI encoding for filenames
2110
path_encoding = osutils.get_diff_header_encoding()
1988
2111
return show_diff_trees(old_tree, new_tree, sys.stdout,
1989
2112
specific_files=specific_files,
1990
2113
external_diff_options=diff_options,
1991
2114
old_label=old_label, new_label=new_label,
1992
extra_trees=extra_trees, using=using,
2115
extra_trees=extra_trees,
2116
path_encoding=path_encoding,
1993
2118
format_cls=format)
2003
2128
# level of effort but possibly much less IO. (Or possibly not,
2004
2129
# if the directories are very large...)
2005
2130
_see_also = ['status', 'ls']
2006
takes_options = ['show-ids']
2131
takes_options = ['directory', 'show-ids']
2008
2133
@display_command
2009
def run(self, show_ids=False):
2010
tree = WorkingTree.open_containing(u'.')[0]
2012
self.add_cleanup(tree.unlock)
2134
def run(self, show_ids=False, directory=u'.'):
2135
tree = WorkingTree.open_containing(directory)[0]
2136
self.add_cleanup(tree.lock_read().unlock)
2013
2137
old = tree.basis_tree()
2015
self.add_cleanup(old.unlock)
2138
self.add_cleanup(old.lock_read().unlock)
2016
2139
for path, ie in old.inventory.iter_entries():
2017
2140
if not tree.has_id(ie.file_id):
2018
2141
self.outf.write(path)
2030
2153
_see_also = ['status', 'ls']
2033
help='Write an ascii NUL (\\0) separator '
2034
'between files rather than a newline.')
2154
takes_options = ['directory', 'null']
2037
2156
@display_command
2038
def run(self, null=False):
2039
tree = WorkingTree.open_containing(u'.')[0]
2157
def run(self, null=False, directory=u'.'):
2158
tree = WorkingTree.open_containing(directory)[0]
2159
self.add_cleanup(tree.lock_read().unlock)
2040
2160
td = tree.changes_from(tree.basis_tree())
2041
2162
for path, id, kind, text_modified, meta_modified in td.modified:
2043
2164
self.outf.write(path + '\0')
2053
2174
_see_also = ['status', 'ls']
2056
help='Write an ascii NUL (\\0) separator '
2057
'between files rather than a newline.')
2175
takes_options = ['directory', 'null']
2060
2177
@display_command
2061
def run(self, null=False):
2062
wt = WorkingTree.open_containing(u'.')[0]
2064
self.add_cleanup(wt.unlock)
2178
def run(self, null=False, directory=u'.'):
2179
wt = WorkingTree.open_containing(directory)[0]
2180
self.add_cleanup(wt.lock_read().unlock)
2065
2181
basis = wt.basis_tree()
2067
self.add_cleanup(basis.unlock)
2182
self.add_cleanup(basis.lock_read().unlock)
2068
2183
basis_inv = basis.inventory
2069
2184
inv = wt.inventory
2070
2185
for file_id in inv:
2071
if file_id in basis_inv:
2186
if basis_inv.has_id(file_id):
2073
2188
if inv.is_root(file_id) and len(basis_inv) == 0:
2075
2190
path = inv.id2path(file_id)
2076
if not os.access(osutils.abspath(path), os.F_OK):
2191
if not os.access(osutils.pathjoin(wt.basedir, path), os.F_OK):
2079
2194
self.outf.write(path + '\0')
2279
2397
help='Show just the specified revision.'
2280
2398
' See also "help revisionspec".'),
2400
RegistryOption('authors',
2401
'What names to list as authors - first, all or committer.',
2403
lazy_registry=('bzrlib.log', 'author_list_registry'),
2282
2405
Option('levels',
2283
2406
short_name='n',
2284
2407
help='Number of levels to display - 0 for all, 1 for flat.',
2286
2409
type=_parse_levels),
2287
2410
Option('message',
2289
2411
help='Show revisions whose message matches this '
2290
2412
'regular expression.',
2292
2415
Option('limit',
2293
2416
short_name='l',
2294
2417
help='Limit the output to the first N revisions.',
2302
2425
Option('exclude-common-ancestry',
2303
2426
help='Display only the revisions that are not part'
2304
2427
' of both ancestries (require -rX..Y)'
2429
Option('signatures',
2430
help='Show digital signature validity'),
2433
help='Show revisions whose properties match this '
2436
ListOption('match-message',
2437
help='Show revisions whose message matches this '
2440
ListOption('match-committer',
2441
help='Show revisions whose committer matches this '
2444
ListOption('match-author',
2445
help='Show revisions whose authors match this '
2448
ListOption('match-bugs',
2449
help='Show revisions whose bugs match this '
2307
2453
encoding_type = 'replace'
2378
2530
dir, relpath = bzrdir.BzrDir.open_containing(location)
2379
2531
b = dir.open_branch()
2381
self.add_cleanup(b.unlock)
2532
self.add_cleanup(b.lock_read().unlock)
2382
2533
rev1, rev2 = _get_revision_range(revision, b, self.name())
2535
if b.get_config().validate_signatures_in_log():
2539
if not gpg.GPGStrategy.verify_signatures_available():
2540
raise errors.GpgmeNotInstalled(None)
2384
2542
# Decide on the type of delta & diff filtering to use
2385
2543
# TODO: add an --all-files option to make this configurable & consistent
2386
2544
if not verbose:
2528
2699
help='Recurse into subdirectories.'),
2529
2700
Option('from-root',
2530
2701
help='Print paths relative to the root of the branch.'),
2531
Option('unknown', help='Print unknown files.'),
2702
Option('unknown', short_name='u',
2703
help='Print unknown files.'),
2532
2704
Option('versioned', help='Print versioned files.',
2533
2705
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.'),
2706
Option('ignored', short_name='i',
2707
help='Print ignored files.'),
2708
Option('kind', short_name='k',
2539
2709
help='List entries of a particular kind: file, directory, symlink.',
2543
2715
@display_command
2544
2716
def run(self, revision=None, verbose=False,
2545
2717
recursive=False, from_root=False,
2546
2718
unknown=False, versioned=False, ignored=False,
2547
null=False, kind=None, show_ids=False, path=None):
2719
null=False, kind=None, show_ids=False, path=None, directory=None):
2549
2721
if kind and kind not in ('file', 'directory', 'symlink'):
2550
2722
raise errors.BzrCommandError('invalid kind specified')
2713
2894
_see_also = ['status', 'ignored', 'patterns']
2714
2895
takes_args = ['name_pattern*']
2896
takes_options = ['directory',
2716
2897
Option('default-rules',
2717
2898
help='Display the default ignore rules that bzr uses.')
2720
def run(self, name_pattern_list=None, default_rules=None):
2901
def run(self, name_pattern_list=None, default_rules=None,
2721
2903
from bzrlib import ignores
2722
2904
if default_rules is not None:
2723
2905
# dump the default rules and exit
2729
2911
"NAME_PATTERN or --default-rules.")
2730
2912
name_pattern_list = [globbing.normalize_pattern(p)
2731
2913
for p in name_pattern_list]
2915
for p in name_pattern_list:
2916
if not globbing.Globster.is_pattern_valid(p):
2917
bad_patterns += ('\n %s' % p)
2919
msg = ('Invalid ignore pattern(s) found. %s' % bad_patterns)
2920
ui.ui_factory.show_error(msg)
2921
raise errors.InvalidPattern('')
2732
2922
for name_pattern in name_pattern_list:
2733
2923
if (name_pattern[0] == '/' or
2734
2924
(len(name_pattern) > 1 and name_pattern[1] == ':')):
2735
2925
raise errors.BzrCommandError(
2736
2926
"NAME_PATTERN should not be an absolute path")
2737
tree, relpath = WorkingTree.open_containing(u'.')
2927
tree, relpath = WorkingTree.open_containing(directory)
2738
2928
ignores.tree_ignores_add_patterns(tree, name_pattern_list)
2739
2929
ignored = globbing.Globster(name_pattern_list)
2931
self.add_cleanup(tree.lock_read().unlock)
2742
2932
for entry in tree.list_files():
2744
2934
if id is not None:
2745
2935
filename = entry[0]
2746
2936
if ignored.match(filename):
2747
2937
matches.append(filename)
2749
2938
if len(matches) > 0:
2750
2939
self.outf.write("Warning: the following files are version controlled and"
2751
2940
" match your ignore pattern:\n%s"
2767
2956
encoding_type = 'replace'
2768
2957
_see_also = ['ignore', 'ls']
2958
takes_options = ['directory']
2770
2960
@display_command
2772
tree = WorkingTree.open_containing(u'.')[0]
2774
self.add_cleanup(tree.unlock)
2961
def run(self, directory=u'.'):
2962
tree = WorkingTree.open_containing(directory)[0]
2963
self.add_cleanup(tree.lock_read().unlock)
2775
2964
for path, file_class, kind, file_id, entry in tree.list_files():
2776
2965
if file_class != 'I':
2844
3035
'revision in which it was changed.'),
2846
3037
def run(self, dest, branch_or_subdir=None, revision=None, format=None,
2847
root=None, filters=False, per_file_timestamps=False):
3038
root=None, filters=False, per_file_timestamps=False, directory=u'.'):
2848
3039
from bzrlib.export import export
2850
3041
if branch_or_subdir is None:
2851
tree = WorkingTree.open_containing(u'.')[0]
3042
tree = WorkingTree.open_containing(directory)[0]
2852
3043
b = tree.branch
2885
3076
@display_command
2886
3077
def run(self, filename, revision=None, name_from_revision=False,
3078
filters=False, directory=None):
2888
3079
if revision is not None and len(revision) != 1:
2889
3080
raise errors.BzrCommandError("bzr cat --revision takes exactly"
2890
3081
" one revision specifier")
2891
3082
tree, branch, relpath = \
2892
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
2894
self.add_cleanup(branch.unlock)
3083
_open_directory_or_containing_tree_or_branch(filename, directory)
3084
self.add_cleanup(branch.lock_read().unlock)
2895
3085
return self._run(tree, branch, relpath, filename, revision,
2896
3086
name_from_revision, filters)
2912
3105
"%r is not present in revision %s" % (
2913
3106
filename, rev_tree.get_revision_id()))
2915
content = rev_tree.get_file_text(old_file_id)
3108
actual_file_id = old_file_id
2917
3110
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
3111
if cur_file_id is not None and rev_tree.has_id(cur_file_id):
3112
actual_file_id = cur_file_id
3113
elif old_file_id is not None:
3114
actual_file_id = old_file_id
2933
3116
raise errors.BzrCommandError(
2934
3117
"%r is not present in revision %s" % (
2935
3118
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)
3120
from bzrlib.filter_tree import ContentFilterTree
3121
filter_tree = ContentFilterTree(rev_tree,
3122
rev_tree._content_filter_stack)
3123
content = filter_tree.get_file_text(actual_file_id)
2949
self.outf.write(content)
3125
content = rev_tree.get_file_text(actual_file_id)
3127
self.outf.write(content)
2952
3130
class cmd_local_time_offset(Command):
3013
3191
to trigger updates to external systems like bug trackers. The --fixes
3014
3192
option can be used to record the association between a revision and
3015
3193
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
3196
_see_also = ['add', 'bugs', 'hooks', 'uncommit']
3044
3197
takes_args = ['selected*']
3101
3258
def run(self, message=None, file=None, verbose=False, selected_list=None,
3102
3259
unchanged=False, strict=False, local=False, fixes=None,
3103
author=None, show_diff=False, exclude=None, commit_time=None):
3260
author=None, show_diff=False, exclude=None, commit_time=None,
3104
3262
from bzrlib.errors import (
3105
3263
PointlessCommit,
3106
3264
ConflictsInTree,
3120
3279
raise errors.BzrCommandError(
3121
3280
"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
3282
properties = {}
3131
tree, selected_list = tree_files(selected_list)
3284
tree, selected_list = WorkingTree.open_containing_paths(selected_list)
3132
3285
if selected_list == ['']:
3133
3286
# workaround - commit of root of tree should be exactly the same
3134
3287
# as just default commit in that tree, and succeed even though
3184
3340
# make_commit_message_template_encoded returns user encoding.
3185
3341
# 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)
3343
my_message = set_commit_message(commit_obj)
3344
if my_message is None:
3345
start_message = generate_commit_message_template(commit_obj)
3346
my_message = edit_commit_message_encoded(text,
3347
start_message=start_message)
3190
3348
if my_message is None:
3191
3349
raise errors.BzrCommandError("please specify a commit"
3192
3350
" message with either --message or --file")
3193
if my_message == "":
3194
raise errors.BzrCommandError("empty commit message specified")
3351
if my_message == "":
3352
raise errors.BzrCommandError("Empty commit message specified."
3353
" Please specify a commit message with either"
3354
" --message or --file or leave a blank message"
3355
" with --message \"\".")
3195
3356
return my_message
3197
3358
# The API permits a commit with a filter of [] to mean 'select nothing'
3205
3366
reporter=None, verbose=verbose, revprops=properties,
3206
3367
authors=author, timestamp=commit_stamp,
3207
3368
timezone=offset,
3208
exclude=safe_relpath_files(tree, exclude))
3369
exclude=tree.safe_relpath_files(exclude),
3209
3371
except PointlessCommit:
3210
3372
raise errors.BzrCommandError("No changes to commit."
3211
" Use --unchanged to commit anyhow.")
3373
" Please 'bzr add' the files you want to commit, or use"
3374
" --unchanged to force an empty commit.")
3212
3375
except ConflictsInTree:
3213
3376
raise errors.BzrCommandError('Conflicts detected in working '
3214
3377
'tree. Use "bzr conflicts" to list, "bzr resolve FILE" to'
3297
3460
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.
3461
__doc__ = """Upgrade a repository, branch or working tree to a newer format.
3463
When the default format has changed after a major new release of
3464
Bazaar, you may be informed during certain operations that you
3465
should upgrade. Upgrading to a newer format may improve performance
3466
or make new features available. It may however limit interoperability
3467
with older repositories or with older versions of Bazaar.
3469
If you wish to upgrade to a particular format rather than the
3470
current default, that can be specified using the --format option.
3471
As a consequence, you can use the upgrade command this way to
3472
"downgrade" to an earlier format, though some conversions are
3473
a one way process (e.g. changing from the 1.x default to the
3474
2.x default) so downgrading is not always possible.
3476
A backup.bzr.~#~ directory is created at the start of the conversion
3477
process (where # is a number). By default, this is left there on
3478
completion. If the conversion fails, delete the new .bzr directory
3479
and rename this one back in its place. Use the --clean option to ask
3480
for the backup.bzr directory to be removed on successful conversion.
3481
Alternatively, you can delete it by hand if everything looks good
3484
If the location given is a shared repository, dependent branches
3485
are also converted provided the repository converts successfully.
3486
If the conversion of a branch fails, remaining branches are still
3489
For more information on upgrades, see the Bazaar Upgrade Guide,
3490
http://doc.bazaar.canonical.com/latest/en/upgrade-guide/.
3305
_see_also = ['check']
3493
_see_also = ['check', 'reconcile', 'formats']
3306
3494
takes_args = ['url?']
3307
3495
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'),
3496
RegistryOption('format',
3497
help='Upgrade to a specific format. See "bzr help'
3498
' formats" for details.',
3499
lazy_registry=('bzrlib.bzrdir', 'format_registry'),
3500
converter=lambda name: bzrdir.format_registry.make_bzrdir(name),
3501
value_switches=True, title='Branch format'),
3503
help='Remove the backup.bzr directory if successful.'),
3505
help="Show what would be done, but don't actually do anything."),
3316
def run(self, url='.', format=None):
3508
def run(self, url='.', format=None, clean=False, dry_run=False):
3317
3509
from bzrlib.upgrade import upgrade
3318
upgrade(url, format)
3510
exceptions = upgrade(url, format, clean_up=clean, dry_run=dry_run)
3512
if len(exceptions) == 1:
3513
# Compatibility with historical behavior
3321
3519
class cmd_whoami(Command):
3340
3539
encoding_type = 'replace'
3342
3541
@display_command
3343
def run(self, email=False, branch=False, name=None):
3542
def run(self, email=False, branch=False, name=None, directory=None):
3344
3543
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()
3544
if directory is None:
3545
# use branch if we're inside one; otherwise global config
3547
c = Branch.open_containing(u'.')[0].get_config()
3548
except errors.NotBranchError:
3549
c = _mod_config.GlobalConfig()
3551
c = Branch.open(directory).get_config()
3351
3553
self.outf.write(c.user_email() + '\n')
3353
3555
self.outf.write(c.username() + '\n')
3559
raise errors.BzrCommandError("--email can only be used to display existing "
3356
3562
# display a warning if an email address isn't included in the given name.
3358
config.extract_email_address(name)
3564
_mod_config.extract_email_address(name)
3359
3565
except errors.NoEmailInUsername, e:
3360
3566
warning('"%s" does not seem to contain an email address. '
3361
3567
'This is allowed, but not recommended.', name)
3363
3569
# use global config unless --branch given
3365
c = Branch.open_containing('.')[0].get_config()
3571
if directory is None:
3572
c = Branch.open_containing(u'.')[0].get_config()
3574
c = Branch.open(directory).get_config()
3367
c = config.GlobalConfig()
3576
c = _mod_config.GlobalConfig()
3368
3577
c.set_user_option('email', name)
3436
3646
'bzr alias --remove expects an alias to remove.')
3437
3647
# If alias is not found, print something like:
3438
3648
# unalias: foo: not found
3439
c = config.GlobalConfig()
3649
c = _mod_config.GlobalConfig()
3440
3650
c.unset_alias(alias_name)
3442
3652
@display_command
3443
3653
def print_aliases(self):
3444
3654
"""Print out the defined aliases in a similar format to bash."""
3445
aliases = config.GlobalConfig().get_aliases()
3655
aliases = _mod_config.GlobalConfig().get_aliases()
3446
3656
for key, value in sorted(aliases.iteritems()):
3447
3657
self.outf.write('bzr alias %s="%s"\n' % (key, value))
3515
3728
if typestring == "sftp":
3516
3729
from bzrlib.tests import stub_sftp
3517
3730
return stub_sftp.SFTPAbsoluteServer
3518
if typestring == "memory":
3731
elif typestring == "memory":
3519
3732
from bzrlib.tests import test_server
3520
3733
return memory.MemoryServer
3521
if typestring == "fakenfs":
3734
elif typestring == "fakenfs":
3522
3735
from bzrlib.tests import test_server
3523
3736
return test_server.FakeNFSServer
3524
3737
msg = "No known transport type %s. Supported types are: sftp\n" %\
3537
3750
'throughout the test suite.',
3538
3751
type=get_transport_type),
3539
3752
Option('benchmark',
3540
help='Run the benchmarks rather than selftests.'),
3753
help='Run the benchmarks rather than selftests.',
3541
3755
Option('lsprof-timed',
3542
3756
help='Generate lsprof output for benchmarked'
3543
3757
' sections of code.'),
3544
3758
Option('lsprof-tests',
3545
3759
help='Generate lsprof output for each test.'),
3546
Option('cache-dir', type=str,
3547
help='Cache intermediate benchmark output in this '
3549
3760
Option('first',
3550
3761
help='Run all tests, but run specified tests first.',
3551
3762
short_name='f',
3560
3771
Option('randomize', type=str, argname="SEED",
3561
3772
help='Randomize the order of tests using the given'
3562
3773
' seed or "now" for the current time.'),
3563
Option('exclude', type=str, argname="PATTERN",
3565
help='Exclude tests that match this regular'
3774
ListOption('exclude', type=str, argname="PATTERN",
3776
help='Exclude tests that match this regular'
3567
3778
Option('subunit',
3568
3779
help='Output test progress via subunit.'),
3569
3780
Option('strict', help='Fail on missing dependencies or '
3586
3797
def run(self, testspecs_list=None, verbose=False, one=False,
3587
3798
transport=None, benchmark=None,
3588
lsprof_timed=None, cache_dir=None,
3589
3800
first=False, list_only=False,
3590
3801
randomize=None, exclude=None, strict=False,
3591
3802
load_list=None, debugflag=None, starting_with=None, subunit=False,
3592
3803
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)
3804
from bzrlib import tests
3602
3806
if testspecs_list is not None:
3603
3807
pattern = '|'.join(testspecs_list)
3612
3816
self.additional_selftest_args['runner_class'] = SubUnitBzrRunner
3613
3817
# On Windows, disable automatic conversion of '\n' to '\r\n' in
3614
3818
# stdout, which would corrupt the subunit stream.
3615
if sys.platform == "win32" and sys.stdout.fileno() >= 0:
3819
# FIXME: This has been fixed in subunit trunk (>0.0.5) so the
3820
# following code can be deleted when it's sufficiently deployed
3821
# -- vila/mgz 20100514
3822
if (sys.platform == "win32"
3823
and getattr(sys.stdout, 'fileno', None) is not None):
3617
3825
msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
3619
3827
self.additional_selftest_args.setdefault(
3620
3828
'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)
3830
raise errors.BzrCommandError(
3831
"--benchmark is no longer supported from bzr 2.2; "
3832
"use bzr-usertest instead")
3833
test_suite_factory = None
3835
exclude_pattern = None
3629
test_suite_factory = None
3837
exclude_pattern = '(' + '|'.join(exclude) + ')'
3631
3838
selftest_kwargs = {"verbose": verbose,
3632
3839
"pattern": pattern,
3633
3840
"stop_on_failure": one,
3635
3842
"test_suite_factory": test_suite_factory,
3636
3843
"lsprof_timed": lsprof_timed,
3637
3844
"lsprof_tests": lsprof_tests,
3638
"bench_history": benchfile,
3639
3845
"matching_tests_first": first,
3640
3846
"list_only": list_only,
3641
3847
"random_seed": randomize,
3642
"exclude_pattern": exclude,
3848
"exclude_pattern": exclude_pattern,
3643
3849
"strict": strict,
3644
3850
"load_list": load_list,
3645
3851
"debug_flags": debugflag,
3646
3852
"starting_with": starting_with
3648
3854
selftest_kwargs.update(self.additional_selftest_args)
3649
result = selftest(**selftest_kwargs)
3856
# Make deprecation warnings visible, unless -Werror is set
3857
cleanup = symbol_versioning.activate_deprecation_warnings(
3860
result = tests.selftest(**selftest_kwargs)
3650
3863
return int(not result)
3709
3920
The source of the merge can be specified either in the form of a branch,
3710
3921
or in the form of a path to a file containing a merge directive generated
3711
3922
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.
3923
or the branch most recently merged using --remember. The source of the
3924
merge may also be specified in the form of a path to a file in another
3925
branch: in this case, only the modifications to that file are merged into
3926
the current working tree.
3928
When merging from a branch, by default bzr will try to merge in all new
3929
work from the other branch, automatically determining an appropriate base
3930
revision. If this fails, you may need to give an explicit base.
3932
To pick a different ending revision, pass "--revision OTHER". bzr will
3933
try to merge in all new work up to and including revision OTHER.
3935
If you specify two values, "--revision BASE..OTHER", only revisions BASE
3936
through OTHER, excluding BASE but including OTHER, will be merged. If this
3937
causes some revisions to be skipped, i.e. if the destination branch does
3938
not already contain revision BASE, such a merge is commonly referred to as
3939
a "cherrypick". Unlike a normal merge, Bazaar does not currently track
3940
cherrypicks. The changes look like a normal commit, and the history of the
3941
changes from the other branch is not stored in the commit.
3943
Revision numbers are always relative to the source branch.
3725
3945
Merge will do its best to combine the changes in two branches, but there
3726
3946
are some kinds of problems only a human can fix. When it encounters those,
3730
3950
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.
3952
If there is no default branch set, the first merge will set it (use
3953
--no-remember to avoid settting it). After that, you can omit the branch
3954
to use the default. To change the default, use --remember. The value will
3955
only be saved if the remote location can be accessed.
3737
3957
The results of the merge are placed into the destination working
3738
3958
directory, where they can be reviewed (with bzr diff), tested, and then
3739
3959
committed to record the result of the merge.
3741
3961
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
3962
--force is given. If --force is given, then the changes from the source
3963
will be merged with the current working tree, including any uncommitted
3964
changes in the tree. The --force option can also be used to create a
3743
3965
merge revision which has more than two parents.
3745
3967
If one would like to merge changes from the working tree of the other
3793
4015
' completely merged into the source, pull from the'
3794
4016
' source rather than merging. When this happens,'
3795
4017
' you do not need to commit the result.'),
4018
custom_help('directory',
3797
4019
help='Branch to merge into, '
3798
'rather than the one containing the working directory.',
4020
'rather than the one containing the working directory.'),
3802
4021
Option('preview', help='Instead of merging, show a diff of the'
3804
4023
Option('interactive', help='Select changes interactively.',
3808
4027
def run(self, location=None, revision=None, force=False,
3809
merge_type=None, show_base=False, reprocess=None, remember=False,
4028
merge_type=None, show_base=False, reprocess=None, remember=None,
3810
4029
uncommitted=False, pull=False,
3811
4030
directory=None,
3873
4095
self.sanity_check_merger(merger)
3874
4096
if (merger.base_rev_id == merger.other_rev_id and
3875
4097
merger.other_rev_id is not None):
4098
# check if location is a nonexistent file (and not a branch) to
4099
# disambiguate the 'Nothing to do'
4100
if merger.interesting_files:
4101
if not merger.other_tree.has_filename(
4102
merger.interesting_files[0]):
4103
note("merger: " + str(merger))
4104
raise errors.PathsDoNotExist([location])
3876
4105
note('Nothing to do.')
4107
if pull and not preview:
3879
4108
if merger.interesting_files is not None:
3880
4109
raise errors.BzrCommandError('Cannot pull individual files')
3881
4110
if (merger.base_rev_id == tree.last_revision()):
3905
4134
def _do_preview(self, merger):
3906
4135
from bzrlib.diff import show_diff_trees
3907
4136
result_tree = self._get_preview(merger)
4137
path_encoding = osutils.get_diff_header_encoding()
3908
4138
show_diff_trees(merger.this_tree, result_tree, self.outf,
3909
old_label='', new_label='')
4139
old_label='', new_label='',
4140
path_encoding=path_encoding)
3911
4142
def _do_merge(self, merger, change_reporter, allow_pending, verified):
3912
4143
merger.change_reporter = change_reporter
3988
4219
if other_revision_id is None:
3989
4220
other_revision_id = _mod_revision.ensure_null(
3990
4221
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):
4222
# Remember where we merge from. We need to remember if:
4223
# - user specify a location (and we don't merge from the parent
4225
# - user ask to remember or there is no previous location set to merge
4226
# from and user didn't ask to *not* remember
4227
if (user_location is not None
4229
or (remember is None
4230
and tree.branch.get_submit_branch() is None)))):
3994
4231
tree.branch.set_submit_branch(other_branch.base)
3995
_merge_tags_if_possible(other_branch, tree.branch)
4232
# Merge tags (but don't set them in the master branch yet, the user
4233
# might revert this merge). Commit will propagate them.
4234
_merge_tags_if_possible(other_branch, tree.branch, ignore_master=True)
3996
4235
merger = _mod_merge.Merger.from_revision_ids(pb, tree,
3997
4236
other_revision_id, base_revision_id, other_branch, base_branch)
3998
4237
if other_path != '':
4167
4405
last committed revision is used.
4169
4407
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.
4408
merge instead. For example, "merge . -r -2..-3" (don't forget the ".")
4409
will remove the changes introduced by the second last commit (-2), without
4410
affecting the changes introduced by the last commit (-1). To remove
4411
certain changes on a hunk-by-hunk basis, see the shelve command.
4174
4413
By default, any files that have been manually changed will be backed up
4175
4414
first. (Files changed only by merge are not backed up.) Backup files have
4340
4579
theirs_only=False,
4341
4580
log_format=None, long=False, short=False, line=False,
4342
4581
show_ids=False, verbose=False, this=False, other=False,
4343
include_merges=False, revision=None, my_revision=None):
4582
include_merges=False, revision=None, my_revision=None,
4344
4584
from bzrlib.missing import find_unmerged, iter_log_revisions
4345
4585
def message(s):
4346
4586
if not is_quiet():
4507
4744
@display_command
4508
4745
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")
4746
from bzrlib import plugin
4747
# Don't give writelines a generator as some codecs don't like that
4748
self.outf.writelines(
4749
list(plugin.describe_plugins(show_paths=verbose)))
4531
4752
class cmd_testament(Command):
4578
4798
Option('long', help='Show commit date in annotations.'),
4582
4803
encoding_type = 'exact'
4584
4805
@display_command
4585
4806
def run(self, filename, all=False, long=False, revision=None,
4587
from bzrlib.annotate import annotate_file, annotate_file_tree
4807
show_ids=False, directory=None):
4808
from bzrlib.annotate import (
4588
4811
wt, branch, relpath = \
4589
bzrdir.BzrDir.open_containing_tree_or_branch(filename)
4812
_open_directory_or_containing_tree_or_branch(filename, directory)
4590
4813
if wt is not None:
4592
self.add_cleanup(wt.unlock)
4814
self.add_cleanup(wt.lock_read().unlock)
4595
self.add_cleanup(branch.unlock)
4816
self.add_cleanup(branch.lock_read().unlock)
4596
4817
tree = _get_one_revision_tree('annotate', revision, branch=branch)
4598
self.add_cleanup(tree.unlock)
4818
self.add_cleanup(tree.lock_read().unlock)
4819
if wt is not None and revision is None:
4600
4820
file_id = wt.path2id(relpath)
4602
4822
file_id = tree.path2id(relpath)
4603
4823
if file_id is None:
4604
4824
raise errors.NotVersionedError(filename)
4605
file_version = tree.inventory[file_id].revision
4606
4825
if wt is not None and revision is None:
4607
4826
# If there is a tree and we're not annotating historical
4608
4827
# versions, annotate the working tree's content.
4609
4828
annotate_file_tree(wt, file_id, self.outf, long, all,
4610
4829
show_ids=show_ids)
4612
annotate_file(branch, file_version, file_id, long, all, self.outf,
4831
annotate_file_tree(tree, file_id, self.outf, long, all,
4832
show_ids=show_ids, branch=branch)
4616
4835
class cmd_re_sign(Command):
4620
4839
hidden = True # is this right ?
4621
4840
takes_args = ['revision_id*']
4622
takes_options = ['revision']
4841
takes_options = ['directory', 'revision']
4624
def run(self, revision_id_list=None, revision=None):
4843
def run(self, revision_id_list=None, revision=None, directory=u'.'):
4625
4844
if revision_id_list is not None and revision is not None:
4626
4845
raise errors.BzrCommandError('You can only supply one of revision_id or --revision')
4627
4846
if revision_id_list is None and revision is None:
4628
4847
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)
4848
b = WorkingTree.open_containing(directory)[0].branch
4849
self.add_cleanup(b.lock_write().unlock)
4632
4850
return self._run(b, revision_id_list, revision)
4634
4852
def _run(self, b, revision_id_list, revision):
4694
4912
_see_also = ['checkouts', 'unbind']
4695
4913
takes_args = ['location?']
4914
takes_options = ['directory']
4698
def run(self, location=None):
4699
b, relpath = Branch.open_containing(u'.')
4916
def run(self, location=None, directory=u'.'):
4917
b, relpath = Branch.open_containing(directory)
4700
4918
if location is None:
4702
4920
location = b.get_old_bound_location()
4784
5004
b = control.open_branch()
4786
5006
if tree is not None:
4788
self.add_cleanup(tree.unlock)
5007
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)
5009
self.add_cleanup(b.lock_write().unlock)
5010
return self._run(b, tree, dry_run, verbose, revision, force,
5011
keep_tags, local=local)
4794
def _run(self, b, tree, dry_run, verbose, revision, force, local=False):
5013
def _run(self, b, tree, dry_run, verbose, revision, force, keep_tags,
4795
5015
from bzrlib.log import log_formatter, show_log
4796
5016
from bzrlib.uncommit import uncommit
4833
5053
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')
5056
if not ui.ui_factory.confirm_action(
5057
u'Uncommit these revisions',
5058
'bzrlib.builtins.uncommit',
5060
self.outf.write('Canceled\n')
4840
5063
mutter('Uncommitting from {%s} to {%s}',
4841
5064
last_rev_id, rev_id)
4842
5065
uncommit(b, tree=tree, dry_run=dry_run, verbose=verbose,
4843
revno=revno, local=local)
5066
revno=revno, local=local, keep_tags=keep_tags)
4844
5067
self.outf.write('You can restore the old tip by running:\n'
4845
5068
' bzr pull . -r revid:%s\n' % last_rev_id)
4848
5071
class cmd_break_lock(Command):
4849
__doc__ = """Break a dead lock on a repository, branch or working directory.
5072
__doc__ = """Break a dead lock.
5074
This command breaks a lock on a repository, branch, working directory or
4851
5077
CAUTION: Locks should only be broken when you are sure that the process
4852
5078
holding the lock has been stopped.
4859
5085
bzr break-lock bzr+ssh://example.com/bzr/foo
5086
bzr break-lock --conf ~/.bazaar
4861
5089
takes_args = ['location?']
5092
help='LOCATION is the directory where the config lock is.'),
5094
help='Do not ask for confirmation before breaking the lock.'),
4863
def run(self, location=None, show=False):
5097
def run(self, location=None, config=False, force=False):
4864
5098
if location is None:
4865
5099
location = u'.'
4866
control, relpath = bzrdir.BzrDir.open_containing(location)
4868
control.break_lock()
4869
except NotImplementedError:
5101
ui.ui_factory = ui.ConfirmationUserInterfacePolicy(ui.ui_factory,
5103
{'bzrlib.lockdir.break': True})
5105
conf = _mod_config.LockableConfig(file_name=location)
5108
control, relpath = bzrdir.BzrDir.open_containing(location)
5110
control.break_lock()
5111
except NotImplementedError:
4873
5115
class cmd_wait_until_signalled(Command):
4938
5179
def run(self, port=None, inet=False, directory=None, allow_writes=False,
4939
5180
protocol=None):
4940
from bzrlib.transport import get_transport, transport_server_registry
5181
from bzrlib import transport
4941
5182
if directory is None:
4942
5183
directory = os.getcwd()
4943
5184
if protocol is None:
4944
protocol = transport_server_registry.get()
5185
protocol = transport.transport_server_registry.get()
4945
5186
host, port = self.get_host_and_port(port)
4946
5187
url = urlutils.local_path_to_url(directory)
4947
5188
if not allow_writes:
4948
5189
url = 'readonly+' + url
4949
transport = get_transport(url)
4950
protocol(transport, host, port, inet)
5190
t = transport.get_transport(url)
5191
protocol(t, host, port, inet)
4953
5194
class cmd_join(Command):
5064
5306
encoding_type = 'exact'
5066
5308
def run(self, submit_branch=None, public_branch=None, patch_type='bundle',
5067
sign=False, revision=None, mail_to=None, message=None):
5309
sign=False, revision=None, mail_to=None, message=None,
5068
5311
from bzrlib.revision import ensure_null, NULL_REVISION
5069
5312
include_patch, include_bundle = {
5070
5313
'plain': (False, False),
5071
5314
'diff': (True, False),
5072
5315
'bundle': (True, True),
5074
branch = Branch.open('.')
5317
branch = Branch.open(directory)
5075
5318
stored_submit_branch = branch.get_submit_branch()
5076
5319
if submit_branch is None:
5077
5320
submit_branch = stored_submit_branch
5153
5396
source branch defaults to that containing the working directory, but can
5154
5397
be changed using --from.
5399
Both the submit branch and the public branch follow the usual behavior with
5400
respect to --remember: If there is no default location set, the first send
5401
will set it (use --no-remember to avoid settting it). After that, you can
5402
omit the location to use the default. To change the default, use
5403
--remember. The value will only be saved if the location can be accessed.
5156
5405
In order to calculate those changes, bzr must analyse the submit branch.
5157
5406
Therefore it is most efficient for the submit branch to be a local mirror.
5158
5407
If a public location is known for the submit_branch, that location is used
5229
5478
def run(self, submit_branch=None, public_branch=None, no_bundle=False,
5230
no_patch=False, revision=None, remember=False, output=None,
5479
no_patch=False, revision=None, remember=None, output=None,
5231
5480
format=None, mail_to=None, message=None, body=None,
5232
5481
strict=None, **kwargs):
5233
5482
from bzrlib.send import send
5393
5638
_see_also = ['tag']
5394
5639
takes_options = [
5396
help='Branch whose tags should be displayed.',
5400
RegistryOption.from_kwargs('sort',
5640
custom_help('directory',
5641
help='Branch whose tags should be displayed.'),
5642
RegistryOption('sort',
5401
5643
'Sort tags by different criteria.', title='Sorting',
5402
alpha='Sort tags lexicographically (default).',
5403
time='Sort tags chronologically.',
5644
lazy_registry=('bzrlib.tag', 'tag_sort_methods')
5409
5650
@display_command
5651
def run(self, directory='.', sort=None, show_ids=False, revision=None):
5652
from bzrlib.tag import tag_sort_methods
5416
5653
branch, relpath = Branch.open_containing(directory)
5418
5655
tags = branch.tags.get_tag_dict().items()
5423
self.add_cleanup(branch.unlock)
5659
self.add_cleanup(branch.lock_read().unlock)
5425
5661
graph = branch.repository.get_graph()
5426
5662
rev1, rev2 = _get_revision_range(revision, branch, self.name())
5428
5664
# only show revisions between revid1 and revid2 (inclusive)
5429
5665
tags = [(tag, revid) for tag, revid in tags if
5430
5666
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]])
5668
sort = tag_sort_methods.get()
5444
5670
if not show_ids:
5445
5671
# [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
5446
5672
for index, (tag, revid) in enumerate(tags):
5584
5811
def run(self, to_location=None, force=False, create_branch=False,
5812
revision=None, directory=u'.'):
5586
5813
from bzrlib import switch
5814
tree_location = directory
5588
5815
revision = _get_one_revision('switch', revision)
5589
5816
control_dir = bzrdir.BzrDir.open_containing(tree_location)[0]
5590
5817
if to_location is None:
5591
5818
if revision is None:
5592
5819
raise errors.BzrCommandError('You must supply either a'
5593
5820
' revision or a location')
5821
to_location = tree_location
5596
5823
branch = control_dir.open_branch()
5597
5824
had_explicit_nick = branch.get_config().has_explicit_nickname()
5868
6096
You can put multiple items on the shelf, and by default, 'unshelve' will
5869
6097
restore the most recently shelved changes.
6099
For complicated changes, it is possible to edit the changes in a separate
6100
editor program to decide what the file remaining in the working copy
6101
should look like. To do this, add the configuration option
6103
change_editor = PROGRAM @new_path @old_path
6105
where @new_path is replaced with the path of the new version of the
6106
file and @old_path is replaced with the path of the old version of
6107
the file. The PROGRAM should save the new file with the desired
6108
contents of the file in the working tree.
5872
6112
takes_args = ['file*']
5874
6114
takes_options = [
5876
6117
Option('all', help='Shelve all changes.'),
5883
6124
Option('destroy',
5884
6125
help='Destroy removed changes instead of shelving them.'),
5886
_see_also = ['unshelve']
6127
_see_also = ['unshelve', 'configuration']
5888
6129
def run(self, revision=None, all=False, file_list=None, message=None,
5889
writer=None, list=False, destroy=False):
6130
writer=None, list=False, destroy=False, directory=None):
5891
return self.run_for_list()
6132
return self.run_for_list(directory=directory)
5892
6133
from bzrlib.shelf_ui import Shelver
5893
6134
if writer is None:
5894
6135
writer = bzrlib.option.diff_writer_registry.get()
5896
6137
shelver = Shelver.from_args(writer(sys.stdout), revision, all,
5897
file_list, message, destroy=destroy)
6138
file_list, message, destroy=destroy, directory=directory)
5967
6210
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'
6212
takes_options = ['directory',
6213
Option('ignored', help='Delete all ignored files.'),
6214
Option('detritus', help='Delete conflict files, merge and revert'
5971
6215
' backups, and failed selftest dirs.'),
5972
6216
Option('unknown',
5973
6217
help='Delete files unknown to bzr (default).'),
5975
6219
' deleting them.'),
5976
6220
Option('force', help='Do not prompt before deleting.')]
5977
6221
def run(self, unknown=False, ignored=False, detritus=False, dry_run=False,
6222
force=False, directory=u'.'):
5979
6223
from bzrlib.clean_tree import clean_tree
5980
6224
if not (unknown or ignored or detritus):
5984
clean_tree('.', unknown=unknown, ignored=ignored, detritus=detritus,
5985
dry_run=dry_run, no_prompt=force)
6228
clean_tree(directory, unknown=unknown, ignored=ignored,
6229
detritus=detritus, dry_run=dry_run, no_prompt=force)
5988
6232
class cmd_reference(Command):
6032
6276
self.outf.write('%s %s\n' % (path, location))
6279
class cmd_export_pot(Command):
6280
__doc__ = """Export command helps and error messages in po format."""
6285
from bzrlib.export_pot import export_pot
6286
export_pot(self.outf)
6035
6289
def _register_lazy_builtins():
6036
6290
# register lazy builtins from other modules; called at startup and should
6037
6291
# be only called once.
6038
6292
for (name, aliases, module_name) in [
6039
6293
('cmd_bundle_info', [], 'bzrlib.bundle.commands'),
6294
('cmd_config', [], 'bzrlib.config'),
6040
6295
('cmd_dpush', [], 'bzrlib.foreign'),
6041
6296
('cmd_version_info', [], 'bzrlib.cmd_version_info'),
6042
6297
('cmd_resolve', ['resolved'], 'bzrlib.conflicts'),
6043
6298
('cmd_conflicts', [], 'bzrlib.conflicts'),
6044
('cmd_sign_my_commits', [], 'bzrlib.sign_my_commits'),
6299
('cmd_sign_my_commits', [], 'bzrlib.commit_signature_commands'),
6300
('cmd_verify_signatures', [],
6301
'bzrlib.commit_signature_commands'),
6302
('cmd_test_script', [], 'bzrlib.cmd_test_script'),
6046
6304
builtin_command_registry.register_lazy(name, aliases, module_name)
added
removed
bzrlib/builtins.py
